Merge branch 'feature/code-interpreter' of https://github.com/creammangopie/OxyGent into feature/code-interpreter

Author: niuerbo1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,4 +25,4 @@ assignees: ''
 - Other deployments:
 
 **Logs and Reports**
-> If possible, please upload files containing `/cache_dir` or `/cache_dir_dev` for detailed error logs.
+> If possible, please upload files containing `/cache_dir` for detailed error logs.

.gitignore

@@ -240,6 +240,5 @@ pyproject.toml*
 
 # 运行时产生的文件
 cache_dir/
-cache_dir_dev/
 local_file/
 deployment/

CHANGELOG.md

@@ -7,6 +7,15 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Added support for dynamic registration of `oxy`
 
+---
+## [1.0.6.3] - 2025-10-15
+
+### Added
+- Added fine-grained message storage, refer to [./examples/advanced/demo_save_message.py](./examples/advanced/demo_save_message.py)
+
+### Changed
+- Updated examples. For details, see [./examples](./examples)
+
 ---
 
 ## [1.0.6.2] - 2025-10-09

CHANGELOG_zh.md

@@ -9,6 +9,16 @@
 
 ---
 
+## [1.0.6.3] - 2025-10-15
+
+### Added
+- 新增细粒度的消息存储，详见 [./examples/advanced/demo_save_message.py](./examples/advanced/demo_save_message.py)
+
+### Changed
+- 更新示例，详见 [./examples](./examples)
+
+---
+
 ## [1.0.6.2] - 2025-10-09
 
 ### Added

CONTRIBUTING.md

@@ -44,7 +44,7 @@ For developers who want to contribute to our code, here is the guidance:
     python demo.py
 ```
 ```bash
-    python -m examples.agents.single_demo
+    python -m examples.agents.demo_single_agent
 ```
 
 ## 4. Test

CONTRIBUTING_zh.md

@@ -45,7 +45,7 @@ OxyGent致力于为每一位用户和开发者提供开放的智能体系统体
     python demo.py
 ```
 ```bash
-    python -m examples.agents.single_demo
+    python -m examples.agents.demo_single_agent
 ```
 
 ## 4. 测试

config.json

@@ -24,7 +24,9 @@
             "max_tokens": 4096, 
             "top_p": 1
         },
