feat: switch tool entities and format

pkg/provider/modelmgr/modelmgr.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import sqlalchemy
 import traceback
 
-from . import entities, requester
+from . import requester
 from ...core import app
 from ...discover import engine
 from . import token
@@ -16,14 +16,6 @@ FETCH_MODEL_LIST_URL = 'https://api.qchatgpt.rockchin.top/api/v2/fetch/model_lis
 class ModelManager:
     """模型管理器"""
 
-    model_list: list[entities.LLMModelInfo]  # deprecated
-
-    requesters: dict[str, requester.LLMAPIRequester]  # deprecated
-
-    token_mgrs: dict[str, token.TokenManager]  # deprecated
-
-    # ====== 4.0 ======
-
     ap: app.Application
 
     llm_models: list[requester.RuntimeLLMModel]
@@ -34,9 +26,6 @@ class ModelManager:
 
     def __init__(self, ap: app.Application):
         self.ap = ap
-        self.model_list = []
-        self.requesters = {}
-        self.token_mgrs = {}
         self.llm_models = []
         self.requester_components = []
         self.requester_dict = {}
@@ -109,14 +98,7 @@ class ModelManager:
         runtime_llm_model = await self.init_runtime_llm_model(model_info)
         self.llm_models.append(runtime_llm_model)
 
-    async def get_model_by_name(self, name: str) -> entities.LLMModelInfo:  # deprecated
-        """通过名称获取模型"""
-        for model in self.model_list:
-            if model.name == name:
-                return model
-        raise ValueError(f'无法确定模型 {name} 的信息')
-
-    async def get_model_by_uuid(self, uuid: str) -> entities.LLMModelInfo:
+    async def get_model_by_uuid(self, uuid: str) -> requester.RuntimeLLMModel:
         """通过uuid获取模型"""
         for model in self.llm_models:
             if model.model_entity.uuid == uuid:

pkg/provider/modelmgr/requester.py

@@ -6,8 +6,8 @@ import typing
 from ...core import app
 from ...core import entities as core_entities
 from .. import entities as llm_entities
-from ..tools import entities as tools_entities
 from ...entity.persistence import model as persistence_model
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 from . import token
 
 
@@ -59,7 +59,7 @@ class LLMAPIRequester(metaclass=abc.ABCMeta):
         query: core_entities.Query,
         model: RuntimeLLMModel,
         messages: typing.List[llm_entities.Message],
