arkindex-client 1.0.11__tar.gz → 1.0.12__tar.gz

{arkindex-client-1.0.11 → arkindex-client-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-client
-Version: 1.0.11
+Version: 1.0.12
 Summary: API client for the Arkindex project
 Home-page: https://gitlab.com/teklia/arkindex/api-client
 Author: Teklia <contact@teklia.com>

arkindex-client-1.0.12/VERSION

@@ -0,0 +1 @@
+1.0.12

{arkindex-client-1.0.11 → arkindex-client-1.0.12}/arkindex/client.py

@@ -32,9 +32,18 @@ def options_from_env():
     Get API client keyword arguments from environment variables.
     """
     options = {}
-    if "ARKINDEX_API_TOKEN" in os.environ:
+    # ARKINDEX_TASK_TOKEN takes priority over ARKINDEX_API_TOKEN
+    if "ARKINDEX_TASK_TOKEN" in os.environ:
+        options["auth_scheme"] = "Ponos"
+        options["token"] = os.environ.get("ARKINDEX_TASK_TOKEN")
+    elif "ARKINDEX_API_TOKEN" in os.environ:
+        options["auth_scheme"] = "Token"
         options["token"] = os.environ.get("ARKINDEX_API_TOKEN")
 
+    # Allow overriding the default auth schemes
+    if "ARKINDEX_API_AUTH_SCHEME" in os.environ:
+        options["auth_scheme"] = os.environ.get("ARKINDEX_API_AUTH_SCHEME")
+
     if "ARKINDEX_API_URL" in os.environ:
         options["base_url"] = os.environ.get("ARKINDEX_API_URL")
 
@@ -63,6 +72,7 @@ class ArkindexClient(apistar.Client):
     def __init__(
         self,
         token=None,
+        auth_scheme="Token",
         base_url=DEFAULT_BASE_URL,
         schema_url=None,
         csrf_cookie=None,
@@ -139,7 +149,11 @@ class ArkindexClient(apistar.Client):
             csrf_cookie = csrf_cookies.get(split_base_url.netloc) or "arkindex.csrf"
 
         self.configure(
-            token=token, base_url=base_url, csrf_cookie=csrf_cookie, sleep=sleep
+            token=token,
+            auth_scheme=auth_scheme,
+            base_url=base_url,
+            csrf_cookie=csrf_cookie,
+            sleep=sleep,
         )
 
     def __repr__(self):
@@ -151,12 +165,25 @@ class ArkindexClient(apistar.Client):
     def init_transport(self, *args, **kwargs):
         return ArkindexHTTPTransport(*args, **kwargs)
 
-    def configure(self, token=None, base_url=None, csrf_cookie=None, sleep=None):
+    def configure(
+        self,
+        token=None,
+        auth_scheme="Token",
+        base_url=None,
+        csrf_cookie=None,
+        sleep=None,
+    ):
         """
         Reconfigure the API client.
 
         :param token: An API token to use. If omitted, access is restricted to public endpoints.
         :type token: str or None
+        :param auth_scheme:
+           An authentication scheme to use. This is added in the HTTP header before the token:
+           ``Authorization: [scheme] [token]``.
+           This should use ``Token`` to authenticate as a regular user and ``Ponos`` to authenticate as a Ponos task.
+           If omitted, this defaults to ``Token``.
+        :type auth_scheme: str or None
         :param base_url: A custom base URL for the client. If omitted, defaults to the Arkindex main server.
         :type base_url: str or None
         :param csrf_cookie: Use a custom CSRF cookie name. Falls back to ``arkindex.csrf``.
@@ -167,7 +194,9 @@ class ArkindexClient(apistar.Client):
         if not csrf_cookie:
             csrf_cookie = "arkindex.csrf"
         self.transport.session.auth = TokenSessionAuthentication(
-            token, csrf_cookie_name=csrf_cookie
+            token,
+            csrf_cookie_name=csrf_cookie,
+            scheme=auth_scheme,
         )
 
         if not sleep or not isinstance(sleep, float) or sleep < 0:
@@ -200,6 +229,7 @@ class ArkindexClient(apistar.Client):
         """
         resp = self.request("Login", body={"email": email, "password": password})
         if "auth_token" in resp:
+            self.transport.session.auth.scheme = "Token"
             self.transport.session.auth.token = resp["auth_token"]
         return resp
 

{arkindex-client-1.0.11 → arkindex-client-1.0.12}/arkindex_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-client
-Version: 1.0.11
+Version: 1.0.12
 Summary: API client for the Arkindex project
 Home-page: https://gitlab.com/teklia/arkindex/api-client
 Author: Teklia <contact@teklia.com>

arkindex-client-1.0.11/VERSION

@@ -1 +0,0 @@
-1.0.11