karrio-server-manager 2025.5rc33__py3-none-any.whl → 2025.5rc35__py3-none-any.whl

karrio/server/manager/models.py

@@ -72,7 +72,6 @@ class PickupManager(models.Manager):
         return (
             super()
             .get_queryset()
-            .select_related("pickup_carrier")
             .prefetch_related(
                 "shipments",
                 *(("org",) if conf.settings.MULTI_ORGANIZATIONS else tuple()),
@@ -94,12 +93,13 @@ class ShipmentManager(models.Manager):
                 "return_address",
                 "billing_address",
                 "shipment_tracker",
-                "selected_rate_carrier",
                 "shipment_upload_record",
             )
             .prefetch_related(
                 "parcels",
-                "carriers",
+                "parcels__items",
+                "customs__commodities",
+                "customs__duty_billing_address",
                 *(("org",) if conf.settings.MULTI_ORGANIZATIONS else tuple()),
             )
         )
@@ -112,7 +112,6 @@ class TrackingManager(models.Manager):
             .get_queryset()
             .select_related(
                 "created_by",
-                "tracking_carrier",
                 "shipment",
                 "shipment__recipient",
                 "shipment__shipper",
@@ -128,7 +127,6 @@ class DocumentUploadRecordManager(models.Manager):
         return (
             super()
             .get_queryset()
-            .select_related("upload_carrier")
             .prefetch_related(
                 *(("org",) if conf.settings.MULTI_ORGANIZATIONS else tuple()),
             )
@@ -141,7 +139,6 @@ class ManifestManager(models.Manager):
         return (
             super()
             .get_queryset()
-            .select_related("manifest_carrier")
             .defer("manifest")
             .prefetch_related(
                 *(("org",) if conf.settings.MULTI_ORGANIZATIONS else tuple()),
@@ -483,6 +480,7 @@ class Customs(core.OwnedEntity):
 
 @core.register_model
 class Pickup(core.OwnedEntity):
+    CONTEXT_RELATIONS = ["pickup_carrier"]
     DIRECT_PROPS = [
         "confirmation_number",
         "pickup_date",
@@ -545,6 +543,16 @@ class Pickup(core.OwnedEntity):
         handle = self.address or super()
         return handle.delete(*args, **kwargs)
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for pickup_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("pickup_carrier", queryset=carrier_queryset),
+        )
+
     @property
     def object_type(self):
         return "pickup"
@@ -572,6 +580,7 @@ class Pickup(core.OwnedEntity):
 
 @core.register_model
 class Tracking(core.OwnedEntity):
+    CONTEXT_RELATIONS = ["tracking_carrier"]
     DIRECT_PROPS = [
         "metadata",
         "info",
@@ -640,6 +649,16 @@ class Tracking(core.OwnedEntity):
         "Shipment", on_delete=models.CASCADE, related_name="shipment_tracker", null=True
     )
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for tracking_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("tracking_carrier", queryset=carrier_queryset),
+        )
+
     @property
     def object_type(self):
         return "tracker"
@@ -683,6 +702,7 @@ class Tracking(core.OwnedEntity):
 
 @core.register_model
 class Shipment(core.OwnedEntity):
+    CONTEXT_RELATIONS = ["selected_rate_carrier", "carriers"]
     DIRECT_PROPS = [
         "options",
         "services",
@@ -833,6 +853,25 @@ class Shipment(core.OwnedEntity):
         self.customs and self.customs.delete()
         return super().delete(*args, **kwargs)
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """
+        Apply context-aware prefetching for carriers with proper config resolution.
+        This is called by access_by() to ensure carrier configs are resolved for the request context.
+        """
+        from karrio.server.providers.models.carrier import Carrier
+
+        # Resolve carrier configs with the request context for user/org-specific config
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+
+        # Re-apply carrier prefetches with context-aware config resolution
+        # Note: Manager's get_queryset() already sets up base prefetches with context=None
+        # This overrides those prefetches with context-aware ones when called via access_by()
+        return queryset.prefetch_related(
+            models.Prefetch("carriers", queryset=carrier_queryset),
+            models.Prefetch("selected_rate_carrier", queryset=carrier_queryset),
+        )
+
     @property
     def object_type(self):
         return "shipment"
@@ -910,6 +949,7 @@ class Shipment(core.OwnedEntity):
 
 @core.register_model
 class DocumentUploadRecord(core.OwnedEntity):
+    CONTEXT_RELATIONS = ["upload_carrier"]
     HIDDEN_PROPS = (
         "upload_carrier",
         *(("org",) if conf.settings.MULTI_ORGANIZATIONS else tuple()),
@@ -951,6 +991,16 @@ class DocumentUploadRecord(core.OwnedEntity):
         related_name="shipment_upload_record",
     )
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for upload_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("upload_carrier", queryset=carrier_queryset),
+        )
+
     # Computed properties
 
     @property
@@ -987,6 +1037,8 @@ class Manifest(core.OwnedEntity):
         verbose_name_plural = "Manifests"
         ordering = ["-created_at"]
 
+    CONTEXT_RELATIONS = ["manifest_carrier"]
+
     id = models.CharField(
         max_length=50,
         primary_key=True,
@@ -1016,6 +1068,16 @@ class Manifest(core.OwnedEntity):
 
     manifest_carrier = models.ForeignKey(providers.Carrier, on_delete=models.CASCADE)
 
+    @classmethod
+    def resolve_context_data(cls, queryset, context):
+        """Apply context-aware carrier config resolution for manifest_carrier."""
+        from karrio.server.providers.models.carrier import Carrier
+
+        carrier_queryset = Carrier.objects.resolve_config_for(context)
+        return queryset.prefetch_related(
+            models.Prefetch("manifest_carrier", queryset=carrier_queryset),
+        )
+
     # Computed properties
 
     @property

{karrio_server_manager-2025.5rc33.dist-info → karrio_server_manager-2025.5rc35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_manager
-Version: 2025.5rc33
+Version: 2025.5rc35
 Summary: Multi-carrier shipping API Shipments manager module
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0

{karrio_server_manager-2025.5rc33.dist-info → karrio_server_manager-2025.5rc35.dist-info}/RECORD

@@ -1,7 +1,7 @@
 karrio/server/manager/__init__.py,sha256=lDTMs_O6mQl0DEI2_TniT24TDJbjnkla-5QpnwfYlxs,64
 karrio/server/manager/admin.py,sha256=QOl5e2m3ekU5aj0yj9Uq4nRQrNMB_FfqNae6RyIxkC0,35
 karrio/server/manager/apps.py,sha256=WHTQ1t79uDZTbinRzvNg1NjtFwnwEvg0tP_ChrtTRwI,364
-karrio/server/manager/models.py,sha256=DE1ocNQ2bI-0dy1uotxmmDUL8IoEmckE7VVUM9q0BSE,31565
+karrio/server/manager/models.py,sha256=WruyZDTfqKlqu81fwAyxVCwxDu1lvl9l4bo9FbnFbos,34329
 karrio/server/manager/router.py,sha256=IBUR7rfBkdEHQzWxYOPcVSM8NBp3fte9G6Q5BVTUNNw,95
 karrio/server/manager/signals.py,sha256=3ZApZY4Ne8Gb0AT5rjC3Xneb7dnbSQyXp1OiBXt7eIA,1908
 karrio/server/manager/urls.py,sha256=oXJlvhHNKxFkc_CmpFoyTSAMJcLp4Wt9dHbViQDkqw4,220
@@ -100,7 +100,7 @@ karrio/server/manager/views/parcels.py,sha256=hZY45rg6SrTWfQqyJ38MGKSor1yqgPUEVH
 karrio/server/manager/views/pickups.py,sha256=gmpxz9ot1OR-BP1qh-0MXU3kUJi1ht_74hfaLJzJ42w,5503
 karrio/server/manager/views/shipments.py,sha256=_5EJfgxEO6H2EdQQbaSwILgnim7slqxMKDkEk_97F9c,10267
 karrio/server/manager/views/trackers.py,sha256=3oGn2qDpHgk8GZvuz-Cb93Fc0j_h_HbXQR692Zhfiok,12363
-karrio_server_manager-2025.5rc33.dist-info/METADATA,sha256=PH7vUw6Q0Xm2HAKm05gQqqvocRcGu-dmtGnq-blxSKs,734
-karrio_server_manager-2025.5rc33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_manager-2025.5rc33.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_manager-2025.5rc33.dist-info/RECORD,,
+karrio_server_manager-2025.5rc35.dist-info/METADATA,sha256=-JSntjwNP7P042MXocTMVzOu12bar9whAxp_ueeUd6w,734
+karrio_server_manager-2025.5rc35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_manager-2025.5rc35.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_manager-2025.5rc35.dist-info/RECORD,,