by-framework 0.2.2.dev9__py3-none-any.whl → 0.2.2.dev10__py3-none-any.whl

by_framework/__init__.py

@@ -8,6 +8,7 @@ from `GatewayWorker` and running `run_worker`.
 from .admin import WorkerManager
 from .client.byai_client import ByaiGatewayClient
 from .client.client import (
+    CancelSessionResponse,
     CancelTaskResponse,
     DataStreamEntry,
     GatewayClient,
@@ -148,6 +149,7 @@ __all__ = [
     "DataStreamEntry",
     "SendMessageResponse",
     "CancelTaskResponse",
+    "CancelSessionResponse",
     "run_worker",
     "logger",
     "setup_logging",

by_framework/client/client.py

@@ -37,6 +37,7 @@ from by_framework.core.protocol.commands import (
 from by_framework.core.protocol.data_message import DataMessage
 from by_framework.core.protocol.message_header import MessageHeader
 from by_framework.core.protocol.responses import (
+    CancelSessionResponse,
     CancelTaskResponse,
     ExecutionStatus,
     SendMessageResponse,
@@ -581,6 +582,99 @@ class GatewayClient:
             cancelled_count=len(to_cancel),
         )
 
+    async def cancel_session(
+        self,
+        session_id: str,
+        reason: str = "",
+        requested_by: str = "client",
+        cancel_mode: str = CancelMode.GRACEFUL,
+    ) -> CancelSessionResponse:
+        """Cancel every active execution registered under a session.
+
+        Unlike cancel_task, this does not require a starting message_id:
+        it cancels the whole session's active executions in one call.
+        """
+        if self.registry is None:
+            raise ValueError("GatewayClient requires a WorkerRegistry to cancel tasks")
+
+        all_executions = await self.registry.get_all_session_executions(session_id)
+
+        if not all_executions:
+            return CancelSessionResponse(
+                success=False,
+                session_id=session_id,
+                status=ExecutionStatus.NOT_FOUND,
+                timestamp=int(time.time() * 1000),
+                cancelled_count=0,
+                already_finished_count=0,
+            )
+
+        terminal_states = {"COMPLETED", "FAILED", "CANCELLED"}
+        to_cancel = [
+            node
+            for node in all_executions
+            if node.get("status", "") not in terminal_states
+        ]
+        terminal_nodes = [
+            node for node in all_executions if node.get("status", "") in terminal_states
+        ]
+
+        # Flag terminal executions so a still-running descendant can't wake
+        # them back up via callback, without changing their status.
+        for node in terminal_nodes:
+            await self.registry.mark_cancel_requested(
+                node.get("execution_id", ""), session_id, reason
+            )
+
+        if not to_cancel:
+            return CancelSessionResponse(
+                success=False,
+                session_id=session_id,
+                status=ExecutionStatus.ALREADY_FINISHED,
+                timestamp=int(time.time() * 1000),
+                cancelled_count=0,
+                already_finished_count=len(terminal_nodes),
+            )
+
+        for node in to_cancel:
+            node_execution_id = node.get("execution_id", "")
+            node_worker_id = node.get("worker_id", "")
+            node_message_id = node.get("message_id", "")
+
+            await self.registry.mark_execution_cancelling(
+                node_execution_id, session_id, reason
+            )
+
+            if node_worker_id:
+                cancel_command = CancelTaskCommand(
+                    header=MessageHeader(
+                        message_id=f"{CANCEL_MESSAGE_ID_PREFIX}{uuid.uuid4().hex[:8]}",
+                        session_id=session_id,
+                        trace_id=node.get("trace_id") or uuid.uuid4().hex,
+                        target_agent_type=node.get("target_agent_type", ""),
+                        parent_message_id=node_message_id,
+                    ),
+                    target_message_id=node_message_id,
+                    target_execution_id=node_execution_id,
+                    target_worker_id=node_worker_id,
+                    reason=reason,
+                    requested_by=requested_by,
+                    cancel_mode=cancel_mode,
+                )
+                await self.redis.xadd(
+                    RedisKeys.worker_ctrl_stream(node_worker_id),
+                    cancel_command.to_redis_payload(),
+                )
+
+        return CancelSessionResponse(
+            success=True,
+            session_id=session_id,
+            status=ExecutionStatus.CANCEL_REQUESTED,
+            timestamp=int(time.time() * 1000),
+            cancelled_count=len(to_cancel),
+            already_finished_count=len(terminal_nodes),
+        )
+
     async def send_message(
         self,
         target_agent_type: str,
@@ -691,7 +785,28 @@ class GatewayClient:
             content=params["content"],
             extra_payload=params["extra_payload"],
         )
-        execution_id = f"{EXECUTION_ID_PREFIX}{uuid.uuid4().hex[:8]}"
+
+        # A RESUME reuses the message_id of the original AskAgentCommand so the
+        # worker can look the suspended execution back up. Reuse its
+        # execution_id too, and skip re-initializing the registry record for
+        # it below -- initialize_execution() would otherwise overwrite the
+        # message_id -> execution_id mapping and detach this resume from the
+        # execution it's meant to continue.
+        resumed_execution = None
+        if (
+            params["action_type"] == ActionType.RESUME.value
+            and self.registry
+            and hasattr(self.registry, "get_execution_by_message_id")
+        ):
+            resumed_execution = await self.registry.get_execution_by_message_id(
+                message_id, session_id=params["session_id"]
+            )
+
+        execution_id = (
+            resumed_execution["execution_id"]
+            if resumed_execution
+            else f"{EXECUTION_ID_PREFIX}{uuid.uuid4().hex[:8]}"
+        )
 
         # 3. Resolve route and optionally probe agent type/liveness
         should_dispatch_control = True
@@ -837,8 +952,14 @@ class GatewayClient:
                 error_code=ExecutionStatus.ERR_AGENT_TYPE_UNAVAILABLE,
             )
 
-        # Initialize execution tracking
-        if self.registry and hasattr(self.registry, "initialize_execution"):
+        # Initialize execution tracking. Skipped for a RESUME that reattached
+        # to an existing execution -- that execution is already tracked, and
+        # re-initializing it here would overwrite its message_id mapping.
+        if (
+            not resumed_execution
+            and self.registry
+            and hasattr(self.registry, "initialize_execution")
+        ):
             try:
                 await self.registry.initialize_execution(
                     {

by_framework/common/emitter.py

@@ -107,6 +107,22 @@ class DefaultSseLayoutBuilder(DataLayoutBuilder):
         parent_order_id: Optional[str] = None,
     ) -> Dict[str, Any]:
         """Build default BaiYing-compatible user input form payload."""
+        try:
+            parsed_prompt = json.loads(prompt)
+        except (json.JSONDecodeError, TypeError):
+            parsed_prompt = None
+
+        # Structured question prompts are already in the format expected by clients.
+        if isinstance(parsed_prompt, dict) and "questions" in parsed_prompt:
+            return self.build(
+                content=prompt,
+                role="assistant",
+                content_type=SseReasonMessageType.ask_user_question.value,
+                source_agent_type=source_agent_type,
+                order_id=order_id,
+                parent_order_id=parent_order_id,
+            )
+
         input_form = {
             "formStatus": 0,
             "pluginMachineFields": [

by_framework/core/__init__.py

@@ -26,6 +26,7 @@ from .protocol import (
     BaiYingMessage,
     BaiYingMessageRole,
     BaseCommand,
+    CancelSessionResponse,
     CancelTaskCommand,
     CancelTaskResponse,
     DataMessage,
@@ -53,6 +54,7 @@ from .workspace import WorkspaceManager
 __all__ = [
     "SendMessageResponse",
     "CancelTaskResponse",
+    "CancelSessionResponse",
     "BaiYingMessage",
     "BaiYingMessageRole",
     "MessageContent",

by_framework/core/protocol/__init__.py

@@ -65,6 +65,7 @@ from .message import (
 )
 from .message_header import MessageHeader
 from .responses import (
+    CancelSessionResponse,
     CancelTaskResponse,
     CancelTaskResponseDict,
     SendMessageResponse,
@@ -81,6 +82,7 @@ from .results import (
 __all__ = [
     "SendMessageResponse",
     "CancelTaskResponse",
+    "CancelSessionResponse",
     "SendMessageResponseDict",
     "CancelTaskResponseDict",
     "AgentTaskResult",

by_framework/core/protocol/content_type.py

@@ -33,6 +33,7 @@ class SseReasonMessageType(str, Enum):
     think_code_result = "3007"  # thinking process code execution result
     task_finished = "3009"  # task finished
     task_user_input = "3013"  # user input
+    ask_user_question = "3014"  # ask user question
     task_create_file = "3010"  # create file
     task_title = "3011"  # task title
     agent_card = "2015"  # agent card

by_framework/core/protocol/responses.py

@@ -92,3 +92,14 @@ class CancelTaskResponse:
     timestamp: int
     error: str = ""
     cancelled_count: int = 0
+
+
+@dataclass(frozen=True)
+class CancelSessionResponse:
+    success: bool
+    session_id: str
+    status: str
+    timestamp: int
+    cancelled_count: int = 0
+    already_finished_count: int = 0
+    error: str = ""

by_framework/core/registry.py

@@ -1011,7 +1011,8 @@ class WorkerRegistry:
         old_execution = dict(current)
         current["status"] = status
         now = int(time.time() * 1000)
-        current["finished_at"] = now
+        if is_terminal_state(status):
+            current["finished_at"] = now
         current["updated_at"] = now
         if completion:
             for key, value in completion.items():

by_framework/worker/runner.py

@@ -505,6 +505,16 @@ class WorkerRunner:
                     header.message_id, session_id=header.session_id
                 )
 
+            if isinstance(command, ResumeCommand) and existing_execution is None:
+                logger.warning(
+                    "[%s] ResumeCommand did not resolve to an existing execution "
+                    "(message_id=%s, session_id=%s); starting a new, disconnected "
+                    "execution instead of continuing the suspended one.",
+                    self.worker.worker_id,
+                    header.message_id,
+                    header.session_id,
+                )
+
             # Skip terminal state replays
             if (
                 existing_execution

{by_framework-0.2.2.dev9.dist-info → by_framework-0.2.2.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: by-framework
-Version: 0.2.2.dev9
+Version: 0.2.2.dev10
 Summary: 分布式 Agent 调度框架
 License-File: LICENSE
 Requires-Python: >=3.12

{by_framework-0.2.2.dev9.dist-info → by_framework-0.2.2.dev10.dist-info}/RECORD

@@ -1,23 +1,23 @@
-by_framework/__init__.py,sha256=5Ff4xfX-TNXcp4RMoBLQCWuehPMLpNRHwZrXofgFx5A,5300
+by_framework/__init__.py,sha256=aNq4eeO-5WfFC86JJlfDgCvI11vk90ZWtL3yaREcJl4,5356
 by_framework/__main__.py,sha256=_vIEieJzSHfZnPp-zna_hbVtWQUgE0I3mrWD41WzXiA,2561
 by_framework/admin/__init__.py,sha256=MKGQBtKk8YdnMrZ5gkzEemMl4iL8OfeFhEV6HdWR2XI,138
 by_framework/admin/cli.py,sha256=KBmTHONKdb6BeskW6d3DL6GRnL91xen0PJ80JB0h0lc,11710
 by_framework/admin/worker_manager.py,sha256=ihXRMlFJAR74T2JSh3xTNCDjzAElWd0-_yVDAZwSTJU,5924
 by_framework/client/__init__.py,sha256=kGP7uoXIlTJuiJ2Cgl1Q5wqYjnMA4SZqoa7Q7BhQ5JQ,272
 by_framework/client/byai_client.py,sha256=bB1NyKLvVW82bXefD_3zymqZ1vk2O925CIbxOho9Qww,2426
-by_framework/client/client.py,sha256=T_5ahX9enmsaXm-xBGvwpMx-yALzO7wOTgY-qAVj0Q4,40342
+by_framework/client/client.py,sha256=hT_IRR51jsu3MIPFbZDmmL9xQHtNUFJCADBep9iFyQI,45157
 by_framework/common/__init__.py,sha256=EkfIiVdmb8SCpi7OOUm6Hu84B7Wzekb-TG2hbvD_R1w,1685
 by_framework/common/config.py,sha256=RGe5Ce-uUgpZv1bgkdT4kCRcaIpaYhzskyvQy17Qn_o,5043
 by_framework/common/constants.py,sha256=xUp6Nvx31EH7EzkxDNBzXD0GIE9FpPnPmuVbL-BAAoI,22089
-by_framework/common/emitter.py,sha256=Mcp6vglFlS7_JVsLd_KVKvV49TKjoyoN4eCM_tm4I8s,11310
+by_framework/common/emitter.py,sha256=bobdekSsA3vnMu8TMHonkjfgK-awW_p11dgcTU_3mQw,11940
 by_framework/common/exceptions.py,sha256=NKQC7ueLZ4-gVTRz3SFRZNoPHsayu6jxi3-YlW0n_jg,962
 by_framework/common/logger.py,sha256=DX6S7U5CLcCQIUQ3IWqeeDnSC7QGuHKYaEhiKvKrBpk,5823
 by_framework/common/redis_client.py,sha256=JfYE-QutI9G27dbehzvLw0LziTM1gHmG4tdVjxd0IoA,4668
-by_framework/core/__init__.py,sha256=bEaOfjGoCF0WacR_PoYSb5kUqJv-g59pngdnEE7fJzo,2070
+by_framework/core/__init__.py,sha256=cGG93S1gzd1N64JaTCVD7JLV0ZzbF92Q9C6Sog0yDSE,2126
 by_framework/core/availability.py,sha256=ZME5S002eNzNpzaW_QuWw8AmUN1JelUxwCt2U3PPAeQ,17624
 by_framework/core/delivery_gate.py,sha256=yijlCOw8zEou1HCyQzwRHDJZtLBsUnXtQ3x1FZsc4yU,2012
 by_framework/core/discovery.py,sha256=12mAnPzJph0zqlfJwu8k-IN5AKc7dpC0sXToBGLU2Fw,13116
-by_framework/core/registry.py,sha256=Qp_ghu47Wzjf2AKDUpRmzipPUGsbnc6vyB-wb4ubkGI,52864
+by_framework/core/registry.py,sha256=bpthWbuVrUIBO1Wtz5F3A2s2GAon9zX_6FR9zn7fxAw,52906
 by_framework/core/wakeup_controller.py,sha256=0v3Fr69XzIKO0fesYUPvQvsGLYt0f648Xq7XEM_jk6c,5545
 by_framework/core/workspace.py,sha256=R9mxghDh_INtPOIXHilBamAIue8jZMrlQoQRI02KSxw,3980
 by_framework/core/extensions/__init__.py,sha256=MvPh029FXvkR1Lk4bZxiq9SfzUQ57paUfoD17-whvn4,1032
@@ -26,7 +26,7 @@ by_framework/core/extensions/agent_config_audit.py,sha256=Ax67XF2dg_oqz8GvCQ5vsu
 by_framework/core/extensions/plugin.py,sha256=rmV4wjf_x-v8E55s9_bDQPyvsqZT4ebZ2fnScbmUGkg,9236
 by_framework/core/extensions/registry.py,sha256=s2UYEOvNzZ3Q8CH1vPBCUw3hhOfQTJ6GKTJ2aXPxVCY,25314
 by_framework/core/extensions/trace_provider.py,sha256=ShM-aJWfenHD006m5sj3M3fi5zZOiTaQ9MZyKV9yv2o,582
-by_framework/core/protocol/__init__.py,sha256=oQeO2E9DD8Wz2qwvBrKOlm4SgIqnEBlpZwa-BuijCnQ,3388
+by_framework/core/protocol/__init__.py,sha256=wxpD8UMYIYmpXtwZZvT9FQZA6hSjHyoEUZ2kFw1_McA,3444
 by_framework/core/protocol/action_type.py,sha256=5uhwzpaf_PwYMPharJHoX_oc4Cf1dZruCpJ8eyUdwXQ,1112
 by_framework/core/protocol/agent_state.py,sha256=CtqwisNWuPy91FEPXjQrR3r0jLeOrUF1huu23ODnEPo,1919
 by_framework/core/protocol/byai_codec.py,sha256=BqCCYS_uEXOpAHogrNl7-3Tce9HBxMKRpO0ccQN80SA,3185
@@ -34,14 +34,14 @@ by_framework/core/protocol/byai_command.py,sha256=FJjU4H9b7S5Q59OZqDpVu3JBln7_P9
 by_framework/core/protocol/byai_types.py,sha256=szP6yONsMwtErZZUOOgLRnwqIJnPYKM7qcqrgwkEyIc,187
 by_framework/core/protocol/commands.py,sha256=5MFP0EjElbPBAOUE_D0gErUJsHD06EuWCkmqyLsRX8U,11144
 by_framework/core/protocol/content_codec.py,sha256=E8uHhRU6jlH16MQ3UmA8jPexm71l3HKxpquF9xJk04o,643
-by_framework/core/protocol/content_type.py,sha256=fjzNIQQ_-1z7dEMsyEEz7imv1fTBwO1OFyU2H6sk1d4,1217
+by_framework/core/protocol/content_type.py,sha256=fagsdHPIoPyWwmgYfb3JzP52olxDDzpGbmQ9q3bmQxE,1269
 by_framework/core/protocol/data_message.py,sha256=UEK9W1lIt_6DLdu0o_CW5YoQJrsEjRUHHEtH2syRO-A,1290
 by_framework/core/protocol/data_shapes.py,sha256=nA6OnfwXRJB1lmwcME3K5TEn_IwmShmBOlYSmOF7y3k,2245
 by_framework/core/protocol/event_type.py,sha256=no7rh1Mx_mhyqqPzEM4aK-W8JB8NwzyOdWN6R_CqaPw,1106
 by_framework/core/protocol/events.py,sha256=SVUXWWVIgxC9VuKjPE1qnvWJgKhWqY48pOHKD0HLcRg,1594
 by_framework/core/protocol/message.py,sha256=sBLm374jsCNa5UPCBJK7xgxJBw3CjrNsoEAnPSp3rAc,2374
 by_framework/core/protocol/message_header.py,sha256=udZkcUv-NEz2j-vpxGglrHWaIJy6k3ZJ9M5ajtL3WQo,3140
-by_framework/core/protocol/responses.py,sha256=fJhWIgkWoIbrNpS0sHWnVwPsS0pNCav-qGMu9AiTK9g,2376
+by_framework/core/protocol/responses.py,sha256=Q2xNFL1zPAGR0OpAB4uxu6iHHKUMIsBjc7yren4c0UA,2589
 by_framework/core/protocol/results.py,sha256=xRr0FhTyuck0ANSOD8yuozzJoVOHFp0G2iSK9V69Hec,5297
 by_framework/core/runtime/__init__.py,sha256=mYbe9D2BvZ3eYTjvU64CZyHLuMoRUU7DGwAIQXf7KR4,991
 by_framework/core/runtime/agent_config_manager.py,sha256=QpBkBXqWHEgqx8VXaQnRWJsG1TbHNJMHbLBMv0tQqJ8,8301
@@ -88,12 +88,12 @@ by_framework/worker/byai_worker.py,sha256=0NoRqzuTG_MPMxVbZ1ueeOrqI0H8-Adxh7dM3v
 by_framework/worker/context.py,sha256=XTNeTAhXvzS2OMDRCDKVD0s3uQscE1rFo9eImUw773w,44747
 by_framework/worker/heartbeat.py,sha256=trHDS8FUALsA6jyzDPa087hpr8_2vY8ZUFn0ld1kI2o,15465
 by_framework/worker/processor.py,sha256=D5GcV1T21z4mwJnrZFDRNsxdkhW2WZ3TgpygSKKJUfg,8008
-by_framework/worker/runner.py,sha256=ZuuhzdXB4oIjSaNyJCjOIYhzvw6L5N7X6kPzvrbWET8,43719
+by_framework/worker/runner.py,sha256=YoFS1K_8wVtCl6PMnhK2r66ujgWMplPGNwmGCCrqAO8,44214
 by_framework/worker/worker.py,sha256=_RmNkvHEN5kDPlqbHtVQhkhgiKx37xjnCxNkf_tvASM,35441
 by_framework/worker/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 by_framework/worker/sandbox/hook_sandbox.py,sha256=XXSdH5YGX814LvV03vkq-zn5DVIBPYYt2NhRv1lT1Bk,2329
-by_framework-0.2.2.dev9.dist-info/METADATA,sha256=qmdF2bXuu0_IfQI5_QazjrVOxd8EjIHiqnm0PiIVZVo,26533
-by_framework-0.2.2.dev9.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-by_framework-0.2.2.dev9.dist-info/entry_points.txt,sha256=5t6kgMjkR0UgJTpOsbuQDo0fOf7zeXjQW9DhkxfAGFc,56
-by_framework-0.2.2.dev9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-by_framework-0.2.2.dev9.dist-info/RECORD,,
+by_framework-0.2.2.dev10.dist-info/METADATA,sha256=Vg3-Fno6zjGZCliNPIIEBYRoVgiTrRMrKWSua26Vg3U,26534
+by_framework-0.2.2.dev10.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+by_framework-0.2.2.dev10.dist-info/entry_points.txt,sha256=5t6kgMjkR0UgJTpOsbuQDo0fOf7zeXjQW9DhkxfAGFc,56
+by_framework-0.2.2.dev10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+by_framework-0.2.2.dev10.dist-info/RECORD,,