oneshot-python 0.6.0__tar.gz → 0.7.1__tar.gz

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/.gitignore

@@ -71,5 +71,8 @@ tmp/
 # Secrets
 soul-api-keys.json
 
+# Next.js
+.next/
+
 # Build outputs
 apps/video-service/out/

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneshot-python
-Version: 0.6.0
+Version: 0.7.1
 Summary: Core Python SDK for the OneShot API — HTTP client with x402 payment handling
 License-Expression: MIT
 Requires-Python: >=3.10

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/oneshot/client.py

@@ -137,9 +137,10 @@ class OneShotClient:
 
             # Step 2 — Parse 402 response
             # Parse x402 v2 PaymentRequired from PAYMENT-REQUIRED header
-            accepted = parse_payment_required(
+            parsed_req = parse_payment_required(
                 resp.headers.get("payment-required")
             )
+            accepted = parsed_req["accepted"]
 
             quote_data = resp.json()
             payment_request = quote_data["payment_request"]
@@ -156,7 +157,7 @@ class OneShotClient:
 
             self._log(f"Payment required: {payment_request['amount']} USDC")
 
-            # Step 3 — Sign x402 payment (v2 format with accepted requirements)
+            # Step 3 — Sign x402 payment (v2 format with accepted requirements + Bazaar metadata)
             auth = sign_payment_authorization(
                 private_key=self._private_key,
                 from_address=self.address,
@@ -166,6 +167,8 @@ class OneShotClient:
                 chain_id=payment_request["chain_id"],
                 network=f"eip155:{payment_request['chain_id']}",
                 accepted=accepted,
+                resource=parsed_req.get("resource"),
+                extensions=parsed_req.get("extensions"),
             )
 
             # Step 4 — Re-POST with payment headers (x402 format)
@@ -275,6 +278,18 @@ class OneShotClient:
                 return {"success": True}
             return resp.json()
 
+    # ------------------------------------------------------------------
+    # Balance
+    # ------------------------------------------------------------------
+
+    def get_balance(self) -> dict:
+        """Get unified balance (on-chain USDC + credits). Blocking."""
+        return self.call_free_get("/v1/tools/balance")
+
+    async def aget_balance(self) -> dict:
+        """Get unified balance (on-chain USDC + credits). Async."""
+        return await self.acall_free_get("/v1/tools/balance")
+
     # ------------------------------------------------------------------
     # Job polling
     # ------------------------------------------------------------------

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/oneshot/x402.py

@@ -39,8 +39,16 @@ class PaymentAuthorization(TypedDict):
     payload: dict[str, Any]
 
 
-def parse_payment_required(header: str | None) -> PaymentRequirements:
-    """Decode the base64 PAYMENT-REQUIRED header and return the first accepted option.
+class ParsedPaymentRequired(TypedDict, total=False):
+    """Full parsed 402 response with Bazaar discovery metadata."""
+
+    accepted: PaymentRequirements
+    resource: dict[str, Any]
+    extensions: dict[str, Any]
+
+
+def parse_payment_required(header: str | None) -> ParsedPaymentRequired:
+    """Decode the base64 PAYMENT-REQUIRED header and return accepted requirements + Bazaar metadata.
 
     Falls back to sensible defaults if the header is missing or unparseable.
     """
@@ -48,22 +56,29 @@ def parse_payment_required(header: str | None) -> PaymentRequirements:
         try:
             decoded = base64.b64decode(header).decode()
             parsed = json.loads(decoded)
-            # x402 v2: { x402Version: 2, accepts: [...], resource: {...} }
+            # x402 v2: { x402Version: 2, accepts: [...], resource: {...}, extensions: {...} }
             accepts = parsed.get("accepts", [])
             if accepts:
-                return accepts[0]
+                result: ParsedPaymentRequired = {"accepted": accepts[0]}
+                if parsed.get("resource"):
+                    result["resource"] = parsed["resource"]
+                if parsed.get("extensions"):
+                    result["extensions"] = parsed["extensions"]
+                return result
         except Exception:
             pass
 
     # Fallback with production defaults
-    return PaymentRequirements(
-        scheme="exact",
-        network="eip155:8453",
-        amount="0",
-        asset="0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-        payTo="",
-        maxTimeoutSeconds=300,
-        extra={"name": "USD Coin", "version": "2"},
+    return ParsedPaymentRequired(
+        accepted=PaymentRequirements(
+            scheme="exact",
+            network="eip155:8453",
+            amount="0",
+            asset="0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            payTo="",
+            maxTimeoutSeconds=300,
+            extra={"name": "USD Coin", "version": "2"},
+        ),
     )
 
 
@@ -77,6 +92,8 @@ def sign_payment_authorization(
     chain_id: int,
     network: str,
     accepted: PaymentRequirements | None = None,
+    resource: dict[str, Any] | None = None,
+    extensions: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Create an EIP-712 TransferWithAuthorization signature for USDC.
 
@@ -89,6 +106,8 @@ def sign_payment_authorization(
         chain_id: EVM chain ID (8453 for Base Mainnet).
         network: CAIP-2 network string (e.g. "eip155:8453").
         accepted: Parsed PaymentRequirements from server's PAYMENT-REQUIRED header.
+        resource: Resource metadata from 402 response (for Bazaar discovery).
+        extensions: Extensions from 402 response (for Bazaar discovery).
 
     Returns:
         x402 PaymentPayload v2 dict.
@@ -150,8 +169,8 @@ def sign_payment_authorization(
         extra={"name": domain_name, "version": domain_version},
     )
 
-    # x402 PaymentPayload v2 format
-    return {
+    # x402 PaymentPayload v2 format (including resource + extensions for Bazaar discovery)
+    result: dict[str, Any] = {
         "x402Version": 2,
         "accepted": dict(accepted_req),
         "payload": {
@@ -166,6 +185,11 @@ def sign_payment_authorization(
             },
         },
     }
+    if resource:
+        result["resource"] = resource
+    if extensions:
+        result["extensions"] = extensions
+    return result
 
 
 def encode_payment_header(auth: dict[str, Any]) -> str:

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oneshot-python"
-version = "0.6.0"
+version = "0.7.1"
 description = "Core Python SDK for the OneShot API — HTTP client with x402 payment handling"
 readme = {text = "Core Python SDK for the OneShot API", content-type = "text/plain"}
 license = "MIT"

oneshot_python-0.7.1/tests/test_balance.py

@@ -0,0 +1,98 @@
+"""Tests for OneShotClient.get_balance() and aget_balance().
+
+Uses mock HTTP responses to verify the client correctly calls the
+/v1/tools/balance endpoint and returns the parsed response.
+"""
+
+from __future__ import annotations
+
+import json
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+from eth_account import Account
+
+from oneshot.client import OneShotClient
+
+# Deterministic test key (never use with real funds)
+TEST_PRIVATE_KEY = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+TEST_ADDRESS = Account.from_key(TEST_PRIVATE_KEY).address
+
+MOCK_BALANCE_RESPONSE = {
+    "on_chain_balance": "125.500000",
+    "credits_balance": "45.00",
+    "currency": "USDC",
+    "address": TEST_ADDRESS,
+    "chain_id": 8453,
+}
+
+
+class TestGetBalance:
+    """Synchronous get_balance() tests."""
+
+    def test_calls_correct_endpoint(self) -> None:
+        client = OneShotClient(TEST_PRIVATE_KEY)
+
+        with patch.object(client, "call_free_get", return_value=MOCK_BALANCE_RESPONSE) as mock:
+            result = client.get_balance()
+
+        mock.assert_called_once_with("/v1/tools/balance")
+        assert result == MOCK_BALANCE_RESPONSE
+
+    def test_returns_all_fields(self) -> None:
+        client = OneShotClient(TEST_PRIVATE_KEY)
+
+        with patch.object(client, "call_free_get", return_value=MOCK_BALANCE_RESPONSE):
+            result = client.get_balance()
+
+        assert result["on_chain_balance"] == "125.500000"
+        assert result["credits_balance"] == "45.00"
+        assert result["currency"] == "USDC"
+        assert result["address"] == TEST_ADDRESS
+        assert result["chain_id"] == 8453
+
+    def test_propagates_errors(self) -> None:
+        client = OneShotClient(TEST_PRIVATE_KEY)
+
+        with patch.object(client, "call_free_get", side_effect=Exception("Network error")):
+            with pytest.raises(Exception, match="Network error"):
+                client.get_balance()
+
+
+class TestAgetBalance:
+    """Async aget_balance() tests."""
+
+    @pytest.mark.asyncio
+    async def test_calls_correct_endpoint(self) -> None:
+        client = OneShotClient(TEST_PRIVATE_KEY)
+
+        with patch.object(
+            client, "acall_free_get", new_callable=AsyncMock, return_value=MOCK_BALANCE_RESPONSE
+        ) as mock:
+            result = await client.aget_balance()
+
+        mock.assert_called_once_with("/v1/tools/balance")
+        assert result == MOCK_BALANCE_RESPONSE
+
+    @pytest.mark.asyncio
+    async def test_returns_all_fields(self) -> None:
+        client = OneShotClient(TEST_PRIVATE_KEY)
+
+        with patch.object(
+            client, "acall_free_get", new_callable=AsyncMock, return_value=MOCK_BALANCE_RESPONSE
+        ):
+            result = await client.aget_balance()
+
+        assert result["on_chain_balance"] == "125.500000"
+        assert result["credits_balance"] == "45.00"
+        assert result["currency"] == "USDC"
+
+    @pytest.mark.asyncio
+    async def test_propagates_errors(self) -> None:
+        client = OneShotClient(TEST_PRIVATE_KEY)
+
+        with patch.object(
+            client, "acall_free_get", new_callable=AsyncMock, side_effect=Exception("Timeout")
+        ):
+            with pytest.raises(Exception, match="Timeout"):
+                await client.aget_balance()

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/tests/test_x402.py

@@ -65,22 +65,25 @@ class TestParsePaymentRequired:
         header_data = {
             "x402Version": 2,
             "accepts": [MOCK_ACCEPTED],
-            "resource": {},
+            "resource": {"url": "https://example.com/api"},
+            "extensions": {"bazaar": {"info": {}}},
         }
         encoded = base64.b64encode(json.dumps(header_data).encode()).decode()
         result = parse_payment_required(encoded)
-        assert result["scheme"] == "exact"
-        assert result["network"] == "eip155:8453"
-        assert result["payTo"] == TO_ADDRESS
+        assert result["accepted"]["scheme"] == "exact"
+        assert result["accepted"]["network"] == "eip155:8453"
+        assert result["accepted"]["payTo"] == TO_ADDRESS
+        assert result["resource"]["url"] == "https://example.com/api"
+        assert "bazaar" in result["extensions"]
 
     def test_returns_fallback_on_none(self) -> None:
         result = parse_payment_required(None)
-        assert result["scheme"] == "exact"
-        assert result["extra"]["name"] == "USD Coin"
+        assert result["accepted"]["scheme"] == "exact"
+        assert result["accepted"]["extra"]["name"] == "USD Coin"
 
     def test_returns_fallback_on_invalid_base64(self) -> None:
         result = parse_payment_required("not-valid-base64!!!")
-        assert result["scheme"] == "exact"
+        assert result["accepted"]["scheme"] == "exact"
 
 
 class TestSignPaymentAuthorization:

{oneshot_python-0.6.0 → oneshot_python-0.7.1}/uv.lock

@@ -549,7 +549,7 @@ wheels = [
 
 [[package]]
 name = "oneshot-python"
-version = "0.5.0"
+version = "0.7.0"
 source = { editable = "." }
 dependencies = [
     { name = "eth-account" },