karrio-server-core 2025.5rc10__py3-none-any.whl → 2025.5rc12__py3-none-any.whl

karrio/server/core/gateway.py

@@ -174,9 +174,7 @@ class Shipments:
 
         # The request is wrapped in utils.identity to simplify mocking in tests.
         shipment, messages = utils.identity(
-            lambda: karrio.Shipment.create(request)
-            .from_(carrier.gateway)
-            .parse()
+            lambda: karrio.Shipment.create(request).from_(carrier.gateway).parse()
         )
 
         if shipment is None:
@@ -202,19 +200,35 @@ class Shipments:
             }
 
         def process_selected_rate() -> dict:
+            estimated_delivery = lib.failsafe(
+                lambda: (
+                    getattr(shipment.selected_rate, "estimated_delivery", None)
+                    or getattr(selected_rate, "estimated_delivery", None)
+                )
+            )
+            transit_days = lib.failsafe(
+                lambda: (
+                    getattr(shipment.selected_rate, "transit_days", None)
+                    or getattr(selected_rate, "transit_days", None)
+                )
+            )
             rate = lib.identity(
                 {
                     **lib.to_dict(shipment.selected_rate),
                     "id": f"rat_{uuid.uuid4().hex}",
                     "test_mode": carrier.test_mode,
+                    "estimated_delivery": estimated_delivery,
+                    "transit_days": transit_days,
                 }
                 if shipment.selected_rate is not None
                 else lib.to_dict(selected_rate)
             )
-            return lib.to_dict({
-                **rate,
-                "meta": process_meta(shipment.selected_rate or selected_rate),
-            })
+            return lib.to_dict(
+                {
+                    **rate,
+                    "meta": process_meta(shipment.selected_rate or selected_rate),
+                }
+            )
 
         def process_tracking_url(rate: datatypes.Rate) -> str:
             rate_provider = (rate.get("meta") or {}).get("rate_provider")
@@ -263,7 +277,9 @@ class Shipments:
                 "parcels": process_parcel_refs(payload["parcels"]),
                 "tracking_url": process_tracking_url(shipment_rate),
                 "status": serializers.ShipmentStatus.purchased.value,
-                "created_at": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f%z"),
+                "created_at": datetime.datetime.now().strftime(
+                    "%Y-%m-%d %H:%M:%S.%f%z"
+                ),
                 "meta": process_meta(shipment),
                 "messages": messages,
             },

karrio/server/core/models/entity.py

@@ -12,7 +12,9 @@ class Entity(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
-        return self.id
+        return (
+            str(self.id) if self.id is not None else f"{self.__class__.__name__}(None)"
+        )
 
 
 class OwnedEntity(ControlledAccessModel, Entity):

karrio/server/core/serializers.py

@@ -88,6 +88,7 @@ class CarrierDetails(serializers.Serializer):
         help_text="The carrier shipping options.",
     )
 
