karrio-server-core 2025.5rc9__py3-none-any.whl → 2025.5rc11__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-2025.5rc9.dist-info → karrio_server_core-2025.5rc11.dist-info}/METADATA

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

{karrio_server_core-2025.5rc9.dist-info → karrio_server_core-2025.5rc11.dist-info}/RECORD

@@ -11,7 +11,7 @@ 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
@@ -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
@@ -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.5rc9.dist-info/METADATA,sha256=YOlpmYF2Id7UgTB2MkQVxNJnAk_q3K4swzmEAY5veYI,796
-karrio_server_core-2025.5rc9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_core-2025.5rc9.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_core-2025.5rc9.dist-info/RECORD,,
+karrio_server_core-2025.5rc11.dist-info/METADATA,sha256=vgYoK-0D6VP6I2f74PIbJw5kQ79B6Gi79Yo4iLqFajg,797
+karrio_server_core-2025.5rc11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_core-2025.5rc11.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_core-2025.5rc11.dist-info/RECORD,,