karrio-eshipper 2025.5.4__py3-none-any.whl → 2025.5.5__py3-none-any.whl

karrio/providers/eshipper/utils.py

@@ -2,6 +2,7 @@ import datetime
 import karrio.lib as lib
 import karrio.core as core
 import karrio.core.errors as errors
+import karrio.core.models as models
 
 
 class Settings(core.Settings):
@@ -26,19 +27,13 @@ class Settings(core.Settings):
         or collect it from the cache if an unexpired "token" exist.
         """
         cache_key = f"{self.carrier_name}|{self.principal}|{self.credential}"
-        now = datetime.datetime.now() + datetime.timedelta(minutes=30)
 
-        auth = self.connection_cache.get(cache_key) or {}
-        token = auth.get("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["token"]
+        return self.connection_cache.thread_safe(
+            refresh_func=lambda: login(self),
+            cache_key=cache_key,
+            buffer_minutes=30,
+            token_field="token",
+        ).get_state()
 
 
 def login(settings: Settings):
@@ -70,6 +65,19 @@ def login(settings: Settings):
     if any(messages):
         raise errors.ParsedMessagesError(messages=messages)
 
+    # Validate that token is present in the response
+    if "token" not in response:
+        raise errors.ParsedMessagesError(
+            messages=[
+                models.Message(
+                    carrier_name=settings.carrier_name,
+                    carrier_id=settings.carrier_id,
+                    message="Authentication failed: No token received",
+                    code="AUTH_ERROR",
+                )
+            ]
+        )
+
     expiry = datetime.datetime.now() + datetime.timedelta(
         seconds=float(response.get("expires_in", 0))
     )

{karrio_eshipper-2025.5.4.dist-info → karrio_eshipper-2025.5.5.dist-info}/METADATA

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

{karrio_eshipper-2025.5.4.dist-info → karrio_eshipper-2025.5.5.dist-info}/RECORD

@@ -9,7 +9,7 @@ karrio/providers/eshipper/metadata.json,sha256=KBae69ntmCIkZ0dKrAX0vjkm1CyE9UwvI
 karrio/providers/eshipper/rate.py,sha256=r0OTKeXFXmaWdi7XcNDNQ0wL5R1idQAnNhMtXTRfpPM,7184
 karrio/providers/eshipper/tracking.py,sha256=46DVFj8iMLWSsi0f5irTzFpH0uArZtya4eyYh5LkdFQ,2452
 karrio/providers/eshipper/units.py,sha256=CTi0NbWEpVc-GwPEKrtGVR7VEEV9Ij0odaQTUacwgyc,9658
-karrio/providers/eshipper/utils.py,sha256=kvFkCL1aSAn8gAp3GbKuyPoz0ceVwvsJ0FfgRbjJ0Kw,2187
+karrio/providers/eshipper/utils.py,sha256=0Ok4BNFe4KoNNtCNjp6FLUfR8iwfuaMSh_jZRsPK4KE,2381
 karrio/providers/eshipper/shipment/__init__.py,sha256=oPCX3bykNDVeczan1tbmSpuOtFYTtd6h8J9otYVDQqQ,233
 karrio/providers/eshipper/shipment/cancel.py,sha256=vdxMmK7AmI-xOn62NlaMzCCKQ8CBql8QBVPft0VQWn0,1317
 karrio/providers/eshipper/shipment/create.py,sha256=jL4RWdtYOmpofcGVYn-7l2rstMvXK-DKoIAe_TjCBkY,11632
@@ -26,8 +26,8 @@ karrio/schemas/eshipper/shipping_request.py,sha256=OrqSutwyzTj-iau3LDPJUEGBRzzV9
 karrio/schemas/eshipper/shipping_response.py,sha256=RdMXh9goyTrH2qdU_5KMDIAWAEDzMchy_e5f45k-zxs,3892
 karrio/schemas/eshipper/tracking_request.py,sha256=EAE7PJFp2rTYCXMQJ6Kg-hMs3vL-GSTFjhHvzSmMzPg,252
 karrio/schemas/eshipper/tracking_response.py,sha256=2m9doy3y5f6zdA-gbNfsw8rp0oqs3eYrgw8Por_1fjE,2219
-karrio_eshipper-2025.5.4.dist-info/METADATA,sha256=fGqds_j7brnLsox7GBd-5imT0as1C2tewcVpnoU_Inc,997
-karrio_eshipper-2025.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_eshipper-2025.5.4.dist-info/entry_points.txt,sha256=u9RQVmPE2uC3-aL85DnlIHdsHAWYkOnwTAfJvi2--DY,61
-karrio_eshipper-2025.5.4.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_eshipper-2025.5.4.dist-info/RECORD,,
+karrio_eshipper-2025.5.5.dist-info/METADATA,sha256=E87qoZTFew46VEoaeEAmfLUjq8hGN2FCHAEcn4qzIOk,997
+karrio_eshipper-2025.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_eshipper-2025.5.5.dist-info/entry_points.txt,sha256=u9RQVmPE2uC3-aL85DnlIHdsHAWYkOnwTAfJvi2--DY,61
+karrio_eshipper-2025.5.5.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_eshipper-2025.5.5.dist-info/RECORD,,