mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-28 07:35:27 -04:00
Merge remote-tracking branch 'origin/dev' into test-main-dev-merge-20260615
# Conflicts: # src/tool_implementations.py # static/js/research/panel.js
This commit is contained in:
@@ -24,7 +24,9 @@ MAX_PIPELINE_STEPS = 10
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Global managers (set from app.py, same pattern as _mcp_manager)
|
||||
# ---------------------------------------------------------------------------
|
||||
# _session_manager is kept as a local cache for performance (avoiding
|
||||
# repeated get_session_manager_instance() calls). It's synced with
|
||||
# the authoritative singleton in core.models.
|
||||
_session_manager = None
|
||||
_memory_manager = None
|
||||
_memory_vector = None
|
||||
@@ -33,11 +35,15 @@ _personal_docs_manager = None
|
||||
|
||||
|
||||
def set_session_manager(mgr):
|
||||
"""Set the global session manager. Syncs local cache + core singleton."""
|
||||
global _session_manager
|
||||
_session_manager = mgr
|
||||
from core.models import set_session_manager_instance
|
||||
set_session_manager_instance(mgr)
|
||||
|
||||
|
||||
def get_session_manager():
|
||||
"""Get the global session manager."""
|
||||
return _session_manager
|
||||
|
||||
|
||||
@@ -966,16 +972,15 @@ async def do_manage_memory(content: str, session_id: Optional[str] = None, owner
|
||||
memories = [m for m in memories if m.get("category", "").lower() == category_filter]
|
||||
if not memories:
|
||||
return {"results": "No memories found" + (f" in category '{category_filter}'" if category_filter else "") + "."}
|
||||
|
||||
result_lines = [f"Found {len(memories)} memory entries:\n"]
|
||||
for m in memories[:100]:
|
||||
for m in memories:
|
||||
cat = m.get("category", "fact")
|
||||
mid = m.get("id", "?")[:8]
|
||||
text = m.get("text", "")
|
||||
if len(text) > 150:
|
||||
text = text[:150] + "..."
|
||||
result_lines.append(f"- [{cat}] `{mid}` — {text}")
|
||||
if len(memories) > 100:
|
||||
result_lines.append(f"... and {len(memories) - 100} more")
|
||||
return {"results": "\n".join(result_lines)}
|
||||
|
||||
elif action == "add":
|
||||
|
||||
Reference in New Issue
Block a user