agentengine-sdk-python 0.7.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

ksadk/runners/base_runner.py

@@ -7,6 +7,7 @@ BaseRunner - 运行时基类
 import inspect
 import os
 from abc import ABC, abstractmethod
+from pathlib import Path
 from typing import Any, AsyncIterator, Dict, Mapping, Optional
 
 from ksadk.sessions.continuity import RunnerSessionAdapter, TranscriptReplayAdapter
@@ -18,7 +19,8 @@ class BaseRunner(ABC):
     def __init__(self, detection_result: Any, project_dir: str):
         self.detection_result = detection_result
         self.project_dir = project_dir
-        self._agent = None
+        # Framework runners populate this with SDK-specific agent/graph objects.
+        self._agent: Any = None
 
     @abstractmethod
     def load_agent(self) -> None:
@@ -38,7 +40,7 @@ class BaseRunner(ABC):
         pass
 
     @abstractmethod
-    async def stream(self, input_data: Dict[str, Any]) -> AsyncIterator[Dict[str, Any]]:
+    def stream(self, input_data: Dict[str, Any]) -> AsyncIterator[Dict[str, Any]]:
         """流式调用 Agent
 
         Args:
@@ -47,7 +49,7 @@ class BaseRunner(ABC):
         Yields:
             流式输出的数据块
         """
-        pass
+        raise NotImplementedError
 
     @staticmethod
     def normalize_requested_model(model: Optional[str]) -> Optional[str]:
@@ -108,23 +110,28 @@ class BaseRunner(ABC):
                     if cancel_supported
                     else ["unsupported"]
                 ),
-                "Reason": ""
-                if cancel_supported
-                else "runner does not implement cooperative cancellation",
+                "Reason": (
+                    "" if cancel_supported else "runner does not implement cooperative cancellation"
+                ),
             },
             "Checkpoint": checkpoint,
             "ResumeRun": {
                 "Supported": checkpoint_supported,
                 "ResumeMode": str(checkpoint.get("ResumeMode") or "none"),
-                "Reason": checkpoint_reason
-                if not checkpoint_supported
-                else str(checkpoint.get("ResumeReason") or ""),
+                "Reason": (
+                    checkpoint_reason
+                    if not checkpoint_supported
+                    else str(checkpoint.get("ResumeReason") or "")
+                ),
             },
             "SessionContinuity": {
                 "Supported": True,
                 "Type": "semantic_replay",
                 "Level": "semantic",
-                "Reason": "conversation transcript can be replayed, but exact runtime checkpoint resume is not available",
+                "Reason": (
+                    "conversation transcript can be replayed, but exact runtime checkpoint "
+                    "resume is not available"
+                ),
             },
         }
 
@@ -193,15 +200,15 @@ class BaseRunner(ABC):
         if isinstance(usage_metadata, Mapping):
             input_tokens = cls._int_usage_value(usage_metadata.get("input_tokens"))
             output_tokens = cls._int_usage_value(usage_metadata.get("output_tokens"))
-            input_token_details = usage_metadata.get("input_token_details")
-            output_token_details = usage_metadata.get("output_token_details")
-            if not any(
-                key in usage_metadata
-                for key in ("input_tokens", "output_tokens", "total_tokens")
-            ) and not (
-                isinstance(input_token_details, Mapping) and input_token_details
-            ) and not (
-                isinstance(output_token_details, Mapping) and output_token_details
+            usage_input_details = usage_metadata.get("input_token_details")
+            usage_output_details = usage_metadata.get("output_token_details")
+            if (
+                not any(
+                    key in usage_metadata
+                    for key in ("input_tokens", "output_tokens", "total_tokens")
+                )
+                and not (isinstance(usage_input_details, Mapping) and usage_input_details)
+                and not (isinstance(usage_output_details, Mapping) and usage_output_details)
             ):
                 return {}
             return {
@@ -211,10 +218,10 @@ class BaseRunner(ABC):
                     usage_metadata.get("total_tokens") or (input_tokens + output_tokens)
                 ),
                 "input_token_details": (
-                    dict(input_token_details) if isinstance(input_token_details, Mapping) else {}
+                    dict(usage_input_details) if isinstance(usage_input_details, Mapping) else {}
                 ),
                 "output_token_details": (
-                    dict(output_token_details) if isinstance(output_token_details, Mapping) else {}
+                    dict(usage_output_details) if isinstance(usage_output_details, Mapping) else {}
                 ),
             }
 
@@ -237,10 +244,14 @@ class BaseRunner(ABC):
                     reasoning_tokens = completion_details.get("reasoning_tokens")
                     if reasoning_tokens is not None:
                         output_token_details["reasoning"] = cls._int_usage_value(reasoning_tokens)
