karrio-sapient 2025.5.4__py3-none-any.whl → 2025.5.6__py3-none-any.whl

karrio/providers/sapient/utils.py

@@ -1,8 +1,8 @@
-import base64
 import datetime
 import karrio.lib as lib
 import karrio.core as core
 import karrio.core.errors as errors
+import karrio.core.models as models
 
 
 SapientCarrierCode = lib.units.create_enum(
@@ -46,30 +46,18 @@ class Settings(core.Settings):
             option_type=ConnectionConfig,
         )
 
-    """uncomment the following code block to implement the oauth login."""
-
     @property
     def access_token(self):
         """Retrieve the access_token using the client_id|client_secret pair
         or collect it from the cache if an unexpired access_token exist.
         """
         cache_key = f"{self.carrier_name}|{self.client_id}|{self.client_secret}"
-        now = datetime.datetime.now() + datetime.timedelta(minutes=30)
-
-        auth = self.connection_cache.get(cache_key) or {}
-        token = auth.get("access_token")
-        expiry = lib.to_date(auth.get("expiry"), current_format="%Y-%m-%d %H:%M:%S")
-
-        if token is not None and expiry is not None and expiry > now:
-            return token
-
-        self.connection_cache.set(cache_key, lambda: login(self))
-        new_auth = self.connection_cache.get(cache_key)
-
-        return new_auth["access_token"]
 
-
-"""uncomment the following code block to implement the oauth login."""
+        return self.connection_cache.thread_safe(
+            refresh_func=lambda: login(self),
+            cache_key=cache_key,
+            buffer_minutes=30,
+        ).get_state()
 
 
 def login(settings: Settings):
@@ -100,11 +88,37 @@ def login(settings: Settings):
     if not response and isinstance(result, str):
         response = {"error": result}
 
+    # Handle OAuth error response format (error, error_description)
+    if "error" in response:
+        raise errors.ParsedMessagesError(
+            messages=[
+                models.Message(
+                    carrier_name=settings.carrier_name,
+                    carrier_id=settings.carrier_id,
+                    message=response.get("error_description", response.get("error")),
+                    code=response.get("error", "AUTH_ERROR"),
+                )
+            ]
+        )
+
     messages = error.parse_error_response(response, settings)
 
     if any(messages):
         raise errors.ParsedMessagesError(messages)
 
+    # Validate that access_token is present in the response
+    if "access_token" not in response:
+        raise errors.ParsedMessagesError(
+            messages=[
+                models.Message(
+                    carrier_name=settings.carrier_name,
+                    carrier_id=settings.carrier_id,
+                    message="Authentication failed: No access token received",
+                    code="AUTH_ERROR",
+                )
+            ]
+        )
+
     expiry = datetime.datetime.now() + datetime.timedelta(
         seconds=float(response.get("expires_in", 0))
     )

{karrio_sapient-2025.5.4.dist-info → karrio_sapient-2025.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_sapient
-Version: 2025.5.4
+Version: 2025.5.6
 Summary: Karrio - SAPIENT Shipping Extension
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_sapient-2025.5.4.dist-info → karrio_sapient-2025.5.6.dist-info}/RECORD

@@ -6,7 +6,7 @@ karrio/plugins/sapient/__init__.py,sha256=_4xkqTPpUoq8KixCdNqNxcMVH52s5xH6L-s9c5
 karrio/providers/sapient/__init__.py,sha256=Zu7FIaPsCzXgIsrmEtluHQJSj3UnFDpz-oiB93P-xK0,476
 karrio/providers/sapient/error.py,sha256=hkpy86gWOjKLNhtmBoe7NkHq330kRqrtgDxsspLaxGQ,870
 karrio/providers/sapient/units.py,sha256=ZUGl0IVKOA8vLVRWJGY2X9JBOR8H5OBr9s17Fx22EcM,34880
-karrio/providers/sapient/utils.py,sha256=RJSzGtiGd2YtLgvibD3kQh1toUeEvVyzGnBB_QmsFL8,4217
+karrio/providers/sapient/utils.py,sha256=4lRjA5gDiHwJjadHfTeE5eP64g-rkbBhKwjyUnSRx90,4714
 karrio/providers/sapient/pickup/__init__.py,sha256=qT64wGr8J6pkLNa9Y0Zou5mYshoI7W-R0Pp7nWEhQ08,296
 karrio/providers/sapient/pickup/cancel.py,sha256=0laDCfdhjOYHpOEN7l6u1o79nexaxT8GXMM5pJU3Xow,1763
 karrio/providers/sapient/pickup/create.py,sha256=5S-h9qQuDFqxvqrmd2l0-SGQMi86O38sfjfqRVPGgo8,2776
@@ -20,8 +20,8 @@ karrio/schemas/sapient/pickup_request.py,sha256=gzZZ3Bxr_pYWxw28vDRr-aDgtzJIQptU
 karrio/schemas/sapient/pickup_response.py,sha256=xcl3ofB2L2RNksMSRccvFbBdBcK1hVDDPVB-oAu4I54,195
 karrio/schemas/sapient/shipment_requests.py,sha256=3sjensnLiiF7mTIpwS4FyrdEe-xMh5YC1ekj69qI6XM,4618
 karrio/schemas/sapient/shipment_response.py,sha256=457ULt-exxAJ0Drqn2Pnj9pl_4JWMZ-cesuJW9NWBAs,702
-karrio_sapient-2025.5.4.dist-info/METADATA,sha256=kFIUSw_cDX0insdL2kmf7R5hEjLRPiLFL8xWympMzcA,989
-karrio_sapient-2025.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_sapient-2025.5.4.dist-info/entry_points.txt,sha256=rPF-WjVKk-3suhX4-zi9hTkwr0Qxb4ZW-Tjoyzi_Cy8,59
-karrio_sapient-2025.5.4.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_sapient-2025.5.4.dist-info/RECORD,,
+karrio_sapient-2025.5.6.dist-info/METADATA,sha256=UFu6NreHdhZf3kEKtMehUsJqJ_4TPhKdTLrtFl9KghE,989
+karrio_sapient-2025.5.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_sapient-2025.5.6.dist-info/entry_points.txt,sha256=rPF-WjVKk-3suhX4-zi9hTkwr0Qxb4ZW-Tjoyzi_Cy8,59
+karrio_sapient-2025.5.6.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_sapient-2025.5.6.dist-info/RECORD,,