capability-runtime 0.1.1__tar.gz → 0.1.2__tar.gz

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capability-runtime
-Version: 0.1.1
+Version: 0.1.2
 Summary: Bridge/glue layer that composes Agently (LLM/TriggerFlow) with skills-runtime-sdk (skills/tools/WAL/events).
 License-Expression: MIT
 Requires-Python: >=3.10

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "capability-runtime"
-version = "0.1.1"
+version = "0.1.2"
 description = "Bridge/glue layer that composes Agently (LLM/TriggerFlow) with skills-runtime-sdk (skills/tools/WAL/events)."
 readme = "README.md"
 requires-python = ">=3.10"

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/src/capability_runtime/__init__.py

@@ -1,7 +1,7 @@
 """capability-runtime：统一 Runtime 入口（能力协议 + 执行 + 报告）。"""
 from __future__ import annotations
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 # === 统一入口 ===
 from .config import CustomTool, RuntimeConfig

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/src/capability_runtime/adapters/agently_backend.py

@@ -66,13 +66,19 @@ class AgentlyBackendConfig:
 
     requester_factory: AgentlyRequesterFactory
 
-def _normalize_usage_payload(*, usage: Any, model: Any = None) -> Optional[Dict[str, Any]]:
+def _normalize_usage_payload(
+    *,
+    usage: Any,
+    model: Any = None,
+    request_id: Any = None,
+    provider: Any = None,
+) -> Optional[Dict[str, Any]]:
     """
     把 provider usage 归一为 capability-runtime 的 `llm_usage` payload 形状。
 
     返回：
     - `None`：无法提取任何有效 usage 字段
-    - `dict`：`model/input_tokens/output_tokens/total_tokens`
+    - `dict`：`model/input_tokens/output_tokens/total_tokens/request_id/provider`
     """
 
     if not isinstance(usage, dict):
@@ -93,6 +99,8 @@ def _normalize_usage_payload(*, usage: Any, model: Any = None) -> Optional[Dict[
         "input_tokens": input_tokens,
         "output_tokens": output_tokens,
         "total_tokens": total_tokens,
+        "request_id": request_id.strip() if isinstance(request_id, str) and request_id.strip() else None,
+        "provider": provider.strip() if isinstance(provider, str) and provider.strip() else None,
     }
     return payload if any(value is not None for value in payload.values()) else None
 
@@ -120,7 +128,15 @@ def _extract_usage_payload_from_sse_data(data: str) -> Optional[Dict[str, Any]]:
         return None
     if not isinstance(obj, dict):
         return None
-    return _normalize_usage_payload(usage=obj.get("usage"), model=obj.get("model"))
+    request_id = obj.get("request_id")
+    if not (isinstance(request_id, str) and request_id.strip()):
+        request_id = obj.get("id")
+    return _normalize_usage_payload(
+        usage=obj.get("usage"),
+        model=obj.get("model"),
+        request_id=request_id,
+        provider=obj.get("provider"),
+    )
 
 
 def _merge_stream_options_for_usage(value: Any) -> Dict[str, Any]:

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/src/capability_runtime/reporting/node_report.py

@@ -161,6 +161,8 @@ class NodeReportBuilder:
         usage_input_seen = False
         usage_output_seen = False
         usage_total_seen = False
+        usage_request_id: Optional[str] = None
+        usage_provider: Optional[str] = None
 
         def _ensure_tool(call_id: str, *, name: str) -> Dict[str, Any]:
             """获取/初始化工具调用聚合槽位（以 call_id 为主键）。"""
@@ -217,6 +219,14 @@ class NodeReportBuilder:
                 if isinstance(model_name, str) and model_name.strip():
                     usage_model = model_name.strip()
 
+                request_id = usage_summary.get("request_id")
+                if isinstance(request_id, str) and request_id.strip():
+                    usage_request_id = request_id.strip()
+
+                provider = usage_summary.get("provider")
+                if isinstance(provider, str) and provider.strip():
+                    usage_provider = provider.strip()
+
                 input_tokens = usage_summary.get("input_tokens")
                 if isinstance(input_tokens, int):
                     usage_input_total += input_tokens
@@ -378,12 +388,21 @@ class NodeReportBuilder:
             NodeToolCallReport.model_validate(item) for item in tool_calls.values() if isinstance(item, dict)
         ]
         usage_report: Optional[NodeUsageReport] = None
