nextlayer-sdk-python 1.1.0__tar.gz → 1.2.1__tar.gz

{nextlayer_sdk_python-1.1.0 → nextlayer_sdk_python-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextlayer-sdk-python
-Version: 1.1.0
+Version: 1.2.1
 Summary: Client utilities to interact with next layer public APIs
 Author: Wolfgang Powisch
 Author-email: wolfgang.powisch@nextlayer.at

{nextlayer_sdk_python-1.1.0 → nextlayer_sdk_python-1.2.1}/pyproject.toml

@@ -3,7 +3,7 @@ name = "nextlayer-sdk-python"
 packages = [
     { include = "nextlayer", from="src" }
 ]
-version = "v1.1.0"
+version = "1.2.1"
 description = "Client utilities to interact with next layer public APIs"
 readme = "README.md"
 authors = ["Wolfgang Powisch <wolfgang.powisch@nextlayer.at>"]

{nextlayer_sdk_python-1.1.0 → nextlayer_sdk_python-1.2.1}/src/nextlayer/sdk/__init__.py

@@ -1,2 +1,2 @@
 # do not edit this version line, it will be updated in CI-Pipeline!
-__version__ = "v1.1.0"
+__version__ = "v1.2.1"

{nextlayer_sdk_python-1.1.0 → nextlayer_sdk_python-1.2.1}/src/nextlayer/sdk/auth.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import asyncio
 import datetime
 import getpass
 import json
@@ -160,6 +161,13 @@ class NlAuth(object):
             verify=True,
         )
 
+        # shared by NlHttpxAuth.async_auth_flow() so that multiple async Auth
+        # wrappers around the same NlAuth instance (e.g. one per API client,
+        # all backed by one shared NlAuth singleton) serialize their
+        # get_access_token() calls instead of racing concurrent
+        # do_refresh()/do_login() calls against Keycloak.
+        self.async_lock = asyncio.Lock()
+
     def token_expired(self) -> bool:
         now = int(time.time())
         exp_at = self.store.config.expires_at

nextlayer_sdk_python-1.2.1/src/nextlayer/sdk/auth_httpx.py

@@ -0,0 +1,37 @@
+import asyncio
+from typing import AsyncGenerator, Generator
+
+import httpx
+
+from .auth import NlAuth
+
+
+class NlHttpxAuth(httpx.Auth):
+    def __init__(self, *args, **kwargs):
+        if len(args) == 1 and len(kwargs) == 0 and isinstance(args[0], NlAuth):
+            # pass an existing NlAuth instance directly
+            self.nlauth = args[0]
+        else:
+            # pass all arguments to NlAuth constructor and create NlAuth instance internally
+            self.nlauth = NlAuth(*args, **kwargs)
+
+    def auth_flow(
+        self, request: httpx.Request
+    ) -> Generator[httpx.Request, httpx.Response, None]:
+        request.headers["Authorization"] = "Bearer " + self.nlauth.get_access_token()
+        yield request
+
+    async def async_auth_flow(
+        self, request: httpx.Request
+    ) -> AsyncGenerator[httpx.Request, httpx.Response]:
+        # NlAuth.get_access_token() does blocking file I/O and, on refresh/login,
+        # a blocking HTTP call to Keycloak - offload it so it doesn't stall the
+        # event loop. The lock lives on the NlAuth instance (not here) so that
+        # multiple NlHttpxAuth wrappers sharing one NlAuth (e.g. one per API
+        # client, backed by a shared NlAuth singleton) also share the lock -
+        # otherwise they could still race concurrent refresh/login calls
+        # against Keycloak, which the lock is meant to prevent.
+        async with self.nlauth.async_lock:
+            access_token = await asyncio.to_thread(self.nlauth.get_access_token)
+        request.headers["Authorization"] = "Bearer " + access_token
+        yield request

nextlayer_sdk_python-1.1.0/src/nextlayer/sdk/auth_httpx.py

@@ -1,21 +0,0 @@
-from typing import Generator
-
-import httpx
-
-from .auth import NlAuth
-
-
-class NlHttpxAuth(httpx.Auth):
-    def __init__(self, *args, **kwargs):
-        if len(args) == 1 and len(kwargs) == 0 and isinstance(args[0], NlAuth):
-            # pass an existing NlAuth instance directly
-            self.nlauth = args[0]
-        else:
-            # pass all arguments to NlAuth constructor and create NlAuth instance internally
-            self.nlauth = NlAuth(*args, **kwargs)
-
-    def auth_flow(
-        self, request: httpx.Request
-    ) -> Generator[httpx.Request, httpx.Response, None]:
-        request.headers["Authorization"] = "Bearer " + self.nlauth.get_access_token()
-        yield request