capability-runtime 0.1.3__tar.gz → 0.1.3.post1__tar.gz

{capability_runtime-0.1.3 → capability_runtime-0.1.3.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capability-runtime
-Version: 0.1.3
+Version: 0.1.3.post1
 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.3 → capability_runtime-0.1.3.post1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "capability-runtime"
-version = "0.1.3"
+version = "0.1.3.post1"
 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.3 → capability_runtime-0.1.3.post1}/src/capability_runtime/__init__.py

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

{capability_runtime-0.1.3 → capability_runtime-0.1.3.post1}/src/capability_runtime/sdk_lifecycle.py

@@ -738,6 +738,9 @@ def _now_rfc3339() -> str:
     return datetime.now(timezone.utc).replace(microsecond=0).isoformat().replace("+00:00", "Z")
 
 
+_USAGE_PROVIDER_PLACEHOLDERS = {"openai", "openai-compatible"}
+
+
 def _merge_supplemental_usage_metadata_event(*, ev: AgentEvent, supplemental_payloads: List[Dict[str, Any]]) -> AgentEvent:
     """
     把 sink payload 作为 supplemental metadata patch 合并到上游 `llm_usage` 事件。
@@ -747,7 +750,8 @@ def _merge_supplemental_usage_metadata_event(*, ev: AgentEvent, supplemental_pay
     - supplemental_payloads：`_caprt_usage_sink` 收集到的 provider/gateway usage payload 列表
 
     返回：
-    - 新 AgentEvent；仅在上游 metadata 缺失时补 `model/request_id/provider`，不写入 token 字段
+    - 新 AgentEvent；仅在上游 metadata 缺失时补 `model/request_id/provider`，不写入 token 字段；
+      `provider` 可在上游为 OpenAI-compatible 占位值时被 effective provider 受控覆盖。
     """
 
     upstream_payload = dict(ev.payload) if isinstance(ev.payload, dict) else {}
@@ -755,13 +759,30 @@ def _merge_supplemental_usage_metadata_event(*, ev: AgentEvent, supplemental_pay
 
     for supplemental_payload in supplemental_payloads:
         supplemental_summary = extract_usage_metrics(supplemental_payload)
-        for field in ("model", "request_id", "provider"):
+        for field in ("model", "request_id"):
             current_value = extract_usage_metrics(merged_payload).get(field)
             if isinstance(current_value, str) and current_value.strip():
                 continue
             supplemental_value = supplemental_summary.get(field)
             if isinstance(supplemental_value, str) and supplemental_value.strip():
                 merged_payload[field] = supplemental_value.strip()
+        current_provider = extract_usage_metrics(merged_payload).get("provider")
+        supplemental_provider = supplemental_summary.get("provider")
+        if not (isinstance(supplemental_provider, str) and supplemental_provider.strip()):
+            continue
+        supplemental_provider = supplemental_provider.strip()
+        supplemental_provider_is_placeholder = supplemental_provider in _USAGE_PROVIDER_PLACEHOLDERS
+        if not (isinstance(current_provider, str) and current_provider.strip()):
+            merged_payload["provider"] = supplemental_provider
+            continue
+        current_provider = current_provider.strip()
+        if (
+            current_provider in _USAGE_PROVIDER_PLACEHOLDERS
+            and not supplemental_provider_is_placeholder
+            and current_provider != supplemental_provider
+        ):
+            merged_payload.setdefault("provider_upstream", current_provider)
+            merged_payload["provider"] = supplemental_provider
 
     if merged_payload == upstream_payload:
         return ev

{capability_runtime-0.1.3 → capability_runtime-0.1.3.post1}/src/capability_runtime.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capability-runtime
-Version: 0.1.3
+Version: 0.1.3.post1
 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.3 → capability_runtime-0.1.3.post1}/tests/test_agently_backend.py

@@ -118,6 +118,13 @@ def _backend_from_items(items):
 async def _run_usage_backend(backend, tmp_path):
     """用 sdk_native Runtime 运行测试 backend，并返回 CapabilityResult。"""
 
+    rt = _make_usage_runtime(backend, tmp_path)
+    return await rt.run("agent.upstream_usage_with_sink", input={"prompt": "x"})
+
+
+def _make_usage_runtime(backend, tmp_path):
+    """构造注册了 usage 测试 Agent 的 sdk_native Runtime。"""
+
     rt = Runtime(
         RuntimeConfig(
             mode="sdk_native",
@@ -137,7 +144,7 @@ async def _run_usage_backend(backend, tmp_path):
             ),
         )
     )
-    return await rt.run("agent.upstream_usage_with_sink", input={"prompt": "x"})
+    return rt
 
 
 @pytest.mark.asyncio
@@ -384,6 +391,150 @@ def test_supplemental_usage_metadata_helper_does_not_overwrite_existing_model()
     }
 
 