-        if usage_model is not None or usage_input_seen or usage_output_seen or usage_total_seen:
+        if (
+            usage_model is not None
+            or usage_input_seen
+            or usage_output_seen
+            or usage_total_seen
+            or usage_request_id is not None
+            or usage_provider is not None
+        ):
             usage_report = NodeUsageReport(
                 model=usage_model,
                 input_tokens=usage_input_total if usage_input_seen else None,
                 output_tokens=usage_output_total if usage_output_seen else None,
                 total_tokens=usage_total_total if usage_total_seen else None,
+                request_id=usage_request_id,
+                provider=usage_provider,
             )
 
         report = NodeReport(

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/src/capability_runtime/types.py

@@ -48,6 +48,7 @@ class NodeUsageReport(BaseModel):
 
     字段说明：
     - `model`：best-effort 记录本次运行最后一次可识别的模型名。
+    - `request_id` / `provider`：provider/gateway 请求元数据，用于宿主观测、对账与追踪。
     - token 字段缺失时保持 None，禁止伪造 0。
     """
 
@@ -57,6 +58,8 @@ class NodeUsageReport(BaseModel):
     input_tokens: Optional[int] = None
     output_tokens: Optional[int] = None
     total_tokens: Optional[int] = None
+    request_id: Optional[str] = None
+    provider: Optional[str] = None
 
 
 class NodeReport(BaseModel):

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/src/capability_runtime/utils/usage.py

@@ -4,6 +4,7 @@ Usage 提取工具：从 LLM usage payload 中提取标准化指标。
 兼容：
 - 本仓规范字段：`input_tokens/output_tokens/total_tokens`
 - OpenAI 风格字段：`prompt_tokens/completion_tokens/total_tokens`
+- provider metadata：`request_id/id/provider`
 - 可选嵌套：`payload["usage"]`
 """
 
@@ -26,6 +27,12 @@ def _usage_int(value: Any) -> Optional[int]:
     return parsed if parsed >= 0 else None
 
 
+def _usage_text(value: Any) -> Optional[str]:
+    """把 provider metadata 字符串归一为空值安全的文本。"""
+
+    return value.strip() if isinstance(value, str) and value.strip() else None
+
+
 def extract_usage_metrics(payload: Any) -> Dict[str, Optional[Any]]:
     """
     从 `llm_usage` payload 中提取 usage 摘要。
@@ -34,18 +41,29 @@ def extract_usage_metrics(payload: Any) -> Dict[str, Optional[Any]]:
     - payload：AgentEvent.payload 或类似结构
 
     返回：
-    - dict 包含 model/input_tokens/output_tokens/total_tokens
+    - dict 包含 model/input_tokens/output_tokens/total_tokens/request_id/provider
     """
 
     if not isinstance(payload, dict):
-        return {"model": None, "input_tokens": None, "output_tokens": None, "total_tokens": None}
+        return {
+            "model": None,
+            "input_tokens": None,
+            "output_tokens": None,
+            "total_tokens": None,
+            "request_id": None,
+            "provider": None,
+        }
 
     usage_raw = payload.get("usage")
     usage_dict: Dict[str, Any] = usage_raw if isinstance(usage_raw, dict) else payload
-    model = payload.get("model")
-    if not isinstance(model, str) or not model.strip():
-        model = usage_dict.get("model")
-    model_text = model.strip() if isinstance(model, str) and model.strip() else None
+    model_text = _usage_text(payload.get("model")) or _usage_text(usage_dict.get("model"))
+    request_id = (
+        _usage_text(payload.get("request_id"))
+        or _usage_text(payload.get("id"))
+        or _usage_text(usage_dict.get("request_id"))
+        or _usage_text(usage_dict.get("id"))
+    )
+    provider = _usage_text(payload.get("provider")) or _usage_text(usage_dict.get("provider"))
 
     input_tokens = _usage_int(usage_dict.get("input_tokens"))
     if input_tokens is None:
@@ -62,4 +80,6 @@ def extract_usage_metrics(payload: Any) -> Dict[str, Optional[Any]]:
         "input_tokens": input_tokens,
         "output_tokens": output_tokens,
         "total_tokens": total_tokens,
+        "request_id": request_id,
+        "provider": provider,
     }

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/src/capability_runtime.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capability-runtime
-Version: 0.1.1
+Version: 0.1.2
 Summary: Bridge/glue layer that composes Agently (LLM/TriggerFlow) with skills-runtime-sdk (skills/tools/WAL/events).
 License-Expression: MIT
 Requires-Python: >=3.10

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/tests/test_agently_backend.py