+
 class CarrierSettings(serializers.Serializer):
     id = serializers.CharField(required=True, help_text="A unique address identifier")
     object_type = serializers.CharField(
@@ -161,7 +162,7 @@ class AddressData(validators.AugmentedAddressSerializer):
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=30,
+        max_length=50,
         help_text="""The address city.
         **(required for shipment purchase)**
         """,
@@ -170,21 +171,21 @@ class AddressData(validators.AugmentedAddressSerializer):
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=20,
+        max_length=50,
         help_text="The party frederal tax id",
     )
     state_tax_id = serializers.CharField(
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=20,
+        max_length=50,
         help_text="The party state id",
     )
     person_name = serializers.CharField(
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=50,
+        max_length=100,
         help_text="""Attention to
         **(required for shipment purchase)**
         """,
@@ -193,7 +194,7 @@ class AddressData(validators.AugmentedAddressSerializer):
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=50,
+        max_length=100,
         help_text="The company name if the party is a company",
     )
     country_code = serializers.ChoiceField(
@@ -208,14 +209,14 @@ class AddressData(validators.AugmentedAddressSerializer):
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=20,
+        max_length=50,
         help_text="The party phone number.",
     )
     state_code = serializers.CharField(
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=20,
+        max_length=50,
         help_text="The address state code",
     )
     residential = serializers.BooleanField(
@@ -229,14 +230,14 @@ class AddressData(validators.AugmentedAddressSerializer):
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=20,
+        max_length=100,
         help_text="""The address street number""",
     )
     address_line1 = serializers.CharField(
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=50,
+        max_length=100,
         help_text="""The address line with street number <br/>
         **(required for shipment purchase)**
         """,
@@ -245,7 +246,7 @@ class AddressData(validators.AugmentedAddressSerializer):
         required=False,
         allow_blank=True,
         allow_null=True,
-        max_length=50,
+        max_length=100,
         help_text="The address line with suite number",
     )
     validate_location = serializers.BooleanField(
@@ -915,7 +916,7 @@ class PickupUpdateRequest(serializers.Serializer):
     )
     ready_time = serializers.CharField(
         required=True,
-        validators=[(validators.valid_time_format("ready_time"))],
+        validators=[validators.valid_time_format("ready_time")],
         help_text="""The ready time for pickup.
         Time Format: `HH:MM`
         """,

karrio/server/core/validators.py

@@ -313,6 +313,7 @@ class Address:
             try:
                 # Import the validator module dynamically
                 import importlib
+
                 module = importlib.import_module(f"karrio.validators.{validator_name}")
                 if hasattr(module, "METADATA"):
                     validator_class = module.METADATA.Validator
@@ -355,9 +356,11 @@ class Address:
         # For backwards compatibility, check if Google or Canada Post is configured
         if any(config.GOOGLE_CLOUD_API_KEY or ""):
             from karrio.validators.googlegeocoding import Validator as GoogleGeocode
+
             return GoogleGeocode
         elif any(config.CANADAPOST_ADDRESS_COMPLETE_API_KEY or ""):
             from karrio.validators.addresscomplete import Validator as AddressComplete
+
             return AddressComplete
 
         raise Exception("No address validation service provider configured")
@@ -380,17 +383,18 @@ class Address:
         refs = references.REFERENCES
         if len(refs.get("address_validators", {})) > 0:
             # Get the first available validator
-                validator_name = next(iter(refs["address_validators"].keys()))
-
-                # Try to get the validator class from the references
-                try:
-                    # Import the validator module dynamically
-                    import importlib
-                    module = importlib.import_module(f"karrio.validators.{validator_name}")
-                    if hasattr(module, "METADATA"):
-                        return module.METADATA.Validator
-                except (ImportError, AttributeError) as e:
-                    logger.warning(f"Could not import validator {validator_name}: {e}")
+            validator_name = next(iter(refs["address_validators"].keys()))
+
+            # Try to get the validator class from the references
+            try:
+                # Import the validator module dynamically
+                import importlib
+
+                module = importlib.import_module(f"karrio.validators.{validator_name}")
+                if hasattr(module, "METADATA"):
+                    return module.METADATA.Validator
+            except (ImportError, AttributeError) as e:
+                logger.warning(f"Could not import validator {validator_name}: {e}")
 
         # Fall back to legacy validator
         return Address._get_legacy_validator()

karrio/server/serializers/abstract.py

@@ -223,6 +223,7 @@ def link_org(entity: ModelSerializer, context: Context):
             update_fields=(["created_at"] if hasattr(entity, "created_at") else [])
         )
 
+
 def bulk_link_org(entities: typing.List[models.Model], context: Context):
     if len(entities) == 0 or settings.MULTI_ORGANIZATIONS is False:
         return