+@pytest.mark.parametrize("placeholder_provider", ["openai", "openai-compatible"])
+def test_supplemental_usage_metadata_helper_overwrites_placeholder_provider(placeholder_provider: str) -> None:
+    ev = AgentEvent(
+        type="llm_usage",
+        timestamp="2026-05-05T00:00:00Z",
+        run_id="run_1",
+        payload={
+            "model": "upstream-model",
+            "input_tokens": 5,
+            "output_tokens": 6,
+            "total_tokens": 11,
+            "request_id": "req_upstream",
+            "provider": placeholder_provider,
+        },
+    )
+
+    merged = _merge_supplemental_usage_metadata_event(
+        ev=ev,
+        supplemental_payloads=[
+            {
+                "model": "sink-model",
+                "input_tokens": 99,
+                "output_tokens": 99,
+                "total_tokens": 198,
+                "request_id": "req_sink",
+                "provider": "gateway-provider",
+            }
+        ],
+    )
+
+    assert merged.payload == {
+        "model": "upstream-model",
+        "input_tokens": 5,
+        "output_tokens": 6,
+        "total_tokens": 11,
+        "request_id": "req_upstream",
+        "provider": "gateway-provider",
+        "provider_upstream": placeholder_provider,
+    }
+
+
+@pytest.mark.parametrize("sink_provider", ["", "   ", "openai", "openai-compatible"])
+def test_supplemental_usage_metadata_helper_keeps_placeholder_when_sink_is_not_effective(
+    sink_provider: str,
+) -> None:
+    ev = AgentEvent(
+        type="llm_usage",
+        timestamp="2026-05-05T00:00:00Z",
+        run_id="run_1",
+        payload={
+            "input_tokens": 5,
+            "output_tokens": 6,
+            "total_tokens": 11,
+            "provider": "openai",
+        },
+    )
+
+    merged = _merge_supplemental_usage_metadata_event(
+        ev=ev,
+        supplemental_payloads=[{"provider": sink_provider}],
+    )
+
+    assert merged.payload == {
+        "input_tokens": 5,
+        "output_tokens": 6,
+        "total_tokens": 11,
+        "provider": "openai",
+    }
+
+
+@pytest.mark.parametrize("placeholder_provider", ["openai", "openai-compatible"])
+@pytest.mark.asyncio
+async def test_upstream_placeholder_provider_is_replaced_by_sink_effective_provider(
+    tmp_path,
+    placeholder_provider: str,
+):
+    backend = _UpstreamUsageWithSinkBackend(
+        sink_payload={
+            "input_tokens": 99,
+            "output_tokens": 99,
+            "total_tokens": 198,
+            "request_id": "req_sink_gateway",
+            "provider": "gateway-provider",
+        },
+        completed_usage={"input_tokens": 5, "output_tokens": 6, "total_tokens": 11},
+        completed_request_id="req_gateway",
+        completed_provider=placeholder_provider,
+    )
+    rt = _make_usage_runtime(backend, tmp_path)
+
+    items = [
+        item
+        async for item in rt.run_stream("agent.upstream_usage_with_sink", input={"prompt": "x"})
+    ]
+    usage_events = [item for item in items if isinstance(item, AgentEvent) and item.type == "llm_usage"]
+    result = items[-1]
+
+    assert usage_events
+    assert usage_events[-1].payload["provider"] == "gateway-provider"
+    assert usage_events[-1].payload["provider_upstream"] == placeholder_provider
+    assert result.node_report is not None
+    assert result.node_report.usage is not None
+    assert result.node_report.usage.input_tokens == 5
+    assert result.node_report.usage.output_tokens == 6
+    assert result.node_report.usage.total_tokens == 11
+    assert result.node_report.usage.request_id == "req_gateway"
+    assert result.node_report.usage.provider == "gateway-provider"
+
+
+@pytest.mark.asyncio
+async def test_upstream_placeholder_provider_keeps_placeholder_when_sink_is_placeholder(tmp_path):
+    backend = _UpstreamUsageWithSinkBackend(
+        sink_payload={
+            "input_tokens": 99,
+            "output_tokens": 99,
+            "total_tokens": 198,
+            "request_id": "req_sink_gateway",
+            "provider": "openai-compatible",
+        },
+        completed_usage={"input_tokens": 5, "output_tokens": 6, "total_tokens": 11},
+        completed_request_id="req_gateway",
+        completed_provider="openai",
+    )
+    rt = _make_usage_runtime(backend, tmp_path)
+
+    items = [
+        item
+        async for item in rt.run_stream("agent.upstream_usage_with_sink", input={"prompt": "x"})
+    ]
+    usage_events = [item for item in items if isinstance(item, AgentEvent) and item.type == "llm_usage"]
+    result = items[-1]
+
+    assert usage_events
+    assert usage_events[-1].payload["provider"] == "openai"
+    assert "provider_upstream" not in usage_events[-1].payload
+    assert result.node_report is not None
+    assert result.node_report.usage is not None
+    assert result.node_report.usage.input_tokens == 5
+    assert result.node_report.usage.output_tokens == 6
+    assert result.node_report.usage.total_tokens == 11
+    assert result.node_report.usage.request_id == "req_gateway"
+    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.3 → capability_runtime-0.1.3.post1}/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.3",
+        release_tag="v0.1.3.post1",
         pyproject_path=_REPO_ROOT / "pyproject.toml",
         init_path=_REPO_ROOT / "src" / "capability_runtime" / "__init__.py",
     )
-    assert tag_version == pyproject_version == module_version == "0.1.3"
+    assert tag_version == pyproject_version == module_version == "0.1.3.post1"
 
 
 def test_release_guard_rejects_mismatch() -> None: