feat: preliminarily implement pipeline invoking

pkg/core/app.py

@@ -13,14 +13,13 @@ 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 ..provider import runnermgr
 from ..config import manager as config_mgr
 from ..config import settings as settings_mgr
 from ..audit.center import v2 as center_mgr
 from ..command import cmdmgr
 from ..plugin import manager as plugin_mgr
 from ..pipeline import pool
-from ..pipeline import controller, stagemgr, pipelinemgr
+from ..pipeline import controller, pipelinemgr
 from ..utils import version as version_mgr, proxy as proxy_mgr, announce as announce_mgr
 from ..persistence import mgr as persistencemgr
 from ..api.http.controller import main as http_controller
@@ -53,12 +52,12 @@ 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
 
-    runner_mgr: runnermgr.RunnerManager = None
-
     settings_mgr: settings_mgr.SettingsManager = None
 
     # ======= 配置管理器 =======
@@ -100,8 +99,6 @@ class Application:
 
     ctrl: controller.Controller = None
 
-    stage_mgr: stagemgr.StageManager = None
-
     pipeline_mgr: pipelinemgr.PipelineManager = None
 
     ver_mgr: version_mgr.VersionManager = None
@@ -239,9 +236,5 @@ class Application:
                 llm_tool_mgr_inst = llm_tool_mgr.ToolManager(self)
                 await llm_tool_mgr_inst.initialize()
                 self.tool_mgr = llm_tool_mgr_inst
-
-                runner_mgr_inst = runnermgr.RunnerManager(self)
-                await runner_mgr_inst.initialize()
-                self.runner_mgr = runner_mgr_inst
             case _:
                 pass

pkg/core/entities.py

@@ -8,7 +8,7 @@ import asyncio
 import pydantic.v1 as pydantic
 
 from ..provider import entities as llm_entities
-from ..provider.modelmgr import 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
@@ -57,6 +57,9 @@ class Query(pydantic.BaseModel):
     message_chain: platform_message.MessageChain
     """消息链，platform收到的原始消息链"""
 
+    bot_uuid: typing.Optional[str] = None
+    """机器人UUID。"""
+
     pipeline_uuid: typing.Optional[str] = None
     """流水线UUID。"""
 
@@ -81,8 +84,8 @@ class Query(pydantic.BaseModel):
     variables: typing.Optional[dict[str, typing.Any]] = None
     """变量，由前置处理器阶段设置。在prompt中嵌入或由 Runner 传递到 LLMOps 平台。"""
 
-    use_model: typing.Optional[entities.LLMModelInfo] = None
-    """使用的模型，由前置处理器阶段设置"""
+    use_llm_model: typing.Optional[requester.RuntimeLLMModel] = None
+    """使用的对话模型，由前置处理器阶段设置"""
 
     use_funcs: typing.Optional[list[tools_entities.LLMFunction]] = None
     """使用的函数，由前置处理器阶段设置"""
@@ -94,7 +97,7 @@ class Query(pydantic.BaseModel):
     """回复消息链，从resp_messages包装而得"""
 
     # ======= 内部保留 =======
-    current_stage: "pkg.pipeline.stagemgr.StageInstContainer" = None
+    current_stage: "pkg.pipeline.pipelinemgr.StageInstContainer" = None
     """当前所处阶段"""
 
     class Config:
@@ -132,13 +135,16 @@ class Conversation(pydantic.BaseModel):
 
     update_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
 
-    use_model: entities.LLMModelInfo
+    use_llm_model: requester.RuntimeLLMModel
 
     use_funcs: typing.Optional[list[tools_entities.LLMFunction]]
 
     uuid: typing.Optional[str] = None
     """该对话的 uuid，在创建时不会自动生成。而是当使用 Dify API 等由外部管理对话信息的服务时，用于绑定外部的会话。具体如何使用，取决于 Runner。"""
 
+    class Config:
+        arbitrary_types_allowed = True
+
 
 class Session(pydantic.BaseModel):
     """会话，一个 Session 对应一个 {launcher_type.value}_{launcher_id}"""

pkg/core/stages/build_app.py

@@ -6,14 +6,13 @@ from .. import stage, app
 from ...utils import version, proxy, announce, platform
 from ...audit.center import v2 as center_v2
 from ...audit import identifier
-from ...pipeline import pool, controller, stagemgr, pipelinemgr
+from ...pipeline import pool, controller, pipelinemgr
 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 ...provider import runnermgr
 from ...platform import manager as im_mgr
 from ...persistence import mgr as persistencemgr
 from ...api.http.controller import main as http_controller
@@ -61,10 +60,7 @@ class BuildAppStage(stage.BootingStage):
             },
             runtime_info={
                 "admin_id": "{}".format(ap.system_cfg.data["admin-sessions"]),
-                "msg_source": str([
-                    adapter_cfg['adapter'] if 'adapter' in adapter_cfg else 'unknown'
-                    for adapter_cfg in ap.platform_cfg.data['platform-adapters'] if adapter_cfg['enable']
-                ]),
+                "msg_source": str([]),
             },
         )
         ap.ctr_mgr = center_v2_api
@@ -107,18 +103,10 @@ class BuildAppStage(stage.BootingStage):
         await llm_tool_mgr_inst.initialize()
         ap.tool_mgr = llm_tool_mgr_inst
 
-        runner_mgr_inst = runnermgr.RunnerManager(ap)
-        await runner_mgr_inst.initialize()
-        ap.runner_mgr = runner_mgr_inst
-
         im_mgr_inst = im_mgr.PlatformManager(ap=ap)
         await im_mgr_inst.initialize()
         ap.platform_mgr = im_mgr_inst
 
-        stage_mgr = stagemgr.StageManager(ap)
-        await stage_mgr.initialize()
-        ap.stage_mgr = stage_mgr
-
         pipeline_mgr = pipelinemgr.PipelineManager(ap)
         await pipeline_mgr.initialize()
         ap.pipeline_mgr = pipeline_mgr

pkg/core/taskmgr.py

@@ -233,3 +233,10 @@ class AsyncTaskManager:
             if not wrapper.task.done() and scope in wrapper.scopes:
 
                 wrapper.task.cancel()
+
+    def cancel_task(self, task_id: int):
+        for wrapper in self.tasks:
+            if wrapper.id == task_id:
+                if not wrapper.task.done():
+                    wrapper.task.cancel()
+                return