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

ksadk/cli/model_catalog.py

@@ -116,7 +116,9 @@ async def fetch_provider_model_catalog(
     normalized: list[dict[str, Any]] = []
     for raw_model in _extract_catalog_items(payload):
         item = normalize_model_metadata(raw_model)
-        item["_provider_raw_model"] = raw_model if isinstance(raw_model, Mapping) else {"id": str(raw_model)}
+        item["_provider_raw_model"] = (
+            raw_model if isinstance(raw_model, Mapping) else {"id": str(raw_model)}
+        )
         normalized.append(item)
     return normalized
 
@@ -128,7 +130,9 @@ async def fetch_provider_model_metadata(
     model: str | None,
     timeout: float = 10.0,
 ) -> dict[str, Any] | None:
-    catalog = await fetch_provider_model_catalog(api_base=api_base, api_key=api_key, timeout=timeout)
+    catalog = await fetch_provider_model_catalog(
+        api_base=api_base, api_key=api_key, timeout=timeout
+    )
     raw_models = [item.get("_provider_raw_model") or item for item in catalog]
     raw_match = find_model_in_catalog(raw_models, model)
     if raw_match is None:

ksadk/cli/network_options.py

@@ -38,7 +38,10 @@ def network_options(func):
         click.option(
             "--enable-public-access/--disable-public-access",
             default=None,
-            help="是否开启公网访问；创建时默认开启，更新已有 Agent 时未指定则保留现有配置（显式传入才覆盖）",
+            help=(
+                "是否开启公网访问；创建时默认开启，更新已有 Agent 时未指定则保留现有配置"
+                "（显式传入才覆盖）"
+            ),
         ),
         click.option("--enable-vpc-access", is_flag=True, default=False, help="开启 VPC 私网访问"),
         click.option("--vpc-id", default=None, help="VPC ID（开启 VPC 访问时必填）"),
@@ -75,7 +78,8 @@ def extract_network_config(config: Mapping[str, Any] | None) -> dict[str, Any]:
     """Read network from top-level `network` or `deploy.network`."""
     if not isinstance(config, Mapping):
         return {}
-    deploy_config = config.get("deploy") if isinstance(config.get("deploy"), Mapping) else {}
+    deploy_value = config.get("deploy")
+    deploy_config: Mapping[str, Any] = deploy_value if isinstance(deploy_value, Mapping) else {}
     raw_network = config.get("network") or deploy_config.get("network") or {}
     return dict(raw_network) if isinstance(raw_network, Mapping) else {}
 
@@ -98,7 +102,12 @@ def apply_network_config(config: Mapping[str, Any] | None, deploy_target: "Deplo
     if _picked_public_access is not None:
         deploy_target.network.enable_public_access = bool(_picked_public_access)
     deploy_target.network.enable_vpc_access = bool(
-        _pick("enable_vpc_access", "enableVpcAccess", "EnableVpcAccess", default=deploy_target.network.enable_vpc_access)
+        _pick(
+            "enable_vpc_access",
+            "enableVpcAccess",
+            "EnableVpcAccess",
+            default=deploy_target.network.enable_vpc_access,
+        )
     )
     deploy_target.network.vpc_id = str(
         _pick("vpc_id", "vpcId", "VpcId", default=deploy_target.network.vpc_id) or ""
@@ -136,7 +145,9 @@ def apply_network_cli_overrides(deploy_target: "DeployTarget", **network_kwargs:
         value = network_kwargs.get(field)
         if value is not None:
             setattr(deploy_target.network, field, str(value or "").strip())
-    if any(str(getattr(deploy_target.network, field, "") or "").strip() for field in _VPC_ID_FIELDS):
+    if any(
+        str(getattr(deploy_target.network, field, "") or "").strip() for field in _VPC_ID_FIELDS
+    ):
         deploy_target.network.enable_vpc_access = True
 
 
@@ -145,7 +156,9 @@ def validate_deploy_target_network(deploy_target: "DeployTarget") -> None:
     values = {
         "vpc_id": str(getattr(deploy_target.network, "vpc_id", "") or "").strip(),
         "subnet_id": str(getattr(deploy_target.network, "subnet_id", "") or "").strip(),
-        "security_group_id": str(getattr(deploy_target.network, "security_group_id", "") or "").strip(),
+        "security_group_id": str(
+            getattr(deploy_target.network, "security_group_id", "") or ""
+        ).strip(),
     }
     has_any_vpc_id = any(values.values())
     if not (bool(getattr(deploy_target.network, "enable_vpc_access", False)) or has_any_vpc_id):
@@ -156,7 +169,8 @@ def validate_deploy_target_network(deploy_target: "DeployTarget") -> None:
             "开启 VPC 访问时必须同时提供 VpcId、SubnetId、SecurityGroupId。",
             details={"missing": missing},
             hints=[
-                "请同时传入 `--vpc-id`、`--subnet-id`、`--security-group-id`，或在配置文件 network/deploy.network 中同时设置这三个字段。",
+                "请同时传入 `--vpc-id`、`--subnet-id`、`--security-group-id`，"
+                "或在配置文件 network/deploy.network 中同时设置这三个字段。",
                 "`--availability-zone` 是可选字段，不替代子网或安全组。",
             ],
         )
@@ -191,8 +205,7 @@ def resolve_deploy_target_network(
         print_info(f"已根据子网 {subnet_id} 自动推断可用区: {availability_zone}")
     else:
         print_warn(
-            "未能根据子网自动推断可用区；如私网 ENI 调度失败，请显式传入 "
-            "`--availability-zone`。"
+            "未能根据子网自动推断可用区；如私网 ENI 调度失败，请显式传入 " "`--availability-zone`。"
         )
 
 
@@ -234,7 +247,9 @@ def _validate_network_payload(payload: Mapping[str, Any]) -> None:
         )
 
 
-def _fill_network_availability_zone(payload: dict[str, Any], network_kwargs: Mapping[str, Any]) -> None:
+def _fill_network_availability_zone(
+    payload: dict[str, Any], network_kwargs: Mapping[str, Any]
+) -> None:
     if str(payload.get("availability_zone") or "").strip():
         return
     if not bool(payload.get("enable_vpc_access")):
@@ -254,8 +269,7 @@ def _fill_network_availability_zone(payload: dict[str, Any], network_kwargs: Map
         print_info(f"已根据子网 {subnet_id} 自动推断可用区: {availability_zone}")
     else:
         print_warn(
-            "未能根据子网自动推断可用区；如私网 ENI 调度失败，请显式传入 "
-            "`--availability-zone`。"
+            "未能根据子网自动推断可用区；如私网 ENI 调度失败，请显式传入 " "`--availability-zone`。"
         )
 
 
@@ -270,7 +284,9 @@ def _resolve_subnet_availability_zone(*, subnet_id: str, region: str) -> str | N
         return None
 
     try:
-        VpcClient, DescribeSubnetsRequest, Credential, ClientProfile, HttpProfile = _import_vpc_sdk()
+        VpcClient, DescribeSubnetsRequest, Credential, ClientProfile, HttpProfile = (
+            _import_vpc_sdk()
+        )
     except Exception as exc:
         print_warn(f"缺少 VPC 子网查询 SDK，跳过可用区自动推断: {exc}")
         return None
@@ -300,11 +316,13 @@ def _resolve_subnet_availability_zone(*, subnet_id: str, region: str) -> str | N
 
 
 def _import_vpc_sdk():
-    from ksyun.client.vpc.v20160304.client import VpcClient
-    from ksyun.client.vpc.v20160304.models import DescribeSubnetsRequest
-    from ksyun.common.credential import Credential
-    from ksyun.common.profile.client_profile import ClientProfile
-    from ksyun.common.profile.http_profile import HttpProfile
+    from ksyun.client.vpc.v20160304.client import VpcClient  # type: ignore[import-untyped]
+    from ksyun.client.vpc.v20160304.models import (  # type: ignore[import-untyped]
+        DescribeSubnetsRequest,
+    )
+    from ksyun.common.credential import Credential  # type: ignore[import-untyped]
+    from ksyun.common.profile.client_profile import ClientProfile  # type: ignore[import-untyped]
+    from ksyun.common.profile.http_profile import HttpProfile  # type: ignore[import-untyped]
 
     return VpcClient, DescribeSubnetsRequest, Credential, ClientProfile, HttpProfile
 
@@ -328,8 +346,12 @@ def _resolve_ksyun_credentials() -> tuple[str, str]:
     except Exception:
         global_env = {}
 
-    access_key = access_key or global_env.get("KSYUN_ACCESS_KEY") or global_env.get("KS3_ACCESS_KEY") or ""
-    secret_key = secret_key or global_env.get("KSYUN_SECRET_KEY") or global_env.get("KS3_SECRET_KEY") or ""
+    access_key = (
+        access_key or global_env.get("KSYUN_ACCESS_KEY") or global_env.get("KS3_ACCESS_KEY") or ""
+    )
+    secret_key = (
+        secret_key or global_env.get("KSYUN_SECRET_KEY") or global_env.get("KS3_SECRET_KEY") or ""
+    )
     return str(access_key or "").strip(), str(secret_key or "").strip()
 
 

ksadk/cli/resource_common.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 import re
+from dataclasses import dataclass, field
 from typing import Any, Callable, Iterable, Sequence, TypeVar
 
 import click
@@ -181,6 +181,7 @@ def confirm_destructive(
                 details={"prompt": prompt},
             )
         )
+        return False
     if click.confirm(prompt):
         return True
     from ksadk.cli.error_utils import abort_with_cli_error, cancelled_error
@@ -192,6 +193,7 @@ def confirm_destructive(
             details={"prompt": prompt},
         )
     )
+    return False
 
 
 def print_list_summary(*, total: int, page: int, size: int, noun: str) -> None:
@@ -244,7 +246,9 @@ def get_descriptor_resource_key(descriptor: ResourceDescriptor) -> str:
     return descriptor.resource_key or _resource_key(descriptor.name) or "resource"
 
 
-def _legacy_action_descriptors(descriptor: ResourceDescriptor) -> tuple[ResourceActionDescriptor, ...]:
+def _legacy_action_descriptors(
+    descriptor: ResourceDescriptor,
+) -> tuple[ResourceActionDescriptor, ...]:
     action_set = descriptor.actions
     if not isinstance(action_set, ResourceActionSet):
         return tuple(action_set)

ksadk/cli/runtime_bootstrap.py

@@ -0,0 +1,51 @@
+"""Shared RuntimeAdapter-first application composition for CLI entrypoints."""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from typing import Any
+
+from fastapi import FastAPI
+
+from ksadk.agui.config import agui_config_for_detection
+from ksadk.runtime import RuntimeExecutor, RuntimeLaunchContext
+from ksadk.runtime.factory import build_default_runtime_registry
+from ksadk.server.composition import configure_runtime_app
+from ksadk.server.factory import RuntimeAppConfig, create_runtime_app
+
+
+def _managed_a2a_card() -> Any:
+    """Build the managed discovery-only card when the runtime opts in.
+
+    Import is deferred so the A2A package is only loaded when
+    ``KSADK_A2A_RUNTIME_ID`` is configured.
+    """
+    if not os.getenv("KSADK_A2A_RUNTIME_ID", "").strip():
+        return None
+    from ksadk.managed_a2a_card import build_managed_a2a_card_if_configured
+
+    return build_managed_a2a_card_if_configured()
+
+
+def create_runtime_web_app(detection: Any, agent_path: Path) -> FastAPI:
+    """Compose one detected project around the canonical RuntimeExecutor."""
+
+    context = RuntimeLaunchContext(
+        runtime_type=str(detection.type.value),
+        project_dir=agent_path,
+        detection=detection,
+        config=dict(getattr(detection, "raw_config", None) or {}),
+    )
+    return create_runtime_app(
+        RuntimeAppConfig(
+            runtime_executor=RuntimeExecutor(build_default_runtime_registry()),
+            launch_context=context,
+            agui=agui_config_for_detection(detection),
+            a2a=_managed_a2a_card(),
+        ),
+        configure_runtime_app,
+    )
+
+
+__all__ = ["create_runtime_web_app"]

ksadk/cli/storage.py

@@ -6,7 +6,6 @@ from typing import Optional
 
 import click
 
-
 DEFAULT_STORAGE_SIZE_GI = 20
 MIN_STORAGE_SIZE_GI = 20
 MAX_STORAGE_SIZE_GI = 500

ksadk/cli/ui.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from contextlib import contextmanager, redirect_stderr, redirect_stdout
-from dataclasses import dataclass
 import io
 import json
 import os
 import sys
+from contextlib import contextmanager, redirect_stderr, redirect_stdout
+from dataclasses import dataclass
 from typing import Iterator
 
 import click
@@ -27,9 +27,12 @@ STATUS_RICH_STYLE = {
     "RUNNING": "bold #2da44e",
     "READY": "bold #2da44e",
     "HEALTHY": "bold #2da44e",
+    "PASSED": "bold #2da44e",
     "CREATING": "bold #d29922",
     "SUBMITTED": "bold #d29922",
     "PENDING": "bold #d29922",
+    "CANCELLED": "bold #d29922",
+    "UNAVAILABLE": "bold #d29922",
     "UPDATING": "bold #d29922",
     "SCALING": "bold #d29922",
     "FAILED": "bold #f85149",
@@ -42,9 +45,12 @@ STATUS_CLICK_COLOR = {
     "RUNNING": "green",
     "READY": "green",
     "HEALTHY": "green",
+    "PASSED": "green",
     "CREATING": "yellow",
     "SUBMITTED": "yellow",
     "PENDING": "yellow",
+    "CANCELLED": "yellow",
+    "UNAVAILABLE": "yellow",
     "UPDATING": "yellow",
     "SCALING": "yellow",
     "FAILED": "red",
@@ -303,7 +309,9 @@ def no_color_option(*, hidden: bool = False, expose_value: bool = False):
     )
 
 
-def build_no_color_click_option(*, hidden: bool = False, expose_value: bool = False) -> click.Option:
+def build_no_color_click_option(
+    *, hidden: bool = False, expose_value: bool = False
+) -> click.Option:
     """Build a shared no-color option for command injection."""
     return click.Option(
         ["--no-color", "no_color"],

ksadk/cli/workflow_common.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass, replace
 import json
+from dataclasses import dataclass, replace
 from pathlib import Path
 from typing import Any, Sequence
 
@@ -16,9 +16,9 @@ from ksadk.cli.ui import (
     print_info,
     print_kv,
     print_next_steps,
+    print_rule,
     print_title,
     print_warn,
-    print_rule,
 )
 
 
@@ -55,9 +55,19 @@ def build_workflow_local_plan(
     normalized_artifact_type = (artifact_type or "").strip().lower()
     normalized_reference = str(artifact_reference or artifact_plan.reference or "")
     source = artifact_plan.source or ("built" if artifact_plan.should_build else "external")
-    will_build = artifact_plan.will_build if artifact_plan.will_build is not None else artifact_plan.should_build
-    should_publish = artifact_plan.should_publish if artifact_plan.should_publish is not None else artifact_plan.should_build
-    will_publish = artifact_plan.will_publish if artifact_plan.will_publish is not None else will_build
+    will_build = (
+        artifact_plan.will_build
+        if artifact_plan.will_build is not None
+        else artifact_plan.should_build
+    )
+    should_publish = (
+        artifact_plan.should_publish
+        if artifact_plan.should_publish is not None
+        else artifact_plan.should_build
+    )
+    will_publish = (
+        artifact_plan.will_publish if artifact_plan.will_publish is not None else will_build
+    )
     build_reason = _plan_step_reason(
         source=source,
         explicit_ref_option=artifact_plan.explicit_ref_option,
@@ -114,13 +124,20 @@ def build_workflow_local_plan(
     }
 
 
-def should_build_artifact(*, target: str, artifact_type: str | None, ks3_path: str | None, image: str | None) -> bool:
+def should_build_artifact(
+    *, target: str, artifact_type: str | None, ks3_path: str | None, image: str | None
+) -> bool:
     """Whether deploy/launch should build artifacts locally."""
     if target != "serverless":
         return False
     mode = (artifact_type or "Code").strip().lower()
     if mode == "code":
         return not bool(ks3_path)
+    # ManagedRuntime is a declarative server-side manifest.  Deployment does
+    # not upload an artifact, but it must build the canonical manifest locally
+    # to include its SHA-256 in the control-plane request.
+    if mode == "managedruntime":
+        return True
     if mode == "container":
         return not bool(image)
     return False
@@ -136,6 +153,7 @@ def plan_artifact_build(
     repackage: bool = False,
 ) -> ArtifactBuildPlan:
     """Plan artifact build behavior and metadata cleanup under cache options."""
+    mode = (artifact_type or "Code").strip().lower()
     should_build = should_build_artifact(
         target=target,
         artifact_type=artifact_type,
@@ -144,7 +162,6 @@ def plan_artifact_build(
     )
     explicit_ref_option = None
     if target == "serverless" and not should_build:
-        mode = (artifact_type or "Code").strip().lower()
         if mode == "code" and ks3_path:
             explicit_ref_option = "--ks3-path"
         elif mode == "container" and image:
@@ -154,8 +171,8 @@ def plan_artifact_build(
         should_clear_metadata=bool((no_cache or repackage) and should_build),
         explicit_ref_option=explicit_ref_option,
         will_build=should_build,
-        should_publish=bool(target == "serverless" and should_build),
-        will_publish=bool(target == "serverless" and should_build),
+        should_publish=bool(target == "serverless" and should_build and mode != "managedruntime"),
+        will_publish=bool(target == "serverless" and should_build and mode != "managedruntime"),
         source="external" if explicit_ref_option else ("built" if should_build else None),
     )
 
@@ -176,7 +193,9 @@ def _predict_artifact_reference(
 
     normalized_artifact_type = (artifact_type or "Code").strip().lower()
     normalized_deploy_name = (deploy_name or "agent").strip() or "agent"
-    normalized_region = "cn-beijing-6" if str(region or "").strip() == "pre-online" else str(region or "").strip()
+    normalized_region = (
+        "cn-beijing-6" if str(region or "").strip() == "pre-online" else str(region or "").strip()
+    )
 
     if normalized_artifact_type == "code":
         bucket = (ks3_bucket or "").strip()
@@ -184,7 +203,11 @@ def _predict_artifact_reference(
             bucket = f"agentengine-{account_id}-{normalized_region}"
         if not bucket:
             bucket = "<ks3-bucket>"
-        return f"ks3://{bucket}/agents/{normalized_deploy_name}/code_<dry-run>.zip"
+        artifact_label = "runtime" if normalized_artifact_type == "managedruntime" else "code"
+        return f"ks3://{bucket}/agents/{normalized_deploy_name}/{artifact_label}_<dry-run>.zip"
+
+    if normalized_artifact_type == "managedruntime":
+        return "inline:managed-runtime"
 
     if normalized_artifact_type == "container":
         normalized_registry = (registry or "").strip().rstrip("/")
@@ -212,6 +235,7 @@ def resolve_artifact_build_plan(
     """Resolve workflow artifact behavior after package metadata is available."""
     normalized_explicit = str(explicit_reference or "").strip()
     normalized_cached = str(cached_reference or "").strip()
+    is_managed_runtime = (artifact_type or "").strip().lower() == "managedruntime"
 
     if normalized_explicit:
         return replace(
@@ -237,11 +261,11 @@ def resolve_artifact_build_plan(
             reference_is_predicted=False,
         )
 
-    if plan.should_build and dry_run:
+    if plan.should_build and dry_run and not is_managed_runtime:
         return replace(
             plan,
             will_build=False,
-            should_publish=bool(target == "serverless"),
+            should_publish=bool(target == "serverless" and not is_managed_runtime),
             will_publish=False,
             source="planned_build",
             reference=_predict_artifact_reference(
@@ -260,8 +284,8 @@ def resolve_artifact_build_plan(
         return replace(
             plan,
             will_build=True,
-            should_publish=bool(target == "serverless"),
-            will_publish=bool(target == "serverless"),
+            should_publish=bool(target == "serverless" and not is_managed_runtime),
+            will_publish=bool(target == "serverless" and not is_managed_runtime),
             source="built",
             reference=plan.reference,
             reference_is_predicted=False,
@@ -339,7 +363,11 @@ def _request_header_summary(headers: Any) -> str:
 def _summarize_plan_steps(steps: Sequence[dict[str, Any]]) -> tuple[str, str, str]:
     executed = [str(step.get("name") or "-") for step in steps if step.get("will_run")]
     planned = [str(step.get("name") or "-") for step in steps if step.get("planned")]
-    skipped = [str(step.get("name") or "-") for step in steps if not step.get("will_run") and not step.get("planned")]
+    skipped = [
+        str(step.get("name") or "-")
+        for step in steps
+        if not step.get("will_run") and not step.get("planned")
+    ]
     return (
         ", ".join(executed) or "-",
         ", ".join(planned) or "-",
@@ -516,8 +544,14 @@ def render_workflow_dry_run(
 
         print_rule("本地计划")
         print_kv("制品类型", str(plan.get("artifact_type") or "-"))
-        print_kv("需要本地构建", "是" if artifact.get("should_local_build", artifact.get("should_build")) else "否")
-        print_kv("会执行本地构建", "是" if artifact.get("will_local_build", artifact.get("will_build")) else "否")
+        print_kv(
+            "需要本地构建",
+            "是" if artifact.get("should_local_build", artifact.get("should_build")) else "否",
+        )
+        print_kv(
+            "会执行本地构建",
+            "是" if artifact.get("will_local_build", artifact.get("will_build")) else "否",
+        )
         print_kv("需要发布制品", "是" if artifact.get("should_publish") else "否")
         print_kv("会执行制品发布", "是" if artifact.get("will_publish") else "否")
         if artifact.get("source"):

ksadk/codex/__init__.py

@@ -0,0 +1,12 @@
+"""CodexRuntimeAdapter — 非 ADK 体系 runtime (goal-09)。"""
+
+from ksadk.codex.client import AsyncCodexClient, CodexClient
+from ksadk.codex.phase import CodexPhaseTracker
+from ksadk.codex.runtime import CodexRuntimeAdapter
+
+__all__ = [
+    "AsyncCodexClient",
+    "CodexClient",
+    "CodexPhaseTracker",
+    "CodexRuntimeAdapter",
+]