Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@ src/config/user_config.py
*.db
.cache/
.cache.sqlite
.cache

# logging files
*.log
.cache
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "Merlin"
version = "1.2.1"
version = "1.2.2"
description = "Merlin - Your AI Assistant with multi-agent architecture"
readme = "README.md"
requires-python = ">=3.14"
Expand Down
2 changes: 1 addition & 1 deletion src/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Merlin - Your AI Assistant."""

__version__ = "0.1.0"
__version__ = "1.2.2"
__author__ = "sorcware"

from main import main
Expand Down
2 changes: 2 additions & 0 deletions src/config/user_config_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class Model:
}

# Expert agents personal config
# if using multiple models from your host set above
# you only need to add the model name.
EXPERTS = {
"default": {
# 'model_name': 'claude-3-sonnet',
Expand Down
4 changes: 3 additions & 1 deletion src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from rich.text import Text

from core.model_factory import ModelFactory
from experts.memory import MemoryAgent
from experts.orchestrator import TheOracle

console = Console()
Expand Down Expand Up @@ -119,7 +120,8 @@ def display_response_and_routing(result):
def chat_interface():
"""Provide main chat interface for interacting with Merlin."""
history = setup_chat_interface()

# Add the long term memory to the start of the history
history.messages.append({"memory": MemoryAgent()._load_memory_file()})
try:
while True:
# Styled user input
Expand Down
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.