merge

.readthedocs.yaml

@@ -0,0 +1,20 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+mkdocs:
+  configuration: mkdocs.yml
+
+# Optionally declare the Python requirements required to build your docs
+python:
+  install:
+  - requirements: docs/requirements.txt

README.md

@@ -9,6 +9,7 @@ ERNIE Bot SDK提供便捷易用的接口，可以调用文心大模型的能力
 ![Supported Python versions](https://img.shields.io/badge/python-3.8+-orange.svg)
 ![Supported OSs](https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-yellow.svg)
 
+[![Built with Material for MkDocs](https://img.shields.io/badge/Material_for_MkDocs-526CFE?style=for-the-badge&logo=MaterialForMkDocs&logoColor=white)](https://squidfunk.github.io/mkdocs-material/)
 </div>
 
 ## 最新动态

docs/index.md

@@ -0,0 +1,17 @@
+# Welcome to MkDocs
+
+For full documentation visit [mkdocs.org](https://www.mkdocs.org).
+
+## Commands
+
+* `mkdocs new [dir-name]` - Create a new project.
+* `mkdocs serve` - Start the live-reloading docs server.
+* `mkdocs build` - Build the documentation site.
+* `mkdocs -h` - Print help message and exit.
+
+## Project layout
+
+    mkdocs.yml    # The configuration file.
+    docs/
+        index.md  # The documentation homepage.
+        ...       # Other markdown pages, images and other files.

docs/package/erniebot_agent/agents.md

@@ -0,0 +1,10 @@
+
+# Agent Module
+
+
+::: erniebot_agent.agents.base
+    options:
+        summary: true
+        members:
+        - BaseAgent
+        - Agent

docs/requirements.txt

@@ -0,0 +1,4 @@
+mkdocs
+mkdocstrings[python]
+mkdocstrings-python
+griffe

erniebot-agent/requirements.txt

@@ -1,5 +1,6 @@
 aiohttp
 anyio
+asyncio-atexit
 # erniebot
 jinja2
 langchain

erniebot-agent/src/erniebot_agent/agents/base.py

@@ -17,7 +17,6 @@
 import logging
 from typing import Any, Dict, List, Literal, Optional, Union, final
 
-from erniebot_agent import file_io
 from erniebot_agent.agents.callback.callback_manager import CallbackManager
 from erniebot_agent.agents.callback.default import get_default_callbacks
 from erniebot_agent.agents.callback.handlers.base import CallbackHandler
@@ -28,11 +27,11 @@
     ToolResponse,
 )
 from erniebot_agent.chat_models.base import ChatModel
-from erniebot_agent.file_io import protocol
-from erniebot_agent.file_io.base import File
-from erniebot_agent.file_io.file_manager import FileManager
+from erniebot_agent.file import get_global_file_manager, protocol
+from erniebot_agent.file.base import File
+from erniebot_agent.file.file_manager import FileManager
+from erniebot_agent.memory import Message, SystemMessage
 from erniebot_agent.memory.base import Memory
-from erniebot_agent.messages import Message, SystemMessage
 from erniebot_agent.tools.base import BaseTool
 from erniebot_agent.tools.tool_manager import ToolManager
 from erniebot_agent.utils.mixins import GradioMixin
@@ -78,7 +77,7 @@ def __init__(
         else:
             self._callback_manager = CallbackManager(callbacks)
         if file_manager is None:
-            file_manager = file_io.get_global_file_manager()
+            file_manager = get_global_file_manager()
         self.plugins = plugins
         self._file_manager = file_manager
         self._init_file_repr()
@@ -163,10 +162,10 @@ def _parse_tool_args(self, tool_args: str) -> Dict[str, Any]:
         try:
             args_dict = json.loads(tool_args)
         except json.JSONDecodeError:
-            raise ValueError(f"`tool_args` cannot be parsed as JSON. `tool_args` is {tool_args}")
+            raise ValueError(f"`tool_args` cannot be parsed as JSON. `tool_args`: {tool_args}")
 
         if not isinstance(args_dict, dict):
-            raise ValueError(f"`tool_args` cannot be interpreted as a dict. It loads as {args_dict} ")
+            raise ValueError(f"`tool_args` cannot be interpreted as a dict. `tool_args`: {tool_args}")
         return args_dict
 
     async def _sniff_and_extract_files_from_args(

erniebot-agent/src/erniebot_agent/agents/callback/callback_manager.py

@@ -21,7 +21,7 @@
 from erniebot_agent.agents.callback.handlers.base import CallbackHandler
 from erniebot_agent.agents.schema import AgentResponse, LLMResponse, ToolResponse
 from erniebot_agent.chat_models.base import ChatModel
-from erniebot_agent.messages import Message
+from erniebot_agent.memory.messages import Message
 from erniebot_agent.tools.base import BaseTool
 
 if TYPE_CHECKING:
@@ -62,7 +62,7 @@ async def handle_event(self, event_type: EventType, *args: Any, **kwargs: Any) -
         for handler in self._handlers:
             callback = getattr(handler, callback_name, None)
             if not inspect.iscoroutinefunction(callback):
-                raise TypeError("Callback must be a coroutine function.")
+                raise RuntimeError("Callback must be a coroutine function.")
             await callback(*args, **kwargs)
 
     async def on_run_start(self, agent: Agent, prompt: str) -> None:

erniebot-agent/src/erniebot_agent/agents/callback/handlers/base.py

@@ -18,7 +18,7 @@
 
 from erniebot_agent.agents.schema import AgentResponse, LLMResponse, ToolResponse
 from erniebot_agent.chat_models.base import ChatModel
-from erniebot_agent.messages import Message
+from erniebot_agent.memory import Message
 from erniebot_agent.tools.base import BaseTool
 
 if TYPE_CHECKING:

erniebot-agent/src/erniebot_agent/agents/callback/handlers/logging_handler.py

@@ -20,7 +20,7 @@
 from erniebot_agent.agents.callback.handlers.base import CallbackHandler
 from erniebot_agent.agents.schema import AgentResponse, LLMResponse, ToolResponse
 from erniebot_agent.chat_models.base import ChatModel
-from erniebot_agent.messages import Message
+from erniebot_agent.memory import Message
 from erniebot_agent.tools.base import BaseTool
 from erniebot_agent.utils.json import to_pretty_json
 from erniebot_agent.utils.output_style import ColoredContent

erniebot-agent/src/erniebot_agent/agents/functional_agent.py

@@ -19,15 +19,10 @@
 from erniebot_agent.agents.callback.handlers.base import CallbackHandler
 from erniebot_agent.agents.schema import AgentAction, AgentFile, AgentResponse
 from erniebot_agent.chat_models.base import ChatModel
-from erniebot_agent.file_io.base import File
-from erniebot_agent.file_io.file_manager import FileManager
+from erniebot_agent.file.base import File
+from erniebot_agent.file.file_manager import FileManager
+from erniebot_agent.memory import FunctionMessage, HumanMessage, Message, SystemMessage
 from erniebot_agent.memory.base import Memory
-from erniebot_agent.messages import (
-    FunctionMessage,
-    HumanMessage,
-    Message,
-    SystemMessage,
-)
 from erniebot_agent.tools.base import BaseTool
 
 _MAX_STEPS = 5

erniebot-agent/src/erniebot_agent/agents/functional_agent_with_retrieval.py

@@ -12,8 +12,8 @@
     AgentResponse,
     ToolResponse,
 )
-from erniebot_agent.file_io.base import File
-from erniebot_agent.messages import (
+from erniebot_agent.file.base import File
+from erniebot_agent.memory.messages import (
     AIMessage,
     FunctionMessage,
     HumanMessage,

erniebot-agent/src/erniebot_agent/agents/schema.py

@@ -18,9 +18,9 @@
 from dataclasses import dataclass
 from typing import Dict, List, Literal, Optional, Tuple, Union
 
-from erniebot_agent.file_io import protocol
-from erniebot_agent.file_io.base import File
-from erniebot_agent.messages import AIMessage, Message
+from erniebot_agent.file import protocol
+from erniebot_agent.file.base import File
+from erniebot_agent.memory import AIMessage, Message
 
 
 @dataclass

erniebot-agent/src/erniebot_agent/chat_models/base.py

@@ -15,7 +15,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import Any, AsyncIterator, List, Literal, Union, overload
 
-from erniebot_agent.messages import AIMessage, AIMessageChunk, Message
+from erniebot_agent.memory.messages import AIMessage, AIMessageChunk, Message
 
 
 class ChatModel(metaclass=ABCMeta):

erniebot-agent/src/erniebot_agent/chat_models/erniebot.py

@@ -29,7 +29,7 @@
 from erniebot.response import EBResponse
 
 from erniebot_agent.chat_models.base import ChatModel
-from erniebot_agent.messages import (
+from erniebot_agent.memory.messages import (
     AIMessage,
     AIMessageChunk,
     FunctionCall,

erniebot-agent/src/erniebot_agent/extensions/langchain/chat_models/erniebot.py

@@ -173,7 +173,7 @@ def _stream(
         **kwargs: Any,
     ) -> Iterator[ChatGenerationChunk]:
         if stop is not None:
-            raise TypeError("Currently, `stop` is not supported when streaming is enabled.")
+            raise ValueError("Currently, `stop` is not supported when streaming is enabled.")
         params = self._invocation_params
         params.update(kwargs)
         params["messages"] = self._convert_messages_to_dicts(messages)
@@ -195,7 +195,7 @@ async def _astream(
         **kwargs: Any,
     ) -> AsyncIterator[ChatGenerationChunk]:
         if stop is not None:
-            raise TypeError("Currently, `stop` is not supported when streaming is enabled.")
+            raise ValueError("Currently, `stop` is not supported when streaming is enabled.")
         params = self._invocation_params
         params.update(kwargs)
         params["messages"] = self._convert_messages_to_dicts(messages)

erniebot-agent/src/erniebot_agent/extensions/langchain/llms/erniebot.py

@@ -149,7 +149,7 @@ def _stream(
         **kwargs: Any,
     ) -> Iterator[GenerationChunk]:
         if stop is not None:
-            raise TypeError("Currently, `stop` is not supported when streaming is enabled.")
+            raise ValueError("Currently, `stop` is not supported when streaming is enabled.")
         params = self._invocation_params
         params.update(kwargs)
         params["messages"] = [self._build_user_message_from_prompt(prompt)]