visionai-sdk-python 2.2.0.dev1__py3-none-any.whl → 2.2.0.dev2__py3-none-any.whl

visionai_sdk_python/_base.py

@@ -85,11 +85,29 @@ class _BaseClient:
         self._credentials: dict | None = None
         self._credentials_type: Literal["login", "client"] | None = None
 
+    @property
+    def credential(self) -> "ClientCredentials | AsyncClientCredentials | None":
+        """The credential this client was built with, for callers that need the
+        raw token themselves (a WebSocket upgrade, another HTTP library)."""
+        return self._credential
+
     @staticmethod
     def _build_url(base_url: str, path: str) -> str:
         """Join a base URL and a path, normalizing slashes."""
         return f"{base_url.rstrip('/')}/{path.lstrip('/')}"
 
+    def _absolute(self, url: str) -> str:
+        """``url`` as given when absolute, else a path under ``auth_url``."""
+        return url if "://" in url else self._build_url(self.auth_url, url)
+
+    def _with_auth(self, kwargs: dict, token: str) -> dict:
+        """``kwargs`` for httpx with the bearer header; the client's token wins."""
+        headers = {
+            **dict(kwargs.get("headers") or {}),
+            **self._build_auth_header(token),
+        }
+        return {**kwargs, "headers": headers}
+
     def _vlm_base(self) -> str:
         if self.vlm_url is None:
             raise ValueError("vlm_url is required for VLM calls; pass it to the client")

visionai_sdk_python/async_client.py

@@ -19,7 +19,10 @@ class AsyncClient(_BaseClient):
         max_connections: int = 100,
         max_keepalive_connections: int = 20,
         credential: AsyncClientCredentials | None = None,
+        http_client: httpx.AsyncClient | None = None,
     ) -> None:
+        """See ``_BaseClient``; ``http_client`` is an httpx.AsyncClient to send through
+        (tests, shared pools); the client closes only the one it created."""
         super().__init__(
             auth_url=auth_url,
             vlm_url=vlm_url,
@@ -30,7 +33,7 @@ class AsyncClient(_BaseClient):
             max_keepalive_connections=max_keepalive_connections,
             credential=credential,
         )
-        self._client = httpx.AsyncClient(
+        self._client = http_client or httpx.AsyncClient(
             verify=self.verify_ssl,
             timeout=self.timeout,
             limits=httpx.Limits(
@@ -38,6 +41,7 @@ class AsyncClient(_BaseClient):
                 max_keepalive_connections=self.max_keepalive_connections,
             ),
         )
+        self._owns_http = http_client is None
         # Register the different function resource
         self.auth = AsyncAuthResource(self)
         self.vlm = AsyncVLMResource(self)
@@ -51,9 +55,46 @@ class AsyncClient(_BaseClient):
             raise self._map_transport_error(e) from e
         return self._handle_response(response)
 
+    async def request(self, method: str, url: str, **kwargs) -> httpx.Response:
+        """Send any request with this client's bearer token.
+
+        ``url`` is absolute, or a path under ``auth_url``; ``kwargs`` go to httpx.
+        A 401 buys one fresh token (from ``credential`` or the stored login) and
+        one retry, so a token revoked server-side costs one extra request.
+
+        Raises:
+            AuthenticationError: No token, or the fresh one was refused too.
+            RateLimitedError, NetworkError, ServerError, ClientError: As the
+                resource methods.
+        """
+        url = self._absolute(url)
+        await self._ensure_token()
+        token = self._access_token
+        try:
+            return await self._request(method, url, **self._with_auth(kwargs, token))
+        except AuthenticationError:
+            if not await self._renew_rejected(token):
+                raise
+        return await self._request(
+            method, url, **self._with_auth(kwargs, self._access_token)
+        )
+
+    async def _renew_rejected(self, token: str) -> bool:
+        """A 401 for ``token``: get a different one, once; False when none would help."""
+        if self._credential is not None:
+            if not self._credential.invalidate(token):
+                return False
+            self._access_token = (await self._credential.get_token()).token
+            return True
+        if self._credentials is None or self._access_token != token:
+            return False
+        await self._refresh_token()
+        return self._access_token != token
+
     async def close(self) -> None:
-        """Close the HTTP client and release connections."""
-        await self._client.aclose()
+        """Close the HTTP client this client created and release its connections."""
+        if self._owns_http:
+            await self._client.aclose()
 
     async def __aenter__(self) -> "AsyncClient":
         """Async context manager entry."""

visionai_sdk_python/client.py

@@ -19,7 +19,10 @@ class Client(_BaseClient):
         max_connections: int = 100,
         max_keepalive_connections: int = 20,
         credential: ClientCredentials | None = None,
+        http_client: httpx.Client | None = None,
     ) -> None:
