ok Merge branch 'main' of github.com:modelscope/ms-agent into release/1.1

Author: wangxingjun778

.dev_scripts/dockerci.sh

@@ -1,12 +1,6 @@
 #!/bin/bash
 
 # install dependencies for ci
-
-sudo apt-get install libcurl4 openssl
-wget https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-7.0.11.tgz
-tar -zxvf mongodb-linux-x86_64-ubuntu2004-7.0.11.tgz
-export PATH=`pwd`/mongodb-linux-x86_64-ubuntu2004-7.0.11/bin:$PATH
-
 pip install torch
 export CODE_INTERPRETER_WORK_DIR=${GITHUB_WORKSPACE}
 echo "${CODE_INTERPRETER_WORK_DIR}"

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,9 +1,11 @@
+
 name: Bug report
 title: "[<Agent component: framework|tool|llm|etc...>] "
 description: Problems and issues with code of MS-Agent
 labels: [bug]
 assignees:
-  - zzhangpurdue
+  - wangxingjun778
+  - tastelikefeet
   - suluyana
 body:
   - type: markdown
@@ -19,28 +21,22 @@ body:
       label: Initial Checks
       description: |
         Just a few checks to make sure you need to create a bug report.
-
-        _Sorry to sound so draconian 👿; but every second spent replying to issues is time not spent improving MS-Agent 🙇._
       options:
-        - label: I have searched GitHub for a duplicate issue and I'm sure this is something new
+        - label: I have searched related issues and docs but cannot get the expected help.
           required: false
