opengradient 0.5.10__py3-none-any.whl → 0.5.11__py3-none-any.whl

opengradient/client.py

@@ -1152,7 +1152,7 @@ class Client:
                 limits=LIMITS,
                 http2=False,
                 follow_redirects=False,
-                auth=X402Auth(account=self._wallet_account),  # type: ignore
+                auth=X402Auth(account=self._wallet_account, network_filter=DEFAULT_NETWORK_FILTER),  # type: ignore
             ) as client:
                 headers = {
                     "Content-Type": "application/json",

opengradient/x402_auth.py

@@ -5,12 +5,12 @@ This module provides an httpx Auth class that handles x402 payment protocol
 authentication for streaming responses.
 """
 
-from typing import Generator, Optional
-
 import httpx
-from eth_account.account import LocalAccount
+import typing
+import logging
+
 from x402.clients.base import x402Client
-from x402.types import x402PaymentRequiredResponse
+from x402.types import x402PaymentRequiredResponse, PaymentRequirements
 
 
 class X402Auth(httpx.Auth):
@@ -29,10 +29,20 @@ class X402Auth(httpx.Auth):
 
     def __init__(
         self,
-        account: LocalAccount,
-        max_value: Optional[int] = None,
-        network_filter: Optional[str] = None,
-        scheme_filter: Optional[str] = None,
+        account: typing.Any,
+        max_value: typing.Optional[int] = None,
+        payment_requirements_selector: typing.Optional[
+            typing.Callable[
+                [
+                    list[PaymentRequirements],
+                    typing.Optional[str],
+                    typing.Optional[str],
+                    typing.Optional[int],
+                ],
+                PaymentRequirements,
+            ]
+        ] = None,
+        network_filter: typing.Optional[str] = None,
     ):
         """
         Initialize X402Auth with an Ethereum account for signing payments.
@@ -43,60 +53,47 @@ class X402Auth(httpx.Auth):
             network_filter: Optional network filter for selecting payment requirements
             scheme_filter: Optional scheme filter for selecting payment requirements
         """
-        self._account = account
-        self._max_value = max_value
-        self._network_filter = network_filter
-        self._scheme_filter = scheme_filter
-        self._x402_client = x402Client(
+        self.x402_client = x402Client(
             account,
             max_value=max_value,
-            network_filter=network_filter,
-            scheme_filter=scheme_filter,
+            payment_requirements_selector=payment_requirements_selector,  # type: ignore
         )
+        self.network_filter = network_filter
 
-    def auth_flow(
+    async def async_auth_flow(
         self, request: httpx.Request
-    ) -> Generator[httpx.Request, httpx.Response, None]:
+    ) -> typing.AsyncGenerator[httpx.Request, httpx.Response]:
         """
-        Implement the auth flow for x402 payment handling.
-
-        This method yields the initial request, and if a 402 response is received,
-        it creates a payment header and retries the request.
+        Handle authentication flow for x402 payment protocol.
 
         Args:
-            request: The initial httpx Request
+            request: httpx Request object to be authenticated
 
         Yields:
-            httpx.Request objects (initial and retry with payment header)
+            httpx Request object with authentication headers attached
         """
-        # Send the initial request
         response = yield request
 
-        # If not a 402, we're done
-        if response.status_code != 402:
-            return
-
-        # Handle 402 Payment Required
-        try:
-            data = response.json()
-            payment_response = x402PaymentRequiredResponse(**data)
+        if response.status_code == 402:
+            try:
+                await response.aread()
+                data = response.json()
 
-            # Select payment requirements
-            selected_requirements = self._x402_client.select_payment_requirements(
-                payment_response.accepts
-            )
+                payment_response = x402PaymentRequiredResponse(**data)
 
-            # Create payment header
-            payment_header = self._x402_client.create_payment_header(
-                selected_requirements, payment_response.x402_version
-            )
+                selected_requirements = self.x402_client.select_payment_requirements(
+                    payment_response.accepts,
+                    self.network_filter,
+                )
 
-            # Add payment header and retry
-            request.headers["X-Payment"] = payment_header
-            request.headers["Access-Control-Expose-Headers"] = "X-Payment-Response"
+                payment_header = self.x402_client.create_payment_header(
+                    selected_requirements, payment_response.x402_version
+                )
 
-            yield request
+                request.headers["X-Payment"] = payment_header
+                request.headers["Access-Control-Expose-Headers"] = "X-Payment-Response"
+                yield request
 
-        except Exception:
-            # If payment handling fails, just return the original 402 response
-            return
+            except Exception as e:
+                logging.error(f"X402Auth: Error handling payment: {e}")
+                return

{opengradient-0.5.10.dist-info → opengradient-0.5.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengradient
-Version: 0.5.10
+Version: 0.5.11
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <kyle@vannalabs.ai>
 License-Expression: MIT

{opengradient-0.5.10.dist-info → opengradient-0.5.11.dist-info}/RECORD

@@ -2,12 +2,12 @@ opengradient/__init__.py,sha256=hRGex2VGwAQ-lqBNphW93D4R3wPHQpQrTkwgGLe2MoA,1025
 opengradient/account.py,sha256=5wrYpws_1lozjOFjLCTHtxgoxK-LmObDAaVy9eDcJY4,1145
 opengradient/alpha.py,sha256=WAtL1GGbEpoeLO89rOMd8-YAgAFJYM1UJlICm6YGsPs,15195
 opengradient/cli.py,sha256=pfgyLfD1MIDifKmGLFsJqBlgvqIcnsIh3zzg7PaIeH4,33670
-opengradient/client.py,sha256=B13xv_iL2ZynCsiojfsXuERzIdbt62UoOLd_s_moCnA,65250
+opengradient/client.py,sha256=KQZI1WZaMqyIHRWFH4HA1fFd1JtSdkrUYa7RX_bIwJA,65289
 opengradient/defaults.py,sha256=8faLPwvp_BQdErY_SEjBzvmGVuOBdZ2zKcoryD8SCXk,797
 opengradient/exceptions.py,sha256=88tfegboGtlehQcwhxsl6ZzhLJWZWlkf_bkHTiCtXpo,3391
 opengradient/types.py,sha256=bADakUM6WwdMORGC5HvQvWCezNwIlVc7l0zodPapbhQ,14622
 opengradient/utils.py,sha256=ZUq4OBIml2vsC0tRqus4Zwb_e3g4woo00apByrafuVw,8058
-opengradient/x402_auth.py,sha256=utfusvfKxPtsq4MtRX03yQ969G7VeatxAQwHLAW77JU,3350
+opengradient/x402_auth.py,sha256=fuSsgFmvrlZ3X6uAlUnqtkQ485NECxHfBr3IFADpKAg,3309
 opengradient/abi/InferencePrecompile.abi,sha256=reepTHg6Q01UrFP0Gexc-JayplsvOLPfG7jrEZ-cV28,10197
 opengradient/abi/PriceHistoryInference.abi,sha256=ZB3fZdx1kaFlp2wt1vTbTZZG1k8HPvmNtkG5Q8Bnajw,5098
 opengradient/abi/WorkflowScheduler.abi,sha256=yEGs76qO4S1z980KL5hBdfyXiJ6k-kERcB1O_o73AEU,416
@@ -29,9 +29,9 @@ opengradient/workflow_models/constants.py,sha256=viIkb_LGcfVprqQNaA80gBTj6cfYam0
 opengradient/workflow_models/types.py,sha256=Z22hF6c8Y4D2GlzVEIBODGwsqSjSrQvUcpZ7R-mIJdI,409
 opengradient/workflow_models/utils.py,sha256=aL2-Hp5J5qlJft6-wx4GnZNOXZ1vjYaTF1uEgYavWdI,1509
 opengradient/workflow_models/workflow_models.py,sha256=d4C_gs39DAfy4cdY9Ee6GMXpPfzwvKFpmxzK1A7LNgU,3900
-opengradient-0.5.10.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
-opengradient-0.5.10.dist-info/METADATA,sha256=Pfj4IQ8soL-1AO5X5PbqcunZF4K0UK3AixX3Lfsh_Bw,5437
-opengradient-0.5.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-opengradient-0.5.10.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
-opengradient-0.5.10.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
-opengradient-0.5.10.dist-info/RECORD,,
+opengradient-0.5.11.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
+opengradient-0.5.11.dist-info/METADATA,sha256=qJZT1jnWcmpeBQsLN1YrmPRCfMzD4nk7saMguFYNmyc,5437
+opengradient-0.5.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+opengradient-0.5.11.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
+opengradient-0.5.11.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
+opengradient-0.5.11.dist-info/RECORD,,