karrio-server-manager 2025.5rc34__py3-none-any.whl → 2025.5rc36__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/serializers/__init__.py

@@ -22,6 +22,7 @@ from karrio.server.manager.serializers.tracking import (
     TrackerUpdateData,
     update_shipment_tracker,
     can_mutate_tracker,
+    update_tracker,
 )
 from karrio.server.manager.serializers.shipment import (
     ShipmentRateData,

karrio/server/manager/serializers/tracking.py

@@ -120,64 +120,26 @@ class TrackingSerializer(TrackingDetails):
                 ).data,
                 carrier=carrier,
             )
-            # update values only if changed; This is important for webhooks notification
-            changes = []
-            details = response.tracking
-            info = lib.to_dict(details.info or {})
-            events = utils.process_events(
-                response_events=details.events, current_events=instance.events
-            )
-
-            if events != instance.events:
-                instance.events = events
-                changes.append("events")
-
-            if response.messages != instance.messages:
-                instance.messages = lib.to_dict(response.messages)
-                changes.append("messages")
-
-            if details.delivered != instance.delivered:
-                instance.delivered = details.delivered
-                changes.append("delivered")
-
-            if details.status != instance.status:
-                instance.status = details.status
-                changes.append("status")
-
-            if details.estimated_delivery != instance.estimated_delivery:
-                instance.estimated_delivery = details.estimated_delivery
-                changes.append("estimated_delivery")
-
-            if details.options != instance.options:
-                instance.options = details.options
-                changes.append("options")
-
-            if any(info.keys()) and info != instance.info:
-                instance.info = serializers.process_dictionaries_mutations(
-                    ["info"], dict(info=info), instance
-                )["info"]
-                changes.append("info")
 
+            # Handle carrier change separately (not part of tracking_details)
             if carrier.id != instance.tracking_carrier.id:
-                instance.carrier = carrier
-                changes.append("tracking_carrier")
-
-            if details.images is not None and (
-                details.images.delivery_image != instance.delivery_image
-                or details.images.signature_image != instance.signature_image
-            ):
-                changes.append("delivery_image")
-                changes.append("signature_image")
-                instance.delivery_image = (
-                    details.images.delivery_image or instance.delivery_image
-                )
-                instance.signature_image = (
-                    details.images.signature_image or instance.signature_image
-                )
+                instance.tracking_carrier = carrier
+                instance.save(update_fields=["tracking_carrier"])
 
-            if any(changes):
-                instance.save(update_fields=changes)
-                update_shipment_tracker(instance)
+            # Use update_tracker for the rest of the tracking details
+            update_tracker(
+                instance,
+                dict(
+                    events=response.tracking.events,
+                    messages=response.messages,
+                    delivered=response.tracking.delivered,
+                    status=response.tracking.status,
+                    estimated_delivery=response.tracking.estimated_delivery,
+                    options=response.tracking.options,
+                    info=lib.to_dict(response.tracking.info or {}),
+                    images=response.tracking.images,
+                ),
+            )
 
         return instance
 
@@ -246,3 +208,120 @@ def update_shipment_tracker(tracker: models.Tracking):
             tracker.shipment.save(update_fields=["status"])
     except Exception as e:
         logger.exception("Failed to update the tracked shipment", error=str(e), tracker_id=tracker.id, tracking_number=tracker.tracking_number)
+
+
+def update_tracker(tracker: models.Tracking, tracking_details: dict) -> models.Tracking:
+    """Update tracker with new tracking details from webhook or external source.
+
+    This utility function consolidates the change detection logic for updating
+    a tracker instance. It only saves fields that have changed and triggers
+    the shipment status update via update_shipment_tracker.
+
+    Args:
+        tracker: The Tracking model instance to update
+        tracking_details: Dictionary containing tracking details with keys like:
+            - events: List of tracking event dictionaries
+            - messages: List of message dictionaries
+            - delivered: Boolean delivery status
+            - status: Tracker status string
+            - estimated_delivery: Estimated delivery date string
+            - options: Dictionary of tracking options
+            - meta: Dictionary of metadata
+            - info: Dictionary of tracking info
+            - images: Dictionary with delivery_image and signature_image
+
+    Returns:
+        The updated Tracking model instance
+    """
+    try:
+        changes = []
+
+        # Process events - merge with existing events
+        new_events = tracking_details.get("events") or []
+        if new_events:
+            events = utils.process_events(
+                response_events=new_events, current_events=tracker.events
+            )
+            if events != tracker.events:
+                tracker.events = events
+                changes.append("events")
+
+        # Update messages
+        messages = tracking_details.get("messages")
+        if messages is not None and messages != tracker.messages:
+            tracker.messages = lib.to_dict(messages)
+            changes.append("messages")
+
+        # Update delivered status
+        delivered = tracking_details.get("delivered")
+        if delivered is not None and delivered != tracker.delivered:
+            tracker.delivered = delivered
+            changes.append("delivered")
+
+        # Update status
+        status = tracking_details.get("status")
+        if status is not None and status != tracker.status:
+            tracker.status = status
+            changes.append("status")
+
+        # Update estimated delivery
+        estimated_delivery = tracking_details.get("estimated_delivery")
+        if estimated_delivery is not None and estimated_delivery != tracker.estimated_delivery:
+            tracker.estimated_delivery = estimated_delivery
+            changes.append("estimated_delivery")
+
+        # Update options
+        options = tracking_details.get("options")
+        if options is not None and options != tracker.options:
+            tracker.options = options
+            changes.append("options")
+
+        # Update meta
+        meta = tracking_details.get("meta")
+        if meta is not None and meta != tracker.meta:
+            tracker.meta = {**(tracker.meta or {}), **meta}
+            changes.append("meta")
+
+        # Update info - merge with existing info
+        info = tracking_details.get("info") or {}
+        if any(info.keys()) and info != tracker.info:
+            tracker.info = serializers.process_dictionaries_mutations(
+                ["info"], dict(info=info), tracker
+            )["info"]
+            changes.append("info")
+
+        # Update images
+        images = tracking_details.get("images") or {}
+        delivery_image = images.get("delivery_image") if isinstance(images, dict) else getattr(images, "delivery_image", None)
+        signature_image = images.get("signature_image") if isinstance(images, dict) else getattr(images, "signature_image", None)
+
+        if delivery_image is not None or signature_image is not None:
+            if delivery_image != tracker.delivery_image or signature_image != tracker.signature_image:
+                if delivery_image is not None:
+                    tracker.delivery_image = delivery_image
+                    changes.append("delivery_image")
+                if signature_image is not None:
+                    tracker.signature_image = signature_image
+                    changes.append("signature_image")
+
+        # Save changes and update associated shipment
+        if any(changes):
+            tracker.save(update_fields=changes)
+            update_shipment_tracker(tracker)
+            logger.info(
+                "Tracker updated via webhook",
+                tracker_id=tracker.id,
+                tracking_number=tracker.tracking_number,
+                changes=changes,
+            )
+
+        return tracker
+
+    except Exception as e:
+        logger.exception(
+            "Failed to update tracker",
+            error=str(e),
+            tracker_id=tracker.id,
+            tracking_number=tracker.tracking_number,
+        )
+        return tracker

{karrio_server_manager-2025.5rc34.dist-info → karrio_server_manager-2025.5rc36.dist-info}/METADATA

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

{karrio_server_manager-2025.5rc34.dist-info → karrio_server_manager-2025.5rc36.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
@@ -73,7 +73,7 @@ karrio/server/manager/migrations/0064_shipment_shipment_created_at_idx_and_more.
 karrio/server/manager/migrations/0065_alter_address_city_alter_address_company_name_and_more.py,sha256=m0KQSz8cnJzaXUlaAKdqU0duZ8wSQeTYQCIeam3Wivw,6279
 karrio/server/manager/migrations/0066_commodity_image_url_commodity_product_id_and_more.py,sha256=Jw7bEBmqzDSp6zw0xcAiKc9aDCsa3Wrw-oTM8r9Pqfc,997
 karrio/server/manager/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-karrio/server/manager/serializers/__init__.py,sha256=cbi3PpPA8nw_le56PbGP_Ua1kDyyxOt88_Vn9uESbpI,1411
+karrio/server/manager/serializers/__init__.py,sha256=YVwGfjpb-_PezzGc8N8oLTkORan0hZ2muGj2PYG3n0g,1431
 karrio/server/manager/serializers/address.py,sha256=yGKvZiNukeI15LEDdbo1ycqqK8QW77ak_vyLMIKyglI,2779
 karrio/server/manager/serializers/commodity.py,sha256=PKrW-xAYkiNByk5RF8up_Bt1Z8mJV_BGW0mPWT9w4ME,1658
 karrio/server/manager/serializers/customs.py,sha256=gMGC4TJMykjgELBLFHL6v7kPQ5YQKe7cQcMnOGBLL84,2872
@@ -83,7 +83,7 @@ karrio/server/manager/serializers/parcel.py,sha256=733Bg26lVbEkoWtAVM5Qt2IRBS2QD
 karrio/server/manager/serializers/pickup.py,sha256=sX0VmcQxGkXn3IEosMuFwdXh4HhdkPcuBOp79O8PoDQ,9233
 karrio/server/manager/serializers/rate.py,sha256=7vYK_v8iWEDnswqYHG2Lir16_UhHTOxW5rdC6lw3lzA,652
 karrio/server/manager/serializers/shipment.py,sha256=G4vA51UFHvBVNNR9z3Vtac-Y7GexjGadPOCRxSUVqRE,30355
-karrio/server/manager/serializers/tracking.py,sha256=TguVVqNwbKSdDx0m614jP3PiBrkNiQ7fq1A7Ulw7jjo,9241
+karrio/server/manager/serializers/tracking.py,sha256=ixrAjIiZQsvSt4y0qtisGkt6TFOJ3ORNkJAQVt6YQrA,12483
 karrio/server/manager/tests/__init__.py,sha256=Y1UNteEE60vWdUAkjbldu_r_-h4u0He8-UoiBgTjKcU,391
 karrio/server/manager/tests/test_addresses.py,sha256=pNkZC_yJyb29ZlEOtOAs4blcEYiOarw0zhZIZC5uj1w,3111
 karrio/server/manager/tests/test_custom_infos.py,sha256=iv2cLdZVoVWFZK_mDUEnrZssncAnQcn87Rn2sAk8UQI,2731
@@ -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.5rc34.dist-info/METADATA,sha256=hfvpl4yElmDkuRuJuOGez88jHjhGzM32CqGLN_q3xmM,734
-karrio_server_manager-2025.5rc34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_manager-2025.5rc34.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_manager-2025.5rc34.dist-info/RECORD,,
+karrio_server_manager-2025.5rc36.dist-info/METADATA,sha256=gqVdjXCp3F4TIfvQWnxEJ76Js6deZo0n6BRct9pJC9I,734
+karrio_server_manager-2025.5rc36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_manager-2025.5rc36.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_manager-2025.5rc36.dist-info/RECORD,,