{karrio_server_core-2025.5rc10.dist-info → karrio_server_core-2025.5rc12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_core
-Version: 2025.5rc10
+Version: 2025.5rc12
 Summary: Multi-carrier shipping API Core module
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0

{karrio_server_core-2025.5rc10.dist-info → karrio_server_core-2025.5rc12.dist-info}/RECORD

@@ -11,18 +11,18 @@ karrio/server/core/dataunits.py,sha256=Mbmh6Bi9CwlxdAYLIfLlQjxCSZd_uWN0Dux-GIYTr
 karrio/server/core/exceptions.py,sha256=AR4FNT_1wkMkuv_ZELB9pVRL3RRWsSJ7hrNgBP7H3EU,6038
 karrio/server/core/fields.py,sha256=5i5eetbxFkIQ9uoFk8k2xPl1mXXnaVKlPV4xwlF3inY,345
 karrio/server/core/filters.py,sha256=nHj742vPWE3Xs_tpwRRVUh00OwxnF22xKfIK7rx-sw4,27434
-karrio/server/core/gateway.py,sha256=7hCIvgLbqdQcwRr6eIufXCbQ485pmKMFerh9rLHaIGg,25081
+karrio/server/core/gateway.py,sha256=TH3-RIxZ2BUrteyDAXWxH_GvY4pC4A_l7t-pRbLDO-M,25747
 karrio/server/core/middleware.py,sha256=euRkeIvNv3G-b_U3fKDO6po-2dbYF0LiXUYg2nyeCI0,3017
 karrio/server/core/oauth_validators.py,sha256=5JxDkXB_HX4a4xJltZcFGukO7o2cUl9h2t9O8Gp87Zc,6673
 karrio/server/core/permissions.py,sha256=JY3_hTEnyDTWG-weAWPx8xMoaRZwpNL2HaSssBzjH7Y,1189
 karrio/server/core/renderers.py,sha256=IUEUhvvrk_CeqnmnYQgWKHiH3uQhNc0eqDxyO9CuUS4,290
 karrio/server/core/router.py,sha256=IBUR7rfBkdEHQzWxYOPcVSM8NBp3fte9G6Q5BVTUNNw,95
-karrio/server/core/serializers.py,sha256=5ubUTlytTvURGJ5B4O3Xf5tXFOVbHsjUEnzJhiyGqDM,60070
+karrio/server/core/serializers.py,sha256=-wm4uQjtbR5z7qtAxJ7O2ApwzXmfFEdJkspQiVXeCj4,60074
 karrio/server/core/signals.py,sha256=thHh4K4uP3smWuy9kWavFfdOAttH9xN3og_j4lDWdKM,1742
 karrio/server/core/tests.py,sha256=rmZoZfPBRoMO-U3HtDxeKofnzsfijYeDVQrnw5Mb_dU,3164
 karrio/server/core/urls.py,sha256=JQrN6dI7A7c_M498EcDKdjDqlp_d64Ov-RS4HHmssRk,337
 karrio/server/core/utils.py,sha256=xY8aklHPtbaJsCPiKonk5HoY0FrSNseS859RZEQJ9mU,14022
-karrio/server/core/validators.py,sha256=Z0z_9MsPik5Vg0I-ZI43YCwglujT-GGouIeDA40kSr4,13970
+karrio/server/core/validators.py,sha256=3XwjJurJJM6jKwNcZRUyr7j1k8DuOnhct1_1N9ildFg,13934
 karrio/server/core/management/commands/cli.py,sha256=EEIbFHZTroJoUxSOKnebsXtXTbsc408t5b9qSc0QRqk,720
 karrio/server/core/management/commands/create_oauth_client.py,sha256=wdxCeHuUtGpwgV0WItJkW8Di65y9krnFYNEmcgh9x2k,1718
 karrio/server/core/migrations/0001_initial.py,sha256=8c-JMkt84Z5C1Zgm2jw4NiI6tYSK4OLcB-uhxiEDN98,701
@@ -33,7 +33,7 @@ karrio/server/core/migrations/0005_alter_metafield_type_alter_metafield_value.py
 karrio/server/core/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/core/models/__init__.py,sha256=iw1pwHhXpWru5AnLimWzH3mouad9-GTrYTWsmZOC6hU,1176
 karrio/server/core/models/base.py,sha256=pRdm0GIOdGZCrxj-U6cZGTFp4KJuOQhCGtiZNJF1qiE,1785
-karrio/server/core/models/entity.py,sha256=skA74F0YPxoZsJliL8lqRaetjX2WzS5aLIONAwnmQ6E,630
+karrio/server/core/models/entity.py,sha256=cUSIzv84RIPif2DdNSScY7RHuHgXufwIF8YNZ8BYC1g,722
 karrio/server/core/models/metafield.py,sha256=etzJ1BS98Ipe3mxJuDOK3-c36Z2oZKgnPaHQmYta2Dw,5048
 karrio/server/core/models/third_party.py,sha256=iNXvcq0pJN2gFu5Bu03k6FMdQNxEhzoijIhl4lc7JmU,552
 karrio/server/core/views/__init__.py,sha256=jvhomX2_aiPcfdUjq7_kzp5rOerLwScnbRNDqs751Zo,88
@@ -201,7 +201,7 @@ karrio/server/providers/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 karrio/server/providers/views/carriers.py,sha256=_uD_soDZDmMxzfu8mQqeLLcDd4ixnE7f8HjoUlybym8,8808
 karrio/server/providers/views/connections.py,sha256=3Y1rfNsZxkn4YBA03WRQiI-y-AC4EYaOGaMjLmCcz1g,6038
 karrio/server/serializers/__init__.py,sha256=TzD3Lt8Gf7VV5ibGITGg5-ki-M8CR0hzZFulcI2ASJM,90
-karrio/server/serializers/abstract.py,sha256=_6ziZcVIpNr3s35LN-PiAZmcjD6a22xzluhvhJTsV-A,15582
+karrio/server/serializers/abstract.py,sha256=WS4ey0W_NIMGl-5a2rpaZPdU9bKJmfDSpyHNs81PsGo,15583
 karrio/server/tracing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/tracing/admin.py,sha256=6BZCJiBhJVg3vt8cYx9HF_FgcjanMD42la6bBORlSL8,1904
 karrio/server/tracing/apps.py,sha256=6BfIomUwBV8k7yaypl6kYYAkLSG1aceUmuxvbhw04fI,247
@@ -235,7 +235,7 @@ karrio/server/user/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 karrio/server/user/templates/registration/login.html,sha256=3_tj-0rKfwkCk-fp_GT8xFQhLqjGcJs3uZzOAaI40Sw,3690
 karrio/server/user/templates/registration/registration_confirm_email.html,sha256=zFDkNN_BHMQyrBv_mU8aoqXxYxG91TGuf6pKwRa5jxE,247
 karrio/server/user/templates/registration/registration_confirm_email.txt,sha256=I_zN_pJTRigfyiYbyQK0wFfrI5Zq1JG8lf0TyLA9fN0,94
-karrio_server_core-2025.5rc10.dist-info/METADATA,sha256=riaRwve7e8PNbMI-RvHvCDIhzolKr8X5PcesuoG3Njk,797
-karrio_server_core-2025.5rc10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_core-2025.5rc10.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_core-2025.5rc10.dist-info/RECORD,,
+karrio_server_core-2025.5rc12.dist-info/METADATA,sha256=mUiD-2FjXZNzxvJy-7eXCtYoIWjUCN2ra_z07f5E7Uc,797
+karrio_server_core-2025.5rc12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_core-2025.5rc12.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_core-2025.5rc12.dist-info/RECORD,,