updated request interceptor.

Author: JDOxygen

docs/development/api/mas.md

@@ -58,8 +58,6 @@ oxygent/mas.py
 | `show_mas_info()` | No | `None` | Display MAS initialization information |
 | `show_org()` | No | `None` | Display organization structure |
 | `init_global_data()` | No | `None` | Initialize the in-memory global data store |
-| `get_global()` | No | `Any` | Get value from global data store |
-| `set_global()` | No | `None` | Set value in global data store |
 | `is_agent()` | No | `bool` | Check if an oxy name is an agent |
 | `init_master_agent_name()` | No | `None` | Initialize the master agent name |
 | `init_agent_organization()` | No | `None` | Build agent organization structure |

docs/docs_zh/3_2_set_global.md

@@ -3,17 +3,16 @@
 OxyGent支持使用非常简单的方式设置和修改系统全局数据，这些数据类似于全局变量，能够在MAS中使用`OxyRequest`进行更改与访问。
 
 支持的方法包括：
-+ `get_global`：使用`(key,default_value)`按键值访问全局数据
-+ `set_global`：使用`(key,value)`按键值修改全局数据
-+ `get_all_global`：获取所有的全局数据（返回`dict`）
++ `get_global_data`：使用`(key,default_value)`按键值访问全局数据
++ `set_global_data`：使用`(key,value)`按键值修改全局数据
 
 下面使用全局数据实现简单的计数器。
 
 ```python
 class CounterAgent(BaseAgent):
     async def execute(self, oxy_request: OxyRequest):
-        cnt = oxy_request.get_global("counter", 0) + 1 # 获取计数
-        oxy_request.set_global("counter", cnt) # 存储计数+1
+        cnt = oxy_request.get_global_data("counter", 0) + 1 # 获取计数
+        oxy_request.set_global_data("counter", cnt) # 存储计数+1
 
         return OxyResponse(
             state=OxyState.COMPLETED,

examples/backend/demo_custom_shared_data_schema.py

@@ -0,0 +1,45 @@
+"""Demo for using OxyGent with multiple LLMs and an agent."""
+
+import asyncio
+import os
+
+from oxygent import MAS, Config, OxyRequest, oxy
+
+Config.set_es_schema_shared_data(
+    {
+        "properties": {
+            "user_pin": {"type": "keyword"},
+            "user_name": {"type": "keyword"},
+        }
+    }
+)
+
+
+def process_input(oxy_request: OxyRequest) -> OxyRequest:
+    oxy_request.set_shared_data("user_pin", "123456")
+    oxy_request.set_shared_data("user_name", "oxy")
+    return oxy_request
+
+
+oxy_space = [
+    oxy.HttpLLM(
+        name="default_llm",
+        api_key=os.getenv("DEFAULT_LLM_API_KEY"),
+        base_url=os.getenv("DEFAULT_LLM_BASE_URL"),
+        model_name=os.getenv("DEFAULT_LLM_MODEL_NAME"),
+    ),
+    oxy.ReActAgent(
+        name="master_agent",
+        llm_model="default_llm",
+        func_process_input=process_input,
+    ),
+]
+
+
+async def main():
+    async with MAS(oxy_space=oxy_space) as mas:
+        await mas.start_web_service(first_query="hello")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

examples/llms/demo_reset_llm_params.py

@@ -0,0 +1,29 @@
+import asyncio
+import os
+
+from oxygent import MAS, Config, oxy
+
+Config.set_llm_config({})  # 重置LLM默认参数，以适配GPT-5模型
+
+
+oxy_space = [
+    oxy.HttpLLM(
+        name="default_llm",
+        api_key=os.getenv("DEFAULT_LLM_API_KEY"),
+        base_url=os.getenv("DEFAULT_LLM_BASE_URL"),
+        model_name=os.getenv("DEFAULT_LLM_MODEL_NAME"),
+        llm_params={"thinking": False, "stream": False},
+    ),
+]
+
+
+async def main():
+    async with MAS(oxy_space=oxy_space) as mas:
+        await mas.call(
+            callee="default_llm",
+            arguments={"messages": [{"role": "user", "content": "hello"}]},
+        )
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

examples/llms/ollama_demo.py

@@ -10,33 +10,16 @@
         name="default_llm",
         base_url="http://localhost:11434/api/chat",
         model_name=os.getenv("DEFAULT_OLLAMA_MODEL"),
-        semaphore=1,
-    ),
-    oxy.ChatAgent(
-        name="master_agent",
-        is_master=True,
-        llm_model="default_llm",
     ),
 ]
 
 
 async def main():
     async with MAS(oxy_space=oxy_space) as mas:
-        history = [{"role": "system", "content": "You are a helpful assistant."}]
-
-        while True:
-            user_in = input("User: ").strip()
-            if user_in.lower() in {"exit", "quit", "q"}:
-                break
-
-            history.append({"role": "user", "content": user_in})
-            result = await mas.call(
-                callee="master_agent",
-                arguments={"messages": history},
-            )
-            assistant_out = result
-            print(f"Assistant: {assistant_out}\n")
-            history.append({"role": "assistant", "content": assistant_out})
+        await mas.call(
+            callee="default_llm",
+            arguments={"messages": [{"role": "user", "content": "hello"}]},
+        )
 
 
 if __name__ == "__main__":

oxygent/oxy/base_oxy.py

@@ -252,30 +252,26 @@ async def _pre_log(self, oxy_request: OxyRequest):
     async def _request_interceptor(self, oxy_request: OxyRequest):
         if (
             oxy_request.reference_trace_id
+            and oxy_request.restart_node_id
             and oxy_request.is_load_data_for_restart
             and self.mas
             and self.mas.es_client
             and self.category in ["llm", "tool"]
         ):
-            if oxy_request.restart_node_id:
-                es_response = await self.mas.es_client.search(
-                    Config.get_app_name() + "_node",
-                    {
-                        "query": {
-                            "bool": {
-                                "must": [
-                                    {
-                                        "term": {
-                                            "trace_id": oxy_request.reference_trace_id
-                                        }
-                                    },
-                                    {"term": {"input_md5": oxy_request.input_md5}},
-                                ]
-                            }
-                        },
-                        "size": 1,
+            es_response = await self.mas.es_client.search(
+                Config.get_app_name() + "_node",
+                {
+                    "query": {
+                        "bool": {
+                            "must": [
+                                {"term": {"trace_id": oxy_request.reference_trace_id}},
+                                {"term": {"input_md5": oxy_request.input_md5}},
+                            ]
+                        }
                     },
-                )
+                    "size": 1,
+                },
+            )
             logging.info(f"ES search returned {len(es_response['hits']['hits'])} hits")
             if es_response["hits"]["hits"]:
                 current_node_order = es_response["hits"]["hits"][0]["_source"][