@@ -1,5 +1,6 @@
 import pytest
 
+from capability_runtime import AgentSpec, CapabilityKind, CapabilitySpec, Runtime, RuntimeConfig
 from capability_runtime.adapters.agently_backend import AgentlyBackendConfig, AgentlyChatBackend
 from skills_runtime.llm.protocol import ChatRequest
 
@@ -77,7 +78,7 @@ async def test_agently_backend_reports_usage_via_caprt_usage_sink():
             ("message", '{"choices":[{"delta":{"content":"ok"},"finish_reason":null}]}'),
             (
                 "message",
-                '{"choices":[{"delta":{},"finish_reason":"stop"}],"model":"bridge-usage-model","usage":{"prompt_tokens":11,"completion_tokens":7,"total_tokens":18}}',
+                '{"id":"req_123","provider":"openai-compatible","choices":[{"delta":{},"finish_reason":"stop"}],"model":"bridge-usage-model","usage":{"prompt_tokens":11,"completion_tokens":7,"total_tokens":18}}',
             ),
             ("message", "[DONE]"),
         ]
@@ -102,10 +103,93 @@ async def test_agently_backend_reports_usage_via_caprt_usage_sink():
             "input_tokens": 11,
             "output_tokens": 7,
             "total_tokens": 18,
+            "request_id": "req_123",
+            "provider": "openai-compatible",
         }
     ]
 
 
