Merge branch 'test' into tools-json

Author: styxhuang

agents/matmaster_agent/constant.py

@@ -49,6 +49,7 @@
 BOHRIUM_COM = f'https://www{URL_PART}.bohrium.com'
 BOHRIUM_HOST = f'https://bohrium{URL_PART}.dp.tech'
 ICL_SERVICE_URL = '101.126.90.82:8001'
+MEMORY_SERVICE_URL = '101.126.90.82:8002'
 MATMASTER_TOOLS_SERVER = f'https://matmaster-tools-server{URL_PART}.bohrium.com'
 if CURRENT_ENV == 'test':
     DFLOW_HOST = 'https://lbg-workflow-mlops.test.dp.tech'

agents/matmaster_agent/core_agents/base_agents/mcp_agent.py

@@ -13,6 +13,7 @@
     check_user_phonon_balance,
     default_after_model_callback,
     default_after_tool_callback,
+    default_before_model_callback,
     default_before_tool_callback,
     default_cost_func,
     filter_function_calls,
@@ -42,6 +43,12 @@
 from agents.matmaster_agent.flow_agents.model import PlanStepStatusEnum
 from agents.matmaster_agent.locales import i18n
 from agents.matmaster_agent.logger import PrefixFilter
+from agents.matmaster_agent.memory.inject_memory_callback import (
+    inject_memory_before_model,
+)
+from agents.matmaster_agent.memory.store_tool_result_callback import (
+    store_tool_result_in_memory,
+)
 from agents.matmaster_agent.model import CostFuncType
 from agents.matmaster_agent.state import PLAN
 from agents.matmaster_agent.style import tool_response_failed_card
@@ -84,6 +91,12 @@ def mcp_callback_model_validator(data: Any):
     if data.get('after_model_callback') is None:
         data['after_model_callback'] = default_after_model_callback
 
+    if data.get('before_model_callback') is None:
+        data['before_model_callback'] = default_before_model_callback
+    data['before_model_callback'] = inject_memory_before_model(
+        data['before_model_callback']
+    )
+
     if data.get('before_tool_callback') is None:
         data['before_tool_callback'] = default_before_tool_callback
 
@@ -118,11 +131,13 @@ def mcp_callback_model_validator(data: Any):
 
     data['before_tool_callback'] = catch_before_tool_callback_error(pipeline)
 
-    data['after_tool_callback'] = check_before_tool_callback_effect(
-        catch_after_tool_callback_error(
-            remove_job_link(
-                tgz_oss_to_oss_list(
-                    data['after_tool_callback'], data['enable_tgz_unpack']
+    data['after_tool_callback'] = store_tool_result_in_memory(
+        check_before_tool_callback_effect(
+            catch_after_tool_callback_error(
+                remove_job_link(
+                    tgz_oss_to_oss_list(
+                        data['after_tool_callback'], data['enable_tgz_unpack']
+                    )
                 )
             )
         )

agents/matmaster_agent/core_agents/comp_agents/recommend_summary_agent/agent.py

@@ -63,7 +63,7 @@
     GLOBAL_SCHEMA_INSTRUCTION,
     get_vocabulary_enforce_prompt,
 )
-from agents.matmaster_agent.state import RECOMMEND_PARAMS
+from agents.matmaster_agent.state import RECOMMEND_PARAMS, STEP_DESCRIPTION
 from agents.matmaster_agent.sub_agents.tools import ALL_TOOLS
 from agents.matmaster_agent.utils.event_utils import (
     context_function_event,
@@ -214,7 +214,7 @@ async def _run_events(self, ctx: InvocationContext) -> AsyncGenerator[Event, Non
         )
 
         self.tool_call_info_agent.instruction = gen_tool_call_info_instruction(
-            user_prompt=current_step['description'],
+            user_prompt=current_step[STEP_DESCRIPTION],
             agent_prompt=self.instruction,
             tool_doc=tool_doc,
             tool_schema=tool_schema,

agents/matmaster_agent/core_agents/comp_agents/recommend_summary_agent/subagent_summary_agent/callback.py

@@ -12,7 +12,6 @@
     MATMASTER_GENERATE_NPS,
     UNIVERSAL_CONTEXT_FILTER_KEYWORDS,
 )
-from agents.matmaster_agent.flow_agents.plan_info_agent.constant import PLAN_INFO_AGENT
 from agents.matmaster_agent.flow_agents.plan_make_agent.constant import PLAN_MAKE_AGENT
 from agents.matmaster_agent.logger import PrefixFilter
 from agents.matmaster_agent.utils.context_utils import is_content_has_keywords
@@ -30,7 +29,7 @@ async def filter_summary_llm_contents(
         if is_content_has_keywords(
             content,
             UNIVERSAL_CONTEXT_FILTER_KEYWORDS
-            + [PLAN_MAKE_AGENT, PLAN_INFO_AGENT]
+            + [PLAN_MAKE_AGENT]
             + [MATMASTER_FLOW, MATMASTER_FLOW_PLANS, MATMASTER_GENERATE_NPS],
         ):
             continue

agents/matmaster_agent/core_agents/comp_agents/recommend_summary_agent/tool_call_info_agent/prompt.py

@@ -1,6 +1,12 @@
+from agents.matmaster_agent.utils.sanitize_braces import with_sanitized_braces
+
+
+@with_sanitized_braces('user_prompt', 'agent_prompt')
 def gen_tool_call_info_instruction(
     user_prompt, agent_prompt, tool_doc, tool_schema, tool_args_recommend_prompt
 ):
+    user_prompt = user_prompt or ''
+    agent_prompt = agent_prompt or ''
     return f"""
 You are an AI agent that matches user requests to available tools. Your task is to analyze the user's query against the complete parameter schema.