agentengine-sdk-python 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

ksadk/runners/adk_runner.py

@@ -10,7 +10,6 @@ import base64
 import inspect
 import logging
 import os
-import sys
 from dataclasses import dataclass
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as _pkg_version
@@ -24,6 +23,7 @@ from ksadk.conversations.attachments import classify_attachment_kind, read_attac
 from ksadk.conversations.model_context import supports_native_image_input
 from ksadk.runners.base_runner import BaseRunner
 from ksadk.runners.usage_accumulator import accumulate_usage
+from ksadk.runners.utils import load_agent_module
 from ksadk.sessions.continuity import ADKSessionAdapter
 
 logger = logging.getLogger(__name__)
@@ -910,26 +910,12 @@ class ADKRunner(BaseRunner):
         self._apply_json_patch()
         self._apply_mcp_result_patch()
 
-        # 添加项目目录到 Python 路径
-        project_path = Path(self.project_dir).resolve()
-        if str(project_path) not in sys.path:
-            sys.path.insert(0, str(project_path))
-
-        # 确定模块名: 从 entry_point 获取
-        # (e.g. "smart_assistant_adk/agent.py" -> "smart_assistant_adk.agent")
-        entry_point = self.detection_result.entry_point
-        if entry_point.endswith(".py"):
-            module_name = entry_point[:-3]  # 移除 .py 后缀
-        else:
-            module_name = entry_point
-
-        # 转换路径为模块路径 (e.g., "subdir/agent" -> "subdir.agent")
-        module_name = module_name.replace("/", ".").replace("\\", ".")
-
         try:
-            module = __import__(module_name, fromlist=[self.detection_result.agent_variable])
-            self._module = module
-            self._agent = getattr(module, self.detection_result.agent_variable)
+            self._agent, self._module = load_agent_module(
+                self.project_dir,
+                self.detection_result.entry_point,
+                self.detection_result.agent_variable,
+            )
 
             # Inject safety instruction for DeepSeek/LLMs to prevent empty tool names
             if hasattr(self._agent, "instruction"):
@@ -939,12 +925,8 @@ class ADKRunner(BaseRunner):
                 else:
                     self._agent.instruction = safety_prompt
 
-        except ImportError as e:
-            raise ImportError(f"无法导入模块 {module_name}: {e}")
-        except AttributeError:
-            raise AttributeError(
-                f"模块 {module_name} 中未找到 {self.detection_result.agent_variable}"
-            )
+        except (ImportError, AttributeError):
+            raise
         except Exception as exc:
             name_error = self._invalid_agent_name_load_error(exc)
             if name_error is not None:
@@ -1255,6 +1237,7 @@ class ADKRunner(BaseRunner):
             "current_attachments",
             "current_attachment_results",
             "has_current_files",
+            "metadata",
         ):
             if key in input_data:
                 state_delta[key] = input_data.get(key)
@@ -2077,9 +2060,7 @@ class ADKRunner(BaseRunner):
                                 # partial=False；这可能是一个此前 partial thought
                                 # 的终态快照。只补发新增内容，避免正文之后再显示一遍
                                 # 相同的思考块；若此前没有 partial thought，仍完整透传。
-                                previous_thought = sub_agent_thought_snapshots.get(
-                                    author_key, ""
-                                )
+                                previous_thought = sub_agent_thought_snapshots.get(author_key, "")
                                 if part.text.startswith(previous_thought):
                                     thought_delta = part.text[len(previous_thought) :]
                                     sub_agent_thought_snapshots[author_key] = part.text
@@ -2095,8 +2076,10 @@ class ADKRunner(BaseRunner):
                         snapshot = ""
                         replace_snapshot = False
                         for part in event.content.parts:
-                            if hasattr(part, "text") and part.text and not getattr(
-                                part, "thought", False
+                            if (
+                                hasattr(part, "text")
+                                and part.text
+                                and not getattr(part, "thought", False)
                             ):
                                 snapshot += part.text
                                 replace_snapshot = replace_snapshot or _part_metadata_flag(

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
@@ -78,6 +79,21 @@ class BaseRunner(ABC):
         """
         return "unsupported"
 
+    def describe_context_capabilities(self) -> Any:
+        """声明该 Runner 的 Prompt/Context/Memory ownership 合同。
+
+        默认按 ``detection_result.type.value`` 显式分派已知 Runner 的 capability，
+        未知自定义 Runner 落到最保守的 ``framework_assisted + opaque``。子类一般无需
+        override——registry 已是已知 Runner 的显式默认值（方案 6.1）；仅非 BaseRunner
+        体系的 Runner（如 CodexRuntimeAdapter）需自带同名方法。第一个 PR 中该声明仅供
+        shadow ContextPlan / conformance 测试消费，不改变真实输入。
+        """
+        from ksadk.context_engine.capabilities import _capabilities_for_detection_type
+
+        detection_type = getattr(getattr(self, "detection_result", None), "type", None)
+        value = getattr(detection_type, "value", detection_type)
+        return _capabilities_for_detection_type(str(value or "").strip().lower())
+
     def describe_checkpoint_capability(self) -> dict[str, Any]:
         """描述框架级 checkpoint 能力。
 
@@ -102,6 +118,7 @@ class BaseRunner(ABC):
         cancel_supported = type(self).request_cancel is not BaseRunner.request_cancel
         return {
             "Framework": framework or self.__class__.__name__,
+            "model_call_boundaries": False,
             "CancelRun": {
                 "Supported": cancel_supported,
                 "RequestResults": (
@@ -310,13 +327,37 @@ class BaseRunner(ABC):
         import uvicorn
 
         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
 
-        # goal-01/16:经 create_runtime_app 注入 runner(per-app state),替代全局 ``app`` +
-        # ``set_runner`` 全局态。普通 runtime app 装配全部 route group。
+        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(runner=self, agui=default_agui_config(self)),
+            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/factory.py

@@ -77,9 +77,9 @@ def create_runner(detection_result: DetectionResult, project_dir: str) -> BaseRu
         return DeepAgentsRunner(detection_result, project_dir)
 
     elif detection_result.type == FrameworkType.CODEX:
-        from ksadk.runners.codex_runner import CodexRunner
-
-        return CodexRunner(detection_result, project_dir)
+        raise ValueError(
+            "Codex 只支持 RuntimeAdapter 执行链；请使用 " "ksadk.runtime.create_runtime_adapter"
+        )
 
     else:
         raise ValueError(f"不支持的框架类型: {detection_result.type}")