-                if not any(
-                    key in token_usage
-                    for key in ("prompt_tokens", "completion_tokens", "total_tokens")
-                ) and not input_token_details and not output_token_details:
+                if (
+                    not any(
+                        key in token_usage
+                        for key in ("prompt_tokens", "completion_tokens", "total_tokens")
+                    )
+                    and not input_token_details
+                    and not output_token_details
+                ):
                     return {}
                 return {
                     "input_tokens": input_tokens,
@@ -295,11 +306,42 @@ class BaseRunner(ABC):
         usage = cls._message_usage(result)
         return usage if usage else {}
 
-
     def run_server(self, port: int = 8000) -> None:
-        """启动 HTTP Server"""
-        from ksadk.server import app, set_runner
+        """启动 HTTP Server(per-app factory,不再依赖 set_runner 全局态)。"""
         import uvicorn
 
-        set_runner(self)
+        from ksadk.agui.config import default_agui_config
+        from ksadk.managed_a2a_card import build_managed_a2a_card_if_configured
+        from ksadk.runtime import RuntimeExecutor, RuntimeLaunchContext, RuntimeRegistry
+        from ksadk.runtime.runner_adapter import RunnerRuntimeAdapter
+        from ksadk.server.composition import configure_runtime_app
+        from ksadk.server.factory import RuntimeAppConfig, create_runtime_app
+
+        detected_runtime_type = str(
+            getattr(getattr(self.detection_result, "type", None), "value", "runner")
+        )
+        launch_context = RuntimeLaunchContext(
+            runtime_type=detected_runtime_type,
+            project_dir=Path(self.project_dir),
+            detection=self.detection_result,
+        )
+        runtime_type = launch_context.runtime_type
+        registry = RuntimeRegistry()
+        registry.register(
+            runtime_type,
+            lambda _context: RunnerRuntimeAdapter(self, runtime_type=runtime_type),
+        )
+        # BaseRunner 仍可作为底层框架实现启动 Web，但 HTTP 层只消费 RuntimeAdapter。
+        # managed A2A discovery-only card:KSADK_A2A_RUNTIME_ID 非空时挂
+        # ``/.well-known/agent-card.json``;注册前即可被 server 探测(a2a-runtime-inbound-wiring)。
+        # KSADK_A2A_AGENT_ID 是注册后注入的不透明注册 ID；v2 JSON-RPC 绑定用，v1 card 不依赖。
+        app = create_runtime_app(
+            RuntimeAppConfig(
+                runtime_executor=RuntimeExecutor(registry),
+                launch_context=launch_context,
+                agui=default_agui_config(self),
+                a2a=build_managed_a2a_card_if_configured(),
+            ),
+            configure_runtime_app,
+        )
         uvicorn.run(app, host="0.0.0.0", port=port)

ksadk/runners/deepagents_runner.py

@@ -10,4 +10,3 @@ from ksadk.runners.langgraph_runner import LangGraphRunner
 
 class DeepAgentsRunner(LangGraphRunner):
     """DeepAgents 运行时（复用 LangGraphRunner）"""
-

ksadk/runners/factory.py

@@ -6,6 +6,7 @@ import importlib
 import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
+
 from ksadk.detection import DetectionResult, FrameworkType
 from ksadk.runners.base_runner import BaseRunner
 
@@ -15,11 +16,11 @@ if TYPE_CHECKING:
 
 def create_runner(detection_result: DetectionResult, project_dir: str) -> BaseRunner:
     """根据检测结果创建对应的 Runner
-    
+
     Args:
         detection_result: 框架检测结果
         project_dir: 项目目录
-    
+
     Returns:
         对应框架的 Runner 实例
     """
@@ -55,19 +56,31 @@ def create_runner(detection_result: DetectionResult, project_dir: str) -> BaseRu
 
     if detection_result.type == FrameworkType.ADK:
         from ksadk.runners.adk_runner import ADKRunner
+
         return ADKRunner(detection_result, project_dir)
-    
+
     elif detection_result.type == FrameworkType.LANGGRAPH:
         from ksadk.runners.langgraph_runner import LangGraphRunner
+
         return LangGraphRunner(detection_result, project_dir)
-    
+
     elif detection_result.type == FrameworkType.LANGCHAIN:
+        # 新 LangChain(create_agent)= LangGraph 图,经 LangChainRunner 薄壳复用
+        # LangGraphRunner(deepagents 同款);legacy 链在 load_agent 时被薄壳拒绝并给迁移指引。
         from ksadk.runners.langchain_runner import LangChainRunner
+
         return LangChainRunner(detection_result, project_dir)
 
     elif detection_result.type == FrameworkType.DEEPAGENTS:
         from ksadk.runners.deepagents_runner import DeepAgentsRunner
+
         return DeepAgentsRunner(detection_result, project_dir)
-    
+
+    elif detection_result.type == FrameworkType.CODEX:
+        raise ValueError(
+            "Codex 只支持 RuntimeAdapter 执行链；请使用 "
+            "ksadk.runtime.create_runtime_adapter"
+        )
+
     else:
         raise ValueError(f"不支持的框架类型: {detection_result.type}")