karrio-sapient 2025.5.5__py3-none-any.whl → 2025.5.7__py3-none-any.whl

karrio/mappers/sapient/proxy.py

@@ -1,8 +1,10 @@
 """Karrio SAPIENT client proxy."""
 
+import datetime
 import karrio.lib as lib
 import karrio.api.proxy as proxy
-import karrio.providers.sapient.utils as provider_utils
+import karrio.core.errors as errors
+import karrio.providers.sapient.error as provider_error
 import karrio.mappers.sapient.settings as provider_settings
 import karrio.universal.mappers.rating_proxy as rating_proxy
 
@@ -10,10 +12,55 @@ import karrio.universal.mappers.rating_proxy as rating_proxy
 class Proxy(rating_proxy.RatingMixinProxy, proxy.Proxy):
     settings: provider_settings.Settings
 
+    def authenticate(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        """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.settings.carrier_name}|{self.settings.client_id}|{self.settings.client_secret}"
+        )
+
+        def get_token():
+            response = lib.request(
+                url=f"https://authentication.intersoftsapient.net/connect/token",
+                method="POST",
+                headers={
+                    "content-Type": "application/x-www-form-urlencoded",
+                    "user-agent": "Karrio/1.0",
+                },
+                data=lib.to_query_string(
+                    dict(
+                        grant_type="client_credentials",
+                        client_id=self.settings.client_id,
+                        client_secret=self.settings.client_secret,
+                    )
+                ),
+                decoder=lib.to_dict,
+                max_retries=2,
+            )
+
+            messages = provider_error.parse_error_response(response, self.settings)
+            if any(messages):
+                raise errors.ParsedMessagesError(messages)
+
+            expiry = datetime.datetime.now() + datetime.timedelta(
+                seconds=float(response.get("expires_in", 0))
+            )
+            return {**response, "expiry": lib.fdatetime(expiry)}
+
+        token = self.settings.connection_cache.thread_safe(
+            refresh_func=get_token,
+            cache_key=cache_key,
+            buffer_minutes=10,
+        )
+
+        return lib.Deserializable(token.get_state())
+
     def get_rates(self, request: lib.Serializable) -> lib.Deserializable[str]:
         return super().get_rates(request)
 
     def create_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate(request).deserialize()
         response = lib.request(
             url=f"{self.settings.server_url}/v4/shipments/{request.ctx['carrier_code']}",
             data=lib.to_json(request.serialize()),
@@ -21,15 +68,17 @@ class Proxy(rating_proxy.RatingMixinProxy, proxy.Proxy):
             method="POST",
             headers={
                 "Content-Type": "application/json",
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "user-agent": "Karrio/1.0",
             },
-            on_error=provider_utils.parse_error_response,
+            decoder=lib.to_dict_safe,
+            on_error=lambda b: lib.to_dict_safe(b.read()),
         )
 
         return lib.Deserializable(response, lib.to_dict, request.ctx)
 
     def cancel_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate(request).deserialize()
         response = lib.request(
             url=f"{self.settings.server_url}/v4/shipments/status",
             data=lib.to_json(request.serialize()),
@@ -37,16 +86,18 @@ class Proxy(rating_proxy.RatingMixinProxy, proxy.Proxy):
             method="PUT",
             headers={
                 "Content-Type": "application/json",
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "user-agent": "Karrio/1.0",
             },
             on_ok=lambda _: '{"ok": true}',
-            on_error=provider_utils.parse_error_response,
+            decoder=lib.to_dict_safe,
+            on_error=lambda b: lib.to_dict_safe(b.read()),
         )
 
         return lib.Deserializable(response, lib.to_dict)
 
     def schedule_pickup(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate(request).deserialize()
         response = lib.request(
             url=f"{self.settings.server_url}/v4/collections/{request.ctx['carrier_code']}/{request.ctx['shipmentId']}",
             data=lib.to_json(request.serialize()),
@@ -54,10 +105,11 @@ class Proxy(rating_proxy.RatingMixinProxy, proxy.Proxy):
             method="POST",
             headers={
                 "Content-Type": "application/json",
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "user-agent": "Karrio/1.0",
             },
-            on_error=provider_utils.parse_error_response,
+            decoder=lib.to_dict_safe,
+            on_error=lambda b: lib.to_dict_safe(b.read()),
         )
 
         return lib.Deserializable(response, lib.to_dict, request.ctx)
@@ -65,12 +117,13 @@ class Proxy(rating_proxy.RatingMixinProxy, proxy.Proxy):
     def modify_pickup(self, request: lib.Serializable) -> lib.Deserializable[str]:
         response = self.cancel_pickup(lib.Serializable(request.ctx))
 
-        if response.deserialize()["ok"]:
+        if response.deserialize().get("ok"):
             response = self.schedule_pickup(request)
 
         return lib.Deserializable(response, lib.to_dict, request.ctx)
 
     def cancel_pickup(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate(request).deserialize()
         payload = request.serialize()
         response = lib.request(
             url=f"{self.settings.server_url}/v4/collections/{payload['carrier_code']}/{payload['shipmentId']}/cancel",
@@ -78,10 +131,11 @@ class Proxy(rating_proxy.RatingMixinProxy, proxy.Proxy):
             method="PUT",
             headers={
                 "Content-Type": "application/json",
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "user-agent": "Karrio/1.0",
             },
-            on_error=provider_utils.parse_error_response,
+            decoder=lib.to_dict_safe,
+            on_error=lambda b: lib.to_dict_safe(b.read()),
         )
 
         return lib.Deserializable(response, lib.to_dict)

karrio/providers/sapient/utils.py

@@ -1,8 +1,5 @@
-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,100 +43,8 @@ class Settings(core.Settings):
             option_type=ConnectionConfig,
         )
 
-    @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}"
-
-        return self.connection_cache.thread_safe(
-            refresh_func=lambda: login(self),
-            cache_key=cache_key,
-            buffer_minutes=30,
-        ).get_state()
-
-
-def login(settings: Settings):
-    import karrio.providers.sapient.error as error
-
-    result = lib.request(
-        url=f"https://authentication.intersoftsapient.net/connect/token",
-        method="POST",
-        headers={
-            "content-Type": "application/x-www-form-urlencoded",
-            "user-agent": "Karrio/1.0",
-        },
-        data=lib.to_query_string(
-            dict(
-                grant_type="client_credentials",
-                client_id=settings.client_id,
-                client_secret=settings.client_secret,
-            )
-        ),
-        on_error=parse_error_response,
-    )
-
-    # Handle case where result is a plain string (error response)
-    # instead of JSON - parse_error_response may return non-JSON strings
-    response = lib.failsafe(lambda: lib.to_dict(result)) or {}
-
-    # If we couldn't parse as JSON, treat the result as an error message
-    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))
-    )
-    return {**response, "expiry": lib.fdatetime(expiry)}
-
 
 class ConnectionConfig(lib.Enum):
     service_level = lib.OptionEnum("service_level", str)
     shipping_options = lib.OptionEnum("shipping_options", list)
     shipping_services = lib.OptionEnum("shipping_services", list)
-
-
-def parse_error_response(response):
-    """Parse the error response from the SAPIENT API."""
-    content = lib.failsafe(lambda: lib.decode(response.read()))
-
-    # If we have content, try to return it as-is (likely already JSON string)
-    if any(content or ""):
-        return content
-
-    # If no content, create a JSON error object
-    return lib.to_json(
-        dict(Errors=[dict(ErrorCode=str(response.code), Message=response.reason)])
-    )

{karrio_sapient-2025.5.5.dist-info → karrio_sapient-2025.5.7.dist-info}/METADATA

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

{karrio_sapient-2025.5.5.dist-info → karrio_sapient-2025.5.7.dist-info}/RECORD

@@ -1,12 +1,12 @@
 karrio/mappers/sapient/__init__.py,sha256=I4fWpxOlRnfyBNjL0LxvQlpwOk2sjrZhgtCO2XvSJVk,149
 karrio/mappers/sapient/mapper.py,sha256=BDU1L2QW1W-0e8eYcgSf-eLkj5o7SS4kje-WObnZSUg,2866
-karrio/mappers/sapient/proxy.py,sha256=vzfErbI6i5_uVA5UUIjCyKpxNeZu6eupDpSkvQT-P9E,3537
+karrio/mappers/sapient/proxy.py,sha256=bhgLAYElw7JfC_t5-Vin_KG1OyNe7nZRjHJ-YsivcBU,5647
 karrio/mappers/sapient/settings.py,sha256=a5xE-umxBbP1sHaN6SKkbt-ftsmx9pnWkMEUIeAhVLY,1095
 karrio/plugins/sapient/__init__.py,sha256=_4xkqTPpUoq8KixCdNqNxcMVH52s5xH6L-s9c5fongE,537
 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=4lRjA5gDiHwJjadHfTeE5eP64g-rkbBhKwjyUnSRx90,4714
+karrio/providers/sapient/utils.py,sha256=ZY35pktirmkkwsKBgK8TbK4mrmbAfae5GuPLO3T8nvc,1462
 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.5.dist-info/METADATA,sha256=Mz9p5aPk8dAhO-kifzkl47s7OfKJGfzVmKLjcYoG65Y,989
-karrio_sapient-2025.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_sapient-2025.5.5.dist-info/entry_points.txt,sha256=rPF-WjVKk-3suhX4-zi9hTkwr0Qxb4ZW-Tjoyzi_Cy8,59
-karrio_sapient-2025.5.5.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_sapient-2025.5.5.dist-info/RECORD,,
+karrio_sapient-2025.5.7.dist-info/METADATA,sha256=i1dcTyHN19IuI37aZxemo2FkSzoCeJwxL_ecT5DZxG8,989
+karrio_sapient-2025.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_sapient-2025.5.7.dist-info/entry_points.txt,sha256=rPF-WjVKk-3suhX4-zi9hTkwr0Qxb4ZW-Tjoyzi_Cy8,59
+karrio_sapient-2025.5.7.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_sapient-2025.5.7.dist-info/RECORD,,