+@pytest.mark.asyncio
+async def test_agently_backend_usage_sink_accepts_missing_request_metadata():
+    usage_events = []
+    backend = _backend_from_items(
+        [
+            (
+                "message",
+                '{"choices":[{"delta":{},"finish_reason":"stop"}],"model":"bridge-usage-model","usage":{"prompt_tokens":1,"completion_tokens":2,"total_tokens":3}}',
+            ),
+            ("message", "[DONE]"),
+        ]
+    )
+
+    out = [
+        ev
+        async for ev in backend.stream_chat(
+            ChatRequest(
+                model="m",
+                messages=[{"role": "user", "content": "x"}],
+                tools=[],
+                extra={"_caprt_usage_sink": usage_events.append},
+            )
+        )
+    ]
+
+    assert [e.type for e in out] == ["completed"]
+    assert usage_events == [
+        {
+            "model": "bridge-usage-model",
+            "input_tokens": 1,
+            "output_tokens": 2,
+            "total_tokens": 3,
+            "request_id": None,
+            "provider": None,
+        }
+    ]
+
+
+@pytest.mark.asyncio
+async def test_agently_sse_usage_request_metadata_reaches_runtime_node_report(tmp_path):
+    backend = _backend_from_items(
+        [
+            ("message", '{"choices":[{"delta":{"content":"ok"},"finish_reason":null}]}'),
+            (
+                "message",
+                '{"id":"req_123","choices":[{"delta":{},"finish_reason":"stop"}],"model":"bridge-usage-model","usage":{"prompt_tokens":11,"completion_tokens":7,"total_tokens":18}}',
+            ),
+            ("message", "[DONE]"),
+        ]
+    )
+    rt = Runtime(
+        RuntimeConfig(
+            mode="sdk_native",
+            workspace_root=tmp_path,
+            sdk_config_paths=[],
+            preflight_mode="off",
+            sdk_backend=backend,
+        )
+    )
+    rt.register(
+        AgentSpec(
+            base=CapabilitySpec(
+                id="agent.sse_usage_metadata",
+                kind=CapabilityKind.AGENT,
+                name="SSEUsageMetadata",
+                description="离线：SSE completed usage metadata 透传。",
+            ),
+        )
+    )
+
+    result = await rt.run("agent.sse_usage_metadata", input={"prompt": "x"})
+
+    assert result.node_report is not None
+    assert result.node_report.usage is not None
+    assert result.node_report.usage.input_tokens == 11
+    assert result.node_report.usage.output_tokens == 7
+    assert result.node_report.usage.total_tokens == 18
+    assert result.node_report.usage.request_id == "req_123"
+    assert result.node_report.usage.provider == "openai"
+
+
 @pytest.mark.asyncio
 async def test_agently_backend_requests_include_usage_by_default_and_preserves_existing_stream_options():
     requester = _FakeRequester(

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/tests/test_node_report_builder.py

@@ -55,6 +55,59 @@ def test_report_aggregates_llm_usage_summary() -> None:
     assert rep.usage.total_tokens == 23
 
 
+def test_report_preserves_last_llm_usage_request_metadata() -> None:
+    events = [
+        _ev("run_started"),
+        _ev(
+            "llm_usage",
+            payload={
+                "model": "gpt-4.1-mini",
+                "input_tokens": 11,
+                "output_tokens": 7,
+                "total_tokens": 18,
+                "request_id": "req_old",
+                "provider": "gateway-a",
+            },
+        ),
+        _ev(
+            "llm_usage",
+            payload={
+                "model": "gpt-4.1-mini",
+                "prompt_tokens": 2,
+                "completion_tokens": 3,
+                "total_tokens": 5,
+                "request_id": "req_123",
+                "provider": "gateway-b",
+            },
+        ),
+        _ev("run_completed", payload={"final_output": "ok", "wal_locator": "wal.jsonl"}),
+    ]
+
+    rep = NodeReportBuilder().build(events=events)
+
+    assert rep.usage is not None
+    assert rep.usage.input_tokens == 13
+    assert rep.usage.output_tokens == 10
+    assert rep.usage.total_tokens == 23
+    assert rep.usage.request_id == "req_123"
+    assert rep.usage.provider == "gateway-b"
+
+
+def test_report_accepts_llm_usage_without_request_id() -> None:
+    events = [
+        _ev("run_started"),
+        _ev("llm_usage", payload={"model": "gpt-4.1-mini", "input_tokens": 1, "output_tokens": 2, "total_tokens": 3}),
+        _ev("run_completed", payload={"final_output": "ok", "wal_locator": "wal.jsonl"}),
+    ]
+
+    rep = NodeReportBuilder().build(events=events)
+
+    assert rep.usage is not None
+    assert rep.usage.total_tokens == 3
+    assert rep.usage.request_id is None
+    assert rep.usage.provider is None
+
+
 def test_report_collects_artifacts_from_run_completed_payload():
     events = [
         _ev("run_started"),

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/tests/test_node_report_contract_v1.py

@@ -89,6 +89,18 @@ def test_node_usage_report_extra_fields_are_rejected() -> None:
     with pytest.raises(ValidationError):
         NodeUsageReport.model_validate({"model": "m", "total_tokens": 1, "unexpected": True})
 
+    ok = NodeUsageReport.model_validate(
+        {"model": "m", "total_tokens": 1, "request_id": "req_123", "provider": "openai-compatible"}
+    )
+    assert set(ok.model_dump().keys()) == {
+        "model",
+        "input_tokens",
+        "output_tokens",
+        "total_tokens",
+        "request_id",
+        "provider",
+    }
+
 
 def test_events_path_must_come_from_terminal_run_event() -> None:
     # 非终态事件携带 wal_locator/events_path 不应被采纳；只有 run_* 终态事件可提供 locator。

{capability_runtime-0.1.1 → capability_runtime-0.1.2}/tests/test_release_tag_version_guardrail.py

@@ -22,11 +22,11 @@ def _load_release_guard_module():
 def test_release_guard_accepts_current_tag() -> None:
     module = _load_release_guard_module()
     tag_version, pyproject_version, module_version = module.validate_versions(
-        release_tag="v0.1.1",
+        release_tag="v0.1.2",
         pyproject_path=_REPO_ROOT / "pyproject.toml",
         init_path=_REPO_ROOT / "src" / "capability_runtime" / "__init__.py",
     )
-    assert tag_version == pyproject_version == module_version == "0.1.1"
+    assert tag_version == pyproject_version == module_version == "0.1.2"
 
 
 def test_release_guard_rejects_mismatch() -> None: