agentkit-sdk-python 0.6.4__py3-none-any.whl → 0.6.5__py3-none-any.whl

agentkit/toolkit/cli/cli_add.py

@@ -38,9 +38,11 @@ into the existing file, so configuration can be built up incrementally.
 """
 
 import json
+import os
 import re
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
+from urllib.parse import parse_qs, urlparse
 
 import typer
 from rich.console import Console
@@ -62,6 +64,25 @@ _SHORT_TERM_MEMORY_TYPES = ("local", "sqlite", "mysql", "postgresql")
 
 # Harness name charset (matches `init`'s directory-name rule).
 _NAME_RE = re.compile(r"^[a-zA-Z0-9_-]+$")
+_REGISTRY_QUERY_KEYS = {
+    "space_id",
+    "space_name",
+    "top_k",
+    "endpoint",
+    "region",
+}
+_REGISTRY_INT_KEYS = {"top_k"}
+_REGISTER_NETWORK_TYPES = {"public", "private"}
+_REGISTER_DEFAULT_VERSION = "2025-10-30"
+
+
+class _A2ARegisterError(Exception):
+    def __init__(
+        self, message: str, diagnostics: dict[str, Any] | None = None
+    ) -> None:
+        super().__init__(message)
+        self.message = message
+        self.diagnostics = diagnostics or {}
 
 
 def _split_csv(value: Optional[str]) -> Optional[list[str]]:
@@ -112,6 +133,449 @@ def _validate_choice(
         raise typer.Exit(1)
 
 
+def _parse_registry_int(key: str, value: object) -> object:
+    if key not in _REGISTRY_INT_KEYS:
+        return value
+    try:
+        return int(str(value))
+    except ValueError as exc:
+        raise ValueError(f"Registry param `{key}` must be an integer, got {value!r}.") from exc
+
+
+def _parse_registry_uri(value: str) -> dict:
+    """Parse the supported AgentKit A2A registry URI into a spec section."""
+    raw = value.strip()
+    if raw.lower() == "disabled":
+        return {"type": ""}
+
+    parsed = urlparse(raw)
+    if (
+        parsed.scheme != "agentkit"
+        or parsed.netloc != "a2a-registry"
+        or parsed.path not in {"", "/"}
+    ):
+        raise ValueError(
+            "Unsupported registry URI. Currently only "
+            "`agentkit://a2a-registry?space_id=xxx&top_k=3` or "
+            "`disabled` is supported."
+        )
+
+    query = {
+        key.replace("-", "_"): values[-1]
+        for key, values in parse_qs(parsed.query, keep_blank_values=False).items()
+        if values and values[-1] != ""
+    }
+    unknown = sorted(set(query) - _REGISTRY_QUERY_KEYS)
+    if unknown:
+        raise ValueError(
+            f"Unsupported registry query param(s): {', '.join(unknown)}. "
+            f"Known: {', '.join(sorted(_REGISTRY_QUERY_KEYS))}"
+        )
+
+    section: dict = {"type": "agentkit_a2a"}
+    for key, raw_value in query.items():
+        section[key] = _parse_registry_int(key, raw_value)
+    return section
+
+
+def _set_registry_value(section: dict, key: str, value: object | None) -> None:
+    if value is not None:
+        section[key] = _parse_registry_int(key, value)
+
+
+def _apply_registry_config(
+    data: dict,
+    registry: Optional[str],
+    registry_space_id: Optional[str],
+    registry_space_name: Optional[str],
+    registry_top_k: Optional[int],
+    registry_endpoint: Optional[str],
+    registry_region: Optional[str],
+) -> None:
+    has_registry_update = any(
+        value is not None
+        for value in [
+            registry,
+            registry_space_id,
+            registry_space_name,
+            registry_top_k,
+            registry_endpoint,
+            registry_region,
+        ]
+    )
+    if not has_registry_update:
+        return
+
+    section = data.get("registry")
+    if not isinstance(section, dict):
+        section = {}
+
+    if registry is not None:
+        section.update(_parse_registry_uri(registry))
+
+    _set_registry_value(section, "space_id", registry_space_id)
+    _set_registry_value(section, "space_name", registry_space_name)
+    _set_registry_value(section, "top_k", registry_top_k)
+    _set_registry_value(section, "endpoint", registry_endpoint)
+    _set_registry_value(section, "region", registry_region)
+
+    if section.get("type") != "":
+        section["type"] = "agentkit_a2a"
+
+    if section.get("type") == "agentkit_a2a" and not section.get("space_id"):
+        space_name = section.pop("space_name", None)
+        if space_name:
+            resolved_region = (
+                registry_region
+                or section.get("region")
+                or os.getenv("AGENTKIT_REGION")
+                or os.getenv("VOLCENGINE_REGION")
+                or "cn-beijing"
+            )
+            resolved_endpoint = (
+                registry_endpoint
+                or section.get("endpoint")
+                or _default_agentkit_endpoint(resolved_region)
+            )
+            section["space_id"] = _resolve_a2a_space_id_by_name(
+                str(space_name),
+                endpoint=str(resolved_endpoint),
+                region=str(resolved_region),
+            )
+    else:
+        section.pop("space_name", None)
+
+    if section.get("type") == "agentkit_a2a" and not section.get("space_id"):
+        raise ValueError(
+            "Registry space_id is required. Use "
+            '`--registry "agentkit://a2a-registry?space_id=xxx"` '
+            "or `--registry-space-id xxx` / `--registry-space-name name`."
+        )
+
+    data["registry"] = section
+
+
+def _load_spec(path: Path) -> dict:
+    if not path.is_file():
+        return {}
+    return json.loads(path.read_text())
+
+
+def _write_spec(path: Path, data: dict) -> None:
+    path.write_text(json.dumps(data, indent=2, ensure_ascii=False) + "\n")
+
+
+def _load_json(path: Path) -> dict:
+    return json.loads(path.read_text()) if path.is_file() else {}
+
+
+def _parse_register_tags(values: list[str]) -> list[dict[str, str]]:
+    tags = []
+    for value in values:
+        if "=" not in value:
+            console.print(
+                f"[red]Error: invalid --register-tag {value!r}. "
+                "Expected KEY=VALUE.[/red]"
+            )
+            raise typer.Exit(1)
+        key, tag_value = value.split("=", 1)
+        key = key.strip()
+        tag_value = tag_value.strip()
+        if not key:
+            console.print("[red]Error: --register-tag key must not be empty.[/red]")
+            raise typer.Exit(1)
+        tags.append({"Key": key, "Value": tag_value})
+    return tags
+
+
+def _default_agentkit_endpoint(region: str) -> str:
+    if region == "cn-beijing":
+        return "https://agentkit.cn-beijing.volcengineapi.com/"
+    return f"https://agentkit.{region}.volcengineapi.com/"
+
+
+def _request_id(response: dict[str, Any]) -> str | None:
+    return (response.get("ResponseMetadata") or {}).get("RequestId")
+
+
+def _resolve_agentkit_credentials():
+    from agentkit.platform import VolcConfiguration, resolve_credentials
+
+    return resolve_credentials("agentkit", platform_config=VolcConfiguration())
+
+
+def _agentkit_post(
+    *,
+    endpoint: str,
+    version: str,
+    region: str,
+    action: str,
+    body: dict[str, Any],
+) -> tuple[dict[str, Any], int]:
+    import time
+
+    import requests
+
+    from agentkit.auth._sigv4 import sign_headers
+
+    credentials = _resolve_agentkit_credentials()
+    started = time.monotonic()
+    body_bytes = json.dumps(body, ensure_ascii=False).encode("utf-8")
+    parsed = urlparse(endpoint)
+    path = parsed.path or "/"
+    query = {"Action": action, "Version": version}
+    headers = sign_headers(
+        "POST",
+        parsed.netloc,
+        query,
+        body_bytes,
+        access_key=credentials.access_key,
+        secret_key=credentials.secret_key,
+        service="agentkit",
+        region=region,
+        session_token=credentials.session_token or None,
+        path=path,
+    )
+
+    response = None
+    try:
+        response = requests.post(
+            endpoint,
+            params=query,
+            headers=headers,
+            data=body_bytes,
+            timeout=60,
+        )
+        response.raise_for_status()
+        data = response.json()
+    except requests.RequestException as exc:
+        diagnostics = {}
+        if response is not None:
+            diagnostics["status_code"] = response.status_code
+            try:
+                diagnostics["response"] = response.json()
+            except ValueError:
+                pass
+        raise _A2ARegisterError(
+            f"AgentKit OpenAPI request failed: {exc}", diagnostics
+        ) from exc
+    except ValueError as exc:
+        raise _A2ARegisterError(
+            "AgentKit OpenAPI returned non-JSON response"
+        ) from exc
+
+    duration_ms = int((time.monotonic() - started) * 1000)
+    if data.get("Error"):
+        raise _A2ARegisterError(
+            "AgentKit OpenAPI returned an error", {"response": data.get("Error")}
+        )
+    if "Result" not in data:
+        raise _A2ARegisterError("AgentKit OpenAPI response missing Result")
+    return data, duration_ms
+
+
+def _resolve_a2a_space_id_by_name(
+    space_name: str,
+    *,
+    endpoint: str,
+    region: str,
+) -> str:
+    normalized_name = space_name.strip()
+    if not normalized_name:
+        raise ValueError("A2A space name must not be empty.")
+
+    matches: list[dict[str, Any]] = []
+    page_number = 1
+    page_size = 100
+    while True:
+        response, _ = _agentkit_post(
+            endpoint=endpoint,
+            version=_REGISTER_DEFAULT_VERSION,
+            region=region,
+            action="ListA2aSpaces",
+            body={"PageNumber": page_number, "PageSize": page_size},
+        )
+        result = response.get("Result") or {}
+        items = result.get("Items") or []
+        if not isinstance(items, list):
+            raise _A2ARegisterError("ListA2aSpaces response Items is not a list")
+        matches.extend(
+            item
+            for item in items
+            if isinstance(item, dict) and item.get("Name") == normalized_name
+        )
+
+        total_count = int(result.get("TotalCount") or 0)
+        if page_number * page_size >= total_count or not items:
+            break
+        page_number += 1
+
+    if not matches:
+        raise ValueError(f"A2A space name '{normalized_name}' was not found.")
+    if len(matches) > 1:
+        ids = ", ".join(str(item.get("Id", "")) for item in matches if item.get("Id"))
+        raise ValueError(
+            f"A2A space name '{normalized_name}' matched multiple spaces"
+            + (f": {ids}" if ids else ".")
+        )
+
+    space_id = matches[0].get("Id")
+    if not space_id:
+        raise _A2ARegisterError(
+            f"ListA2aSpaces result for '{normalized_name}' is missing Id"
+        )
+    return str(space_id)
+
+
+def _create_a2a_agent(
+    *,
+    a2a_space_id: str,
+    runtime_id: str,
+    network_type: str,
+    tags: list[dict[str, str]] | None,
+    endpoint: str,
+    region: str,
+) -> dict[str, Any]:
+    body: dict[str, Any] = {
+        "Source": "Runtime",
+        "A2aSpaceId": a2a_space_id,
+        "RuntimeConfig": {
+            "RuntimeId": runtime_id,
+            "NetworkType": network_type,
+        },
+        "SetDefaultVersion": True,
+    }
+    if tags:
+        body["Tags"] = tags
+
+    response, request_duration_ms = _agentkit_post(
+        endpoint=endpoint,
+        version=_REGISTER_DEFAULT_VERSION,
+        region=region,
+        action="CreateA2aAgent",
+        body=body,
+    )
+    result = response.get("Result") or {}
+    return {
+        "outcome": "success",
+        "agent_id": result.get("Id", ""),
+        "tags": result.get("Tags") or [],
+        "diagnostics": {
+            "request_id": _request_id(response),
+            "request_duration_ms": request_duration_ms,
+        },
+    }
+
+
+def _resolve_self_register_entry(directory: str, name: str) -> dict[str, Any]:
+    registry_path = Path(directory).resolve() / "harness.json"
+    registry = _load_json(registry_path)
+    entry = registry.get(name)
+    if not isinstance(entry, dict):
+        console.print(
+            f"[red]Error: cannot register harness '{name}'. "
+            f"{registry_path} does not contain an entry for '{name}'. "
+            "Deploy the harness first or check --directory.[/red]"
+        )
+        raise typer.Exit(1)
+
+    missing = [field for field in ("url", "runtime_id") if not entry.get(field)]
+    if missing:
+        console.print(
+            f"[red]Error: cannot register harness '{name}'. "
+            f"{registry_path} entry is missing required field(s): "
+            f"{', '.join(missing)}. Deploy the harness again so harness.json "
+            "records url and runtime_id.[/red]"
+        )
+        raise typer.Exit(1)
+    return entry
+
+
+def _resolve_register_space_id(
+    data: dict,
+    space_id: Optional[str],
+    space_name: Optional[str],
+    *,
+    endpoint: str,
+    region: str,
+) -> str:
+    if space_id:
+        return space_id
+    if space_name:
+        return _resolve_a2a_space_id_by_name(
+            space_name,
+            endpoint=endpoint,
+            region=region,
+        )
+    registry = data.get("registry") if isinstance(data, dict) else None
+    if isinstance(registry, dict) and registry.get("space_id"):
+        return str(registry["space_id"])
+    if isinstance(registry, dict) and registry.get("space_name"):
+        return _resolve_a2a_space_id_by_name(
+            str(registry["space_name"]),
+            endpoint=endpoint,
+            region=region,
+        )
+    console.print(
+        "[red]Error: A2A space id is required for registration. Pass "
+        "--register-space-id / --register-space-name, --registry-space-id / "
+        "--registry-space-name, or set `registry.space_id` in the harness spec.[/red]"
+    )
+    raise typer.Exit(1)
+
+
+def _register_a2a_runtime_agent(
+    *,
+    subject: str,
+    space_id: str,
+    runtime_id: str,
+    network_type: str,
+    tags: list[str],
+    endpoint: Optional[str],
+    region: Optional[str],
+) -> None:
+    normalized_network_type = network_type.strip().lower()
+    if normalized_network_type not in _REGISTER_NETWORK_TYPES:
+        console.print(
+            "[red]Error: --register-network-type must be one of: public, private.[/red]"
+        )
+        raise typer.Exit(1)
+
+    resolved_region = (
+        region
+        or os.getenv("AGENTKIT_REGION")
+        or os.getenv("VOLCENGINE_REGION")
+        or "cn-beijing"
+    )
+    resolved_endpoint = endpoint or _default_agentkit_endpoint(resolved_region)
+    parsed_tags = _parse_register_tags(tags)
+
+    console.print(
+        f"[cyan]Registering {subject} runtime {runtime_id} "
+        f"to A2A space {space_id}...[/cyan]"
+    )
+    try:
+        result = _create_a2a_agent(
+            a2a_space_id=space_id,
+            runtime_id=runtime_id,
+            network_type=normalized_network_type,
+            tags=parsed_tags or None,
+            endpoint=resolved_endpoint,
+            region=resolved_region,
+        )
+    except _A2ARegisterError as exc:
+        console.print(f"[red]❌ A2A registration failed: {exc.message}[/red]")
+        if exc.diagnostics:
+            console.print(json.dumps(exc.diagnostics, ensure_ascii=False, indent=2))
+        raise typer.Exit(1) from exc
+
+    console.print("[green]✅ A2A agent registered[/green]")
+    console.print(f"[cyan]AgentId:[/cyan] {result.get('agent_id', '')}")
+    diagnostics = result.get("diagnostics") or {}
+    if diagnostics.get("request_id"):
+        console.print(f"[cyan]RequestId:[/cyan] {diagnostics['request_id']}")
+
+
 @add_app.command("harness")
 def harness_command(
     name: str = typer.Option(
@@ -135,6 +599,76 @@ def harness_command(
     runtime: Optional[str] = typer.Option(
         None, "--runtime", help=f"Agent runtime backend ({' | '.join(_RUNTIMES)})."
     ),
+    structured_tool_calls: Optional[bool] = typer.Option(
+        None,
+        "--structured-tool-calls/--no-structured-tool-calls",
+        help="Ask the model to return executable structured tool calls.",
+    ),
+    include_tools_every_turn: Optional[bool] = typer.Option(
+        None,
+        "--include-tools-every-turn/--reuse-tool-context",
+        help="Include tool definitions on every model turn.",
+    ),
+    registry: Optional[str] = typer.Option(
+        None,
+        "--registry",
+        help='AgentKit A2A registry URI, e.g. "agentkit://a2a-registry?space_id=xxx&top_k=3".',
+    ),
+    registry_space_id: Optional[str] = typer.Option(
+        None, "--registry-space-id", help="AgentKit A2A SpaceId."
+    ),
+    registry_space_name: Optional[str] = typer.Option(
+        None,
+        "--registry-space-name",
+        help="AgentKit A2A space name. Resolved to space_id via ListA2aSpaces.",
+    ),
+    registry_top_k: Optional[int] = typer.Option(
+        None,
+        "--registry-top-k",
+        help="Number of candidate AgentCards to retrieve from the registry.",
+    ),
+    registry_endpoint: Optional[str] = typer.Option(
+        None, "--registry-endpoint", help="AgentKit OpenAPI endpoint for A2A registry."
+    ),
+    registry_region: Optional[str] = typer.Option(
+        None, "--registry-region", help="AgentKit OpenAPI region."
+    ),
+    # --- A2A registry registration action -----------------------------------
+    register_self: bool = typer.Option(
+        False,
+        "--register-self",
+        help="Register this deployed harness Runtime Agent from harness.json.",
+    ),
+    register_space_id: Optional[str] = typer.Option(
+        None,
+        "--register-space-id",
+        help="A2A registry space id for registration. Defaults to registry.space_id.",
+    ),
+    register_space_name: Optional[str] = typer.Option(
+        None,
+        "--register-space-name",
+        help="A2A registry space name for registration. Resolved via ListA2aSpaces.",
+    ),
+    register_network_type: str = typer.Option(
+        "public",
+        "--register-network-type",
+        help="Runtime network address to register: public or private.",
+    ),
+    register_tag: list[str] = typer.Option(
+        [],
+        "--register-tag",
+        help="A2A agent tag in KEY=VALUE form. Can be repeated.",
+    ),
+    register_endpoint: Optional[str] = typer.Option(
+        None,
+        "--register-endpoint",
+        help="AgentKit OpenAPI endpoint for CreateA2aAgent.",
+    ),
+    register_region: Optional[str] = typer.Option(
+        None,
+        "--register-region",
+        help="AgentKit OpenAPI region. Defaults to AGENTKIT_REGION/VOLCENGINE_REGION/cn-beijing.",
+    ),
     # --- component backend types --------------------------------------------
     knowledgebase_type: Optional[str] = typer.Option(
         None, "--knowledgebase-type", help="Knowledge base backend."
@@ -237,7 +771,9 @@ def harness_command(
         None, "--allowed-id", help="Comma-separated allowed client IDs for OAuth2/JWT."
     ),
     directory: str = typer.Option(
-        ".", "--directory", help="Directory to write <name>.harness.json into."
+        ".",
+        "--directory",
+        help="Directory to write <name>.harness.json into.",
     ),
 ):
     """Create or update a harness config file ``<name>.harness.json``.