-        - label: I have read and followed [the docs & demos](https://github.com/modelscope/ms-agent/tree/master/demo) and still think this is a bug
-          required: false
-        - label: >
-            I am confident that the issue is with ms-agent
-            (not my code, or another library in the ecosystem)
+        - label: The bug has not been fixed in the latest version.
           required: false
 
   - type: textarea
     attributes:
-      label: What happened + What you expected to happen
-      description: Describe 1. the bug 2. expected behavior 3. useful information (e.g., logs)
+      label: A clear and concise description of what the bug is.
+      description: ''
       placeholder: >
-        Please provide the context in which the problem occurred and explain what happened. Further,
-        please also explain why you think the behaviour is erroneous. It is extremely helpful if you can
-        copy and paste the fragment of logs showing the exact error messages or wrong behaviour here.
+        To help us understand the issue better, please provide the following:
 
-        **NOTE**: please copy and paste texts instead of taking screenshots of them for easy future search.
+        - What command or script did you run?
+        - What happened? What did you expect to happen?
+        - If there are any error messages, please copy and paste the exact log output (no screenshots).
     validations:
       required: true
 
@@ -52,32 +48,3 @@ body:
         Please specify the versions of dependencies.
     validations:
       required: true
-
-  - type: textarea
-    attributes:
-      label: Reproduction script
-      description: >
-        Please provide a reproducible script. Providing a narrow reproduction (minimal / no external dependencies) will
-        help us triage and address issues in the timely manner!
-      placeholder: >
-        Please provide a short code snippet (less than 50 lines if possible) that can be copy-pasted to
-        reproduce the issue. The snippet should have **no external library dependencies**
-        (i.e., use fake or mock data / environments).
-
-        **NOTE**: If the code snippet cannot be run by itself, the issue will be marked as "needs-repro-script"
-        until the repro instruction is updated.
-    validations:
-      required: true
-
-  - type: dropdown
-    attributes:
-      label: Issue Severity
-      description: |
-        How does this issue affect your experience as a MS-Agent user?
-      multiple: false
-      options:
-          - "Low: It annoys or frustrates me."
-          - "Medium: It is a significant difficulty but I can work around it."
-          - "High: It blocks me from completing my task."
-    validations:
-        required: false

.github/ISSUE_TEMPLATE/feature-requests.yaml

@@ -3,7 +3,8 @@ description: Suggest an idea for MS-Agent project
 title: "[<Agent component: framework|tool|llm|etc...>] "
 labels: [enhancement]
 assignees:
-  - zzhangpurdue
+  - wangxingjun778
+  - tastelikefeet
   - suluyana
 
 body:
@@ -13,20 +14,6 @@ body:
         Thank you for finding the time to propose a new feature!
         We really appreciate the community efforts to improve MS-Agent.
 
-  - type: checkboxes
-    id: searched
-    attributes:
-      label: Initial Checks
-      description: |
-        Just a few checks to make sure you need to create a feature request.
-
-        _Sorry to sound so draconian 👿; but every second spent replying to issues is time not spent improving MS-Agent 🙇._
-      options:
-        - label: I have searched Google & GitHub for similar requests and couldn't find anything
-          required: true
-        - label: I have read and followed [the docs & demos](https://github.com/modelscope/ms-agent/tree/main/demo) and still think this feature is missing
-          required: true
-
   - type: textarea
     attributes:
       label: Description
@@ -36,8 +23,6 @@ body:
     attributes:
       label: Use case
       description: >
-        Describe the use case of your feature request. It will help us understand and
-        prioritize the feature request.
+        Describe what you're trying to achieve with this feature request. This helps us understand and prioritize it.
       placeholder: >
-        Rather than telling us how you might implement this feature, try to take a
-        step back and describe what you are trying to achieve.
+        Tell us what you're trying to do or solve.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,4 @@
 <!-- Thank you for your contribution! -->
-<!-- Unless your change is trivial, please create an issue to discuss the change before creating a PR -->
 
 ## Change Summary
 
@@ -14,6 +13,4 @@
 * [ ] The pull request title is a good summary of the changes - it will be used in the changelog
 * [ ] Unit tests for the changes exist
 * [ ] Run `pre-commit install` and `pre-commit run --all-files` before git commit, and passed lint check.
-* [ ] Some cases need DASHSCOPE_TOKEN_API to pass the Unit Tests, I have at least **pass the Unit tests on local**
 * [ ] Documentation reflects the changes where applicable
-* [ ] My PR is ready to review, **please add a comment including the phrase "please review" to assign reviewers**

.gitignore

@@ -94,8 +94,9 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
+projects/deep_research/.env
 .venv
+.env
 env/
 venv/
 ENV/

README.md

@@ -243,6 +243,10 @@ For more details, refer to [Doc Research](projects/doc_research/README.md),
 
 <br>
 
+### Interesting works
+
+1. A news collection agent [ms-agent/newspaper](https://www.modelscope.cn/models/ms-agent/newspaper/summary)
+
 ## License
 
 This project is licensed under the [Apache License (Version 2.0)](https://github.com/modelscope/modelscope/blob/master/LICENSE).

ms_agent/agent/llm_agent.py

@@ -10,7 +10,7 @@
 from ms_agent.callbacks import Callback, callbacks_mapping
 from ms_agent.llm.llm import LLM
 from ms_agent.llm.utils import Message, Tool
-from ms_agent.rag.base import Rag
+from ms_agent.rag.base import RAG
 from ms_agent.rag.utils import rag_mapping
 from ms_agent.tools import ToolManager
 from ms_agent.utils import async_retry
@@ -62,7 +62,7 @@ def __init__(self,
         self.tool_manager: Optional[ToolManager] = None
         self.memory_tools: List[Memory] = []
         self.planer: Optional[Planer] = None
-        self.rag: Optional[Rag] = None
+        self.rag: Optional[RAG] = None
         self.llm: Optional[LLM] = None
         self.runtime: Optional[Runtime] = None
         self.max_chat_round: int = 0
@@ -220,7 +220,7 @@ async def _prepare_messages(
             Message(role='user', content=inputs or query),
         ]
         if self.rag is not None:
-            messages = await self.rag.run(messages)
+            messages = await self.rag.query(messages[1].content)
         return messages
 
     async def _prepare_memory(self):
@@ -251,7 +251,7 @@ async def _prepare_rag(self):
                 assert rag.name in rag_mapping, (
                     f'{rag.name} not in rag_mapping, '
                     f'which supports: {list(rag_mapping.keys())}')
-                self.rag: Rag = rag_mapping(rag.name)(self.config)
+                self.rag: RAG = rag_mapping(rag.name)(self.config)
 
     async def _refine_memory(self, messages: List[Message]) -> List[Message]:
         """
@@ -509,6 +509,7 @@ async def _run(self, messages: Union[List[Message], str],
 
             await self._loop_callback('on_task_end', messages)
             await self._cleanup_tools()
+            yield messages
         except Exception as e:
             if hasattr(self.config, 'help'):
                 logger.error(

ms_agent/cli/app.py

@@ -1,8 +1,6 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 import argparse
 
-from ms_agent.app.doc_research import launch_server as launch_doc_research
-
 from modelscope.cli.base import CLICommand
 
 
@@ -53,6 +51,7 @@ def define_args(parsers: argparse.ArgumentParser):
     def execute(self):
 
         if self.args.doc_research:
+            from ms_agent.app.doc_research import launch_server as launch_doc_research
             launch_doc_research(
                 server_name=self.args.server_name,
                 server_port=self.args.server_port,

ms_agent/llm/openai_llm.py

@@ -50,7 +50,7 @@ def __init__(
             base_url=base_url,
         )
         self.args: Dict = OmegaConf.to_container(
-            getattr(config, 'generation_config', {}))
+            getattr(config, 'generation_config', DictConfig({})))
 
     def format_tools(self,
                      tools: Optional[List[Tool]] = None

ms_agent/rag/base.py

@@ -1,61 +1,52 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from abc import abstractmethod
+from abc import ABC, abstractmethod
 from typing import Any, List
 
-from ms_agent.llm import Message
 
-
-class Rag:
+class RAG(ABC):
     """The base class for rags"""
 
     def __init__(self, config):
         self.config = config
 
     @abstractmethod
-    async def add_document(self, url: str, content: str, **metadata) -> bool:
+    async def add_documents(self, documents: List[str]) -> bool:
         """Add document to Rag
 
         Args:
-            url(`str`): The url of the document
-            content(`str`): The content of the document
-            **metadata: Metadata information
+            documents(`List[str]`): The content of the document
 
         Returns:
             success or not
         """
         pass
 
     @abstractmethod
-    async def search_documents(self,
-                               query: str,
-                               limit: int = 5,
-                               score_threshold: float = 0.7,
-                               **filters) -> List[Any]:
-        """Search documents in Rag
+    async def query(self, query: str) -> str:
+        """Search documents
 
         Args:
             query(`str`): The query to search for
-            limit(`int`): The number of documents to return
-            score_threshold(`float`): The score threshold
-            **filters: Any extra filters
-
         Returns:
-            List of documents
+            The query result
         """
         pass
 
     @abstractmethod
-    async def delete_document(self, url: str) -> bool:
-        """Delete document from Rag
+    async def retrieve(self,
+                       query: str,
+                       limit: int = 5,
+                       score_threshold: float = 0.7,
+                       **filters) -> List[Any]:
+        """Retrieve documents
 
         Args:
-            url(`str`): The url of the document
+            query(`str`): The query to search for
+            limit(`int`): The number of documents to return
+            score_threshold(`float`): The score threshold
+            **filters: Any extra filters
 
         Returns:
-            bool: True if the document was successfully deleted
+            List of documents
         """
         pass
-
-    @abstractmethod
-    async def run(self, inputs: List[Message]) -> List[Message]:
-        pass