refactor: 重构插件系统

pkg/core/app.py

@@ -3,22 +3,22 @@ from __future__ import annotations
 import logging
 import asyncio
 
-from ..platform import manager as qqbot_mgr
+from ..platform import manager as im_mgr
 from ..provider.session import sessionmgr as llm_session_mgr
 from ..provider.requester import modelmgr as llm_model_mgr
 from ..provider.sysprompt import sysprompt as llm_prompt_mgr
 from ..provider.tools import toolmgr as llm_tool_mgr
 from ..config import manager as config_mgr
-from ..database import manager as database_mgr
-from ..utils.center import v2 as center_mgr
+# from ..utils.center import v2 as center_mgr
 from ..command import cmdmgr
-from ..plugin import host as plugin_host
+from ..plugin import manager as plugin_mgr
 from . import pool, controller
 from ..pipeline import stagemgr
+from ..utils import version as version_mgr, proxy as proxy_mgr
 
 
 class Application:
-    im_mgr: qqbot_mgr.QQBotManager = None
+    im_mgr: im_mgr.QQBotManager = None
 
     cmd_mgr: cmdmgr.CommandManager = None
 
@@ -34,9 +34,9 @@ class Application:
 
     tips_mgr: config_mgr.ConfigManager = None
 
-    db_mgr: database_mgr.DatabaseManager = None
+    # ctr_mgr: center_mgr.V2CenterAPI = None
 
-    ctr_mgr: center_mgr.V2CenterAPI = None
+    plugin_mgr: plugin_mgr.PluginManager = None
 
     query_pool: pool.QueryPool = None
 
@@ -44,24 +44,29 @@ class Application:
 
     stage_mgr: stagemgr.StageManager = None
 
+    ver_mgr: version_mgr.VersionManager = None
+
+    proxy_mgr: proxy_mgr.ProxyManager = None
+
     logger: logging.Logger = None
 
     def __init__(self):
         pass
 
     async def initialize(self):
-        plugin_host.initialize_plugins()
+        pass
 
         # 把现有的所有内容函数加到toolmgr里
-        for func in plugin_host.__callable_functions__:
-            self.tool_mgr.register_legacy_function(
-                name=func['name'],
-                description=func['description'],
-                parameters=func['parameters'],
-                func=plugin_host.__function_inst_map__[func['name']]
-            )
+        # for func in plugin_host.__callable_functions__:
+        #     self.tool_mgr.register_legacy_function(
+        #         name=func['name'],
+        #         description=func['description'],
+        #         parameters=func['parameters'],
+        #         func=plugin_host.__function_inst_map__[func['name']]
+        #     )
 
     async def run(self):
+        await self.plugin_mgr.load_plugins()
 
         tasks = [
             asyncio.create_task(self.im_mgr.run()),

pkg/core/boot.py

@@ -13,17 +13,15 @@ from . import pool
 from . import controller
 from ..pipeline import stagemgr
 from ..audit import identifier
-from ..database import manager as db_mgr
 from ..provider.session import sessionmgr as llm_session_mgr
 from ..provider.requester import modelmgr as llm_model_mgr
 from ..provider.sysprompt import sysprompt as llm_prompt_mgr
 from ..provider.tools import toolmgr as llm_tool_mgr
 from ..platform import manager as im_mgr
 from ..command import cmdmgr
-from ..plugin import host as plugin_host
+from ..plugin import manager as plugin_mgr
 from ..utils.center import v2 as center_v2
-from ..utils import updater
-from ..utils import context
+from ..utils import version, proxy
 
 use_override = False
 
@@ -58,7 +56,6 @@ async def make_app() -> app.Application:
         "config.py",
         "config-template.py"
     )
-    context.set_config_manager(cfg_mgr)
     cfg = cfg_mgr.data
 
     # 检查是否携带了 --override 或 -r 参数
@@ -87,11 +84,20 @@ async def make_app() -> app.Application:
 
     ap.query_pool = pool.QueryPool()
 
+    proxy_mgr = proxy.ProxyManager(ap)
+    await proxy_mgr.initialize()
+    ap.proxy_mgr = proxy_mgr
+
+    ver_mgr = version.VersionManager(ap)
+    await ver_mgr.initialize()
+    ap.ver_mgr = ver_mgr
+
     center_v2_api = center_v2.V2CenterAPI(
+        ap,
         basic_info={
             "host_id": identifier.identifier['host_id'],
             "instance_id": identifier.identifier['instance_id'],
-            "semantic_version": updater.get_current_tag(),
+            "semantic_version": ver_mgr.get_current_version(),
             "platform": sys.platform,
         },
         runtime_info={
@@ -99,12 +105,7 @@ async def make_app() -> app.Application:
             "msg_source": cfg['msg_source_adapter'],
         }
     )
-    ap.ctr_mgr = center_v2_api
-
-    db_mgr_inst = db_mgr.DatabaseManager(ap)
-    # TODO make it async
-    db_mgr_inst.initialize_database()
-    ap.db_mgr = db_mgr_inst
+    # ap.ctr_mgr = center_v2_api
 
     cmd_mgr_inst = cmdmgr.CommandManager(ap)
     await cmd_mgr_inst.initialize()
@@ -138,7 +139,9 @@ async def make_app() -> app.Application:
     ap.ctrl = ctrl
 
     # TODO make it async
-    plugin_host.load_plugins()
+    plugin_mgr_inst = plugin_mgr.PluginManager(ap)
+    await plugin_mgr_inst.initialize()
+    ap.plugin_mgr = plugin_mgr_inst
     
     await ap.initialize()
 

pkg/core/entities.py

@@ -2,10 +2,17 @@ from __future__ import annotations
 
 import enum
 import typing
+import datetime
+import asyncio
 
 import pydantic
 import mirai
 
+from ..provider import entities as llm_entities
+from ..provider.requester import entities
+from ..provider.sysprompt import entities as sysprompt_entities
+from ..provider.tools import entities as tools_entities
+
 
 class LauncherTypes(enum.Enum):
 
@@ -39,3 +46,43 @@ class Query(pydantic.BaseModel):
 
     resp_message_chain: typing.Optional[mirai.MessageChain] = None
     """回复消息链"""
+
+
+class Conversation(pydantic.BaseModel):
+    """对话"""
+
+    prompt: sysprompt_entities.Prompt
+
+    messages: list[llm_entities.Message]
+
+    create_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    update_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    use_model: entities.LLMModelInfo
+
+    use_funcs: typing.Optional[list[tools_entities.LLMFunction]]
+
+
+class Session(pydantic.BaseModel):
+    """会话"""
+    launcher_type: LauncherTypes
+
+    launcher_id: int
+
+    sender_id: typing.Optional[int] = 0
+
+    use_prompt_name: typing.Optional[str] = 'default'
+
+    using_conversation: typing.Optional[Conversation] = None
+
+    conversations: typing.Optional[list[Conversation]] = []
+
+    create_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    update_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    semaphore: typing.Optional[asyncio.Semaphore] = None
+
+    class Config:
+        arbitrary_types_allowed = True