@@ -269,9 +805,8 @@ def harness_command(
         raise typer.Exit(1)
 
     # Start from the existing file (merge) or a minimal default scaffold.
-    if target.is_file():
-        data = json.loads(target.read_text())
-    else:
+    data = _load_spec(target)
+    if not data:
         data = {
             "harness_name": name,
             "runtime": "adk",
@@ -287,6 +822,10 @@ def harness_command(
         data["system_prompt"] = system_prompt
     if runtime is not None:
         data["runtime"] = runtime
+    if structured_tool_calls is not None:
+        data["structured_tool_calls"] = structured_tool_calls
+    if include_tools_every_turn is not None:
+        data["include_tools_every_turn"] = include_tools_every_turn
     tools_list = _split_csv(tools)
     if tools_list is not None:
         data["tools"] = tools_list
@@ -354,10 +893,69 @@ def harness_command(
             auth["allowed_ids"] = allowed_ids
         data["auth"] = auth
 
+    try:
+        _apply_registry_config(
+            data,
+            registry,
+            registry_space_id,
+            registry_space_name,
+            registry_top_k,
+            registry_endpoint,
+            registry_region,
+        )
+    except _A2ARegisterError as exc:
+        console.print(f"[red]Error: failed to resolve A2A space name: {exc.message}[/red]")
+        if exc.diagnostics:
+            console.print(json.dumps(exc.diagnostics, ensure_ascii=False, indent=2))
+        raise typer.Exit(1) from exc
+    except ValueError as exc:
+        console.print(f"[red]Error: {exc}[/red]")
+        raise typer.Exit(1) from exc
+
     _prune(data)
-    target.write_text(json.dumps(data, indent=2, ensure_ascii=False) + "\n")
+    _write_spec(target, data)
     console.print(f"[green]✓ Wrote harness config: {target}[/green]")
 
+    if register_self:
+        entry = _resolve_self_register_entry(directory, name)
+        register_resolved_region = (
+            register_region
+            or os.getenv("AGENTKIT_REGION")
+            or os.getenv("VOLCENGINE_REGION")
+            or "cn-beijing"
+        )
+        register_resolved_endpoint = register_endpoint or _default_agentkit_endpoint(
+            register_resolved_region
+        )
+        try:
+            resolved_space_id = _resolve_register_space_id(
+                data,
+                register_space_id,
+                register_space_name,
+                endpoint=register_resolved_endpoint,
+                region=register_resolved_region,
+            )
+        except _A2ARegisterError as exc:
+            console.print(
+                f"[red]Error: failed to resolve A2A space name: {exc.message}[/red]"
+            )
+            if exc.diagnostics:
+                console.print(json.dumps(exc.diagnostics, ensure_ascii=False, indent=2))
+            raise typer.Exit(1) from exc
+        except ValueError as exc:
+            console.print(f"[red]Error: {exc}[/red]")
+            raise typer.Exit(1) from exc
+        console.print(f"[cyan]Harness URL:[/cyan] {entry['url']}")
+        _register_a2a_runtime_agent(
+            subject=f"harness '{name}'",
+            space_id=resolved_space_id,
+            runtime_id=str(entry["runtime_id"]),
+            network_type=register_network_type,
+            tags=register_tag,
+            endpoint=register_resolved_endpoint,
+            region=register_resolved_region,
+        )
+
 
 # Credential types accepted by ``agentkit add credential``. Only ``api-key`` is
 # wired up today; the value maps to the API's ``AuthType`` field.

agentkit/toolkit/cli/cli_invoke.py

@@ -19,6 +19,7 @@ from typing import Optional, Any
 import base64
 import binascii
 import json
+import os
 import typer
 from typer.core import TyperGroup
 from rich.console import Console
@@ -27,6 +28,7 @@ import random
 import uuid
 from agentkit.toolkit.config import get_config
 import logging
+from urllib.parse import parse_qs, urlparse
 
 # Note: Avoid importing heavy packages at the top to keep CLI startup fast
 logger = logging.getLogger(__name__)
@@ -607,13 +609,18 @@ def build_harness_overrides(
     tools: Optional[str],
     skills: Optional[str],
     runtime: Optional[str],
+    registry_space_id: Optional[str] = None,
+    registry_top_k: Optional[int] = None,
+    registry_endpoint: Optional[str] = None,
+    registry_region: Optional[str] = None,
 ) -> dict:
     """Collect the non-null fields for the harness app's ``HarnessOverrides``.
 
-    Field names/shapes match veadk's ``HarnessOverrides`` model: ``model_name``
-    (string), ``tools`` / ``skills`` as comma-separated strings, ``system_prompt``,
-    ``runtime``. Only the keys present here are applied server-side
-    (``model_fields_set``); unset fields keep the deployed harness's values.
+    Field names/shapes match AgentKit's ``HarnessOverrides`` model:
+    ``model_name`` (string), ``tools`` / ``skills`` as comma-separated strings,
+    ``system_prompt``, ``runtime``, and optional registry overrides. Only the
+    keys present here are applied server-side (``model_fields_set``); unset
+    fields keep the deployed harness's values.
     """
     overrides: dict[str, Any] = {}
     if system_prompt is not None:
@@ -626,6 +633,156 @@ def build_harness_overrides(
         overrides["skills"] = skills
     if runtime is not None:
         overrides["runtime"] = runtime
+    if registry_space_id is not None:
+        overrides["registry_space_id"] = registry_space_id
+    if registry_top_k is not None:
+        overrides["registry_top_k"] = registry_top_k
+    if registry_endpoint is not None:
+        overrides["registry_endpoint"] = registry_endpoint
+    if registry_region is not None:
+        overrides["registry_region"] = registry_region
+    return overrides
+
+
+_INVOKE_REGISTRY_QUERY_ALIASES = {
+    "space_id": "registry_space_id",
+    "registry_space_id": "registry_space_id",
+    "space_name": "registry_space_name",
+    "top_k": "registry_top_k",
+    "registry_top_k": "registry_top_k",
+    "endpoint": "registry_endpoint",
+    "registry_endpoint": "registry_endpoint",
+    "region": "registry_region",
+    "registry_region": "registry_region",
+}
+_INVOKE_REGISTRY_INT_KEYS = {"registry_top_k"}
+
+
+def _parse_harness_registry_override(value: Optional[str]) -> dict[str, Any]:
+    """Parse ``--registry`` into one-time harness registry overrides.
+
+    Supported forms:
+    - agentkit://a2a-registry?space_id=xxx&top_k=3&region=cn-beijing
+    - https://... (treated as registry_endpoint; recognized query params are
+      also extracted when present)
+    """
+    if value is None:
+        return {}
+
+    raw = value.strip()
+    if not raw:
+        return {}
+
+    parsed = urlparse(raw)
+    overrides: dict[str, Any] = {}
+
+    query = {
+        key.replace("-", "_"): values[-1]
+        for key, values in parse_qs(parsed.query, keep_blank_values=False).items()
+        if values and values[-1] != ""
+    }
+
+    if parsed.scheme == "agentkit":
+        if parsed.netloc != "a2a-registry" or parsed.path not in {"", "/"}:
+            raise ValueError(
+                "Unsupported registry URI. Use "
+                '`agentkit://a2a-registry?space_id=xxx&top_k=3` or an http(s) URL.'
+            )
+    elif parsed.scheme in {"http", "https"}:
+        overrides["registry_endpoint"] = raw
+    else:
+        raise ValueError(
+            "Unsupported registry value. Use "
+            '`agentkit://a2a-registry?space_id=xxx&top_k=3` or an http(s) URL.'
+        )
+
+    unknown = sorted(set(query) - set(_INVOKE_REGISTRY_QUERY_ALIASES))
+    if unknown and parsed.scheme == "agentkit":
+        raise ValueError(
+            f"Unsupported registry query param(s): {', '.join(unknown)}. "
+            f"Known: {', '.join(sorted(_INVOKE_REGISTRY_QUERY_ALIASES))}"
+        )
+
+    for key, raw_value in query.items():
+        if key not in _INVOKE_REGISTRY_QUERY_ALIASES:
+            continue
+        target = _INVOKE_REGISTRY_QUERY_ALIASES[key]
+        if target in _INVOKE_REGISTRY_INT_KEYS:
+            try:
+                overrides[target] = int(str(raw_value))
+            except ValueError as exc:
+                raise ValueError(
+                    f"Registry param `{key}` must be an integer, got {raw_value!r}."
+                ) from exc
+        else:
+            overrides[target] = raw_value
+
+    return overrides
+
+
+def _resolve_harness_registry_space_name(
+    overrides: dict[str, Any],
+    *,
+    registry_endpoint: Optional[str],
+    registry_region: Optional[str],
+) -> None:
+    if overrides.get("registry_space_id"):
+        overrides.pop("registry_space_name", None)
+        return
+
+    space_name = overrides.pop("registry_space_name", None)
+    if not space_name:
+        return
+
+    from agentkit.toolkit.cli.cli_add import (
+        _default_agentkit_endpoint,
+        _resolve_a2a_space_id_by_name,
+    )
+
+    resolved_region = (
+        registry_region
+        or overrides.get("registry_region")
+        or os.getenv("AGENTKIT_REGION")
+        or os.getenv("VOLCENGINE_REGION")
+        or "cn-beijing"
+    )
+    resolved_endpoint = (
+        registry_endpoint
+        or overrides.get("registry_endpoint")
+        or _default_agentkit_endpoint(str(resolved_region))
+    )
+    overrides["registry_space_id"] = _resolve_a2a_space_id_by_name(
+        str(space_name),
+        endpoint=str(resolved_endpoint),
+        region=str(resolved_region),
+    )
+
+
+def _merge_harness_registry_overrides(
+    *,
+    registry: Optional[str],
+    registry_space_id: Optional[str],
+    registry_space_name: Optional[str],
+    registry_top_k: Optional[int],
+    registry_endpoint: Optional[str],
+    registry_region: Optional[str],
+) -> dict[str, Any]:
+    overrides = _parse_harness_registry_override(registry)
+    if registry_space_id is not None:
+        overrides["registry_space_id"] = registry_space_id
+    if registry_space_name is not None:
+        overrides["registry_space_name"] = registry_space_name
+    if registry_top_k is not None:
+        overrides["registry_top_k"] = registry_top_k
+    if registry_endpoint is not None:
+        overrides["registry_endpoint"] = registry_endpoint
+    if registry_region is not None:
+        overrides["registry_region"] = registry_region
+    _resolve_harness_registry_space_name(
+        overrides,
+        registry_endpoint=registry_endpoint,
+        registry_region=registry_region,
+    )
     return overrides
 
 
@@ -826,6 +983,39 @@ def harness_command(
     runtime: str = typer.Option(
         None, "--runtime", help="Override the harness runtime backend for this call."
     ),
+    registry_space_id: str = typer.Option(
+        None,
+        "--registry-space-id",
+        help="Override the A2A registry space id for this invocation.",
+    ),
+    registry_space_name: str = typer.Option(
+        None,
+        "--registry-space-name",
+        help="Override the A2A registry space name for this invocation.",
+    ),
+    registry: str = typer.Option(
+        None,
+        "--registry",
+        help=(
+            "Override A2A registry for this invocation. Accepts "
+            "`agentkit://a2a-registry?space_id=xxx&top_k=3` or an http(s) URL."
+        ),
+    ),
+    registry_top_k: int = typer.Option(
+        None,
+        "--registry-top-k",
+        help="Override the number of A2A AgentCards to retrieve for this invocation.",
+    ),
+    registry_endpoint: str = typer.Option(
+        None,
+        "--registry-endpoint",
+        help="Override the A2A registry OpenAPI endpoint for this invocation.",
+    ),
+    registry_region: str = typer.Option(
+        None,
+        "--registry-region",
+        help="Override the A2A registry OpenAPI region for this invocation.",
+    ),
     apikey: str = typer.Option(
         None,
         "--apikey",
@@ -859,12 +1049,30 @@ def harness_command(
         # Per-call overrides
         agentkit invoke harness my-harness --system-prompt "Be terse." "What is 2+2?"
         agentkit invoke harness my-harness --max-llm-calls 10 "Plan a trip."
+        agentkit invoke harness my-harness --registry-space-id as-xxx "Find an agent."
     """
     import requests
+    from agentkit.toolkit.cli.cli_add import _A2ARegisterError
     from agentkit.toolkit.harness import load_harness_registry
 
     console.print("[cyan]Invoking harness...[/cyan]")
 
+    try:
+        registry_overrides = _merge_harness_registry_overrides(
+            registry=registry,
+            registry_space_id=registry_space_id,
+            registry_space_name=registry_space_name,
+            registry_top_k=registry_top_k,
+            registry_endpoint=registry_endpoint,
+            registry_region=registry_region,
+        )
+    except _A2ARegisterError as e:
+        console.print(f"[red]Error: failed to resolve A2A space name: {e}[/red]")
+        raise typer.Exit(1)
+    except ValueError as e:
+        console.print(f"[red]Error: {e}[/red]")
+        raise typer.Exit(1)
+
     registry = load_harness_registry(directory)
     entry = registry.get(name)
     if not isinstance(entry, dict) or not entry.get("url"):
@@ -932,7 +1140,15 @@ def harness_command(
             prompt=message,
             session_id=session_id,
             overrides=build_harness_overrides(
-                system_prompt, model_name, tools, skills, runtime
+                system_prompt,
+                model_name,
+                tools,
+                skills,
+                runtime,
+                registry_space_id=registry_overrides.get("registry_space_id"),
+                registry_top_k=registry_overrides.get("registry_top_k"),
+                registry_endpoint=registry_overrides.get("registry_endpoint"),
+                registry_region=registry_overrides.get("registry_region"),
             ),
             raw=raw,
         )
@@ -955,7 +1171,15 @@ def harness_command(
         "run_agent_request": run_agent_request,
     }
     overrides = build_harness_overrides(
-        system_prompt, model_name, tools, skills, runtime
+        system_prompt,
+        model_name,
+        tools,
+        skills,
+        runtime,
+        registry_overrides.get("registry_space_id"),
+        registry_overrides.get("registry_top_k"),
+        registry_overrides.get("registry_endpoint"),
+        registry_overrides.get("registry_region"),
     )
     if overrides:
         body["harness"] = overrides

agentkit/toolkit/cli/sandbox/model_config.py

@@ -64,6 +64,7 @@ class ModelProviderConfig:
 
 
 DEFAULT_MODEL_CONTEXT_WINDOW = 1000000
+LIMITED_MODEL_CONTEXT_WINDOW = 200000
 DEFAULT_MODEL_PROVIDER = ModelProviderType.MODEL_SQUARE.value
 
 MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
@@ -74,7 +75,7 @@ MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
         models={
             "doubao-seed-2-0-pro-260215": ModelSpec(
                 supports_reasoning_summaries=True,
-                context_window=256000,
+                context_window=LIMITED_MODEL_CONTEXT_WINDOW,
             ),
             "deepseek-v4-flash-260425": ModelSpec(
                 supports_reasoning_summaries=True,
@@ -84,10 +85,6 @@ MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
                 supports_reasoning_summaries=True,
                 context_window=DEFAULT_MODEL_CONTEXT_WINDOW,
             ),
-            "glm-4-7-251222": ModelSpec(
-                supports_reasoning_summaries=False,
-                context_window=200000,
-            ),
         },
     ),
     ModelProviderType.CODING_PLAN.value: ModelProviderConfig(
@@ -97,7 +94,7 @@ MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
         models={
             "doubao-seed-2.0-pro": ModelSpec(
                 supports_reasoning_summaries=True,
-                context_window=256000,
+                context_window=LIMITED_MODEL_CONTEXT_WINDOW,
             ),
             "deepseek-v4-flash": ModelSpec(
                 supports_reasoning_summaries=True,
@@ -107,10 +104,6 @@ MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
                 supports_reasoning_summaries=True,
                 context_window=DEFAULT_MODEL_CONTEXT_WINDOW,
             ),
-            "glm-5.2": ModelSpec(
-                supports_reasoning_summaries=False,
-                context_window=DEFAULT_MODEL_CONTEXT_WINDOW,
-            ),
         },
     ),
     ModelProviderType.AGENT_PLAN.value: ModelProviderConfig(
@@ -120,7 +113,7 @@ MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
         models={
             "doubao-seed-2.0-pro": ModelSpec(
                 supports_reasoning_summaries=True,
-                context_window=256000,
+                context_window=LIMITED_MODEL_CONTEXT_WINDOW,
             ),
             "deepseek-v4-flash": ModelSpec(
                 supports_reasoning_summaries=True,
@@ -130,10 +123,6 @@ MODEL_PROVIDER_CONFIGS: dict[str, ModelProviderConfig] = {
                 supports_reasoning_summaries=True,
                 context_window=DEFAULT_MODEL_CONTEXT_WINDOW,
             ),
-            "glm-5.2": ModelSpec(
-                supports_reasoning_summaries=False,
-                context_window=DEFAULT_MODEL_CONTEXT_WINDOW,
-            ),
         },
     ),
 }
@@ -291,6 +280,22 @@ def _build_model_catalog_item(model_name: str, spec: ModelSpec) -> dict:
     }
 
 
+def infer_model_spec(model_name: str) -> ModelSpec:
+    normalized_model_name = model_name.strip().lower()
+    if (
+        normalized_model_name == "glm-5.2"
+        or normalized_model_name.startswith("deepseek-v4")
+    ):
+        context_window = DEFAULT_MODEL_CONTEXT_WINDOW
+    else:
+        context_window = LIMITED_MODEL_CONTEXT_WINDOW
+
+    return ModelSpec(
+        supports_reasoning_summaries=True,
+        context_window=context_window,
+    )
+
+
 def model_catalog_context_window(
     model_name: str,
     model_provider: str | ModelProviderType | None = None,
@@ -299,7 +304,7 @@ def model_catalog_context_window(
     spec = config.models.get(model_name)
     if spec:
         return spec.context_window
-    return DEFAULT_MODEL_CONTEXT_WINDOW
+    return infer_model_spec(model_name).context_window
 
 
 def build_codex_model_catalog_json(
@@ -310,15 +315,11 @@ def build_codex_model_catalog_json(
     config = MODEL_PROVIDER_CONFIGS[resolved_provider]
     resolved_model_name = resolve_model_name(model_name, resolved_provider)
     deduped_model_names = list(dict.fromkeys((resolved_model_name, *config.models)))
-    fallback_spec = ModelSpec(
-        supports_reasoning_summaries=True,
-        context_window=DEFAULT_MODEL_CONTEXT_WINDOW,
-    )
     payload = {
         "models": [
             _build_model_catalog_item(
                 name,
-                config.models.get(name, fallback_spec),
+                config.models.get(name) or infer_model_spec(name),
             )
             for name in deduped_model_names
         ]

agentkit/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.6.4"
+VERSION = "0.6.5"

{agentkit_sdk_python-0.6.4.dist-info → agentkit_sdk_python-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentkit-sdk-python
-Version: 0.6.4
+Version: 0.6.5
 Summary: Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure.
 Author-email: Xiangrui Cheng <innsdcc@gmail.com>, Yumeng Bao <baoyumeng.123@gmail.com>, Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>
 License:                                  Apache License

{agentkit_sdk_python-0.6.4.dist-info → agentkit_sdk_python-0.6.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 agentkit/__init__.py,sha256=l27ZMDslc3VhmmnPZJyrqVvTDoZ0LqhCtM5hw0caHcU,1021
-agentkit/version.py,sha256=Gqi1HbRwc0kvmHCsWkr5xNkdwCCb5yUMM7RR000G9Bs,653
+agentkit/version.py,sha256=-8u8ma3ZjT78npvdx0yb_H-M501lF15MhCY0uJyY6CU,653
 agentkit/apps/__init__.py,sha256=-oXTjxV3gejpJ8pffTUcUAXw0LfxKCYZJk-_hIJhtLM,1921
 agentkit/apps/base_app.py,sha256=3hZZExL1wyTGWveJEZZoqXN086MzmkVS_WU1vyulIWg,754
 agentkit/apps/utils.py,sha256=IzimIDmT6FS6PV9MLimPh46mq5zT-EjVmnYPxBdyEq0,1934
@@ -81,7 +81,7 @@ agentkit/toolkit/builders/ve_pipeline.py,sha256=n2ZbjqkSBKv5oOsqD-E0SpC5NeP2Impr
 agentkit/toolkit/cli/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 agentkit/toolkit/cli/__main__.py,sha256=arwJ1gHkaaoQAXb0ezo_FeyxiMqVy0FXujB2WOX_ohU,775
 agentkit/toolkit/cli/cli.py,sha256=PFe6axB5f2Ox10azlf2Ditb1rXeVVMI5BbX46Cnu33k,4769
-agentkit/toolkit/cli/cli_add.py,sha256=bXNYGikOms-nWFSjMTgFsY-ZVdd1KM2U9nb7Eiq4amI,16981
+agentkit/toolkit/cli/cli_add.py,sha256=1yP5zyErRJa4RfYKcI-OaPlyIaLHg62nHk87aEaKzPY,36505
 agentkit/toolkit/cli/cli_auth.py,sha256=eislIHxafJovjDSQai8zfO4zcd502-U5oJYelnPFKgQ,26445
 agentkit/toolkit/cli/cli_build.py,sha256=gtRBPJfm6Z4y37ISC_CiGwEkMhD4fD7IQi1H6Lzc2Yo,2984
 agentkit/toolkit/cli/cli_config.py,sha256=cb-QGXNvm8kQiaii4vjfCwt6Y9oukiZFSgHp1Y8Ovuk,29096
@@ -89,7 +89,7 @@ agentkit/toolkit/cli/cli_delete.py,sha256=Q6utRf5ak1fHF_Bm73weWgiiQA3Oz3iWzl5ij5
 agentkit/toolkit/cli/cli_deploy.py,sha256=B912gRSpgLFBCLF8w8lD1J_jP5-PvpT_Zjblx-0yees,7066
 agentkit/toolkit/cli/cli_destroy.py,sha256=QpH7cctsaIFd2io6hhEeKnCjxK7DbE7AnFsecWL5BxY,1797
 agentkit/toolkit/cli/cli_init.py,sha256=feuypfgggXj6_0ZP4TEQ3rIZOuYRVUxXwvpdq9nsOY0,17911
-agentkit/toolkit/cli/cli_invoke.py,sha256=n86EvG2IKnsf6JvlUiyRfGVB_F-iz1odsoeMvPhfZsg,37487
+agentkit/toolkit/cli/cli_invoke.py,sha256=6fvL0yprSHHfj04vD2uA6AS27ouvpD33QIjgREZz01k,45204
 agentkit/toolkit/cli/cli_knowledge.py,sha256=J3pcJs01tWJAMp79nFnX5pU6AEZK7XVCZtyPRLKkfUI,25142
 agentkit/toolkit/cli/cli_launch.py,sha256=vkhjTBcxteVGwxtkDXKQxDjqTsFyDPx0SZcKL-zkPMg,3774
 agentkit/toolkit/cli/cli_list.py,sha256=KBqSRMaiO6Frej_ZvTV4_ODWgMVdHzJtsl63K43Y3hY,14256
@@ -116,7 +116,7 @@ agentkit/toolkit/cli/sandbox/cli_run.py,sha256=7TTRssT1CNGIC-8JRGtPazRJZDX_9WM-M
 agentkit/toolkit/cli/sandbox/cli_shell.py,sha256=PniGXNmw4PoZRiB0P29jryra_aFtpuCwJgv5vlxfFeU,4642
 agentkit/toolkit/cli/sandbox/cli_web.py,sha256=nvBEp99yqA3-sDNA_PBn7jOG_VgkHTw_8lDSvRNYSRA,2496
 agentkit/toolkit/cli/sandbox/git_config.py,sha256=y0omhCCsH33XCMEpmbtAdHM8pevRFQdil1-JfOV8RTo,6097
-agentkit/toolkit/cli/sandbox/model_config.py,sha256=jMGucgNK6cJYg4crzX2vOSMa6dg2ZUqHGs4xpP3sCTU,10839
+agentkit/toolkit/cli/sandbox/model_config.py,sha256=rAXSEwtkiv7sxiuwWl8Bh-I511GnsAg6IcSC1Hd4Asc,10821
 agentkit/toolkit/cli/sandbox/sandbox_client.py,sha256=h7cuAgYLRjhpAvqZXAZHvBNkB3N2sda3HXZ_Acvt_1g,13837
 agentkit/toolkit/cli/sandbox/session_create.py,sha256=o8UcfSyIZfXyP7F3tsmebn7xHnPlIqU7W3q-x8-pxhI,12655
 agentkit/toolkit/cli/sandbox/session_sync.py,sha256=pRX8nHTlAALdBIi4utupEvjfoL1BVTW2YcOSGC66iyM,3133
@@ -228,9 +228,9 @@ agentkit/utils/misc.py,sha256=FXMlcupj3KzxfJvMYFp0uTQk3FRMx8FiEXkYiy-UQ8w,3437
 agentkit/utils/request.py,sha256=IVoat3EavR9rQ_fXi0eA2rZPCJ9lVZAXXn7uIIX6bY4,1614
 agentkit/utils/template_utils.py,sha256=Qjg9V6dEpjAd_yYezIIPwuDsDeeMmp6XTMn5ZECifNc,6336
 agentkit/utils/ve_sign.py,sha256=nrYiS2bYncvWKQVpVMzwYwPDfkA0OJS7LO9l_wfW0xc,9310
-agentkit_sdk_python-0.6.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agentkit_sdk_python-0.6.4.dist-info/METADATA,sha256=YGZUey_M5jNhkkemTq7EQOA8XvN-Rjj6kyL-k2IKJUg,19462
-agentkit_sdk_python-0.6.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-agentkit_sdk_python-0.6.4.dist-info/entry_points.txt,sha256=fhzZUsvsLXeB4mPaa0SBQiTBqFT404uDAKPaePAOUAE,58
-agentkit_sdk_python-0.6.4.dist-info/top_level.txt,sha256=ipy8JF-QQ-V0C1oRFLxsyaW8zwrasfJ-zjAh9vgOc7U,9
-agentkit_sdk_python-0.6.4.dist-info/RECORD,,
+agentkit_sdk_python-0.6.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agentkit_sdk_python-0.6.5.dist-info/METADATA,sha256=-cvLyYEu2KfEUXw6UkEhVrbRr7_Ud-IiQYTurDxz3q4,19462
+agentkit_sdk_python-0.6.5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+agentkit_sdk_python-0.6.5.dist-info/entry_points.txt,sha256=fhzZUsvsLXeB4mPaa0SBQiTBqFT404uDAKPaePAOUAE,58
+agentkit_sdk_python-0.6.5.dist-info/top_level.txt,sha256=ipy8JF-QQ-V0C1oRFLxsyaW8zwrasfJ-zjAh9vgOc7U,9
+agentkit_sdk_python-0.6.5.dist-info/RECORD,,