-        funcs: typing.List[tools_entities.LLMFunction] = None,
+        funcs: typing.List[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         """调用API

pkg/provider/modelmgr/requesters/anthropicmsgs.py

@@ -11,8 +11,8 @@ from .. import errors, requester
 
 from ....core import entities as core_entities
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
 from ....utils import image
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class AnthropicMessages(requester.LLMAPIRequester):
@@ -51,7 +51,7 @@ class AnthropicMessages(requester.LLMAPIRequester):
         query: core_entities.Query,
         model: requester.RuntimeLLMModel,
         messages: typing.List[llm_entities.Message],
-        funcs: typing.List[tools_entities.LLMFunction] = None,
+        funcs: typing.List[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = model.token_mgr.get_token()

pkg/provider/modelmgr/requesters/chatcmpl.py

@@ -10,7 +10,7 @@ import httpx
 from .. import errors, requester
 from ....core import entities as core_entities
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class OpenAIChatCompletions(requester.LLMAPIRequester):
@@ -63,7 +63,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
         query: core_entities.Query,
         req_messages: list[dict],
         use_model: requester.RuntimeLLMModel,
-        use_funcs: list[tools_entities.LLMFunction] = None,
+        use_funcs: list[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
@@ -104,7 +104,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
         query: core_entities.Query,
         model: requester.RuntimeLLMModel,
         messages: typing.List[llm_entities.Message],
-        funcs: typing.List[tools_entities.LLMFunction] = None,
+        funcs: typing.List[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         req_messages = []  # req_messages 仅用于类内，外部同步由 query.messages 进行

pkg/provider/modelmgr/requesters/deepseekchatcmpl.py

@@ -6,7 +6,7 @@ from . import chatcmpl
 from .. import errors, requester
 from ....core import entities as core_entities
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
@@ -22,7 +22,7 @@ class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
         query: core_entities.Query,
         req_messages: list[dict],
         use_model: requester.RuntimeLLMModel,
-        use_funcs: list[tools_entities.LLMFunction] = None,
+        use_funcs: list[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()

pkg/provider/modelmgr/requesters/giteeaichatcmpl.py

@@ -7,7 +7,7 @@ from . import chatcmpl
 from .. import requester
 from ....core import entities as core_entities
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class GiteeAIChatCompletions(chatcmpl.OpenAIChatCompletions):
@@ -23,7 +23,7 @@ class GiteeAIChatCompletions(chatcmpl.OpenAIChatCompletions):
         query: core_entities.Query,
         req_messages: list[dict],
         use_model: requester.RuntimeLLMModel,
-        use_funcs: list[tools_entities.LLMFunction] = None,
+        use_funcs: list[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()

pkg/provider/modelmgr/requesters/modelscopechatcmpl.py

@@ -11,7 +11,7 @@ import httpx
 from .. import entities, errors, requester
 from ....core import entities as core_entities
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class ModelScopeChatCompletions(requester.LLMAPIRequester):
@@ -128,7 +128,7 @@ class ModelScopeChatCompletions(requester.LLMAPIRequester):
         query: core_entities.Query,
         req_messages: list[dict],
         use_model: requester.RuntimeLLMModel,
-        use_funcs: list[tools_entities.LLMFunction] = None,
+        use_funcs: list[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
@@ -169,7 +169,7 @@ class ModelScopeChatCompletions(requester.LLMAPIRequester):
         query: core_entities.Query,
         model: entities.LLMModelInfo,
         messages: typing.List[llm_entities.Message],
-        funcs: typing.List[tools_entities.LLMFunction] = None,
+        funcs: typing.List[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         req_messages = []  # req_messages 仅用于类内，外部同步由 query.messages 进行

pkg/provider/modelmgr/requesters/moonshotchatcmpl.py

@@ -7,7 +7,7 @@ from . import chatcmpl
 from .. import requester
 from ....core import entities as core_entities
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
@@ -23,7 +23,7 @@ class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
         query: core_entities.Query,
         req_messages: list[dict],
         use_model: requester.RuntimeLLMModel,
-        use_funcs: list[tools_entities.LLMFunction] = None,
+        use_funcs: list[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()

pkg/provider/modelmgr/requesters/ollamachat.py

@@ -11,7 +11,7 @@ import ollama
 
 from .. import errors, requester
 from ... import entities as llm_entities
-from ...tools import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 from ....core import entities as core_entities
 
 REQUESTER_NAME: str = 'ollama-chat'
@@ -42,7 +42,7 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
         query: core_entities.Query,
         req_messages: list[dict],
         use_model: requester.RuntimeLLMModel,
-        use_funcs: list[tools_entities.LLMFunction] = None,
+        use_funcs: list[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         args = extra_args.copy()
@@ -108,7 +108,7 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
         query: core_entities.Query,
         model: requester.RuntimeLLMModel,
         messages: typing.List[llm_entities.Message],
-        funcs: typing.List[tools_entities.LLMFunction] = None,
+        funcs: typing.List[resource_tool.LLMTool] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         req_messages: list = []

pkg/provider/runners/localagent.py

@@ -18,13 +18,15 @@ class LocalAgentRunner(runner.RequestRunner):
 
         req_messages = query.prompt.messages.copy() + query.messages.copy() + [query.user_message]
 
+        use_llm_model = await self.ap.model_mgr.get_model_by_uuid(query.use_llm_model_uuid)
+
         # 首次请求
-        msg = await query.use_llm_model.requester.invoke_llm(
+        msg = await use_llm_model.requester.invoke_llm(
             query,
-            query.use_llm_model,
+            use_llm_model,
             req_messages,
             query.use_funcs,
-            extra_args=query.use_llm_model.model_entity.extra_args,
+            extra_args=use_llm_model.model_entity.extra_args,
         )
 
         yield msg
@@ -61,12 +63,12 @@ class LocalAgentRunner(runner.RequestRunner):
                     req_messages.append(err_msg)
 
             # 处理完所有调用，再次请求
-            msg = await query.use_llm_model.requester.invoke_llm(
+            msg = await use_llm_model.requester.invoke_llm(
                 query,
-                query.use_llm_model,
+                use_llm_model,
                 req_messages,
                 query.use_funcs,
-                extra_args=query.use_llm_model.model_entity.extra_args,
+                extra_args=use_llm_model.model_entity.extra_args,
             )
 
             yield msg

pkg/provider/session/sessionmgr.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import asyncio
 
 from ...core import app, entities as core_entities
-from ...provider import entities as provider_entities
+from langbot_plugin.api.entities.builtin.provider import message as provider_message, prompt as provider_prompt
+import langbot_plugin.api.entities.builtin.provider.session as provider_session
 
 
 class SessionManager:
@@ -11,7 +12,7 @@ class SessionManager:
 
     ap: app.Application
 
-    session_list: list[core_entities.Session]
+    session_list: list[provider_session.Session]
 
     def __init__(self, ap: app.Application):
         self.ap = ap
@@ -20,7 +21,7 @@ class SessionManager:
     async def initialize(self):
         pass
 
-    async def get_session(self, query: core_entities.Query) -> core_entities.Session:
+    async def get_session(self, query: core_entities.Query) -> provider_session.Session:
         """获取会话"""
         for session in self.session_list:
             if query.launcher_type == session.launcher_type and query.launcher_id == session.launcher_id:
@@ -28,7 +29,7 @@ class SessionManager:
 
         session_concurrency = self.ap.instance_config.data['concurrency']['session']
 
-        session = core_entities.Session(
+        session = provider_session.Session(
             launcher_type=query.launcher_type,
             launcher_id=query.launcher_id,
             semaphore=asyncio.Semaphore(session_concurrency),
@@ -39,11 +40,11 @@ class SessionManager:
     async def get_conversation(
         self,
         query: core_entities.Query,
-        session: core_entities.Session,
+        session: provider_session.Session,
         prompt_config: list[dict],
         pipeline_uuid: str,
         bot_uuid: str,
-    ) -> core_entities.Conversation:
+    ) -> provider_session.Conversation:
         """获取对话或创建对话"""
 
         if not session.conversations:
@@ -53,20 +54,17 @@ class SessionManager:
         prompt_messages = []
 
         for prompt_message in prompt_config:
-            prompt_messages.append(provider_entities.Message(**prompt_message))
+            prompt_messages.append(provider_message.Message(**prompt_message))
 
-        prompt = provider_entities.Prompt(
+        prompt = provider_prompt.Prompt(
             name='default',
             messages=prompt_messages,
         )
 
         if session.using_conversation is None or session.using_conversation.pipeline_uuid != pipeline_uuid:
-            conversation = core_entities.Conversation(
+            conversation = provider_session.Conversation(
                 prompt=prompt,
                 messages=[],
-                use_funcs=await self.ap.tool_mgr.get_all_functions(
-                    plugin_enabled=True,
-                ),
                 pipeline_uuid=pipeline_uuid,
                 bot_uuid=bot_uuid,
             )

pkg/provider/tools/entities.py

@@ -1,31 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-import pydantic.v1 as pydantic
-
-
-class LLMFunction(pydantic.BaseModel):
-    """函数"""
-
-    name: str
-    """函数名"""
-
-    human_desc: str
-
-    description: str
-    """给LLM识别的函数描述"""
-
-    parameters: dict
-
-    func: typing.Callable
-    """供调用的python异步方法
-    
-    此异步方法第一个参数接收当前请求的query对象，可以从其中取出session等信息。
-    query参数不在parameters中，但在调用时会自动传入。
-    但在当前版本中，插件提供的内容函数都是同步的，且均为请求无关的，故在此版本的实现（以及考虑了向后兼容性的版本）中，
-    对插件的内容函数进行封装并存到这里来。
-    """
-
-    class Config:
-        arbitrary_types_allowed = True

pkg/provider/tools/loader.py

@@ -4,7 +4,7 @@ import abc
 import typing
 
 from ...core import app, entities as core_entities
-from . import entities as tools_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 preregistered_loaders: list[typing.Type[ToolLoader]] = []
@@ -35,7 +35,7 @@ class ToolLoader(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def get_tools(self, enabled: bool = True) -> list[tools_entities.LLMFunction]:
+    async def get_tools(self, enabled: bool = True) -> list[resource_tool.LLMTool]:
         """获取所有工具"""
         pass
 

pkg/provider/tools/loaders/mcp.py

@@ -7,8 +7,9 @@ from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import stdio_client
 from mcp.client.sse import sse_client
 
-from .. import loader, entities as tools_entities
+from .. import loader
 from ....core import app, entities as core_entities
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 class RuntimeMCPSession:
@@ -24,7 +25,7 @@ class RuntimeMCPSession:
 
     exit_stack: AsyncExitStack
 
-    functions: list[tools_entities.LLMFunction] = []
+    functions: list[resource_tool.LLMTool] = []
 
     def __init__(self, server_name: str, server_config: dict, ap: app.Application):
         self.server_name = server_name
@@ -91,7 +92,7 @@ class RuntimeMCPSession:
             func.__name__ = tool.name
 
             self.functions.append(
-                tools_entities.LLMFunction(
+                resource_tool.LLMTool(
                     name=tool.name,
                     human_desc=tool.description,
                     description=tool.description,
@@ -114,7 +115,7 @@ class MCPLoader(loader.ToolLoader):
 
     sessions: dict[str, RuntimeMCPSession] = {}
 
-    _last_listed_functions: list[tools_entities.LLMFunction] = []
+    _last_listed_functions: list[resource_tool.LLMTool] = []
 
     def __init__(self, ap: app.Application):
         super().__init__(ap)
@@ -130,7 +131,7 @@ class MCPLoader(loader.ToolLoader):
             # self.ap.event_loop.create_task(session.initialize())
             self.sessions[server_config['name']] = session
 
-    async def get_tools(self, enabled: bool = True) -> list[tools_entities.LLMFunction]:
+    async def get_tools(self, enabled: bool = True) -> list[resource_tool.LLMTool]:
         all_functions = []
 
         for session in self.sessions.values():

pkg/provider/tools/loaders/plugin.py

@@ -3,9 +3,10 @@ from __future__ import annotations
 import typing
 import traceback
 
-from .. import loader, entities as tools_entities
+from .. import loader
 from ....core import entities as core_entities
 from ....plugin import context as plugin_context
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 
 @loader.loader_class('plugin-tool-loader')
@@ -15,9 +16,9 @@ class PluginToolLoader(loader.ToolLoader):
     本加载器中不存储工具信息，仅负责从插件系统中获取工具信息。
     """
 
-    async def get_tools(self, enabled: bool = True) -> list[tools_entities.LLMFunction]:
+    async def get_tools(self, enabled: bool = True) -> list[resource_tool.LLMTool]:
         # 从插件系统获取工具（内容函数）
-        all_functions: list[tools_entities.LLMFunction] = []
+        all_functions: list[resource_tool.LLMTool] = []
 
         for plugin in self.ap.plugin_mgr.plugins(
             enabled=enabled, status=plugin_context.RuntimeContainerStatus.INITIALIZED
@@ -38,7 +39,7 @@ class PluginToolLoader(loader.ToolLoader):
 
     async def _get_function_and_plugin(
         self, name: str
-    ) -> typing.Tuple[tools_entities.LLMFunction, plugin_context.BasePlugin]:
+    ) -> typing.Tuple[resource_tool.LLMTool, plugin_context.BasePlugin]:
         """获取函数和插件实例"""
         for plugin in self.ap.plugin_mgr.plugins(
             enabled=True, status=plugin_context.RuntimeContainerStatus.INITIALIZED

pkg/provider/tools/toolmgr.py

@@ -3,9 +3,10 @@ from __future__ import annotations
 import typing
 
 from ...core import app, entities as core_entities
-from . import entities, loader as tools_loader
+from . import loader as tools_loader
 from ...utils import importutil
 from . import loaders
+import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 importutil.import_modules_in_pkg(loaders)
 
@@ -28,16 +29,16 @@ class ToolManager:
             await loader_inst.initialize()
             self.loaders.append(loader_inst)
 
-    async def get_all_functions(self, plugin_enabled: bool = None) -> list[entities.LLMFunction]:
+    async def get_all_functions(self, plugin_enabled: bool = None) -> list[resource_tool.LLMTool]:
         """获取所有函数"""
-        all_functions: list[entities.LLMFunction] = []
+        all_functions: list[resource_tool.LLMTool] = []
 
         for loader in self.loaders:
             all_functions.extend(await loader.get_tools(plugin_enabled))
 
         return all_functions
 
-    async def generate_tools_for_openai(self, use_funcs: list[entities.LLMFunction]) -> list:
+    async def generate_tools_for_openai(self, use_funcs: list[resource_tool.LLMTool]) -> list:
         """生成函数列表"""
         tools = []
 
@@ -54,7 +55,7 @@ class ToolManager:
 
         return tools
 
-    async def generate_tools_for_anthropic(self, use_funcs: list[entities.LLMFunction]) -> list:
+    async def generate_tools_for_anthropic(self, use_funcs: list[resource_tool.LLMTool]) -> list:
         """为anthropic生成函数列表
 
         e.g.