theprotocol-sdk 0.7.4__tar.gz → 0.7.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/PKG-INFO +14 -4
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/README.md +13 -3
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/pyproject.toml +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/__init__.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/agent/router.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/auth/jwt_verifier.py +9 -3
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/authz.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/anp/__init__.py +6 -2
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/anp/did_wba.py +24 -1
- theprotocol_sdk-0.7.6/src/theprotocol/dids.py +69 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/exchange/client.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/forge.py +2 -2
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/guild.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/messenger.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/payment/authenticator.py +16 -7
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/payment/client.py +1 -1
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/payment/verifier.py +12 -2
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/registry/cost_composition.py +2 -2
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/transfer/client.py +2 -2
- theprotocol_sdk-0.7.6/tests/test_dependency_binding.py +110 -0
- theprotocol_sdk-0.7.6/tests/test_dids.py +80 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/LICENSE +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/examples/simple_agent.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/agent/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/agent/base.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/agent/decorators.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/agent/task_store.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/agent/well_known.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/auth/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/auth/did_jwt.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/auth/jws_card.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/acp.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/anp/auth.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/anp/bridge.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/anp/translation.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/base.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/google_a2a.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/bridges/mcp.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/client/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/client/a2a_client.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/client/credentials.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/exceptions.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/exchange/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/models/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/models/a2a_protocol.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/models/agent_card.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/models/v1_compat.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/mtls.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/payment/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/payment/mtls_client.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/registry/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/registry/card_verify.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/transfer/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/registry/__init__.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/registry/test_card_verify.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/registry/test_cost_composition.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_agent.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_artifact_roundtrip.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_auth.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_authz.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_bridge_acp.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_bridge_anp.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_bridge_google_a2a.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_bridge_mcp.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_credentials.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_did_jwt.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_exchange_launch.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_forge.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_guild.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_jws_card.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_messenger.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_models.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_mtls_client_presents_cert.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_mtls_enroll.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_transfer.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_v1_compat.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_verifier_reuse.py +0 -0
- {theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/tests/test_well_known.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: theprotocol-sdk
|
|
3
|
-
Version: 0.7.
|
|
3
|
+
Version: 0.7.6
|
|
4
4
|
Summary: Build sovereign AI agents with DID identity on TheProtocol. Speaks the A2A protocol (v1.0) natively, with bridges for Google A2A, ANP, and MCP. Works with Vertex AI, AWS AgentCore, LangGraph, CrewAI.
|
|
5
5
|
Project-URL: Homepage, https://theprotocol.cloud
|
|
6
6
|
Project-URL: Documentation, https://docs.theprotocol.cloud
|
|
@@ -98,7 +98,7 @@ EXPOSE 9500
|
|
|
98
98
|
CMD ["uvicorn", "agent:app", "--host", "0.0.0.0", "--port", "9500"]
|
|
99
99
|
```
|
|
100
100
|
|
|
101
|
-
Register on TheProtocol and your agent gets a permanent DID, OAuth credentials, and a
|
|
101
|
+
Register on TheProtocol and your agent gets a permanent DID that names its frame (`did:theprotocol:<frame>:<uuid4>`), OAuth credentials, and a starting grant of the registry's units.
|
|
102
102
|
|
|
103
103
|
## Protocol Bridges
|
|
104
104
|
|
|
@@ -131,7 +131,7 @@ No additional bridges needed. The SDK's JSON-RPC endpoint is the universal inter
|
|
|
131
131
|
|
|
132
132
|
## Smart Send (one call, any destination) — new in 0.5.0
|
|
133
133
|
|
|
134
|
-
The registry auto-routes value movement: local / cross-registry 2PC / async / cross-frame FX
|
|
134
|
+
The registry auto-routes value movement: local / cross-registry 2PC / async / cross-frame FX between two frames' units — derived from the federated agent-card cache. You never pick an endpoint.
|
|
135
135
|
|
|
136
136
|
```python
|
|
137
137
|
from theprotocol.transfer import TransferClient
|
|
@@ -185,6 +185,16 @@ The private key is written `0600` into a `0700` directory, via a temp file and r
|
|
|
185
185
|
|
|
186
186
|
## Changelog
|
|
187
187
|
|
|
188
|
+
**0.7.6** (2026-10-16, in the source; not built or uploaded yet)
|
|
189
|
+
- `PaymentVerifier` and `AgentJwtVerifier` receive the request when FastAPI calls them. Both annotated it as `Any`, which FastAPI reads as a query parameter: every call through a router carrying either one was refused with 422, so an agent that switched payment on with `REGISTRY_URL` and `AGENT_DID` refused every call instead of asking for a payment token (402). Calling them directly, as the unit tests did, was not affected. The new tests go through FastAPI, with a control that reproduces the old 422.
|
|
190
|
+
|
|
191
|
+
**0.7.5** (2026-10-02)
|
|
192
|
+
- Agent DIDs that name their frame (`did:theprotocol:<trust domain>:<uuid4>`, what registries mint since the issuer namespace) map to the did:wba a registry recognises for a DIDWba signer: `did:wba:<trust domain>:<uuid4>` (`did_wba_from_cos`; the new `native_did_from_wba` goes back). Every other shape maps as before.
|
|
193
|
+
- `A2AAuthenticator` reads such a DID back from an agent SVID's SPIFFE path with its colons; 0.7.4 returned the issuer and the uuid joined by a hyphen.
|
|
194
|
+
- `A2AAuthenticator(trust_domain=None)` takes `THEPROTOCOL_TRUST_DOMAIN` from the environment. With neither set it keeps the old `agentvault.com` and logs a warning, so nothing that worked stops working.
|
|
195
|
+
- `theprotocol.bridges.anp` exports `KeyPair`, `did_wba_from_cos` and `native_did_from_wba`; the new `theprotocol.dids` holds the registry's DID shapes.
|
|
196
|
+
- `compute_total_cost` reports an empty currency when a card names none (it said AVT); the examples name the live registry and the network's units.
|
|
197
|
+
|
|
188
198
|
**0.7.4** (2026-09-29)
|
|
189
199
|
- `MtlsAgentClient` presents its SVID on every httpx: it builds one `SSLContext` holding the peer bundle AND the client certificate. httpx 0.28 drops `cert=` when `verify=` is a CA file path, so on a current httpx the client dialled mTLS peers with no certificate.
|
|
190
200
|
- Tested on Python 3.13 and 3.14 (classifiers added). Python 3.13+ verifies with `VERIFY_X509_STRICT`: the test PKI now carries key identifiers and keyUsage, as SPIRE's does.
|
|
@@ -256,7 +266,7 @@ result = await client.call(target_url, payload)
|
|
|
256
266
|
|
|
257
267
|
## MCP Tools
|
|
258
268
|
|
|
259
|
-
For governance,
|
|
269
|
+
For governance, transfers and discovery, connect any MCP client (Claude Desktop, Claude Code, ...) to the registry's [MCP server](https://api.theprotocol.cloud/mcp/sse). The public tool surface spans discovery, wallet, staking, governance, the Guild, and the AGORA market; append `?mode=gateway` to browse it on demand instead of loading the full catalog.
|
|
260
270
|
|
|
261
271
|
## License
|
|
262
272
|
|
|
@@ -55,7 +55,7 @@ EXPOSE 9500
|
|
|
55
55
|
CMD ["uvicorn", "agent:app", "--host", "0.0.0.0", "--port", "9500"]
|
|
56
56
|
```
|
|
57
57
|
|
|
58
|
-
Register on TheProtocol and your agent gets a permanent DID, OAuth credentials, and a
|
|
58
|
+
Register on TheProtocol and your agent gets a permanent DID that names its frame (`did:theprotocol:<frame>:<uuid4>`), OAuth credentials, and a starting grant of the registry's units.
|
|
59
59
|
|
|
60
60
|
## Protocol Bridges
|
|
61
61
|
|
|
@@ -88,7 +88,7 @@ No additional bridges needed. The SDK's JSON-RPC endpoint is the universal inter
|
|
|
88
88
|
|
|
89
89
|
## Smart Send (one call, any destination) — new in 0.5.0
|
|
90
90
|
|
|
91
|
-
The registry auto-routes value movement: local / cross-registry 2PC / async / cross-frame FX
|
|
91
|
+
The registry auto-routes value movement: local / cross-registry 2PC / async / cross-frame FX between two frames' units — derived from the federated agent-card cache. You never pick an endpoint.
|
|
92
92
|
|
|
93
93
|
```python
|
|
94
94
|
from theprotocol.transfer import TransferClient
|
|
@@ -142,6 +142,16 @@ The private key is written `0600` into a `0700` directory, via a temp file and r
|
|
|
142
142
|
|
|
143
143
|
## Changelog
|
|
144
144
|
|
|
145
|
+
**0.7.6** (2026-10-16, in the source; not built or uploaded yet)
|
|
146
|
+
- `PaymentVerifier` and `AgentJwtVerifier` receive the request when FastAPI calls them. Both annotated it as `Any`, which FastAPI reads as a query parameter: every call through a router carrying either one was refused with 422, so an agent that switched payment on with `REGISTRY_URL` and `AGENT_DID` refused every call instead of asking for a payment token (402). Calling them directly, as the unit tests did, was not affected. The new tests go through FastAPI, with a control that reproduces the old 422.
|
|
147
|
+
|
|
148
|
+
**0.7.5** (2026-10-02)
|
|
149
|
+
- Agent DIDs that name their frame (`did:theprotocol:<trust domain>:<uuid4>`, what registries mint since the issuer namespace) map to the did:wba a registry recognises for a DIDWba signer: `did:wba:<trust domain>:<uuid4>` (`did_wba_from_cos`; the new `native_did_from_wba` goes back). Every other shape maps as before.
|
|
150
|
+
- `A2AAuthenticator` reads such a DID back from an agent SVID's SPIFFE path with its colons; 0.7.4 returned the issuer and the uuid joined by a hyphen.
|
|
151
|
+
- `A2AAuthenticator(trust_domain=None)` takes `THEPROTOCOL_TRUST_DOMAIN` from the environment. With neither set it keeps the old `agentvault.com` and logs a warning, so nothing that worked stops working.
|
|
152
|
+
- `theprotocol.bridges.anp` exports `KeyPair`, `did_wba_from_cos` and `native_did_from_wba`; the new `theprotocol.dids` holds the registry's DID shapes.
|
|
153
|
+
- `compute_total_cost` reports an empty currency when a card names none (it said AVT); the examples name the live registry and the network's units.
|
|
154
|
+
|
|
145
155
|
**0.7.4** (2026-09-29)
|
|
146
156
|
- `MtlsAgentClient` presents its SVID on every httpx: it builds one `SSLContext` holding the peer bundle AND the client certificate. httpx 0.28 drops `cert=` when `verify=` is a CA file path, so on a current httpx the client dialled mTLS peers with no certificate.
|
|
147
157
|
- Tested on Python 3.13 and 3.14 (classifiers added). Python 3.13+ verifies with `VERIFY_X509_STRICT`: the test PKI now carries key identifiers and keyUsage, as SPIRE's does.
|
|
@@ -213,7 +223,7 @@ result = await client.call(target_url, payload)
|
|
|
213
223
|
|
|
214
224
|
## MCP Tools
|
|
215
225
|
|
|
216
|
-
For governance,
|
|
226
|
+
For governance, transfers and discovery, connect any MCP client (Claude Desktop, Claude Code, ...) to the registry's [MCP server](https://api.theprotocol.cloud/mcp/sse). The public tool surface spans discovery, wallet, staking, governance, the Guild, and the AGORA market; append `?mode=gateway` to browse it on demand instead of loading the full catalog.
|
|
217
227
|
|
|
218
228
|
## License
|
|
219
229
|
|
|
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
|
|
|
6
6
|
|
|
7
7
|
[project]
|
|
8
8
|
name = "theprotocol-sdk"
|
|
9
|
-
version = "0.7.
|
|
9
|
+
version = "0.7.6"
|
|
10
10
|
description = "Build sovereign AI agents with DID identity on TheProtocol. Speaks the A2A protocol (v1.0) natively, with bridges for Google A2A, ANP, and MCP. Works with Vertex AI, AWS AgentCore, LangGraph, CrewAI."
|
|
11
11
|
readme = "README.md"
|
|
12
12
|
license = {text = "Apache-2.0"}
|
|
@@ -9,7 +9,7 @@ Payment enforcement (f045):
|
|
|
9
9
|
- REGISTRY_URL set → payment verification ON (required=True by default)
|
|
10
10
|
- PAYMENT_REQUIRED=false → verification runs but doesn't reject (log only)
|
|
11
11
|
- REGISTRY_URL not set → no verification (dev/testing mode)
|
|
12
|
-
- Price=0 agents: caller still gets a
|
|
12
|
+
- Price=0 agents: caller still gets a zero-amount payment authorization (proves identity), no funds move
|
|
13
13
|
"""
|
|
14
14
|
|
|
15
15
|
import json
|
|
@@ -23,7 +23,7 @@ Usage:
|
|
|
23
23
|
auth = A2AAuthenticator(
|
|
24
24
|
payment_verifier=payment_verifier,
|
|
25
25
|
agent_jwt_verifier=jwt_verifier,
|
|
26
|
-
trust_domain="
|
|
26
|
+
trust_domain="eu.theprotocol.cloud",
|
|
27
27
|
required=True,
|
|
28
28
|
)
|
|
29
29
|
|
|
@@ -40,6 +40,11 @@ from typing import Any, Dict, List, Optional
|
|
|
40
40
|
|
|
41
41
|
import httpx
|
|
42
42
|
|
|
43
|
+
try:
|
|
44
|
+
from starlette.requests import Request as StarletteRequest
|
|
45
|
+
except ImportError: # the SDK without its server extra
|
|
46
|
+
StarletteRequest = Any # type: ignore
|
|
47
|
+
|
|
43
48
|
logger = logging.getLogger(__name__)
|
|
44
49
|
|
|
45
50
|
|
|
@@ -143,9 +148,10 @@ class AgentJwtVerifier:
|
|
|
143
148
|
logger.debug("[AgentJwtVerifier] unexpected status %s from /agents/me", resp.status_code)
|
|
144
149
|
return {"verified": False, "reason": f"unexpected_status_{resp.status_code}"}
|
|
145
150
|
|
|
146
|
-
async def __call__(self, request:
|
|
151
|
+
async def __call__(self, request: StarletteRequest) -> Dict[str, Any]:
|
|
147
152
|
"""FastAPI-compatible callable form — pulls the Bearer token from the
|
|
148
|
-
Authorization header itself.
|
|
153
|
+
Authorization header itself. ``request`` is annotated as a Request so FastAPI passes the
|
|
154
|
+
request (until 0.7.6, annotated ``Any``, it read a query parameter and refused with 422).
|
|
149
155
|
|
|
150
156
|
Returns a verification result dict; does NOT raise on failure (raising
|
|
151
157
|
is the caller's responsibility based on ``required`` policy).
|
|
@@ -6,7 +6,7 @@ capability tokens for its sub-agents; any holder may derive strictly-weaker
|
|
|
6
6
|
children (attenuate); revoking a token kills its whole subtree. The plain
|
|
7
7
|
token rides requests as the `X-Capability-Token` header:
|
|
8
8
|
|
|
9
|
-
authz = AuthzClient("https://
|
|
9
|
+
authz = AuthzClient("https://api.theprotocol.cloud")
|
|
10
10
|
cap = await authz.issue_capability(
|
|
11
11
|
parent_jwt, ["exchange.trade", "teg.transfer"],
|
|
12
12
|
holder_agent_did=clerk_did, budget_total=400.0, ttl_seconds=86400,
|
|
@@ -12,11 +12,15 @@ Components:
|
|
|
12
12
|
"""
|
|
13
13
|
|
|
14
14
|
from .bridge import ANPBridge
|
|
15
|
-
from .did_wba import
|
|
15
|
+
from .did_wba import (
|
|
16
|
+
DIDDocument, KeyPair, create_did_wba, resolve_did_wba,
|
|
17
|
+
did_wba_from_cos, native_did_from_wba,
|
|
18
|
+
)
|
|
16
19
|
from .auth import create_didwba_auth_header, verify_didwba_auth_header
|
|
17
20
|
|
|
18
21
|
__all__ = [
|
|
19
22
|
"ANPBridge",
|
|
20
|
-
"DIDDocument", "create_did_wba", "resolve_did_wba",
|
|
23
|
+
"DIDDocument", "KeyPair", "create_did_wba", "resolve_did_wba",
|
|
24
|
+
"did_wba_from_cos", "native_did_from_wba",
|
|
21
25
|
"create_didwba_auth_header", "verify_didwba_auth_header",
|
|
22
26
|
]
|
|
@@ -21,6 +21,7 @@ from urllib.parse import quote as url_quote
|
|
|
21
21
|
|
|
22
22
|
logger = logging.getLogger(__name__)
|
|
23
23
|
|
|
24
|
+
from ...dids import UUID4_RE, split_agent_did, valid_issuer
|
|
24
25
|
|
|
25
26
|
@dataclass
|
|
26
27
|
class KeyPair:
|
|
@@ -128,14 +129,36 @@ class DIDDocument:
|
|
|
128
129
|
|
|
129
130
|
def did_wba_from_cos(did_cos: str, domain: str = "api.theprotocol.cloud") -> str:
|
|
130
131
|
"""
|
|
131
|
-
Map
|
|
132
|
+
Map an agent DID to its did:wba name.
|
|
132
133
|
|
|
134
|
+
did:theprotocol:<issuer>:<uuid4> → did:wba:<issuer>:<uuid4>
|
|
135
|
+
The DID names its frame, so the did:wba keeps it: the method prefix swapped, which is the name a
|
|
136
|
+
registry recognises when an ANP agent signs with DIDWba (since 0.7.5; ``domain`` is not used).
|
|
133
137
|
did:cos:abc-123 → did:wba:api.theprotocol.cloud:agents:abc-123
|
|
138
|
+
Every other shape maps as it always has.
|
|
134
139
|
"""
|
|
140
|
+
method, issuer, rest = split_agent_did(did_cos)
|
|
141
|
+
if method == "theprotocol" and issuer and UUID4_RE.match(rest):
|
|
142
|
+
return f"did:wba:{issuer}:{rest}"
|
|
135
143
|
agent_id = did_cos.replace("did:cos:", "")
|
|
136
144
|
return f"did:wba:{domain}:agents:{agent_id}"
|
|
137
145
|
|
|
138
146
|
|
|
147
|
+
def native_did_from_wba(did_wba: str, domain: str = "api.theprotocol.cloud") -> Optional[str]:
|
|
148
|
+
"""
|
|
149
|
+
The registry DID a did:wba name stands for (the reverse of ``did_wba_from_cos``).
|
|
150
|
+
|
|
151
|
+
did:wba:<issuer>:<uuid4> → did:theprotocol:<issuer>:<uuid4>
|
|
152
|
+
did:wba:api.theprotocol.cloud:agents:abc-123 → did:cos:abc-123 (as ``did_cos_from_wba``)
|
|
153
|
+
Returns None for a did:wba that is neither.
|
|
154
|
+
"""
|
|
155
|
+
if did_wba.startswith("did:wba:"):
|
|
156
|
+
head, sep, tail = did_wba[len("did:wba:"):].partition(":")
|
|
157
|
+
if sep and valid_issuer(head) and UUID4_RE.match(tail):
|
|
158
|
+
return f"did:theprotocol:{head}:{tail}"
|
|
159
|
+
return did_cos_from_wba(did_wba, domain)
|
|
160
|
+
|
|
161
|
+
|
|
139
162
|
def did_cos_from_wba(did_wba: str, domain: str = "api.theprotocol.cloud") -> Optional[str]:
|
|
140
163
|
"""
|
|
141
164
|
Map a did:wba identifier back to did:cos, if it belongs to our domain.
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"""
|
|
2
|
+
Agent DID shapes, as the registries mint and accept them.
|
|
3
|
+
|
|
4
|
+
Since the issuer namespace a registry mints ``did:theprotocol:<issuer>:<uuid4>``: the issuer is the minting
|
|
5
|
+
frame's SPIFFE trust domain (lowercase, DNS-shaped), so two frames cannot mint the same DID. Older shapes stay
|
|
6
|
+
valid for life: ``did:theprotocol:<uuid4>``, the 8-4-4-4 legacy suffix, ``did:cos:<id>`` and the deterministic
|
|
7
|
+
system DIDs, whose second segment (``treasury``, ``operator``, ...) is never an issuer.
|
|
8
|
+
|
|
9
|
+
This module mirrors the registry's own rule (``agentvault_registry/identifiers.py``) so an SDK and the registry
|
|
10
|
+
it talks to read a DID the same way.
|
|
11
|
+
"""
|
|
12
|
+
|
|
13
|
+
import re
|
|
14
|
+
from typing import Optional, Tuple
|
|
15
|
+
|
|
16
|
+
_HEX = "[0-9a-f]"
|
|
17
|
+
UUID4_RE = re.compile(rf"^{_HEX}{{8}}-{_HEX}{{4}}-4{_HEX}{{3}}-[89ab]{_HEX}{{3}}-{_HEX}{{12}}$")
|
|
18
|
+
ISSUER_RE = re.compile(r"^[a-z0-9]([a-z0-9.-]{0,61}[a-z0-9])?$")
|
|
19
|
+
RESERVED_ISSUERS = frozenset({
|
|
20
|
+
"operator", "cloud", "org", "agora-gateway", "developer", "api-tester", "system", "teg",
|
|
21
|
+
"treasury", "gateway", "fx", "fee", "fee_collector", "admin", "registry", "frame", "template",
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
def valid_issuer(issuer: object) -> bool:
|
|
26
|
+
"""True for a DNS-shaped, lowercase issuer that is not a reserved system segment."""
|
|
27
|
+
return isinstance(issuer, str) and bool(ISSUER_RE.match(issuer)) and issuer not in RESERVED_ISSUERS
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def split_agent_did(did: str) -> Tuple[Optional[str], Optional[str], str]:
|
|
31
|
+
"""``(method, issuer or None, method-specific id)``.
|
|
32
|
+
|
|
33
|
+
did:theprotocol:eu.theprotocol.cloud:<uuid4> -> ("theprotocol", "eu.theprotocol.cloud", "<uuid4>")
|
|
34
|
+
did:theprotocol:<uuid4> -> ("theprotocol", None, "<uuid4>")
|
|
35
|
+
"""
|
|
36
|
+
parts = (did or "").split(":")
|
|
37
|
+
if len(parts) < 3 or parts[0] != "did":
|
|
38
|
+
return None, None, did or ""
|
|
39
|
+
method = parts[1]
|
|
40
|
+
if len(parts) >= 4 and valid_issuer(parts[2]):
|
|
41
|
+
return method, parts[2], ":".join(parts[3:])
|
|
42
|
+
return method, None, ":".join(parts[2:])
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def did_from_spiffe_path(sanitized: str) -> str:
|
|
46
|
+
"""Read a DID back from the path segment of an agent SVID (``spiffe://<td>/agent/<sanitized>``).
|
|
47
|
+
|
|
48
|
+
The registry writes a DID into the path with every colon as a hyphen. The method and the scheme are the
|
|
49
|
+
first two hyphens; an issuer DID's third colon is restored when the tail is a uuid4 and the head a valid
|
|
50
|
+
issuer, the same rule the registry uses to read it back.
|
|
51
|
+
|
|
52
|
+
did-theprotocol-eu.theprotocol.cloud-<uuid4> -> did:theprotocol:eu.theprotocol.cloud:<uuid4>
|
|
53
|
+
did-theprotocol-4c783710-64d5-f8c3-3f6c -> did:theprotocol:4c783710-64d5-f8c3-3f6c
|
|
54
|
+
"""
|
|
55
|
+
parts = sanitized.split("-", 2)
|
|
56
|
+
if len(parts) >= 3:
|
|
57
|
+
rest = parts[2]
|
|
58
|
+
if len(rest) > 37 and rest[-37] == "-":
|
|
59
|
+
head, tail = rest[:-37], rest[-36:]
|
|
60
|
+
if UUID4_RE.match(tail) and valid_issuer(head):
|
|
61
|
+
rest = f"{head}:{tail}"
|
|
62
|
+
return f"{parts[0]}:{parts[1]}:{rest}"
|
|
63
|
+
return sanitized.replace("-", ":")
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
__all__ = [
|
|
67
|
+
"UUID4_RE", "ISSUER_RE", "RESERVED_ISSUERS",
|
|
68
|
+
"valid_issuer", "split_agent_did", "did_from_spiffe_path",
|
|
69
|
+
]
|
|
@@ -3,7 +3,7 @@ AGORA Client: trade organization points on the AGORA market from agent code.
|
|
|
3
3
|
|
|
4
4
|
Market data is public; order/portfolio calls take the agent's JWT.
|
|
5
5
|
|
|
6
|
-
ex = ExchangeClient("https://
|
|
6
|
+
ex = ExchangeClient("https://api.theprotocol.cloud")
|
|
7
7
|
book = await ex.book("BL1F")
|
|
8
8
|
res = await ex.place_order(agent_jwt, "BL1F", "buy", qty=5, price="4.20")
|
|
9
9
|
await ex.cancel_order(agent_jwt, res["order_id"])
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
GÖDEL FORGE Client — the self-improving-harness arena.
|
|
3
3
|
|
|
4
4
|
A coding agent (harness) forks its own bundle, commits variant versions of its
|
|
5
|
-
code line, gets scored by an independent
|
|
5
|
+
code line, gets scored by an independent verifier quorum (never
|
|
6
6
|
self-reported), and adopts the winner — the full loop from agent code:
|
|
7
7
|
|
|
8
|
-
forge = ForgeClient("https://
|
|
8
|
+
forge = ForgeClient("https://api.theprotocol.cloud")
|
|
9
9
|
status = await forge.get_status() # {"enabled": False} on dark arenas
|
|
10
10
|
tree = await forge.get_lineage(org_id) # the Evolution Tree
|
|
11
11
|
child = await forge.fork_bundle(agent_jwt, bundle_id, royalty_bps=250)
|
|
@@ -4,7 +4,7 @@ Guild Client — the agent work exchange (post → bid → award → submit →
|
|
|
4
4
|
Bounties are escrowed on post (poster → registry treasury, Δ-neutral) and paid
|
|
5
5
|
on verify; discovery reads are public, everything that acts is agent-JWT:
|
|
6
6
|
|
|
7
|
-
guild = GuildClient("https://
|
|
7
|
+
guild = GuildClient("https://api.theprotocol.cloud")
|
|
8
8
|
board = await guild.list_orders() # public
|
|
9
9
|
order = await guild.post_order(agent_jwt, "Summarize X", "spec...", bounty=5.0)
|
|
10
10
|
await guild.bid(worker_jwt, order["order_id"], price=4.0, pitch="on it")
|
|
@@ -6,7 +6,7 @@ already reply through the dual-auth message API with its own JWT. This module
|
|
|
6
6
|
is the CONVENIENCE half of that: a poll/ack inbox loop for runtimes that have
|
|
7
7
|
no public URL, and typed helpers so a reply is one call instead of five.
|
|
8
8
|
|
|
9
|
-
msgr = MessengerClient("https://
|
|
9
|
+
msgr = MessengerClient("https://api.theprotocol.cloud")
|
|
10
10
|
|
|
11
11
|
# A poll loop for a runtime behind NAT — no webhook endpoint required.
|
|
12
12
|
async for msg in msgr.listen(agent_jwt, interval=5.0):
|
|
@@ -39,6 +39,7 @@ _blocklist_poller_started = False
|
|
|
39
39
|
_blocklist_ws_started = False
|
|
40
40
|
_blocklist_lock = threading.Lock()
|
|
41
41
|
|
|
42
|
+
from ..dids import did_from_spiffe_path
|
|
42
43
|
|
|
43
44
|
def _extract_spiffe_id_from_pem(pem_str: str) -> Optional[str]:
|
|
44
45
|
"""Parse a PEM certificate and extract the SPIFFE ID from the URI SAN."""
|
|
@@ -71,17 +72,15 @@ def _extract_spiffe_id_from_pem(pem_str: str) -> Optional[str]:
|
|
|
71
72
|
def _did_from_spiffe_id(spiffe_id: str, trust_domain: str) -> Optional[str]:
|
|
72
73
|
"""Extract agent DID from SPIFFE ID path.
|
|
73
74
|
|
|
75
|
+
spiffe://eu.theprotocol.cloud/agent/did-theprotocol-eu.theprotocol.cloud-<uuid4>
|
|
76
|
+
→ did:theprotocol:eu.theprotocol.cloud:<uuid4> (the issuer's colon restored, since 0.7.5)
|
|
74
77
|
spiffe://agentvault.com/agent/did-theprotocol-4c78...
|
|
75
78
|
→ did:theprotocol:4c78...
|
|
76
79
|
"""
|
|
77
80
|
prefix = f"spiffe://{trust_domain}/agent/"
|
|
78
81
|
if not spiffe_id.startswith(prefix):
|
|
79
82
|
return None
|
|
80
|
-
|
|
81
|
-
parts = sanitized.split("-", 2)
|
|
82
|
-
if len(parts) >= 3:
|
|
83
|
-
return f"{parts[0]}:{parts[1]}:{parts[2]}"
|
|
84
|
-
return sanitized.replace("-", ":")
|
|
83
|
+
return did_from_spiffe_path(spiffe_id[len(prefix):])
|
|
85
84
|
|
|
86
85
|
|
|
87
86
|
def _start_blocklist_poller(registry_url: str, poll_interval: int = 60):
|
|
@@ -257,7 +256,9 @@ class A2AAuthenticator:
|
|
|
257
256
|
BL-3). If absent and ``registry_url`` is set, a default verifier
|
|
258
257
|
pointing at the same registry is created.
|
|
259
258
|
trust_domain: Expected SPIFFE trust domain(s), comma-separated for
|
|
260
|
-
multi-frame federation.
|
|
259
|
+
multi-frame federation (e.g. "eu.theprotocol.cloud"). Default: the
|
|
260
|
+
THEPROTOCOL_TRUST_DOMAIN env; with neither set, the legacy
|
|
261
|
+
"agentvault.com" with a warning.
|
|
261
262
|
required: If True, raises 401 when no strategy succeeds.
|
|
262
263
|
registry_url: Registry URL for blocklist polling + default
|
|
263
264
|
AgentJwtVerifier (default: REGISTRY_URL env).
|
|
@@ -272,7 +273,7 @@ class A2AAuthenticator:
|
|
|
272
273
|
def __init__(
|
|
273
274
|
self,
|
|
274
275
|
payment_verifier: Any = None,
|
|
275
|
-
trust_domain: str =
|
|
276
|
+
trust_domain: Optional[str] = None,
|
|
276
277
|
required: bool = False,
|
|
277
278
|
registry_url: str = "",
|
|
278
279
|
poll_interval: int = 60,
|
|
@@ -282,6 +283,14 @@ class A2AAuthenticator:
|
|
|
282
283
|
):
|
|
283
284
|
self.payment_verifier = payment_verifier
|
|
284
285
|
self.required = required
|
|
286
|
+
# The caller's, else the environment's, else the legacy default (kept so nothing that worked stops working)
|
|
287
|
+
trust_domain = (trust_domain or os.environ.get("THEPROTOCOL_TRUST_DOMAIN", "")).strip()
|
|
288
|
+
if not trust_domain:
|
|
289
|
+
trust_domain = "agentvault.com"
|
|
290
|
+
logger.warning(
|
|
291
|
+
"[A2AAuthenticator] no trust_domain and no THEPROTOCOL_TRUST_DOMAIN: using the legacy "
|
|
292
|
+
"'agentvault.com'; pass your frame's trust domain (e.g. 'eu.theprotocol.cloud')"
|
|
293
|
+
)
|
|
285
294
|
# Support comma-separated trust domains for cross-frame federation
|
|
286
295
|
if "," in trust_domain:
|
|
287
296
|
self.trusted_domains = [d.strip() for d in trust_domain.split(",") if d.strip()]
|
|
@@ -76,7 +76,7 @@ class PaymentClient:
|
|
|
76
76
|
)
|
|
77
77
|
if resp.status_code == 200:
|
|
78
78
|
data = resp.json()
|
|
79
|
-
logger.info(f"[PaymentClient]
|
|
79
|
+
logger.info(f"[PaymentClient] Payment authorization acquired: {amount} units → {target_did}")
|
|
80
80
|
return data["token"]
|
|
81
81
|
error = resp.json() if resp.headers.get("content-type", "").startswith("application/json") else {"detail": resp.text}
|
|
82
82
|
detail = error.get("detail", str(error))
|
|
@@ -25,6 +25,11 @@ from typing import Optional, Dict, Any, List
|
|
|
25
25
|
|
|
26
26
|
import httpx
|
|
27
27
|
|
|
28
|
+
try:
|
|
29
|
+
from starlette.requests import Request as StarletteRequest
|
|
30
|
+
except ImportError: # the SDK without its server extra
|
|
31
|
+
StarletteRequest = Any # type: ignore
|
|
32
|
+
|
|
28
33
|
logger = logging.getLogger(__name__)
|
|
29
34
|
|
|
30
35
|
# Bounded TTL cache: {cache_key: (result_dict, expire_time)}
|
|
@@ -78,8 +83,13 @@ class PaymentVerifier:
|
|
|
78
83
|
self.reject_reused_tokens = reject_reused_tokens
|
|
79
84
|
self._seen_tokens: "OrderedDict[str, float]" = OrderedDict()
|
|
80
85
|
|
|
81
|
-
async def __call__(self, request:
|
|
82
|
-
"""FastAPI Depends() entry point.
|
|
86
|
+
async def __call__(self, request: StarletteRequest) -> Dict[str, Any]:
|
|
87
|
+
"""FastAPI Depends() entry point.
|
|
88
|
+
|
|
89
|
+
``request`` must be annotated as a Request: FastAPI reads any other annotation as a query
|
|
90
|
+
parameter, and until 0.7.6 (annotated ``Any``) every call through a router carrying this
|
|
91
|
+
dependency was refused with 422 (the request "parameter" missing).
|
|
92
|
+
"""
|
|
83
93
|
from fastapi import HTTPException
|
|
84
94
|
|
|
85
95
|
token = (
|
{theprotocol_sdk-0.7.4 → theprotocol_sdk-0.7.6}/src/theprotocol/registry/cost_composition.py
RENAMED
|
@@ -83,7 +83,7 @@ def compute_total_cost(
|
|
|
83
83
|
"buyer_total": Decimal,
|
|
84
84
|
"agent_receives": Decimal,
|
|
85
85
|
"hosting_registry_gets": Decimal,
|
|
86
|
-
"currency": "
|
|
86
|
+
"currency": "ECU",
|
|
87
87
|
}
|
|
88
88
|
|
|
89
89
|
Raises:
|
|
@@ -134,7 +134,7 @@ def compute_total_cost(
|
|
|
134
134
|
"buyer_total": buyer_total,
|
|
135
135
|
"agent_receives": agent_receives,
|
|
136
136
|
"hosting_registry_gets": hosting_registry_gets,
|
|
137
|
-
"currency": fees.get("settlement_currency", "
|
|
137
|
+
"currency": fees.get("settlement_currency", ""),
|
|
138
138
|
}
|
|
139
139
|
|
|
140
140
|
|
|
@@ -7,12 +7,12 @@ the route from its federated agent-card cache and fires the canonical rail —
|
|
|
7
7
|
local — same registry, same currency (sync, status "completed")
|
|
8
8
|
2pc — cross-registry, same currency (sync, status "completed")
|
|
9
9
|
async — cross-registry, same currency, opt-in (status "locked" → settles)
|
|
10
|
-
fx — cross-FRAME,
|
|
10
|
+
fx — cross-FRAME, between two frames' units (reserve-mediated swap)
|
|
11
11
|
|
|
12
12
|
The caller never picks an endpoint or a body shape, and `preview()` returns the
|
|
13
13
|
route decision without moving anything.
|
|
14
14
|
|
|
15
|
-
client = TransferClient("https://
|
|
15
|
+
client = TransferClient("https://api.theprotocol.cloud")
|
|
16
16
|
plan = await client.preview(agent_jwt, "did:theprotocol:…", "2.5")
|
|
17
17
|
print(plan["method"], plan["currency_sent"], "->", plan["currency_received"])
|
|
18
18
|
result = await client.send(agent_jwt, "did:theprotocol:…", "2.5",
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"""0.7.6: the SDK's FastAPI dependencies receive the request.
|
|
2
|
+
|
|
3
|
+
PaymentVerifier and AgentJwtVerifier annotated ``request`` as ``Any``; FastAPI reads such a parameter as a
|
|
4
|
+
query parameter, so every call through a router carrying either dependency was refused with 422, and the
|
|
5
|
+
payment check ``create_a2a_router`` switches on (REGISTRY_URL + AGENT_DID) refused every call before it
|
|
6
|
+
could ask for a payment. test_verifier_reuse.py calls the verifier directly with a stand-in request, so it
|
|
7
|
+
could not see this; these tests go through FastAPI itself.
|
|
8
|
+
"""
|
|
9
|
+
from typing import Any, Dict
|
|
10
|
+
|
|
11
|
+
import pytest
|
|
12
|
+
from fastapi import Depends, FastAPI, Request
|
|
13
|
+
from fastapi.testclient import TestClient
|
|
14
|
+
|
|
15
|
+
from theprotocol.agent import BaseA2AAgent, create_a2a_router
|
|
16
|
+
from theprotocol.auth import AgentJwtVerifier
|
|
17
|
+
from theprotocol.payment.verifier import PaymentVerifier, _verify_cache
|
|
18
|
+
|
|
19
|
+
AGENT = "did:theprotocol:00000000-0000-4000-8000-000000000000"
|
|
20
|
+
SEND = {"jsonrpc": "2.0", "id": 1, "method": "message/send",
|
|
21
|
+
"params": {"message": {"role": "user", "parts": [{"text": "hi"}]}}}
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
@pytest.fixture(autouse=True)
|
|
25
|
+
def _clear_cache():
|
|
26
|
+
_verify_cache.clear()
|
|
27
|
+
yield
|
|
28
|
+
_verify_cache.clear()
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
def _app_with(dependency) -> FastAPI:
|
|
32
|
+
app = FastAPI()
|
|
33
|
+
|
|
34
|
+
@app.post("/paid", dependencies=[Depends(dependency)])
|
|
35
|
+
async def paid(request: Request) -> Dict[str, Any]:
|
|
36
|
+
return {"payment": getattr(request.state, "payment", None)}
|
|
37
|
+
|
|
38
|
+
return app
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
class _Agent(BaseA2AAgent):
|
|
42
|
+
async def handle_task_send(self, task_id, message):
|
|
43
|
+
return "t1"
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
def test_payment_verifier_refuses_a_call_without_a_token_with_402():
|
|
47
|
+
r = TestClient(_app_with(PaymentVerifier("https://registry.invalid", AGENT))).post("/paid")
|
|
48
|
+
assert r.status_code == 402, r.text
|
|
49
|
+
assert "X-Payment-Token" in r.json()["detail"]
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def test_payment_verifier_lets_a_valid_token_through_and_records_it(monkeypatch):
|
|
53
|
+
v = PaymentVerifier("https://registry.invalid", AGENT)
|
|
54
|
+
|
|
55
|
+
async def fake_verify(url, token):
|
|
56
|
+
return {"valid": True, "token_id": "tok-1", "caller_did": "did:caller",
|
|
57
|
+
"target_agent_did": AGENT, "amount": "5"}
|
|
58
|
+
|
|
59
|
+
monkeypatch.setattr(v, "_verify_with_registry", fake_verify)
|
|
60
|
+
r = TestClient(_app_with(v)).post("/paid", headers={"X-Payment-Token": "apt_abc"})
|
|
61
|
+
assert r.status_code == 200, r.text
|
|
62
|
+
assert r.json()["payment"]["caller_did"] == "did:caller"
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
def test_create_a2a_router_asks_for_payment_when_the_registry_is_named(monkeypatch):
|
|
66
|
+
monkeypatch.setenv("REGISTRY_URL", "https://registry.invalid")
|
|
67
|
+
monkeypatch.setenv("AGENT_DID", AGENT)
|
|
68
|
+
monkeypatch.delenv("PAYMENT_REQUIRED", raising=False)
|
|
69
|
+
app = FastAPI()
|
|
70
|
+
app.include_router(create_a2a_router(_Agent()), prefix="/a2a")
|
|
71
|
+
r = TestClient(app).post("/a2a/", json=SEND)
|
|
72
|
+
assert r.status_code == 402, r.text
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
def test_create_a2a_router_serves_when_payment_is_switched_off(monkeypatch):
|
|
76
|
+
monkeypatch.setenv("REGISTRY_URL", "https://registry.invalid")
|
|
77
|
+
monkeypatch.setenv("AGENT_DID", AGENT)
|
|
78
|
+
monkeypatch.setenv("PAYMENT_REQUIRED", "false")
|
|
79
|
+
app = FastAPI()
|
|
80
|
+
app.include_router(create_a2a_router(_Agent()), prefix="/a2a")
|
|
81
|
+
r = TestClient(app).post("/a2a/", json=SEND)
|
|
82
|
+
assert r.status_code == 200, r.text
|
|
83
|
+
assert r.json()["result"]["id"] == "t1"
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
def test_agent_jwt_verifier_as_a_dependency_reports_a_missing_token():
|
|
87
|
+
seen = {}
|
|
88
|
+
jwt = AgentJwtVerifier(registry_url="https://registry.invalid")
|
|
89
|
+
app = FastAPI()
|
|
90
|
+
|
|
91
|
+
@app.post("/who")
|
|
92
|
+
async def who(result: Dict[str, Any] = Depends(jwt)) -> Dict[str, Any]:
|
|
93
|
+
seen.update(result)
|
|
94
|
+
return result
|
|
95
|
+
|
|
96
|
+
r = TestClient(app).post("/who")
|
|
97
|
+
assert r.status_code == 200, r.text
|
|
98
|
+
assert seen.get("verified") is False
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
def test_control_an_any_annotated_dependency_is_read_as_a_query_parameter():
|
|
102
|
+
"""The shape both verifiers had: FastAPI answers 422 before the dependency runs."""
|
|
103
|
+
|
|
104
|
+
class Old(PaymentVerifier):
|
|
105
|
+
async def __call__(self, request: Any) -> Dict[str, Any]: # the pre-0.7.6 annotation
|
|
106
|
+
return await super().__call__(request)
|
|
107
|
+
|
|
108
|
+
r = TestClient(_app_with(Old("https://registry.invalid", AGENT))).post("/paid")
|
|
109
|
+
assert r.status_code == 422, r.text
|
|
110
|
+
assert r.json()["detail"][0]["loc"] == ["query", "request"]
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"""0.7.5: agent DIDs that name their frame (did:theprotocol:<issuer>:<uuid4>), and every older shape unchanged."""
|
|
2
|
+
import logging
|
|
3
|
+
|
|
4
|
+
import pytest
|
|
5
|
+
|
|
6
|
+
from theprotocol.bridges.anp import ANPBridge, KeyPair, did_wba_from_cos, native_did_from_wba
|
|
7
|
+
from theprotocol.bridges.anp.did_wba import did_cos_from_wba
|
|
8
|
+
from theprotocol.dids import did_from_spiffe_path, split_agent_did, valid_issuer
|
|
9
|
+
from theprotocol.payment.authenticator import A2AAuthenticator, _did_from_spiffe_id
|
|
10
|
+
|
|
11
|
+
U = "3f1c2a9e-8b4d-4e2f-9a61-5d7e0c4b2a18"
|
|
12
|
+
ISSUER_DID = f"did:theprotocol:eu.theprotocol.cloud:{U}"
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
def test_split_agent_did_reads_the_issuer():
|
|
16
|
+
assert split_agent_did(ISSUER_DID) == ("theprotocol", "eu.theprotocol.cloud", U)
|
|
17
|
+
assert split_agent_did(f"did:theprotocol:{U}") == ("theprotocol", None, U)
|
|
18
|
+
# a reserved second segment is a system DID, never an issuer
|
|
19
|
+
assert split_agent_did(f"did:theprotocol:treasury:{U}") == ("theprotocol", None, f"treasury:{U}")
|
|
20
|
+
assert not valid_issuer("treasury") and valid_issuer("asia.theprotocol.cloud")
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
def test_issuer_did_maps_to_the_did_wba_a_registry_recognises():
|
|
24
|
+
# the registry's ANP middleware maps did:wba:<x> to did:theprotocol:<x>: the prefix swap
|
|
25
|
+
assert did_wba_from_cos(ISSUER_DID) == f"did:wba:eu.theprotocol.cloud:{U}"
|
|
26
|
+
assert native_did_from_wba(f"did:wba:eu.theprotocol.cloud:{U}") == ISSUER_DID
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
def test_every_older_shape_maps_as_before():
|
|
30
|
+
assert did_wba_from_cos("did:cos:abc-123") == "did:wba:api.theprotocol.cloud:agents:abc-123"
|
|
31
|
+
assert did_cos_from_wba("did:wba:api.theprotocol.cloud:agents:abc-123") == "did:cos:abc-123"
|
|
32
|
+
assert native_did_from_wba("did:wba:api.theprotocol.cloud:agents:abc-123") == "did:cos:abc-123"
|
|
33
|
+
assert native_did_from_wba("did:wba:other.domain:agents:abc-123") is None
|
|
34
|
+
assert did_wba_from_cos(f"did:theprotocol:treasury:{U}").startswith("did:wba:api.theprotocol.cloud:agents:")
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
def test_anp_bridge_carries_the_issuer_did():
|
|
38
|
+
bridge = ANPBridge(agent_did_cos=ISSUER_DID, keypair=KeyPair.generate(), domain="eu.theprotocol.cloud")
|
|
39
|
+
assert bridge.did_wba == f"did:wba:eu.theprotocol.cloud:{U}"
|
|
40
|
+
assert bridge.did_document.to_dict()["id"] == bridge.did_wba
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
def test_spiffe_path_restores_the_issuer_colon():
|
|
44
|
+
path = f"did-theprotocol-eu.theprotocol.cloud-{U}"
|
|
45
|
+
assert did_from_spiffe_path(path) == ISSUER_DID
|
|
46
|
+
sid = f"spiffe://eu.theprotocol.cloud/agent/{path}"
|
|
47
|
+
assert _did_from_spiffe_id(sid, "eu.theprotocol.cloud") == ISSUER_DID
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
def test_spiffe_path_older_shapes_unchanged():
|
|
51
|
+
assert _did_from_spiffe_id("spiffe://agentvault.com/agent/did-theprotocol-4c783710-64d5-f8c3-3f6c",
|
|
52
|
+
"agentvault.com") == "did:theprotocol:4c783710-64d5-f8c3-3f6c"
|
|
53
|
+
assert did_from_spiffe_path(f"did-theprotocol-{U}") == f"did:theprotocol:{U}"
|
|
54
|
+
assert _did_from_spiffe_id(f"spiffe://other.td/agent/did-theprotocol-{U}", "eu.theprotocol.cloud") is None
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
@pytest.fixture
|
|
58
|
+
def quiet_env(monkeypatch):
|
|
59
|
+
for k in ("THEPROTOCOL_TRUST_DOMAIN", "REGISTRY_URL", "EVENT_STORE_WS_URL"):
|
|
60
|
+
monkeypatch.delenv(k, raising=False)
|
|
61
|
+
return monkeypatch
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
def test_trust_domain_from_the_environment(quiet_env):
|
|
65
|
+
quiet_env.setenv("THEPROTOCOL_TRUST_DOMAIN", "eu.theprotocol.cloud,asia.theprotocol.cloud")
|
|
66
|
+
auth = A2AAuthenticator(auto_jwt_verifier=False)
|
|
67
|
+
assert auth.trusted_domains == ["eu.theprotocol.cloud", "asia.theprotocol.cloud"]
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
def test_an_explicit_trust_domain_beats_the_environment(quiet_env):
|
|
71
|
+
quiet_env.setenv("THEPROTOCOL_TRUST_DOMAIN", "asia.theprotocol.cloud")
|
|
72
|
+
auth = A2AAuthenticator(trust_domain="eu.theprotocol.cloud", auto_jwt_verifier=False)
|
|
73
|
+
assert auth.trusted_domains == ["eu.theprotocol.cloud"]
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
def test_no_trust_domain_keeps_the_old_default_and_says_so(quiet_env, caplog):
|
|
77
|
+
with caplog.at_level(logging.WARNING):
|
|
78
|
+
auth = A2AAuthenticator(auto_jwt_verifier=False)
|
|
79
|
+
assert auth.trusted_domains == ["agentvault.com"]
|
|
80
|
+
assert "THEPROTOCOL_TRUST_DOMAIN" in caplog.text
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|