-        "cache": {"save_dir": "./cache_dir"},
+        "cache": {
+            "save_dir": "./cache_dir"
+        },
         "message": {
             "is_send_tool_call": true,
             "is_send_observation": true,
@@ -58,7 +60,7 @@
         },
         "agent": {
             "prompt": "",
-            "llm_model": "",
+            "llm_model": "default_llm",
             "input_schema": {
                 "properties": {"query": {"description": "Query question"}},
                 "required": ["query"]
@@ -70,8 +72,8 @@
         }
     },
     "dev": {
-        "cache": {
-            "save_dir": "./cache_dir_dev"
+        "app": {
+            "name": "app-dev"
         },
         "es": {
             "hosts": [

demo.py

@@ -1,161 +1,48 @@
 import asyncio
 import os
 
-from pydantic import Field
-
-from oxygent import MAS, Config, OxyRequest, OxyResponse, oxy
-from oxygent.prompts import INTENTION_PROMPT
+from oxygent import MAS, Config, oxy, preset_tools
 
 Config.set_agent_llm_model("default_llm")
 
 
-async def workflow(oxy_request: OxyRequest):
-    short_memory = oxy_request.get_short_memory()
-    print("--- History record --- :", short_memory)
-    master_short_memory = oxy_request.get_short_memory(master_level=True)
-    print("--- History record-User layer --- :", master_short_memory)
-    print("user query:", oxy_request.get_query(master_level=True))
-    await oxy_request.send_message({"type": "msg_type", "content": "msg_content"})
-    oxy_response = await oxy_request.call(
-        callee="time_agent",
-        arguments={"query": "What time is it now in Asia/Shanghai?"},
-    )
-    print("--- Current time --- :", oxy_response.output)
-    oxy_response = await oxy_request.call(
-        callee="default_llm",
-        arguments={
-            "messages": [
-                {"role": "system", "content": "You are a helpful assistant."},
-                {"role": "user", "content": "Hello!"},
-            ],
-            "llm_params": {"temperature": 0.6},
-        },
-    )
-    print(oxy_response.output)
-    import re
-
-    numbers = re.findall(r"\d+", oxy_request.get_query())
-    if numbers:
-        n = numbers[-1]
-        oxy_response = await oxy_request.call(callee="calc_pi", arguments={"prec": n})
-        return f"Save {n} positions: {oxy_response.output}"
-    else:
-        return "Save 2 positions: 3.14, or you could ask me to save how many positions you want."
-
-
-fh = oxy.FunctionHub(name="joke_tools")
-
-
-@fh.tool(description="a tool for telling jokes")
-async def joke_tool(joke_type: str = Field(description="The type of the jokes")):
-    import random
-
-    jokes = [
-        "Teacher: Can you use the word 'because' in a sentence? \n Student: I didn't do my homework because… because I didn't do my homework.",
-        "Patient: Doctor, I feel like a pair of curtains.\nDoctor: Pull yourself together!",
-        "How many software engineers does it take to change a light bulb?\nNone. That's a hardware problem.",
-    ]
-    print("The type of the jokes", joke_type)
-    return random.choice(jokes)
-
-
-def update_query(oxy_request: OxyRequest) -> OxyRequest:
-    print(oxy_request.shared_data)
-    user_query = oxy_request.get_query(master_level=True)
-    current_query = oxy_request.get_query()
-    print(user_query + "\n" + current_query)
-    oxy_request.arguments["who"] = oxy_request.callee
-    return oxy_request
-
-
-def format_output(oxy_response: OxyResponse) -> OxyResponse:
-    oxy_response.output = "Answer: " + oxy_response.output
-    return oxy_response
-
-
 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={"temperature": 0.01},
-        semaphore=4,
-    ),
-    oxy.ChatAgent(name="intent_agent", prompt=INTENTION_PROMPT),
-    fh,
-    oxy.StdioMCPClient(
-        name="time_tools",
-        params={
-            "command": "uvx",
-            "args": ["mcp-server-time", "--local-timezone=Asia/Shanghai"],
-        },
-    ),
-    oxy.StdioMCPClient(
-        name="file_tools",
-        params={
-            "command": "npx",
-            "args": ["-y", "@modelcontextprotocol/server-filesystem", "./local_file"],
-        },
-    ),
-    oxy.StdioMCPClient(
-        name="my_tools",
-        params={
-            "command": "uv",
-            "args": ["--directory", "./mcp_servers", "run", "my_tools.py"],
-        },
-    ),
-    oxy.ReActAgent(
-        name="master_agent",
-        sub_agents=["time_agent", "file_agent", "math_agent"],
-        additional_prompt="You may get several types of tasks, please choose correct tools to finish tasks.",
-        is_master=True,
-        func_format_output=format_output,
-        timeout=100,
-        llm_model="default_llm",
     ),
+    preset_tools.time_tools,
     oxy.ReActAgent(
         name="time_agent",
-        desc="A tool for time query.",
-        additional_prompt="Do not send other information except time.",
+        desc="A tool that can query the time",
         tools=["time_tools"],
-        func_process_input=update_query,
-        trust_mode=False,
-        timeout=10,
     ),
+    preset_tools.file_tools,
     oxy.ReActAgent(
         name="file_agent",
-        desc="A tool for file operation.",
+        desc="A tool that can operate the file system",
         tools=["file_tools"],
     ),
-    oxy.WorkflowAgent(
+    preset_tools.math_tools,
+    oxy.ReActAgent(
         name="math_agent",
-        desc="A tool for pi query",
-        sub_agents=["time_agent"],
-        tools=["my_tools"],
-        func_workflow=workflow,
-        is_retain_master_short_memory=True,
+        desc="A tool that can perform mathematical calculations.",
+        tools=["math_tools"],
+    ),
+    oxy.ReActAgent(
+        is_master=True,
+        name="master_agent",
+        sub_agents=["time_agent", "file_agent", "math_agent"],
     ),
-    # oxy.StreamableMCPClient(name="test_stream", server_url="http://127.0.0.1:9000/mcp"),
 ]
 
 
 async def main():
-    """
-    new instance:
-        Method 1: async with MAS(oxy_space=oxy_space) as mas:
-        Method 2: mas = await MAS.create(oxy_space=oxy_space)
-    call directly:
-        await mas.call(callee="joke_tool", arguments={"joke_type": "comic"})
-    start:
-        await mas.start_cli_mode(first_query="Get what time it is and save in `log.txt` under `/local_file`")
-        await mas.start_web_service(first_query="Get what time it is and save in `log.txt` under `/local_file`")
-        await mas.start_batch_processing(["Hello", "What time is it now", "200 positions of Pi"])
-    """
     async with MAS(oxy_space=oxy_space) as mas:
         await mas.start_web_service(
-            first_query="Please calculate the 20 positions of Pi",
-            welcome_message="Hi, I’m OxyGent. How can I assist you?",
+            first_query="What time is it now? Please save it into time.txt."
         )
 
 

demo_in_readme.py

@@ -46,7 +46,7 @@ The position of the class is:
 
 ```python
 oxy.SSEMCPClient(
-    name="my_tools",
-    sse_url="http://127.0.0.1:9000/sse"
+    name="math_tools",
+    sse_url="http://127.0.0.1:8000/sse"
 )
 ```