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

karrio/mappers/easyship/proxy.py

@@ -8,14 +8,23 @@ import karrio.mappers.easyship.settings as provider_settings
 class Proxy(proxy.Proxy):
     settings: provider_settings.Settings
 
+    def authenticate(self, _=None) -> lib.Deserializable[str]:
+        """Return the access_token for API authentication.
+
+        Easyship uses a direct access token (no OAuth flow required).
+        This method provides a consistent interface with other carriers.
+        """
+        return lib.Deserializable(self.settings.access_token)
+
     def get_rates(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate().deserialize()
         response = lib.request(
             url=f"{self.settings.server_url}/2023-01/rates",
             data=lib.to_json(request.serialize()),
             trace=self.trace_as("json"),
             method="POST",
             headers={
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "Content-Type": "application/json",
                 "user-agent": "app/1.0",
             },
@@ -24,29 +33,32 @@ class Proxy(proxy.Proxy):
         return lib.Deserializable(response, lib.to_dict)
 
     def create_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
-        # create shipment
+        access_token = self.authenticate().deserialize()
+        # create shipment with retry for transient failures (e.g., Cloudflare 522 timeouts)
         response = lib.request(
             url=f"{self.settings.server_url}/2023-01/shipments",
             data=lib.to_json(request.serialize()),
             trace=self.trace_as("json"),
             method="POST",
             headers={
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "Content-Type": "application/json",
                 "user-agent": "app/1.0",
             },
+            max_retries=2,
         )
 
-        return lib.Deserializable(response, lib.to_dict, request.ctx)
+        return lib.Deserializable(response, lib.to_dict_safe, request.ctx)
 
     def cancel_shipment(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate().deserialize()
         easyship_shipment_id = request.serialize().get("easyship_shipment_id")
         response = lib.request(
             url=f"{self.settings.server_url}/2023-01/shipments/{easyship_shipment_id}/cancel",
             trace=self.trace_as("json"),
             method="POST",
             headers={
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "Content-Type": "application/json",
                 "user-agent": "app/1.0",
             },
@@ -55,6 +67,7 @@ class Proxy(proxy.Proxy):
         return lib.Deserializable(response, lib.to_dict)
 
     def get_tracking(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate().deserialize()
         responses = lib.run_asynchronously(
             lambda data: (
                 data["shipment_id"],
@@ -63,7 +76,7 @@ class Proxy(proxy.Proxy):
                     trace=self.trace_as("json"),
                     method="GET",
                     headers={
-                        "Authorization": f"Bearer {self.settings.access_token}",
+                        "Authorization": f"Bearer {access_token}",
                         "Content-Type": "application/json",
                         "user-agent": "app/1.0",
                     },
@@ -78,13 +91,14 @@ class Proxy(proxy.Proxy):
         )
 
     def schedule_pickup(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate().deserialize()
         response = lib.request(
             url=f"{self.settings.server_url}/2023-01/pickups",
             data=lib.to_json(request.serialize()),
             trace=self.trace_as("json"),
             method="POST",
             headers={
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "Content-Type": "application/json",
                 "user-agent": "app/1.0",
             },
@@ -101,13 +115,14 @@ class Proxy(proxy.Proxy):
         return lib.Deserializable(response, lib.to_dict, request.ctx)
 
     def cancel_pickup(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate().deserialize()
         easyship_pickup_id = request.serialize().get("easyship_pickup_id")
         response = lib.request(
             url=f"{self.settings.server_url}/2023-01/pickups/{easyship_pickup_id}/cancel",
             trace=self.trace_as("json"),
             method="POST",
             headers={
-                "Authorization": f"Bearer {self.settings.access_token}",
+                "Authorization": f"Bearer {access_token}",
                 "Content-Type": "application/json",
                 "user-agent": "app/1.0",
             },
@@ -116,6 +131,7 @@ class Proxy(proxy.Proxy):
         return lib.Deserializable(response, lib.to_dict)
 
     def create_manifest(self, request: lib.Serializable) -> lib.Deserializable[str]:
+        access_token = self.authenticate().deserialize()
         # create manifest
         response = lib.to_dict(
             lib.request(
@@ -124,7 +140,7 @@ class Proxy(proxy.Proxy):
                 trace=self.trace_as("json"),
                 method="POST",
                 headers={
-                    "Authorization": f"Bearer {self.settings.access_token}",
+                    "Authorization": f"Bearer {access_token}",
                     "Content-Type": "application/json",
                     "user-agent": "app/1.0",
                 },
@@ -143,7 +159,7 @@ class Proxy(proxy.Proxy):
                     url=manifest_url,
                     method="GET",
                     headers={
-                        "Authorization": f"Bearer {self.settings.access_token}",
+                        "Authorization": f"Bearer {access_token}",
                         "origin": "http://localhost:5002",
                         "user-agent": "app/1.0",
                     },

karrio/providers/easyship/tracking.py

@@ -62,6 +62,23 @@ def _extract_details(
                 date=lib.ftime(details.updated_at, "%Y-%m-%dT%H:%M:%SZ"),
                 time=lib.ftime(details.updated_at, "%Y-%m-%dT%H:%M:%SZ"),
                 description="",
+                timestamp=lib.fiso_timestamp(details.updated_at, current_format="%Y-%m-%dT%H:%M:%SZ"),
+                status=next(
+                    (
+                        s.name
+                        for s in list(provider_units.TrackingStatus)
+                        if getattr(master, "tracking_state", None) in s.value
+                    ),
+                    None,
+                ),
+                reason=next(
+                    (
+                        r.name
+                        for r in list(provider_units.TrackingIncidentReason)
+                        if str(master.leg_number) in r.value
+                    ),
+                    None,
+                ),
             )
         ],
     )

karrio/providers/easyship/units.py

@@ -106,6 +106,14 @@ class TrackingStatus(lib.Enum):
     ready_for_pickup = ["ready_for_pickup"]
 
 
+class TrackingIncidentReason(lib.Enum):
+    """Maps Easyship exception codes to normalized TrackingIncidentReason."""
+    carrier_damaged_parcel = []
+    consignee_refused = []
+    consignee_not_home = []
+    unknown = []
+
+
 def to_service_code(service: typing.Dict[str, str]) -> str:
     return lib.to_slug(
         f'easyship_{to_carrier_code(service)}_{lib.to_snake_case(service["service_name"])}'

karrio/providers/easyship/utils.py

@@ -1,14 +1,10 @@
-import base64
-import datetime
 import karrio.lib as lib
 import karrio.core as core
-import karrio.core.errors as errors
 
 
 class Settings(core.Settings):
     """Easyship connection settings."""
 
-    # Add carrier specific api connection properties here
     access_token: str
 
     @property
@@ -19,17 +15,6 @@ class Settings(core.Settings):
     def server_url(self):
         return "https://api.easyship.com"
 
-    # """uncomment the following code block to expose a carrier tracking url."""
-    # @property
-    # def tracking_url(self):
-    #     return "https://www.carrier.com/tracking?tracking-id={}"
-
-    # """uncomment the following code block to implement the Basic auth."""
-    # @property
-    # def authorization(self):
-    #     pair = "%s:%s" % (self.username, self.password)
-    #     return base64.b64encode(pair.encode("utf-8")).decode("ascii")
-
     @property
     def connection_config(self) -> lib.units.Options:
         return lib.to_connection_config(
@@ -38,56 +23,6 @@ class Settings(core.Settings):
         )
 
 
-#     """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."""
-# def login(settings: Settings):
-#     import karrio.providers.easyship.error as error
-
-#     result = lib.request(
-#         url=f"{settings.server_url}/oauth/token",
-#         method="POST",
-#         headers={"content-Type": "application/x-www-form-urlencoded"},
-#         data=lib.to_query_string(
-#             dict(
-#                 grant_type="client_credentials",
-#                 client_id=settings.client_id,
-#                 client_secret=settings.client_secret,
-#             )
-#         ),
-#     )
-
-#     response = lib.to_dict(result)
-#     messages = error.parse_error_response(response, 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)}
-
-
 class ConnectionConfig(lib.Enum):
     """Carrier specific connection configs"""
 

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

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

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

@@ -1,6 +1,6 @@
 karrio/mappers/easyship/__init__.py,sha256=aLA1ENTKZ7CGHtXQ0t5BQYucVdOnKMDPKGrdRXWZyGw,151
 karrio/mappers/easyship/mapper.py,sha256=fLIBDvC8BkNAi2viZuuBy_zj1sjLSF7cEEbfxtXCz5E,3703
-karrio/mappers/easyship/proxy.py,sha256=xoaDjuuEW9kWsBVxBKr42g_jNv2K9l4zB2bOAE2DN_Y,5811
+karrio/mappers/easyship/proxy.py,sha256=UkI9TuvFQ5bN4XDVLd5fm8xkTPf8lRnNqDaMZw53fVE,6537
 karrio/mappers/easyship/settings.py,sha256=ghyujn4gy5XtjCggAI59tzEAHNX_GxA0RC2-vxxv_mo,489
 karrio/plugins/easyship/__init__.py,sha256=ENXQAYszRmxCvdVoY8EJtRAJBL0u31AlUhEmKD3Kpx0,543
 karrio/providers/easyship/__init__.py,sha256=dWvRdjJLzka87iVfszU3cWVDJJBQn2YKKrT7-rZjAAU,759
@@ -8,9 +8,9 @@ karrio/providers/easyship/error.py,sha256=sqp_d9TMhjB1dg6UxJ-cIi8QW1UMV2pI_Xp623
 karrio/providers/easyship/manifest.py,sha256=BoFk5beASPeIbdToB5yi_naVzUSTLcIB11rLBmgJ7kY,2243
 karrio/providers/easyship/metadata.json,sha256=EuukQpPGZST6ANmXCz5QqTYYAhFUxHvt3QAnxlrqyvk,229126
 karrio/providers/easyship/rate.py,sha256=PSKu8wDJH0i3xeUpk6OLmIe7Pyio6_i4tiXmP8ekqpk,9005
-karrio/providers/easyship/tracking.py,sha256=WdWLFmYYyQz9UYm3QDzSDsiw6aS_JVtS6uNV2oRmoBM,3532
-karrio/providers/easyship/units.py,sha256=52urzcBU0tEUiOFcfBPQnwnbNkRyeQNE3VtvKFWtKKo,4284
-karrio/providers/easyship/utils.py,sha256=v-H-rdbCnjV6qrxYtOZR3GT91dkGFFsQl7phgclakm4,3340
+karrio/providers/easyship/tracking.py,sha256=pQy4hNbOWfP-V4JXhwenMMofHRYq2totoM10O9Va4fs,4220
+karrio/providers/easyship/units.py,sha256=_O45dD2La7FYJdA6NA-o-h6svrt-RRxUASfgDlMGrTw,4508
+karrio/providers/easyship/utils.py,sha256=Sbthof9MMLjZoex3BYcztQ5RRlSuq6NAC18ro0x2KKI,906
 karrio/providers/easyship/pickup/__init__.py,sha256=vObZR6snWBhZb09L-klqUgNbb3Ib9g0NTSEQpF_T4mM,299
 karrio/providers/easyship/pickup/cancel.py,sha256=Kq6T0AvWjV1QSs43tbvRxiuJx0nP5v7cVa6Ls-0cQ1Y,1251
 karrio/providers/easyship/pickup/create.py,sha256=YX4pFPdZIgvIH5tB5SpcxiBo-4Rxp3c4msZKy-Ib_4E,3118
@@ -32,8 +32,8 @@ karrio/schemas/easyship/shipment_request.py,sha256=nowz5CWtxdZg4zb81a_QsrmEI0dEt
 karrio/schemas/easyship/shipment_response.py,sha256=9uJJs4xR0bLLz7vmZMCSaIyz59dBl4kvHjMKwVvLs7g,11002
 karrio/schemas/easyship/tracking_request.py,sha256=XQ735p0jyG46fzaNlSqb2Wu8Ral6UgID8HFM6fBQsPw,1620
 karrio/schemas/easyship/tracking_response.py,sha256=QwuvI_8-YQXo-2q6uMAJA5IQrgX2gfoPtg1TGBHoZA4,1830
-karrio_easyship-2025.5.5.dist-info/METADATA,sha256=rSDKnFwHwOGa2Yv6pKLP6GSI9r6cZiAvVOWHucV3QNk,997
-karrio_easyship-2025.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_easyship-2025.5.5.dist-info/entry_points.txt,sha256=fWVjIqvIorXvb1UVUMceu3i7pP0ba6gJnaZm7HLkZIY,61
-karrio_easyship-2025.5.5.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_easyship-2025.5.5.dist-info/RECORD,,
+karrio_easyship-2025.5.7.dist-info/METADATA,sha256=_40DRtWY4i2bKQvMSyd3ER7qGPLXxahPo9U9UM64-hI,997
+karrio_easyship-2025.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_easyship-2025.5.7.dist-info/entry_points.txt,sha256=fWVjIqvIorXvb1UVUMceu3i7pP0ba6gJnaZm7HLkZIY,61
+karrio_easyship-2025.5.7.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_easyship-2025.5.7.dist-info/RECORD,,