Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55b0875773 |
+6
-33
@@ -40,8 +40,8 @@ class AgentLoop:
|
||||
5. Sends responses back
|
||||
"""
|
||||
|
||||
# Server-side context management: Anthropic preserves all thinking blocks
|
||||
# and clears old tool results only when approaching the 200k context limit.
|
||||
# Server-side context management: Anthropic trims old tool results and preserves all
|
||||
# thinking blocks (keep="all" maximises cache hits). Client keeps full history.
|
||||
CONTEXT_MANAGEMENT = {
|
||||
"edits": [
|
||||
{
|
||||
@@ -50,11 +50,7 @@ class AgentLoop:
|
||||
},
|
||||
{
|
||||
"type": "clear_tool_uses_20250919",
|
||||
# Raised from 80k to 195k to avoid premature cache invalidation.
|
||||
# For conversations with few tool uses (e.g., 18 uses over 182k tokens),
|
||||
# cache stability (saves 169k/turn) >> clearing benefit (13-26k one-time).
|
||||
# Leaves 5k headroom before hitting 200k standard context limit.
|
||||
"trigger": {"type": "input_tokens", "value": 195000},
|
||||
"trigger": {"type": "input_tokens", "value": 80000},
|
||||
"keep": {"type": "tool_uses", "value": 5},
|
||||
},
|
||||
]
|
||||
@@ -567,23 +563,10 @@ class AgentLoop:
|
||||
reasoning_content=final_reasoning,
|
||||
)
|
||||
|
||||
# Save to session: mem0 context (if present) + user message + full tool chain
|
||||
# Save to session: user message + full tool chain (tool_use, tool_results, thinking, final reply)
|
||||
# Store current_message (not msg.content) so the time prefix is preserved
|
||||
# and cache keys match on subsequent turns
|
||||
# Include sender_id to distinguish real user messages from system-generated ones
|
||||
|
||||
# Find and save mem0 injection (appears just before current user message)
|
||||
# build_messages returns: [...history, mem0_user, mem0_asst, current_user]
|
||||
# turn_start = len(messages), so mem0 is at turn_start-3 and turn_start-2
|
||||
# This makes mem0 part of immutable history, stabilizing cache across turns
|
||||
if turn_start >= 3:
|
||||
potential_mem0_user = messages[turn_start - 3]
|
||||
potential_mem0_asst = messages[turn_start - 2]
|
||||
if (potential_mem0_user.get("role") == "user" and
|
||||
potential_mem0_user.get("content") == "[Memory context]" and
|
||||
potential_mem0_asst.get("role") == "assistant"):
|
||||
session.add_raw_message(potential_mem0_user)
|
||||
session.add_raw_message(potential_mem0_asst)
|
||||
|
||||
session.add_message("user", current_message, sender_id=msg.sender_id)
|
||||
for chain_msg in messages[turn_start:]:
|
||||
session.add_raw_message(chain_msg)
|
||||
@@ -786,17 +769,7 @@ class AgentLoop:
|
||||
reasoning_content=final_reasoning,
|
||||
)
|
||||
|
||||
# Save to session: mem0 (if present) + user message + full tool chain
|
||||
# Find and save mem0 injection for cache stability
|
||||
if turn_start >= 3:
|
||||
potential_mem0_user = messages[turn_start - 3]
|
||||
potential_mem0_asst = messages[turn_start - 2]
|
||||
if (potential_mem0_user.get("role") == "user" and
|
||||
potential_mem0_user.get("content") == "[Memory context]" and
|
||||
potential_mem0_asst.get("role") == "assistant"):
|
||||
session.add_raw_message(potential_mem0_user)
|
||||
session.add_raw_message(potential_mem0_asst)
|
||||
|
||||
# Save to session: user message + full tool chain
|
||||
session.add_message("user", f"[System: {msg.sender_id}] {msg.content}")
|
||||
for chain_msg in messages[turn_start:]:
|
||||
session.add_raw_message(chain_msg)
|
||||
|
||||
@@ -47,7 +47,6 @@ class Mem0MemoryStore:
|
||||
|
||||
today = datetime.now().strftime("%Y-%m-%d")
|
||||
custom_prompt = f"Extract dated facts from this conversation as JSON: {{\"facts\": [...]}}. Today is {today}.\n\n"
|
||||
self.custom_prompt = custom_prompt
|
||||
|
||||
# Initialize mem0 with optional config + custom prompt
|
||||
# Extract only MemoryConfig-relevant fields
|
||||
@@ -58,9 +57,14 @@ class Mem0MemoryStore:
|
||||
if key in raw_config:
|
||||
mem0_cfg_dict[key] = raw_config[key]
|
||||
logger.debug(f"Extracted for MemoryConfig: {list(mem0_cfg_dict.keys())}")
|
||||
logger.debug(f"Custom prompt length: {len(custom_prompt)} chars")
|
||||
self.custom_prompt = custom_prompt
|
||||
mem0_cfg_dict["custom_fact_extraction_prompt"] = custom_prompt
|
||||
mem0_config = MemoryConfig(**mem0_cfg_dict)
|
||||
logger.debug(f"MemoryConfig created: vector_store={mem0_config.vector_store.provider if mem0_config.vector_store else None}")
|
||||
logger.debug(f"MemoryConfig.custom_fact_extraction_prompt is None: {mem0_config.custom_fact_extraction_prompt is None}")
|
||||
self.memory = Memory(config=mem0_config)
|
||||
logger.debug(f"Memory.config.custom_fact_extraction_prompt is None: {self.memory.config.custom_fact_extraction_prompt is None}")
|
||||
|
||||
logger.info("Mem0 memory system initialized with custom nanobot prompt")
|
||||
|
||||
@@ -154,15 +158,21 @@ class Mem0MemoryStore:
|
||||
provider: Any,
|
||||
model: str,
|
||||
) -> list[str]:
|
||||
"""Extract facts from conversation using the main agent's LLM provider."""
|
||||
"""
|
||||
Extract facts from conversation using the main agent's LLM provider.
|
||||
|
||||
Uses the same provider/model already running (e.g. Haiku via Claude Max),
|
||||
avoiding a separate LLM call to mem0's default GPT-nano.
|
||||
"""
|
||||
import json as _json
|
||||
|
||||
# Build conversation text for extraction
|
||||
conv_text = ""
|
||||
for msg in messages:
|
||||
role = msg.get("role", "unknown")
|
||||
content_val = msg.get("content", "")
|
||||
if isinstance(content_val, str) and content_val.strip():
|
||||
conv_text += f"{role}: {content_val}\n\n"
|
||||
content = msg.get("content", "")
|
||||
if isinstance(content, str) and content.strip():
|
||||
conv_text += f"{role}: {content}\n\n"
|
||||
|
||||
if not conv_text.strip():
|
||||
return []
|
||||
@@ -178,19 +188,22 @@ class Mem0MemoryStore:
|
||||
max_tokens=2000,
|
||||
temperature=0.3,
|
||||
)
|
||||
text = (response.content or "").strip()
|
||||
|
||||
# Parse the JSON response — LLMResponse.content is a string
|
||||
text = response.content or ""
|
||||
# Strip markdown code fences if present
|
||||
text = text.strip()
|
||||
if text.startswith("```"):
|
||||
text = text.split("```")[1]
|
||||
if text.startswith("json"):
|
||||
text = text[4:]
|
||||
text = text.strip()
|
||||
text = text.split("\n", 1)[1] if "\n" in text else text[3:]
|
||||
if text.endswith("```"):
|
||||
text = text[:-3]
|
||||
text = text.strip()
|
||||
|
||||
data = _json.loads(text)
|
||||
facts = data.get("facts", [])
|
||||
if not isinstance(facts, list):
|
||||
logger.warning(f"LLM returned non-list facts: {type(facts)}")
|
||||
return []
|
||||
logger.debug(f"Extracted {len(facts)} facts using {model}")
|
||||
return facts
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fact extraction failed: {e}")
|
||||
return []
|
||||
@@ -201,7 +214,12 @@ class Mem0MemoryStore:
|
||||
user_id: str,
|
||||
session_id: str | None = None,
|
||||
) -> None:
|
||||
"""Store pre-extracted facts in mem0 with infer=False."""
|
||||
"""
|
||||
Store pre-extracted facts in mem0 with infer=False.
|
||||
|
||||
Bypasses mem0's built-in LLM extraction — facts are already
|
||||
in final form from extract_facts().
|
||||
"""
|
||||
if not facts:
|
||||
return
|
||||
|
||||
@@ -293,8 +311,7 @@ class Mem0MemoryStore:
|
||||
"""
|
||||
Consolidate session messages into mem0 memory.
|
||||
|
||||
Unlike the original MemoryStore, mem0 handles extraction automatically,
|
||||
so this just needs to feed recent messages to mem0.
|
||||
Facts are extracted using the main agent's LLM provider, then stored with infer=False.
|
||||
|
||||
Returns True on success.
|
||||
"""
|
||||
|
||||
@@ -326,35 +326,18 @@ class AnthropicOAuthProvider(LLMProvider):
|
||||
"""Make request to Anthropic API."""
|
||||
client = await self._get_client()
|
||||
|
||||
# Add cache breakpoints on the last TWO user messages (4-breakpoint strategy):
|
||||
# BP3: Second-to-last user message (stable history from previous turn)
|
||||
# BP4: Last user message (current turn, will become BP3 next turn)
|
||||
# This allows BP3 to reuse what BP4 cached last turn.
|
||||
user_indices = [i for i, m in enumerate(messages) if m.get("role") == "user"]
|
||||
|
||||
if len(user_indices) >= 2:
|
||||
# BP3: Second-to-last user message
|
||||
idx = user_indices[-2]
|
||||
msg = messages[idx]
|
||||
content = msg["content"]
|
||||
if isinstance(content, str):
|
||||
messages[idx] = {**msg, "content": [{"type": "text", "text": content, "cache_control": {"type": "ephemeral"}}]}
|
||||
elif isinstance(content, list) and content:
|
||||
new_content = list(content)
|
||||
new_content[-1] = {**new_content[-1], "cache_control": {"type": "ephemeral"}}
|
||||
messages[idx] = {**msg, "content": new_content}
|
||||
|
||||
if len(user_indices) >= 1:
|
||||
# BP4: Last user message
|
||||
idx = user_indices[-1]
|
||||
msg = messages[idx]
|
||||
content = msg["content"]
|
||||
if isinstance(content, str):
|
||||
messages[idx] = {**msg, "content": [{"type": "text", "text": content, "cache_control": {"type": "ephemeral"}}]}
|
||||
elif isinstance(content, list) and content:
|
||||
new_content = list(content)
|
||||
new_content[-1] = {**new_content[-1], "cache_control": {"type": "ephemeral"}}
|
||||
messages[idx] = {**msg, "content": new_content}
|
||||
# Cache the last user message so conversation history is cached across turns
|
||||
if messages:
|
||||
last = messages[-1]
|
||||
if last.get("role") == "user":
|
||||
content = last["content"]
|
||||
if isinstance(content, str):
|
||||
last = {**last, "content": [{"type": "text", "text": content, "cache_control": {"type": "ephemeral"}}]}
|
||||
elif isinstance(content, list) and content:
|
||||
new_content = list(content)
|
||||
new_content[-1] = {**new_content[-1], "cache_control": {"type": "ephemeral"}}
|
||||
last = {**last, "content": new_content}
|
||||
messages = messages[:-1] + [last]
|
||||
|
||||
payload: dict[str, Any] = {
|
||||
"model": model,
|
||||
|
||||
Reference in New Issue
Block a user