refactor: move prompt mgm to pipeline

pkg/core/app.py

@@ -11,7 +11,6 @@ import os
 from ..platform import manager as im_mgr
 from ..provider.session import sessionmgr as llm_session_mgr
 from ..provider.modelmgr 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 ..config import settings as settings_mgr
@@ -52,9 +51,6 @@ class Application:
 
     model_mgr: llm_model_mgr.ModelManager = None
 
-    # TODO 移动到 pipeline 里
-    prompt_mgr: llm_prompt_mgr.PromptManager = None
-
     # TODO 移动到 pipeline 里
     tool_mgr: llm_tool_mgr.ToolManager = None
 
@@ -229,10 +225,6 @@ class Application:
                 await llm_session_mgr_inst.initialize()
                 self.sess_mgr = llm_session_mgr_inst
 
-                llm_prompt_mgr_inst = llm_prompt_mgr.PromptManager(self)
-                await llm_prompt_mgr_inst.initialize()
-                self.prompt_mgr = llm_prompt_mgr_inst
-
                 llm_tool_mgr_inst = llm_tool_mgr.ToolManager(self)
                 await llm_tool_mgr_inst.initialize()
                 self.tool_mgr = llm_tool_mgr_inst

pkg/core/entities.py

@@ -9,7 +9,6 @@ import pydantic.v1 as pydantic
 
 from ..provider import entities as llm_entities
 from ..provider.modelmgr import entities, modelmgr, requester
-from ..provider.sysprompt import entities as sysprompt_entities
 from ..provider.tools import entities as tools_entities
 from ..platform import adapter as msadapter
 from ..platform.types import message as platform_message
@@ -75,7 +74,7 @@ class Query(pydantic.BaseModel):
     messages: typing.Optional[list[llm_entities.Message]] = []
     """历史消息列表，由前置处理器阶段设置"""
 
-    prompt: typing.Optional[sysprompt_entities.Prompt] = None
+    prompt: typing.Optional[llm_entities.Prompt] = None
     """情景预设内容，由前置处理器阶段设置"""
 
     user_message: typing.Optional[llm_entities.Message] = None
@@ -127,7 +126,7 @@ class Query(pydantic.BaseModel):
 class Conversation(pydantic.BaseModel):
     """对话，包含于 Session 中，一个 Session 可以有多个历史 Conversation，但只有一个当前使用的 Conversation"""
 
-    prompt: sysprompt_entities.Prompt
+    prompt: llm_entities.Prompt
 
     messages: list[llm_entities.Message]
 

pkg/core/stages/build_app.py

@@ -11,7 +11,6 @@ from ...plugin import manager as plugin_mgr
 from ...command import cmdmgr
 from ...provider.session import sessionmgr as llm_session_mgr
 from ...provider.modelmgr 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 ...persistence import mgr as persistencemgr
@@ -95,10 +94,6 @@ class BuildAppStage(stage.BootingStage):
         await llm_session_mgr_inst.initialize()
         ap.sess_mgr = llm_session_mgr_inst
 
-        llm_prompt_mgr_inst = llm_prompt_mgr.PromptManager(ap)
-        await llm_prompt_mgr_inst.initialize()
-        ap.prompt_mgr = llm_prompt_mgr_inst
-
         llm_tool_mgr_inst = llm_tool_mgr.ToolManager(ap)
         await llm_tool_mgr_inst.initialize()
         ap.tool_mgr = llm_tool_mgr_inst