+        """See ``_BaseClient``; ``http_client`` is an httpx.Client to send through
+        (tests, shared pools); the client closes only the one it created."""
         super().__init__(
             auth_url=auth_url,
             vlm_url=vlm_url,
@@ -30,7 +33,7 @@ class Client(_BaseClient):
             max_keepalive_connections=max_keepalive_connections,
             credential=credential,
         )
-        self._client = httpx.Client(
+        self._client = http_client or httpx.Client(
             verify=self.verify_ssl,
             timeout=self.timeout,
             limits=httpx.Limits(
@@ -38,6 +41,7 @@ class Client(_BaseClient):
                 max_keepalive_connections=self.max_keepalive_connections,
             ),
         )
+        self._owns_http = http_client is None
         # Register the different function resource
         self.auth = AuthResource(self)
         self.vlm = VLMResource(self)
@@ -51,9 +55,44 @@ class Client(_BaseClient):
             raise self._map_transport_error(e) from e
         return self._handle_response(response)
 
+    def request(self, method: str, url: str, **kwargs) -> httpx.Response:
+        """Send any request with this client's bearer token.
+
+        ``url`` is absolute, or a path under ``auth_url``; ``kwargs`` go to httpx.
+        A 401 buys one fresh token (from ``credential`` or the stored login) and
+        one retry, so a token revoked server-side costs one extra request.
+
+        Raises:
+            AuthenticationError: No token, or the fresh one was refused too.
+            RateLimitedError, NetworkError, ServerError, ClientError: As the
+                resource methods.
+        """
+        url = self._absolute(url)
+        self._ensure_token()
+        token = self._access_token
+        try:
+            return self._request(method, url, **self._with_auth(kwargs, token))
+        except AuthenticationError:
+            if not self._renew_rejected(token):
+                raise
+        return self._request(method, url, **self._with_auth(kwargs, self._access_token))
+
+    def _renew_rejected(self, token: str) -> bool:
+        """A 401 for ``token``: get a different one, once; False when none would help."""
+        if self._credential is not None:
+            if not self._credential.invalidate(token):
+                return False
+            self._access_token = self._credential.get_token().token
+            return True
+        if self._credentials is None or self._access_token != token:
+            return False
+        self._refresh_token()
+        return self._access_token != token
+
     def close(self) -> None:
-        """Close the HTTP client and release connections."""
-        self._client.close()
+        """Close the HTTP client this client created and release its connections."""
+        if self._owns_http:
+            self._client.close()
 
     def __enter__(self) -> "Client":
         """Context manager entry."""

visionai_sdk_python/vlm/async_resource.py

@@ -28,8 +28,8 @@ class AsyncVLMResource(VLMMixin):
     ) -> ResponseNormalModel | ResponseErrorModel:
         """Submit an inference request to the VLM service.
 
-        Uses the internally stored access token obtained from login() or get_access_token().
-        If the token is expiring soon, it will be automatically refreshed.
+        Sent with the client's token (``credential``, ``login()`` or ``get_access_token()``);
+        a 401 gets one fresh token and one retry.
 
         Args:
             payload: Inference parameters as a NIMRequestModel instance or a dict
@@ -45,17 +45,13 @@ class AsyncVLMResource(VLMMixin):
             NetworkError: If the request times out or a network error occurs.
             VisionaiSDKError: If the request fails for any other reason.
         """
-        # Ensure token is valid
-        await self._sdk_client._ensure_token()
-
         # Prepare request (from Mixin)
         body = self._prepare_chat_request(payload)
 
-        # I/O operation (async)
-        response = await self._sdk_client._request(
+        # I/O operation (async); the client adds the token and retries once on 401
+        response = await self._sdk_client.request(
             "POST",
             self._sdk_client._build_url(self._sdk_client._vlm_base(), VLMEndpoint.CHAT),
-            headers=self._sdk_client._build_auth_header(self._sdk_client._access_token),
             json=body,
         )
 
@@ -67,8 +63,8 @@ class AsyncVLMResource(VLMMixin):
     ) -> ResponseNormalModel | ResponseErrorModel:
         """Poll the result of a previously submitted inference request.
 
-        Uses the internally stored access token obtained from login() or get_access_token().
-        If the token is expiring soon, it will be automatically refreshed.
+        Sent with the client's token (``credential``, ``login()`` or ``get_access_token()``);
+        a 401 gets one fresh token and one retry.
 
         Args:
             result_id: Chat result ID returned from a prior chat() call.
@@ -82,16 +78,12 @@ class AsyncVLMResource(VLMMixin):
             NetworkError: If the request times out or a network error occurs.
             VisionaiSDKError: If the request fails for any other reason.
         """
