refactor: 重构插件系统

pkg/provider/session/entities.py

@@ -1,53 +0,0 @@
-from __future__ import annotations
-
-import datetime
-import asyncio
-import typing
-
-import pydantic
-
-from ..sysprompt import entities as sysprompt_entities
-from .. import entities as llm_entities
-from ..requester import entities
-from ...core import entities as core_entities
-from ..tools import entities as tools_entities
-
-
-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: core_entities.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

pkg/provider/session/sessionmgr.py

@@ -3,14 +3,13 @@ from __future__ import annotations
 import asyncio
 
 from ...core import app, entities as core_entities
-from . import entities
 
 
 class SessionManager:
 
     ap: app.Application
 
-    session_list: list[entities.Session]
+    session_list: list[core_entities.Session]
 
     def __init__(self, ap: app.Application):
         self.ap = ap
@@ -19,14 +18,14 @@ class SessionManager:
     async def initialize(self):
         pass
 
-    async def get_session(self, query: core_entities.Query) -> entities.Session:
+    async def get_session(self, query: core_entities.Query) -> core_entities.Session:
         """获取会话
         """
         for session in self.session_list:
             if query.launcher_type == session.launcher_type and query.launcher_id == session.launcher_id:
                 return session
 
-        session = entities.Session(
+        session = core_entities.Session(
             launcher_type=query.launcher_type,
             launcher_id=query.launcher_id,
             semaphore=asyncio.Semaphore(1) if self.ap.cfg_mgr.data['wait_last_done'] else asyncio.Semaphore(10000),
@@ -34,12 +33,12 @@ class SessionManager:
         self.session_list.append(session)
         return session
 
-    async def get_conversation(self, session: entities.Session) -> entities.Conversation:
+    async def get_conversation(self, session: core_entities.Session) -> core_entities.Conversation:
         if not session.conversations:
             session.conversations = []
 
         if session.using_conversation is None:
-            conversation = entities.Conversation(
+            conversation = core_entities.Conversation(
                 prompt=await self.ap.prompt_mgr.get_prompt(session.use_prompt_name),
                 messages=[],
                 use_model=await self.ap.model_mgr.get_model_by_name(self.ap.cfg_mgr.data['completion_api_params']['model']),