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

ksadk/cli/cmd_invoke.py

@@ -18,6 +18,7 @@ import click
 
 from ksadk.api import AgentEngineAPIError, AgentEngineClient
 from ksadk.cli.agent_ref import merge_agent_inputs, resolve_agent_ref, resolve_openclaw_ref
+from ksadk.cli.invoke_payload import build_chat_request
 from ksadk.cli.cmd_files import (
     _build_sync_payload,
     _collect_local_files_report,
@@ -603,6 +604,9 @@ def run_invoke_command(
                 insecure,
                 model,
                 api_format_resolved,
+                default_model=(
+                    "openclaw" if _is_openclaw_target(next_state, latest_access) else None
+                ),
             )
         )
     else:
@@ -1286,6 +1290,7 @@ async def _invoke_once(
     insecure: bool = False,
     model: Optional[str] = None,
     api_format: str = "chat_completions",
+    default_model: Optional[str] = None,
 ):
     """单次调用"""
     click.echo(f"\n👤 你: {message}")
@@ -1306,7 +1311,7 @@ async def _invoke_once(
                     last_refresh_time = 0.0
                     full_reasoning = ""
                     async for chunk in _stream_chat(
-                        endpoint, message, api_key, session_id, True, insecure, model, api_format
+                        endpoint, message, api_key, session_id, True, insecure, model, api_format, default_model
                     ):
                         content, reasoning = _extract_content(chunk)
 
@@ -1336,7 +1341,7 @@ async def _invoke_once(
                     live.refresh()  # 确保最后一次刷新
             else:
                 async for chunk in _stream_chat(
-                    endpoint, message, api_key, session_id, True, insecure, model, api_format
+                    endpoint, message, api_key, session_id, True, insecure, model, api_format, default_model
                 ):
                     content, reasoning = _extract_content(chunk)
                     if reasoning:
@@ -1346,7 +1351,7 @@ async def _invoke_once(
             click.echo()  # 换行
         else:
             response = await _chat(
-                endpoint, message, api_key, session_id, insecure, model, api_format
+                endpoint, message, api_key, session_id, insecure, model, api_format, default_model
             )
             content = _extract_response_content(response)
             if console and Markdown:
@@ -1365,6 +1370,7 @@ async def _chat(
     insecure: bool = False,
     model: Optional[str] = None,
     api_format: str = "chat_completions",
+    default_model: Optional[str] = None,
 ) -> dict[str, Any]:
     """非流式调用 (OpenAI 兼容格式)"""
     try:
@@ -1373,25 +1379,15 @@ async def _chat(
         click.secho("❌ 请安装 httpx: pip install httpx", fg="red")
         raise SystemExit(1)
 
-    normalized_api_format = str(api_format or "chat_completions").strip().lower()
-    if normalized_api_format == "responses":
-        url = f"{endpoint.rstrip('/')}/v1/responses"
-        payload: dict[str, Any] = {
-            "input": [{"role": "user", "content": message}],
-            "stream": False,
-        }
-    else:
-        url = f"{endpoint.rstrip('/')}/v1/chat/completions"
-        payload = {
-            "messages": [{"role": "user", "content": message}],
-            "stream": False,
-        }
-
-    if session_id:
-        payload["session_id"] = session_id
-
-    if model:
-        payload["model"] = model
+    url, payload = build_chat_request(
+        endpoint,
+        message,
+        session_id=session_id,
+        model=model,
+        api_format=api_format,
+        default_model=default_model,
+        stream=False,
+    )
 
     # 本地请求禁用系统代理 (ClashX 等会导致本地请求 502 错误)
     # trust_env=False 会禁用: 代理设置、SSL 证书环境变量、.netrc 文件
@@ -1431,6 +1427,7 @@ async def _stream_chat(
     insecure: bool = False,
     model: Optional[str] = None,
     api_format: str = "chat_completions",
+    default_model: Optional[str] = None,
 ):
     """流式调用 (SSE)"""
     try:
@@ -1439,22 +1436,15 @@ async def _stream_chat(
         click.secho("❌ 请安装 httpx: pip install httpx", fg="red")
         raise SystemExit(1)
 
-    normalized_api_format = str(api_format or "chat_completions").strip().lower()
-    if normalized_api_format == "responses":
-        url = f"{endpoint.rstrip('/')}/v1/responses"
-        payload: dict[str, Any] = {
-            "input": [{"role": "user", "content": message}],
-            "stream": True,
-        }
-    else:
-        url = f"{endpoint.rstrip('/')}/v1/chat/completions"
-        payload = {"messages": [{"role": "user", "content": message}], "stream": True}
-
-    if session_id:
-        payload["session_id"] = session_id
-
-    if model:
-        payload["model"] = model
+    url, payload = build_chat_request(
+        endpoint,
+        message,
+        session_id=session_id,
+        model=model,
+        api_format=api_format,
+        default_model=default_model,
+        stream=True,
+    )
 
     # 本地请求禁用系统代理 (ClashX 等会导致本地请求 502 错误)
     # trust_env=False 会禁用: 代理设置、SSL 证书环境变量、.netrc 文件

ksadk/cli/cmd_managed_runtime.py

@@ -0,0 +1,95 @@
+"""Production entrypoint for platform-owned declarative runtimes.
+
+``agentengine managed-runtime`` is deliberately narrower than ``agentengine
+web``: it accepts one Server-admitted ``agentengine.yaml`` mounted by the
+control plane and never opens a browser or packages user code.  Runtime Service
+uses this entrypoint for ``ArtifactType=ManagedRuntime`` workloads.
+"""
+
+from __future__ import annotations
+
+import os
+import shutil
+from pathlib import Path
+from typing import Any
+
+import click
+import yaml
+
+from ksadk.cli.cmd_web import web
+
+
+def _load_managed_runtime_manifest(manifest_path: Path) -> dict[str, Any]:
+    """Validate the small launch contract before starting a hosted process."""
+
+    if manifest_path.name != "agentengine.yaml":
+        raise click.ClickException("managed runtime manifest must be named agentengine.yaml")
+    try:
+        payload = yaml.safe_load(manifest_path.read_text(encoding="utf-8-sig"))
+    except (OSError, yaml.YAMLError) as exc:
+        raise click.ClickException(f"unable to read managed runtime manifest: {exc}") from exc
+    if not isinstance(payload, dict):
+        raise click.ClickException("managed runtime manifest must be a YAML object")
+    if str(payload.get("artifact_type") or "").strip() != "ManagedRuntime":
+        raise click.ClickException(
+            "managed runtime manifest must declare artifact_type=ManagedRuntime"
+        )
+    framework = str(payload.get("framework") or "").strip().lower()
+    runtime = payload.get("runtime")
+    if not framework or not isinstance(runtime, dict):
+        raise click.ClickException("managed runtime manifest requires framework and runtime")
+    runtime_name = str(runtime.get("name") or "").strip().lower()
+    runtime_version = str(runtime.get("version") or "").strip()
+    if runtime_name != framework or not runtime_version:
+        raise click.ClickException(
+            "managed runtime manifest requires runtime.name=framework and runtime.version"
+        )
+    return payload
+
+
+def _prepare_writable_runtime_dir(manifest_path: Path) -> Path:
+    """Copy the verified ConfigMap declaration into a writable runtime home.
+
+    Kubernetes projects ConfigMaps read-only.  The RuntimeAdapter intentionally
+    persists local session/UI state below its project directory, so pointing it
+    straight at ``/etc/agentkit`` makes even ``/health`` fail.  ManagedRuntime
+    has no user code or auxiliary files: the verified declaration is the sole
+    input copied into an ephemeral (or PVC-mounted) working directory.
+    """
+
+    work_dir = Path(
+        os.getenv("AGENTENGINE_MANAGED_RUNTIME_WORKDIR", "/tmp/agentengine-managed-runtime")
+    ).resolve()
+    try:
+        work_dir.mkdir(parents=True, exist_ok=True)
+        target = work_dir / "agentengine.yaml"
+        shutil.copyfile(manifest_path, target)
+        _load_managed_runtime_manifest(target)
+    except OSError as exc:
+        raise click.ClickException(
+            f"unable to prepare writable managed runtime directory: {exc}"
+        ) from exc
+    return work_dir
+
+
+@click.command("managed-runtime", context_settings=dict(help_option_names=["-h", "--help"]))
+@click.argument(
+    "manifest_path",
+    type=click.Path(exists=True, file_okay=True, dir_okay=False, path_type=Path),
+)
+@click.option("--port", type=int, default=8080, show_default=True)
+@click.option("--host", default="0.0.0.0", show_default=True)
+def managed_runtime(manifest_path: Path, port: int, host: str) -> None:
+    """Serve one mounted, declarative ``agentengine.yaml`` in hosted mode."""
+
+    manifest_path = manifest_path.resolve()
+    _load_managed_runtime_manifest(manifest_path)
+    work_dir = _prepare_writable_runtime_dir(manifest_path)
+    # The command is a production process entrypoint, never a local UI action.
+    # ``web`` owns the RuntimeAdapter composition, while no_open prevents an
+    # accidental browser launch if this container is ever run with a display.
+    os.environ["AGENTENGINE_MANAGED_RUNTIME"] = "1"
+    web.callback(str(work_dir), port, host, None, True)
+
+
+__all__ = ["managed_runtime"]

ksadk/cli/cmd_observe.py

@@ -0,0 +1,85 @@
+"""Local observability commands."""
+
+from __future__ import annotations
+
+import asyncio
+from pathlib import Path
+
+import click
+
+from ksadk.cli.ui import configure_ui_runtime, emit_json, is_json_output, print_kv, print_success
+from ksadk.observability.session_log import SessionLogError, export_session_log
+from ksadk.sessions.local_service import LocalSessionService
+
+
+class ObserveCliError(click.ClickException):
+    exit_code = 2
+
+
+@click.group("observe", context_settings=dict(help_option_names=["-h", "--help"]))
+def observe() -> None:
+    """查询和导出本地 Agent 观测数据。"""
+
+
+async def _export(
+    session_id: str,
+    output_path: Path,
+    invocation_id: str | None,
+):
+    service = LocalSessionService(project_dir=str(Path.cwd()))
+    try:
+        return await export_session_log(
+            service,
+            session_id,
+            output_path,
+            invocation_id=invocation_id,
+        )
+    finally:
+        await service.aclose()
+
+
+@observe.command("export")
+@click.option("--session-id", required=True)
+@click.option("--invocation-id")
+@click.option(
+    "--output",
+    "output_path",
+    required=True,
+    type=click.Path(path_type=Path, dir_okay=False),
+)
+@click.option(
+    "--format",
+    "output_format",
+    type=click.Choice(["pretty", "json"]),
+    default="pretty",
+    show_default=True,
+)
+def export_command(
+    session_id: str,
+    invocation_id: str | None,
+    output_path: Path,
+    output_format: str,
+) -> None:
+    """将本地 Session 事件导出为可校验 JSONL。"""
+    configure_ui_runtime(output_mode=output_format)
+    try:
+        result = asyncio.run(_export(session_id, output_path, invocation_id))
+    except SessionLogError as exc:
+        raise ObserveCliError(str(exc)) from exc
+
+    payload = {
+        "path": str(result.path),
+        "eventCount": result.event_count,
+        "firstSeqId": result.first_seq_id,
+        "lastSeqId": result.last_seq_id,
+        "exportedThroughSeqId": result.exported_through_seq_id,
+    }
+    if is_json_output():
+        emit_json(payload)
+        return
+    print_success(f"已导出 {result.event_count} 条事件")
+    print_kv("文件", str(result.path))
+    print_kv("序号范围", f"{result.first_seq_id or '-'} - {result.last_seq_id or '-'}")
+
+
+__all__ = ["observe"]