chore: 迁移服务器前同步本地修改

kilostar/core/individual/consciousness_node/consciousness_node.py

@@ -14,7 +14,6 @@
 
 
 from typing import Union, overload
-from kilostar.utils.ray_compat import actor_class
 from kilostar.core.individual.consciousness_node.template import (
     ConsciousnessNodeDeps,
     ForregulatoryNode,
@@ -28,11 +27,9 @@ from pydantic_ai import Agent, RunContext
 from kilostar.core.global_state_machine.global_state_machine import GlobalStateMachine
 from kilostar.core.global_state_machine.model_provider.base_provider import Provider
 from kilostar.adapter.model_adapter.agent_factory import AgentFactory
-from kilostar.utils.ray_hook import ray_actor_hook
 from kilostar.utils.prompts import agent_prompt
 
 
-@actor_class
 class ConsciousnessNode:
     def __init__(self) -> None:
         from kilostar.utils.logger import get_logger
@@ -134,8 +131,10 @@ class ConsciousnessNode:
             f"ConsciousnessNode: 开始为 trace_id {trace_id} 设计工作流。原始命令：{command}"
         )
         # 获取可用技能 (示例)
-        postgres_database = ray_actor_hook("postgres_database").postgres_database
-        skills_entities = await postgres_database.get_all_worker_individual.remote()
+        from kilostar.utils.actor import get_postgres
+
+        postgres_database = get_postgres()
+        skills_entities = await postgres_database.get_all_worker_individual()
         available_skills = []
         if skills_entities:
             for skill in skills_entities:
@@ -151,10 +150,10 @@ class ConsciousnessNode:
             original_command=command, available_skills=available_skills
         )
 
-        global_workflow_manager = ray_actor_hook(
-            "global_workflow_manager"
-        ).global_workflow_manager
-        await global_workflow_manager.put_pending.remote(
+        from kilostar.utils.actor import get_gwm
+
+        global_workflow_manager = get_gwm()
+        await global_workflow_manager.put_pending(
             trace_id, "正在为您构建并规划工作流任务节点，请稍候..."
         )
 
@@ -164,20 +163,21 @@ class ConsciousnessNode:
             workflow = result.workflow
             workflow.trace_id = trace_id
 
-            await global_workflow_manager.put_pending.remote(
+            await global_workflow_manager.put_pending(
                 trace_id, "工作流构建完成，即将开始执行！"
             )
 
-            # 直接以 ray task 形式 fire workflow，不再经过 WorkflowRunningEngine 这层中转：
-            # workflow 是一次性、有头有尾的执行，task 语义比常驻 actor 更贴。
+            # 以后台任务形式 fire workflow：workflow 是一次性、有头有尾的
+            # 执行，跑完即结束；持久化交给 PostgresStatePersistence 保证可恢复。
+            from kilostar.utils.actor import spawn_background
             from kilostar.core.work.workflow.workflow_engine import run_workflow_task
 
-            run_workflow_task.remote(workflow.model_dump(), trace_id)
+            spawn_background(run_workflow_task(workflow.model_dump(), trace_id))
         else:
-            await global_workflow_manager.put_pending.remote(
+            await global_workflow_manager.put_pending(
                 trace_id, "很抱歉，工作流生成失败。"
             )
-            await postgres_database.update_workflow_status.remote(trace_id, "failed")
+            await postgres_database.update_workflow_status(trace_id, "failed")
 
     async def working(
         self,

kilostar/core/individual/consciousness_node/template.py

@@ -14,24 +14,23 @@
 
 
 from kilostar.core.work.workflow.workflow import KiloStarWorkflow, WorkflowStep
-from kilostar.utils.agent_model import ResponseModel, DepsModel, RequestModel
-from pydantic import Field
+from pydantic import BaseModel, Field
 from typing import Optional, List
 
 
 # 意识节点回复类
-class ConsciousnessNodeResponse(ResponseModel):
+class ConsciousnessNodeResponse(BaseModel):
     """Consciousness response model,是意识节点所有回复类型的父类"""
     pass
 
-class ConsciousnessNodeDeps(DepsModel):
+class ConsciousnessNodeDeps(BaseModel):
     """ConsciousnessNode 在 pydantic-ai Agent 中使用的依赖：原始指令、当前指令以及可用 Skill 列表。"""
     original_command: str
     command: str
     available_skills: Optional[List[dict]] = None
     locale: str = "zh"
 
-class ConsciousnessNodeInput(RequestModel):
+class ConsciousnessNodeInput(BaseModel):
     """ConsciousnessNode 各类入参的共同基类，仅用于打 schema 标签。"""
     pass