arch(core): add sop table/update task prompts

gusye1234 · gusye1234 · commit 0c842ded22cc · 2025-10-20T14:49:12.000+08:00
diff --git a/src/server/core/acontext_core/llm/agent/task.py b/src/server/core/acontext_core/llm/agent/task.py
@@ -185,157 +185,3 @@ async def task_agent_curd(
             break
         already_iterations += 1
     return Result.resolve(None)
-
-
-# @track_process
-# async def task_agent_curd_debug(
-#     project_id: asUUID,
-#     session_id: asUUID,
-#     previous_messages: List[MessageBlob],
-#     messages: List[MessageBlob],
-#     max_iterations=3,  # task curd agent only receive one turn of actions
-# ) -> Result[None]:
-#     async with DB_CLIENT.get_session_context() as db_session:
-#         r = await TD.fetch_current_tasks(db_session, session_id)
-#         tasks, eil = r.unpack()
-#         if eil:
-#             return r
-
-#         r = await TD.fetch_planning_task(db_session, session_id)
-#         planning_section, eil = r.unpack()
-#         if eil:
-#             return r
-
-#     task_section = pack_task_section(tasks)
-#     previous_messages_section = pack_previous_messages_section(
-#         planning_section, tasks, previous_messages
-#     )
-#     current_messages_section = pack_current_message_with_ids(messages)
-
-#     LOG.info(f"Task Section: {task_section}")
-#     LOG.info(f"Previous Messages Section: {previous_messages_section}")
-#     LOG.info(f"Current Messages Section: {current_messages_section}")
-
-#     json_tools = [tool.model_dump() for tool in TaskPrompt.tool_schema()]
-#     already_iterations = 0
-#     _messages = [
-#         {
-#             "role": "user",
-#             "content": TaskPrompt.pack_task_input(
-#                 previous_messages_section, current_messages_section, task_section
-#             ),
-#         }
-#     ]
-
-#     FAKE_TOOLS = {
-#         0: [
-#             {
-#                 "id": "1",
-#                 "type": "function",
-#                 "function": {
-#                     "name": "insert_task",
-#                     "arguments": {
-#                         "after_task_order": 0,
-#                         "task_description": "Search and collect the latest information about iPhone 15 Pro Max",
-#                     },
-#                 },
-#             },
-#             {
-#                 "id": "2",
-#                 "type": "function",
-#                 "function": {
-#                     "name": "insert_task",
-#                     "arguments": {
-#                         "after_task_order": 1,
-#                         "task_description": "Report the collected information about iPhone 15 Pro Max to the user",
-#                     },
-#                 },
-#             },
-#         ],
-#         1: [
-#             {
-#                 "id": "1",
-#                 "type": "function",
-#                 "function": {
-#                     "name": "append_messages_to_task",
-#                     "arguments": {"task_order": 1, "message_ids": [4, 5, 6, 7, 8]},
-#                 },
-#             },
-#             {
-#                 "id": "2",
-#                 "type": "function",
-#                 "function": {
-#                     "name": "update_task",
-#                     "arguments": {"task_order": 1, "task_status": "success"},
-#                 },
-#             },
-#             {
-#                 "id": "3",
-#                 "type": "function",
-#                 "function": {
-#                     "name": "append_messages_to_task",
-#                     "arguments": {"task_order": 2, "message_ids": [9]},
-#                 },
-#             },
-#             {
-#                 "id": "4",
-#                 "type": "function",
-#                 "function": {
-#                     "name": "update_task",
-#                     "arguments": {"task_order": 2, "task_status": "success"},
-#                 },
-#             },
-#         ],
-#     }
-#     while already_iterations < max_iterations:
-#         from ...schema.llm import LLMToolCall
-
-#         if already_iterations not in FAKE_TOOLS:
-#             print("No fake tools found, stop iterations")
-#             break
-#         use_tools = FAKE_TOOLS[already_iterations]
-#         use_tools = [LLMToolCall(**tool) for tool in use_tools]
-#         just_finish = False
-#         tool_response = []
-#         USE_CTX = None
-#         for tool_call in use_tools:
-#             try:
-#                 tool_name = tool_call.function.name
-#                 if tool_name == "finish":
-#                     just_finish = True
-#                     continue
-#                 tool_arguments = tool_call.function.arguments
-#                 tool = TASK_TOOLS[tool_name]
-#                 with bound_logging_vars(tool=tool_name):
-#                     async with DB_CLIENT.get_session_context() as db_session:
-#                         USE_CTX = await build_task_ctx(
-#                             db_session,
-#                             project_id,
-#                             session_id,
-#                             messages,
-#                             before_use_ctx=USE_CTX,
-#                         )
-#                         r = await tool.handler(USE_CTX, tool_arguments)
-#                     t, eil = r.unpack()
-#                     if eil:
-#                         return r
-#                 LOG.info(f"Tool Call: {tool_name} - {tool_arguments} -> {t}")
-#                 tool_response.append(
-#                     {
-#                         "role": "tool",
-#                         "tool_call_id": tool_call.id,
-#                         "content": t,
-#                     }
-#                 )
-#                 if tool_name in NEED_UPDATE_CTX:
-#                     USE_CTX = None
-#             except KeyError as e:
-#                 return Result.reject(f"Tool {tool_name} not found: {str(e)}")
-#             except Exception as e:
-#                 return Result.reject(f"Tool {tool_name} error: {str(e)}")
-#         _messages.extend(tool_response)
-#         if just_finish:
-#             LOG.info("finish function is called")
-#             break
-#         already_iterations += 1
-#     return Result.resolve(None)
diff --git a/src/server/core/acontext_core/llm/agent/task_sop.py b/src/server/core/acontext_core/llm/agent/task_sop.py
@@ -0,0 +1,25 @@
+import re
+from typing import List
+from urllib import response
+from ...env import LOG, DEFAULT_CORE_CONFIG, bound_logging_vars
+from ...infra.db import AsyncSession, DB_CLIENT
+from ...schema.result import Result
+from ...schema.utils import asUUID
+from ...schema.session.task import TaskSchema, TaskStatus
+from ...schema.session.message import MessageBlob
+from ...service.data import task as TD
+from ..complete import llm_complete, response_to_sendable_message
+from ..prompt.task import TaskPrompt, TASK_TOOLS
+from ...util.generate_ids import track_process
+from ..tool.sop_lib.ctx import SOPCtx
+
+
+@track_process
+async def sop_agent_curd(
+    project_id: asUUID,
+    space_id: asUUID,
+    planning_task: TaskSchema,
+    current_task: TaskSchema,
+    max_iterations=3,  # task curd agent only receive one turn of actions
+):
+    pass
diff --git a/src/server/core/acontext_core/llm/prompt/task.py b/src/server/core/acontext_core/llm/prompt/task.py
@@ -29,6 +29,7 @@ def system_prompt(cls) -> str:
 ## Planning Detection
 - Planning messages often consist of user and agent discussions, clarify what's tasks to do at next.
 - Append those messages to planning section.
+- Make sure the planning section have the full context of user requirements.
 
 ## Task Creation/Modifcation
 - Tasks are often confirmed by the agent's response to user's requirements, don't invent them.
@@ -50,10 +51,10 @@ def system_prompt(cls) -> str:
 - Update task statuses or descriptions when confident about relationships 
 
 ## Update Task Status 
-- `running`: When task work begins or is actively discussed
-- `success`: When completion is confirmed or deliverables provided
-- `failed`: When explicit errors occur or tasks are abandoned
 - `pending`: For tasks not yet started
+- `running`: When task work begins, or re-run because the previous works were failed or wrong.
+- `failed`: When explicit errors occur or tasks are abandoned, or user directly tell that some tasks are failed or wrong.
+- `success`: Only when task's completion is confirmed by user, or agent starts to process the next task without explicitly report errors or failure.
 
 
 ## Input Format
@@ -66,12 +67,15 @@ def system_prompt(cls) -> str:
 ## Report your Thinking
 Use extremely brief wordings to report:
 1. Any user requirement or planning?
-2. How existing tasks are related to current conversation? 
-3. Any new task is created?
-4. Which Messages are contributed to planning? Which of them are contributed to which task?
-5. Which task's status/description need to be updated?
-6. Describe your tool-call actions to correctly manage the tasks.
-7. Confirm your will call `finish` tool after every tools are called
+2. Does the user report that any task failed and need to re-run?
+3. How existing tasks are related to current conversation? 
+4. Any new task is created?
+5. Which Messages are contributed to planning? 
+6. Which of them are contributed to which task?
+7. Which task's status/description need to be updated?
+8. Briefly describe your tool-call actions to correctly manage the tasks.
+
+Make sure your will call `finish` tool after every tools are called
 """
 
     @classmethod
diff --git a/src/server/core/acontext_core/llm/tool/sop_lib/ctx.py b/src/server/core/acontext_core/llm/tool/sop_lib/ctx.py
@@ -7,4 +7,5 @@
 class SOPCtx:
     db_session: AsyncSession
     project_id: asUUID
-    session_id: asUUID
+    space_id: asUUID
+    task_id: asUUID
diff --git a/src/server/core/acontext_core/llm/tool/task_lib/append.py b/src/server/core/acontext_core/llm/tool/task_lib/append.py
@@ -37,7 +37,7 @@ async def _append_messages_to_task_handler(
         )
     if actually_task.status in (TaskStatus.SUCCESS, TaskStatus.FAILED):
         return Result.resolve(
-            f"Task {task_order} is already {actually_task.status}, appending failed."
+            f"Appending failed. Task {task_order} is already {actually_task.status}. Update its status to 'running' first then append messages."
         )
     r = await TD.append_messages_to_task(
         ctx.db_session,
@@ -62,7 +62,7 @@ async def _append_messages_to_task_handler(
                 "description": """Link current message ids to a task for tracking progress and context.
 Use this to associate conversation messages with relevant tasks.
 Make sure you append messages first(if any), then update the task status.
-If the task is marked as 'success' or 'failed', don't append messages to it.""",
+If you decide to append message to a task marked as 'success' or 'failed', update it's status to 'running' first""",
                 "parameters": {
                     "type": "object",
                     "properties": {
diff --git a/src/server/core/acontext_core/schema/block/sop_block.py b/src/server/core/acontext_core/schema/block/sop_block.py
@@ -6,13 +6,13 @@
 class SOPStep(BaseModel):
     tool_name: str
     tool_arguments_with_placeholder: dict[str, Any]
-    purpose_annotation: Optional[str] = None
+    props: Optional[dict] = None
 
 
 class SOPData(BaseModel):
     use_when: str
     notes: str
-    sop: List[SOPStep]
+    tool_sops: List[SOPStep]
 
 
 class SOPBlock(SOPData):
diff --git a/src/server/core/acontext_core/schema/config.py b/src/server/core/acontext_core/schema/config.py
@@ -9,6 +9,8 @@ class ProjectConfig(BaseModel):
     project_session_message_buffer_max_turns: int = 6
     project_session_message_buffer_max_overflow: int = 12
     project_session_message_buffer_ttl_seconds: int = 10
+    default_task_agent_max_iterations: int = 3
+    default_sop_agent_max_iterations: int = 3
 
 
 class CoreConfig(BaseModel):
diff --git a/src/server/core/acontext_core/schema/orm/__init__.py b/src/server/core/acontext_core/schema/orm/__init__.py
@@ -5,6 +5,8 @@
 from .message import Message, Part, Asset, ToolCallMeta
 from .task import Task
 from .block import Block
+from .tool_reference import ToolReference
+from .tool_sop import ToolSOP
 
 __all__ = [
     "ORM_BASE",
@@ -17,4 +19,6 @@
     "Asset",
     "Task",
     "Block",
+    "ToolReference",
+    "ToolSOP",
 ]
diff --git a/src/server/core/acontext_core/schema/orm/block.py b/src/server/core/acontext_core/schema/orm/block.py
@@ -31,11 +31,19 @@
         "name": "text",
         "allow_children": True,
         "require_parent": True,
+        "props_schema": {
+            "use_when": str,
+            "notes": str,
+        },
     },
     "sop": {
         "name": "sop",
         "allow_children": True,
         "require_parent": True,
+        "props_schema": {
+            "use_when": str,
+            "notes": str,
+        },
     },
 }
 
diff --git a/src/server/core/acontext_core/schema/orm/tool_sop.py b/src/server/core/acontext_core/schema/orm/tool_sop.py
@@ -17,12 +17,11 @@
 class ToolSOP(CommonMixin):
     __tablename__ = "tool_sops"
 
-    __table_args__ = (Index("ix_tool_sop_project_id", "project_id"),)
+    __table_args__ = (Index("ix_tool_sop_tool_reference_id", "tool_reference_id"),)
 
-    purpose_annotation: str = field(metadata={"db": Column(String, nullable=False)})
     placeholder_arguments: dict = field(metadata={"db": Column(JSONB, nullable=False)})
 
-    tool_id: asUUID = field(
+    tool_reference_id: asUUID = field(
         metadata={
             "db": Column(
                 UUID(as_uuid=True),
@@ -41,6 +40,10 @@ class ToolSOP(CommonMixin):
         }
     )
 
+    props: Optional[dict] = field(
+        default=None, metadata={"db": Column(JSONB, nullable=True)}
+    )
+
     # Relationships
     tool_reference: "ToolReference" = field(
         init=False,
diff --git a/src/server/core/acontext_core/service/controller/message.py b/src/server/core/acontext_core/service/controller/message.py
@@ -61,11 +61,12 @@ async def process_session_pending_message(
             ]
 
         r = await AT.task_agent_curd(
-            project_id, session_id, previous_messages_data, messages_data
+            project_id,
+            session_id,
+            previous_messages_data,
+            messages_data,
+            max_iterations=project_config.default_task_agent_max_iterations,
         )
-        # r = await AT.task_agent_curd_debug(
-        #     project_id, session_id, previous_messages_data, messages_data
-        # )
 
         after_status = TaskStatus.SUCCESS
         if not r.ok():
diff --git a/src/server/core/acontext_core/service/controller/space_task.py b/src/server/core/acontext_core/service/controller/space_task.py
diff --git a/src/server/core/acontext_core/service/space_task.py b/src/server/core/acontext_core/service/space_task.py
diff --git a/src/server/core/tests/service/test_task_data.py b/src/server/core/tests/service/test_task_data.py