-        # Ensure token is valid
-        await self._sdk_client._ensure_token()
-
-        # I/O operation (async)
-        response = await self._sdk_client._request(
+        # I/O operation (async); the client adds the token and retries once on 401
+        response = await self._sdk_client.request(
             "GET",
             self._sdk_client._build_url(
                 self._sdk_client._vlm_base(), f"{VLMEndpoint.CHAT}/{result_id}"
             ),
-            headers=self._sdk_client._build_auth_header(self._sdk_client._access_token),
         )
 
         # Parse response (from Mixin)

visionai_sdk_python/vlm/resource.py

@@ -28,8 +28,8 @@ class VLMResource(VLMMixin):
     ) -> ResponseNormalModel | ResponseErrorModel:
         """Submit an inference request to the VLM service.
 
-        Uses the internally stored access token obtained from login() or get_access_token().
-        If the token is expiring soon, it will be automatically refreshed.
+        Sent with the client's token (``credential``, ``login()`` or ``get_access_token()``);
+        a 401 gets one fresh token and one retry.
 
         Args:
             payload: Inference parameters as a NIMRequestModel instance or a dict
@@ -45,17 +45,13 @@ class VLMResource(VLMMixin):
             NetworkError: If the request times out or a network error occurs.
             VisionaiSDKError: If the request fails for any other reason.
         """
-        # Ensure token is valid
-        self._sdk_client._ensure_token()
-
         # Prepare request (from Mixin)
         body = self._prepare_chat_request(payload)
 
