label-studio-sdk 1.0.14__tar.gz → 1.0.15__tar.gz

{label_studio_sdk-1.0.14 → label_studio_sdk-1.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: label-studio-sdk
-Version: 1.0.14
+Version: 1.0.15
 Summary: 
 Requires-Python: >=3.9,<4
 Classifier: Intended Audience :: Developers

{label_studio_sdk-1.0.14 → label_studio_sdk-1.0.15}/pyproject.toml

@@ -3,7 +3,7 @@ name = "label-studio-sdk"
 
 [tool.poetry]
 name = "label-studio-sdk"
-version = "1.0.14"
+version = "1.0.15"
 description = ""
 readme = "README.md"
 authors = []

{label_studio_sdk-1.0.14 → label_studio_sdk-1.0.15}/src/label_studio_sdk/tokens/client_ext.py

@@ -1,7 +1,7 @@
 import threading
 import typing
 from datetime import datetime, timezone
-import inspect
+import ssl
 
 import httpx
 import jwt
@@ -78,34 +78,63 @@ class TokensClientExt:
         
         return self._access_token
 
+    def _get_client_params(self, existing_client: httpx.AsyncClient) -> dict:
+        """Extract parameters from an existing client to create a new one.
+
+        Args:
+            existing_client: The existing client to extract parameters from.
+
+        Returns:
+            dict: Parameters for creating a new client.
+        """
+        return {
+            'auth': existing_client.auth,
+            'params': existing_client.params,
+            'headers': existing_client.headers,
+            'cookies': existing_client.cookies,
+            'timeout': existing_client.timeout,
+            'follow_redirects': existing_client.follow_redirects,
+            'max_redirects': existing_client.max_redirects,
+            'event_hooks': existing_client.event_hooks,
+            'base_url': existing_client.base_url,
+            'trust_env': existing_client.trust_env,
+            'default_encoding': existing_client._default_encoding,
+            'verify': existing_client._transport._pool._ssl_context.verify_mode != ssl.CERT_NONE,
+            'http1': existing_client._transport._pool._http1,
+            'http2': existing_client._transport._pool._http2,
+            'limits': httpx.Limits(
+                max_connections=existing_client._transport._pool._max_connections,
+                max_keepalive_connections=existing_client._transport._pool._max_keepalive_connections,
+                keepalive_expiry=existing_client._transport._pool._keepalive_expiry
+            )
+        }
+
     def refresh(self) -> AccessTokenResponse:
         """Refresh the access token and return the token response."""
-        # We don't do this often, just use a separate sync httpx client for simplicity here
-        # (avoids complicated state management and sync vs async handling)
-        # Create a new client with the same parameters as the existing one
         existing_client = self._client_wrapper.httpx_client.httpx_client
 
-        # Get all parameters from httpx.Client.__init__
-        client_params = {}
-        sig = inspect.signature(httpx.Client.__init__)
-        for param_name in sig.parameters:
-            if param_name != 'self':  # Skip 'self' parameter
-                try:
-                    value = getattr(existing_client, param_name, None)
-                    if value is not None:
-                        client_params[param_name] = value
-                except AttributeError:
-                    continue
-
-        with httpx.Client(**client_params) as sync_client:
-            response = sync_client.request(
+        # For sync client, use it directly
+        if isinstance(existing_client, httpx.Client):
+            print(f"\nverify:{existing_client._transport._pool._ssl_context.verify_mode != ssl.CERT_NONE}")
+            response = existing_client.request(
                 method="POST",
                 url=f"{self._base_url}/api/token/refresh/",
                 json={"refresh": self._api_key},
                 headers={"Content-Type": "application/json"},
             )
+        else:
+            # If an async client was used, get all parameters from the client to init a new sync client
+            client_params = self._get_client_params(existing_client)
+
+            with httpx.Client(**client_params) as sync_client:
+                response = sync_client.request(
+                    method="POST",
+                    url=f"{self._base_url}/api/token/refresh/",
+                    json={"refresh": self._api_key},
+                    headers={"Content-Type": "application/json"},
+                )
             
-            if response.status_code == 200:
-                return AccessTokenResponse.parse_obj(response.json())
-            else:
-                raise ApiError(status_code=response.status_code, body=response.json())
+        if response.status_code == 200:
+            return AccessTokenResponse.parse_obj(response.json())
+        else:
+            raise ApiError(status_code=response.status_code, body=response.json())