karrio-amazon-shipping 2025.5.5__py3-none-any.whl → 2025.5.7__py3-none-any.whl

karrio/mappers/amazon_shipping/proxy.py

@@ -1,12 +1,80 @@
 import typing
+import datetime
+import urllib.parse
 import karrio.lib as lib
 import karrio.api.proxy as proxy
+import karrio.core.errors as errors
+import karrio.core.models as models
+import karrio.providers.amazon_shipping.error as provider_error
 from karrio.mappers.amazon_shipping.settings import Settings
 
 
 class Proxy(proxy.Proxy):
     settings: Settings
 
+    def authenticate(self, _=None) -> lib.Deserializable[str]:
+        """Retrieve the access_token using the seller_id|developer_id pair
+        or collect it from the cache if an unexpired access_token exist.
+        """
+        cache_key = f"{self.settings.carrier_name}|{self.settings.seller_id}|{self.settings.developer_id}"
+
+        def get_token():
+            query = urllib.parse.urlencode(
+                dict(
+                    developerId=self.settings.developer_id,
+                    sellingPartnerId=self.settings.seller_id,
+                    mwsAuthToken=self.settings.mws_auth_token,
+                )
+            )
+            result = lib.request(
+                url=f"{self.settings.server_url}/authorization/v1/authorizationCode?{query}",
+                trace=self.settings.trace_as("json"),
+                method="POST",
+                headers={"content-Type": "application/json"},
+                max_retries=2,
+            )
+
+            response = lib.to_dict(result)
+            messages = provider_error.parse_error_response(response, self.settings)
+
+            if any(messages):
+                raise errors.ParsedMessagesError(messages)
+
+            # Validate that authorizationCode is present in the response payload
+            authorization_code = lib.failsafe(
+                lambda: response.get("payload", {}).get("authorizationCode")
+            )
+            if not authorization_code:
+                raise errors.ParsedMessagesError(
+                    messages=[
+                        models.Message(
+                            carrier_name=self.settings.carrier_name,
+                            carrier_id=self.settings.carrier_id,
+                            message="Authentication failed: No authorization code received",
+                            code="AUTH_ERROR",
+                        )
+                    ]
+                )
+
+            expiry = datetime.datetime.now() + datetime.timedelta(
+                seconds=float(response.get("expires_in", 0))
+            )
+
+            return {
+                **response,
+                "expiry": lib.fdatetime(expiry),
+                "authorizationCode": authorization_code,
+            }
+
+        token = self.settings.connection_cache.thread_safe(
+            refresh_func=get_token,
+            cache_key=cache_key,
+            buffer_minutes=30,
+            token_field="authorizationCode",
+        )
+
+        return lib.Deserializable(token.get_state())
+
     def get_rates(self, request: lib.Serializable) -> lib.Deserializable:
         response = self._send_request(
             path="/shipping/v1/rates",
@@ -31,11 +99,18 @@ class Proxy(proxy.Proxy):
         return lib.Deserializable(response if any(response) else "{}", lib.to_dict)
 
     def get_tracking(self, request: lib.Serializable) -> lib.Deserializable:
+        access_token = self.authenticate().deserialize()
+
         track = lambda trackingId: (
             trackingId,
-            self._send_request(
-                path=f"/shipping/v1/tracking/{trackingId}",
+            lib.request(
+                url=f"{self.settings.server_url}/shipping/v1/tracking/{trackingId}",
+                trace=self.trace_as("json"),
                 method="GET",
+                headers={
+                    "Content-Type": "application/json",
+                    "x-amz-access-token": access_token,
+                },
             ),
         )
 
@@ -50,6 +125,7 @@ class Proxy(proxy.Proxy):
     def _send_request(
         self, path: str, request: lib.Serializable = None, method: str = "POST"
     ) -> str:
+        access_token = self.authenticate().deserialize()
         data: dict = dict(data=request.serialize()) if request is not None else dict()
         return lib.request(
             **{
@@ -58,7 +134,7 @@ class Proxy(proxy.Proxy):
                 "method": method,
                 "headers": {
                     "Content-Type": "application/json",
-                    "x-amz-access-token": self.settings.access_token,
+                    "x-amz-access-token": access_token,
                 },
                 **data,
             }

karrio/providers/amazon_shipping/tracking.py

@@ -4,6 +4,7 @@ import karrio.lib as lib
 import karrio.core.models as models
 import karrio.providers.amazon_shipping.error as error
 import karrio.providers.amazon_shipping.utils as provider_utils
+import karrio.providers.amazon_shipping.units as provider_units
 
 
 def parse_tracking_response(
@@ -56,6 +57,23 @@ def _extract_details(
                     join=True,
                     separator=", ",
                 ),
+                timestamp=lib.fiso_timestamp(event.eventTime, current_format="%Y-%m-%dT%H:%M:%SZ"),
+                status=next(
+                    (
+                        s.name
+                        for s in list(provider_units.TrackingStatus)
+                        if event.eventCode in s.value
+                    ),
+                    None,
+                ),
+                reason=next(
+                    (
+                        r.name
+                        for r in list(provider_units.TrackingIncidentReason)
+                        if event.eventCode in r.value
+                    ),
+                    None,
+                ),
             )
             for event in details.eventHistory
         ],

karrio/providers/amazon_shipping/units.py

@@ -18,3 +18,19 @@ class Service(lib.StrEnum):
     amazon_shipping_ground = "Amazon Shipping Ground"
     amazon_shipping_standard = "Amazon Shipping Standard"
     amazon_shipping_premium = "Amazon Shipping Premium"
+
+
+class TrackingStatus(lib.Enum):
+    on_hold = []
+    delivered = ["Delivered"]
+    in_transit = []
+    delivery_failed = []
+    out_for_delivery = []
+
+
+class TrackingIncidentReason(lib.Enum):
+    """Maps Amazon Shipping exception codes to normalized TrackingIncidentReason."""
+    carrier_damaged_parcel = []
+    consignee_refused = []
+    consignee_not_home = []
+    unknown = []

karrio/providers/amazon_shipping/utils.py

@@ -1,9 +1,6 @@
-import datetime
-import urllib.parse
-import karrio.lib as lib
+"""Amazon Shipping connection settings."""
+
 import karrio.core as core
-import karrio.core.errors as errors
-import karrio.core.models as models
 
 
 class Settings(core.Settings):
@@ -38,66 +35,3 @@ class Settings(core.Settings):
     @property
     def carrier_name(self):
         return "amazon_shipping"
-
-    @property
-    def access_token(self):
-        """Retrieve the access_token using the seller_id|developer_id pair
-        or collect it from the cache if an unexpired access_token exist.
-        """
-        cache_key = f"{self.carrier_name}|{self.seller_id}|{self.developer_id}"
-
-        return self.connection_cache.thread_safe(
-            refresh_func=lambda: login(self),
-            cache_key=cache_key,
-            buffer_minutes=30,
-            token_field="authorizationCode",
-        ).get_state()
-
-
-def login(settings: Settings):
-    import karrio.providers.amazon_shipping.error as error
-
-    query = urllib.parse.urlencode(
-        dict(
-            developerId=settings.developer_id,
-            sellingPartnerId=settings.seller_id,
-            mwsAuthToken=settings.mws_auth_token,
-        )
-    )
-    result = lib.request(
-        url=f"{settings.server_url}/authorization/v1/authorizationCode?{query}",
-        headers={"content-Type": "application/json"},
-        method="POST",
-    )
-
-    response = lib.to_dict(result)
-    messages = error.parse_error_response(response, settings)
-
-    if any(messages):
-        raise errors.ParsedMessagesError(messages)
-
-    # Validate that authorizationCode is present in the response payload
-    authorization_code = lib.failsafe(
-        lambda: response.get("payload", {}).get("authorizationCode")
-    )
-    if not authorization_code:
-        raise errors.ParsedMessagesError(
-            messages=[
-                models.Message(
-                    carrier_name=settings.carrier_name,
-                    carrier_id=settings.carrier_id,
-                    message="Authentication failed: No authorization code received",
-                    code="AUTH_ERROR",
-                )
-            ]
-        )
-
-    expiry = datetime.datetime.now() + datetime.timedelta(
-        seconds=float(response.get("expires_in", 0))
-    )
-
-    return {
-        **response,
-        "expiry": lib.fdatetime(expiry),
-        "authorizationCode": authorization_code,
-    }

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

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

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

@@ -1,14 +1,14 @@
 karrio/mappers/amazon_shipping/__init__.py,sha256=a-I2ruFujHDDyd7cA8vAPPom9-WjxhxTg8yeoqy5I1c,173
 karrio/mappers/amazon_shipping/mapper.py,sha256=MHRzpj3yt929OuZtGgyfJ1WByq951lMDFG7b5CUoyPY,2122
-karrio/mappers/amazon_shipping/proxy.py,sha256=9heU65ELMqct9_Mf2hTYvOxJ6MPW1cZv0NAsYIVWz7o,2230
+karrio/mappers/amazon_shipping/proxy.py,sha256=6ro1kpmHq7ugeuPRKN-PU1pJetqZFXbIYbSHxTMfctg,5204
 karrio/mappers/amazon_shipping/settings.py,sha256=v_d5kYrKA5Wvv42TgOhvxayHeY4bHGrDRldMcpUkUf4,601
 karrio/plugins/amazon_shipping/__init__.py,sha256=DM1Sxy3lvH6sWMktRgfRI-ned-tgN8tK46PkaV92EqM,432
 karrio/providers/amazon_shipping/__init__.py,sha256=bccHAUMrkWlBQQq9WEZv3os_STMF-JPsO1w01NNUzxk,367
 karrio/providers/amazon_shipping/error.py,sha256=khbjAf7thICwU71ej2n2PgvYEJaUt2BHl9G-Z1fHEMc,901
 karrio/providers/amazon_shipping/rate.py,sha256=7BS9Mn5-eUfVpZkQ0X1fCEoKDpHIuJO3P_t-s1Mn7kY,3625
-karrio/providers/amazon_shipping/tracking.py,sha256=wOZt98U4RenEhX6C0CioJDNXRE986_sFt9_zsfnYdGs,2294
-karrio/providers/amazon_shipping/units.py,sha256=DKT9sHUVfTWD1d46pu68TOfunajj4lGXejKPQIOxWyA,486
-karrio/providers/amazon_shipping/utils.py,sha256=fFU-p-JloDBeiB0JVb_NJuIye6WcvMF4QbSjCSyW5Ys,3135
+karrio/providers/amazon_shipping/tracking.py,sha256=YEfneC834IDQwqvNd3EL-fhipDcNtKptb_MVaN7wfjY,3012
+karrio/providers/amazon_shipping/units.py,sha256=9uE4Dum9kPMyGNS6vEdgUvT9Tt1UlIHTDtNs-5zzo_g,869
+karrio/providers/amazon_shipping/utils.py,sha256=wMeeXDkJRDhyWxtZ3RCxkvgvy-wBEafoFhaFVokCETk,1029
 karrio/providers/amazon_shipping/shipment/__init__.py,sha256=ZD_QkyZjlp4VThWp5ebDfavYPHTy6lvOJCXmMEUtFZ8,246
 karrio/providers/amazon_shipping/shipment/cancel.py,sha256=Z4JkHPn1tJO8dOiEEf9W47naJXf4W3CKmfLUzxY9S1U,985
 karrio/providers/amazon_shipping/shipment/create.py,sha256=X1CHwOCIcwUg-HDsk38-0XnpYahPAqL8zfMF11cb_LI,4374
@@ -24,8 +24,8 @@ karrio/schemas/amazon_shipping/rate_request.py,sha256=sc0mAjuS2lY_uqQA4Je7Sj59Vb
 karrio/schemas/amazon_shipping/rate_response.py,sha256=P6xypSrTnnrWL0IGWinRY1ZCytKi-c2aqWD9o9C-QuY,938
 karrio/schemas/amazon_shipping/shipping_label.py,sha256=8aLQpIFVv7dPdknjN8S-053zhA9gv2JpVi2F8prGMWo,382
 karrio/schemas/amazon_shipping/tracking_response.py,sha256=RQS_mAYgr0m_BHeEX4jbz4NxB1Kj7SX5_jHGXKLwOcc,854
-karrio_amazon_shipping-2025.5.5.dist-info/METADATA,sha256=i-O3bMt-yL9LV_fJdkwKAOxE8GfKuQ9JNwcnA-vpen8,1044
-karrio_amazon_shipping-2025.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_amazon_shipping-2025.5.5.dist-info/entry_points.txt,sha256=jwZSXX8ySMgVsTaxzrEf4UMGMDTUAMRcBYLjqTOQnWc,75
-karrio_amazon_shipping-2025.5.5.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_amazon_shipping-2025.5.5.dist-info/RECORD,,
+karrio_amazon_shipping-2025.5.7.dist-info/METADATA,sha256=6hKmlTw-w-FnsPYL9tQ1FgpnAXuxtXHT_pQAlQRVFqE,1044
+karrio_amazon_shipping-2025.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_amazon_shipping-2025.5.7.dist-info/entry_points.txt,sha256=jwZSXX8ySMgVsTaxzrEf4UMGMDTUAMRcBYLjqTOQnWc,75
+karrio_amazon_shipping-2025.5.7.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_amazon_shipping-2025.5.7.dist-info/RECORD,,