karrio-easypost 2025.5.7__py3-none-any.whl → 2026.1__py3-none-any.whl

karrio/providers/easypost/units.py

@@ -5,6 +5,16 @@ import karrio.core.units as units
 import karrio.core.models as models
 
 
+# EasyPost API carrier name normalization mapping
+# Maps EasyPost's carrier variations to Karrio's standard CarrierId enum names
+CARRIER_NAME_NORMALIZATION = {
+    "UPSDAP": "UPS",
+    "UPS DAP": "UPS",
+    "FedExDefault": "FedEx",
+    "FedEx Default": "FedEx",
+}
+
+
 class LabelType(lib.Enum):
     PDF = "PDF"
     ZPL = "ZPL"
@@ -862,13 +872,38 @@ class Service(lib.StrEnum):
 
     @staticmethod
     def info(serviceName, carrier):
-        rate_provider = CarrierId.map(carrier).name_or_key
-        service = Service.map(serviceName)
+        # Normalize carrier name to handle EasyPost API variations
+        normalized_carrier = CARRIER_NAME_NORMALIZATION.get(carrier, carrier)
+        rate_provider = CarrierId.map(normalized_carrier).name_or_key
+
+        # Try carrier-qualified lookup first to avoid service name collisions
+        service_code = None
+        carrier_enum = CarrierId.map(normalized_carrier)
+
+        if carrier_enum.name and serviceName:
+            # Construct carrier-qualified service code: easypost_{carrier}_{service}
+            carrier_code = carrier_enum.name
+            service_snake = lib.to_snake_case(serviceName)
+            qualified_service_name = f"easypost_{carrier_code}_{service_snake}"
+
+            # Check if the qualified service exists
+            # Note: We cannot use Service.map() because Python enums with duplicate
+            # values create aliases, so Service.easypost_usps_priority and
+            # Service.easypost_canadapost_priority are the SAME object (both = 'Priority')
+            if hasattr(Service, qualified_service_name):
+                service_code = qualified_service_name
+
+        # Fallback to original behavior if qualified lookup fails
+        if not service_code:
+            service = Service.map(serviceName)
+            service_code = service.name_or_key
+
+        # Format the service name for display
         service_name = re.sub(
-            r"((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))", r" \1", service.name_or_key
+            r"((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))", r" \1", service_code
         ).replace("easypost_", "")
 
-        return rate_provider, service.name_or_key, service_name
+        return rate_provider, service_code, service_name
 
 
 class CarrierId(lib.StrEnum):

{karrio_easypost-2025.5.7.dist-info → karrio_easypost-2026.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_easypost
-Version: 2025.5.7
+Version: 2026.1
 Summary: Karrio - EasyPost Shipping extension
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_easypost-2025.5.7.dist-info → karrio_easypost-2026.1.dist-info}/RECORD

@@ -7,7 +7,7 @@ karrio/providers/easypost/__init__.py,sha256=v89eaMBV-Kn7Za7WzrXpSkKfFG2HSRB0SXB
 karrio/providers/easypost/error.py,sha256=GrONkEpEi8ujKNvd4I9Z9xGfqFrc4QE2wOkoMJOFEjk,953
 karrio/providers/easypost/rate.py,sha256=_uJ_9PgB5AM_oMDjAsY_wFd_DUz-zm_zu4qPkSyZHTY,7710
 karrio/providers/easypost/tracking.py,sha256=DvjNyjLDFHDZ9Iu9zJjZwxOBCb8rXz3uBtwu8dlAmxg,4913
-karrio/providers/easypost/units.py,sha256=JCJBcJXV017JChD7DCj-YbMs_c-DhhxttyG25NhFS00,53298
+karrio/providers/easypost/units.py,sha256=4VrHtGONrsqDv7zwWu_GC37N_V8RjXV1gf3tAUR_yV0,54794
 karrio/providers/easypost/utils.py,sha256=rJ1uxvaOXcwCAbPmiklk0UoJwhbix0sjVc6jV1BWbtQ,774
 karrio/providers/easypost/shipment/__init__.py,sha256=oEO3ToyRIVyE5mcc_exdZRpM6WMu6PMD2UpdkUJrKqI,232
 karrio/providers/easypost/shipment/cancel.py,sha256=QEIkm4aPwzOyFMV4fvx_7b8VErwIhcBGl9ZszQM5nsM,1010
@@ -18,9 +18,9 @@ karrio/schemas/easypost/shipment_purchase.py,sha256=xNQWUKV6aYFFdTn7xLCjjtya0h-o
 karrio/schemas/easypost/shipment_request.py,sha256=7HirvgDktcppvHlEeMz49ryK6sPWIBP-c1_1xE3y8ow,2858
 karrio/schemas/easypost/shipments_response.py,sha256=KgWbIoPvI1NoQOGoV30-K3Dl6JFkKdAS3B3yHQfb6R4,8957
 karrio/schemas/easypost/trackers_response.py,sha256=Q0Z74hKZYLDmfKh7lzxM7cfe3x-z-LXve94d7s3r9Kw,2915
-karrio_easypost-2025.5.7.dist-info/licenses/LICENSE,sha256=qvVLDB3Y1leH0p_1m30RxZrOGOx8F9O5eZIwdyVzcuQ,7651
-karrio_easypost-2025.5.7.dist-info/METADATA,sha256=vkvKW878hnvvHaHVnBtQj9yrQht3PAhImJTFYtYK0qg,1040
-karrio_easypost-2025.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_easypost-2025.5.7.dist-info/entry_points.txt,sha256=mArG7sxxZUl07ycYJn7BGzz1uv-hZPVROniK64EbUz4,61
-karrio_easypost-2025.5.7.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
-karrio_easypost-2025.5.7.dist-info/RECORD,,
+karrio_easypost-2026.1.dist-info/licenses/LICENSE,sha256=qvVLDB3Y1leH0p_1m30RxZrOGOx8F9O5eZIwdyVzcuQ,7651
+karrio_easypost-2026.1.dist-info/METADATA,sha256=kC4Ul6Oj0myt8ejS_68bP0tQHbqBENKX5XWfuaGTQGo,1038
+karrio_easypost-2026.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_easypost-2026.1.dist-info/entry_points.txt,sha256=mArG7sxxZUl07ycYJn7BGzz1uv-hZPVROniK64EbUz4,61
+karrio_easypost-2026.1.dist-info/top_level.txt,sha256=FZCY8Nwft8oEGHdl--xku8P3TrnOxu5dETEU_fWpRSM,20
+karrio_easypost-2026.1.dist-info/RECORD,,