-        # I/O operation (sync)
-        response = self._sdk_client._request(
+        # I/O operation (sync); the client adds the token and retries once on 401
+        response = self._sdk_client.request(
             "POST",
             self._sdk_client._build_url(self._sdk_client._vlm_base(), VLMEndpoint.CHAT),
-            headers=self._sdk_client._build_auth_header(self._sdk_client._access_token),
             json=body,
         )
 
@@ -65,8 +61,8 @@ class VLMResource(VLMMixin):
     def get_chat(self, result_id: str) -> ResponseNormalModel | ResponseErrorModel:
         """Poll the result of a previously submitted inference request.
 
-        Uses the internally stored access token obtained from login() or get_access_token().
-        If the token is expiring soon, it will be automatically refreshed.
+        Sent with the client's token (``credential``, ``login()`` or ``get_access_token()``);
+        a 401 gets one fresh token and one retry.
 
         Args:
             result_id: Chat result ID returned from a prior chat() call.
@@ -80,16 +76,12 @@ class VLMResource(VLMMixin):
             NetworkError: If the request times out or a network error occurs.
             VisionaiSDKError: If the request fails for any other reason.
         """
-        # Ensure token is valid
-        self._sdk_client._ensure_token()
-
-        # I/O operation (sync)
-        response = self._sdk_client._request(
+        # I/O operation (sync); the client adds the token and retries once on 401
+        response = self._sdk_client.request(
             "GET",
             self._sdk_client._build_url(
                 self._sdk_client._vlm_base(), f"{VLMEndpoint.CHAT}/{result_id}"
             ),
-            headers=self._sdk_client._build_auth_header(self._sdk_client._access_token),
         )
 
         # Parse response (from Mixin)

{visionai_sdk_python-2.2.0.dev1.dist-info → visionai_sdk_python-2.2.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: visionai-sdk-python
-Version: 2.2.0.dev1
+Version: 2.2.0.dev2
 Summary: VisionAI SDK for Python
 Author-email: Tony Yang <tonyyang@linkervision.com>
 Requires-Python: >=3.11
@@ -146,7 +146,10 @@ cred = ClientCredentials(
 )
 client = Client(auth_url="...", vlm_url="...", credential=cred)   # vlm.chat() uses it
 
-token = cred.get_token().token          # for requests the SDK does not make itself
+token = cred.get_token().token          # for a WebSocket upgrade or another library
+
+# Any other HTTP call with the same token; a 401 gets one fresh token and one retry
+nodes = client.request("GET", "https://vs.example.com/mgmt/nodes").json()
 ```
 
 Platform mints at most 50 tokens per client per month, so the credential protects the

{visionai_sdk_python-2.2.0.dev1.dist-info → visionai_sdk_python-2.2.0.dev2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 visionai_sdk_python/__init__.py,sha256=EITFK0aQPAQN3BSnwTfrPAt1iu50pmuhXl0-jBSbiD4,774
-visionai_sdk_python/_base.py,sha256=73Jq7OTNgY6naybpkdAIOyt-CHgEdtyD_TL5XBgERtU,9599
+visionai_sdk_python/_base.py,sha256=fnvnes3i5K5CObwIROs3NM6X-PHTLS-IyK6cK9hILeA,10397
 visionai_sdk_python/_jwt_verifier.py,sha256=h4CAK1iiDAJ-oKnXrLbCJw5rWcsVe94QNY12ne1Wzto,8442
 visionai_sdk_python/_request_attribution.py,sha256=zQk_bSLsu1RTp1Fe3MGUUX8YRzq3iqfBTmhhjM7BuRU,1907
 visionai_sdk_python/_source_header.py,sha256=DWiR-TGclET4UrqmAEO7bYPtf9XuLSE4FGQjZIgVWiY,5133
-visionai_sdk_python/async_client.py,sha256=NbfWjAQcQ1xh53Q_Q9XQpQQSWGXhEge79cHHT6V2lnM,3924
-visionai_sdk_python/client.py,sha256=5iyqh3jVX7iWG52dN0zzdFL05UJYs8yQAE9fOqkt55s,3768
+visionai_sdk_python/async_client.py,sha256=b8hMe9e3eth8B5tOIhP4Wo7ja7JvxO7fe8xQk1lSDjQ,5837
+visionai_sdk_python/client.py,sha256=urkFrMtw7qrkyfzekhF5vsYZt5LlgeJXml-jI8uWSqI,5599
 visionai_sdk_python/constants.py,sha256=KWhoxZdlwqXwhUJDqERStq2mrms-MA8aRDqBwbIvNO0,1471
 visionai_sdk_python/endpoints.py,sha256=CC-AoxXzg39sMAhqx1CTS3gRWKx_H7VOqBANRLVotoU,183
 visionai_sdk_python/exceptions.py,sha256=UExz_lx7do154RyFobcYIaD_hDD-AExvMiOSDkKxe-0,1259
@@ -18,11 +18,11 @@ visionai_sdk_python/auth/models.py,sha256=u6MDFYaWMyf08XCrGZzwPHv43d6AElH9XO2QSj
 visionai_sdk_python/auth/resource.py,sha256=vFBf_27h2u6R1w3aXm5cDEpvS21RyiwgtDm0olZFpec,5238
 visionai_sdk_python/vlm/__init__.py,sha256=EDd7ZG4k7inn8qqkyIhO3xI_4MPMWJT5Npsient-tTc,571
 visionai_sdk_python/vlm/_mixin.py,sha256=TkqezNpW8QEe9pujsvx1APcylYQYr_PvHruEz4Le3JQ,1718
-visionai_sdk_python/vlm/async_resource.py,sha256=2TlLFiyiiQBvGR1BQHZVH_swCdKLANPZTOOD4fRIa0Y,3703
+visionai_sdk_python/vlm/async_resource.py,sha256=b878VPxVfO4xpjG-JH2XcimqywMFtEw-cyEfeSLVGRo,3417
 visionai_sdk_python/vlm/models.py,sha256=yDFjo4LfAxqXYBnl6ZW7YUJQoKKRkQWtqBJi2ruI6Jw,984
 visionai_sdk_python/vlm/preprocess.py,sha256=ZpJJa13h8_YKwh_P7Pn8WIXV0x-r2xJi-ETgCFsGw-Y,7892
-visionai_sdk_python/vlm/resource.py,sha256=UK_FNkQbnXlIkq0MTVav4vRRNE-p6QnWg-RL_ACGZhc,3616
-visionai_sdk_python-2.2.0.dev1.dist-info/METADATA,sha256=0_CPJjTYkmwvxCw5n3_V0vt0UzwhO2KdwrAmgNONtOk,29494
-visionai_sdk_python-2.2.0.dev1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-visionai_sdk_python-2.2.0.dev1.dist-info/top_level.txt,sha256=79a5MCSLLv6Mbfun-8RS-G6O927hahBwDqJjeuWLdvM,20
-visionai_sdk_python-2.2.0.dev1.dist-info/RECORD,,
+visionai_sdk_python/vlm/resource.py,sha256=qx03gOxVamtoDrLNadp1J9EtVuP95SntOuilFog_SSo,3342
+visionai_sdk_python-2.2.0.dev2.dist-info/METADATA,sha256=DWZr4KOvRRLb1IXTQtpvwSBxr4ozPzJCAm9xAlTe53Q,29654
+visionai_sdk_python-2.2.0.dev2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+visionai_sdk_python-2.2.0.dev2.dist-info/top_level.txt,sha256=79a5MCSLLv6Mbfun-8RS-G6O927hahBwDqJjeuWLdvM,20
+visionai_sdk_python-2.2.0.dev2.dist-info/RECORD,,