Merge remote-tracking branch 'upstream' into fix/refine_deepresearch

Merge remote-tracking branch 'upstream' into fix/refine_deepresearch

Author: alcholiclg

.dev_scripts/dockerci.sh

@@ -6,7 +6,7 @@ export CODE_INTERPRETER_WORK_DIR=${GITHUB_WORKSPACE}
 echo "${CODE_INTERPRETER_WORK_DIR}"
 
 # cp file
-cp tests/* "${CODE_INTERPRETER_WORK_DIR}/"
+cp -r tests/* "${CODE_INTERPRETER_WORK_DIR}/"
 ls  "${CODE_INTERPRETER_WORK_DIR}"
 # pip install playwright
 # playwright install --with-deps chromium

.github/ISSUE_TEMPLATE/doc-demo-bug.yaml

@@ -11,16 +11,6 @@ body:
     attributes:
       label: Description
       description: |
-        Tell us about the change you'd like to see. For example, "I'd like to
-        see more examples of how to create a new tool."
+        Tell us about the change you'd like to see, and the link of the code/doc block.
     validations:
       required: true
-
-  - type: textarea
-    attributes:
-      label: Link
-      description: |
-        If the problem is related to an existing section, please add a link to
-        the section. For example, https://github.com/modelscope/ms-agent/blob/main/demo/demo_alpha_umi.ipynb.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature-requests.yaml

@@ -17,12 +17,4 @@ body:
   - type: textarea
     attributes:
       label: Description
-      description: A short description of your feature
-
-  - type: textarea
-    attributes:
-      label: Use case
-      description: >
-        Describe what you're trying to achieve with this feature request. This helps us understand and prioritize it.
-      placeholder: >
-        Tell us what you're trying to do or solve.
+      description: A description of your feature, meanwhile please attach any links/papers related to the feature.

.github/workflows/citest.yaml

@@ -8,18 +8,17 @@ on:
     paths-ignore:
       - "setup.*"
       - "requirements.txt"
-      - "output/**"
+      - "requirements/*"
       - "README.md"
-      - "README_CN.md"
       - ".github/workflows/lint.yaml"
       - ".github/workflows/publish.yaml"
 
   pull_request:
     paths-ignore:
       - "setup.*"
       - "requirements.txt"
+      - "requirements/*"
       - "README.md"
-      - "README_zh-CN.md"
       - ".github/workflows/lint.yaml"
       - ".github/workflows/publish.yaml"
 
@@ -34,6 +33,7 @@ jobs:
     timeout-minutes: 60
     environment: testci
     steps:
+    - uses: actions/checkout@v4
 
     # Add a step to check if it's a fork and set an environment variable
     - name: Check if PR is from a fork
@@ -50,11 +50,10 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: pip install -r requirements/research.txt
 
-    - name: Run tests
-      env:
-        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-        DASHSCOPE_API_KEY: ${{ secrets.DASHSCOPE_API_KEY }}
-        MODELSCOPE_API_KEY: ${{ secrets.MODELSCOPE_API_KEY }}
+    - name: Install Code Dependencies
+      if: steps.cache.outputs.cache-hit != 'true'
+      run: pip install -r requirements/code.txt
 
+    - name: Run tests
       shell: bash
       run: bash .dev_scripts/dockerci.sh

.pre-commit-config.yaml

@@ -20,7 +20,6 @@ repos:
             (?x)^(
                 examples/|
                 tests/run.py|
-                swift/cli/sft.py
             )$
   - repo: https://github.com/pre-commit/mirrors-yapf.git
     rev: v0.30.0

.pre-commit-config_local.yaml

@@ -17,7 +17,6 @@ repos:
             (?x)^(
                 examples/|
                 tests/run.py|
-                swift/cli/sft.py
             )$
   - repo: /home/admin/pre-commit/mirrors-yapf
     rev: v0.30.0

README.md

@@ -7,7 +7,7 @@
 <p>
 
 <p align="center">
-<a href="https://modelscope.cn/mcp/playground">MCP Playground</a> ｜ <a href="https://arxiv.org/abs/2309.00986">Paper</a>
+<a href="https://modelscope.cn/mcp/playground">MCP Playground</a> ｜ <a href="https://arxiv.org/abs/2309.00986">Paper</a> | <a href="https://ms-agent-en.readthedocs.io/en/latest">Docs</a>
 <br>
 </p>
 
@@ -152,10 +152,11 @@ export MODELSCOPE_API_KEY={your_modelscope_api_key}
 You can find or generate your API key at https://modelscope.cn/my/myaccesstoken.
 
 ```python
-from ms_agent import LLMAgent
 import asyncio
 
-# Configure MCP server
+from ms_agent import LLMAgent
+
+# Configure MCP servers
 mcp = {
   "mcpServers": {
     "fetch": {
@@ -166,13 +167,12 @@ mcp = {
 }
 
 async def main():
-    # Initialize the agent with MCP configuration
-    llm_agent = LLMAgent(mcp_config=mcp)
-    # Run a task
-    await llm_agent.run('Briefly introduce modelscope.cn')
+    # Use json to configure MCP
+    llm_agent = LLMAgent(mcp_config=mcp)   # Run task
+    await llm_agent.run('Introduce modelscope.cn')
 
 if __name__ == '__main__':
-    # Launch the async main function
+    # Start
     asyncio.run(main())
 ```
 ----
@@ -210,7 +210,8 @@ This example demonstrates how the agent remembers user preferences across sessio
 import uuid
 import asyncio
 from omegaconf import OmegaConf
-from ms_agent.agent import LLMAgent
+from ms_agent.agent.loader import AgentLoader
+
 
 async def main():
     random_id = str(uuid.uuid4())
@@ -220,18 +221,18 @@ async def main():
             'user_id': 'awesome_me'
         }]
     })
-    agent1 = LLMAgent(config=default_memory)
+    agent1 = AgentLoader.build(config_dir_or_id='ms-agent/simple_agent', config=default_memory)
     agent1.config.callbacks.remove('input_callback')  # Disable interactive input for direct output
 
     await agent1.run('I am a vegetarian and I drink coffee every morning.')
     del agent1
     print('========== Data preparation completed, starting test ===========')
-    agent2 = LLMAgent(config=default_memory)
+    agent2 = AgentLoader.build(config_dir_or_id='ms-agent/simple_agent', config=default_memory)
     agent2.config.callbacks.remove('input_callback')  # Disable interactive input for direct output
 
     res = await agent2.run('Please help me plan tomorrow’s three meals.')
     print(res)
-    assert ('vegan' in res[-1].content.lower()) and 'coffee' in res[-1].content.lower()
+    assert 'vegan' in res[-1].content.lower() and 'coffee' in res[-1].content.lower()
 
 asyncio.run(main())
 ```
@@ -303,11 +304,10 @@ This project provides a framework for **Doc Research**, enabling agents to auton
 
 **2. Local Gradio Application**
 
-* Research Report for [UniME: Breaking the Modality Barrier: Universal Embedding Learning
-with Multimodal LLMs](https://arxiv.org/pdf/2504.17432)
+* Research Report for [UniME: Breaking the Modality Barrier: Universal Embedding Learning with Multimodal LLMs](https://arxiv.org/pdf/2504.17432)
 <div align="center">
   <img src="https://github.com/user-attachments/assets/3f85ba08-6366-49b7-b551-cbe50edf6218" alt="LocalGradioApplication" width="750">
-  <p><em>Demo: UniME Research Report</em></p>
+  <p><em>Demo：UniME Research Report</em></p>
 </div>