karrio-server-events 2025.5rc34__py3-none-any.whl → 2025.5rc36__py3-none-any.whl

karrio/server/events/signals.py

@@ -86,7 +86,7 @@ def shipment_cancelled(sender, instance, *args, **kwargs):
     - shipment cancelled/deleted (label voided)
     """
     event = EventTypes.shipment_cancelled.value
-    data = serializers.Shipment(instance)
+    data = serializers.Shipment(instance).data
     event_at = instance.updated_at
     context = dict(
         user_id=utils.failsafe(lambda: instance.created_by.id),

karrio/server/events/task_definitions/base/archiving.py

@@ -22,46 +22,61 @@ def run_data_archiving(*args, **kwargs):
         days=conf.settings.TRACKER_DATA_RETENTION
     )
 
-    # Use efficient existence checks and batch processing
-    BATCH_SIZE = 1000  # Process in batches to avoid memory issues
-    
-    # Optimize querysets by only selecting required fields for existence checks
-    tracing_exists = tracing.TracingRecord.objects.filter(created_at__lt=log_retention).exists()
-    event_exists = events.Event.objects.filter(created_at__lt=log_retention).exists()
-    api_log_exists = core.APILog.objects.filter(requested_at__lt=log_retention).exists()
-    tracking_exists = manager.Tracking.objects.filter(created_at__lt=tracker_retention).exists()
-    shipping_exists = manager.Shipment.objects.filter(created_at__lt=shipment_retention).exists()
-    order_exists = orders.Order.objects.filter(created_at__lt=order_retention).exists()
-
-    if tracing_exists:
-        logger.info("Archiving SDK tracing backlog", retention_days=conf.settings.API_LOGS_DATA_RETENTION)
-        tracing_data = tracing.TracingRecord.objects.filter(created_at__lt=log_retention)
-        utils.failsafe(lambda: _bulk_delete_tracing_data(tracing_data))
-
-    if event_exists:
-        logger.info("Archiving events backlog", retention_days=conf.settings.API_LOGS_DATA_RETENTION)
-        event_data = events.Event.objects.filter(created_at__lt=log_retention)
-        utils.failsafe(lambda: event_data.delete())
-
-    if api_log_exists:
-        logger.info("Archiving API request logs backlog", retention_days=conf.settings.API_LOGS_DATA_RETENTION)
-        api_log_data = core.APILog.objects.filter(requested_at__lt=log_retention)
-        utils.failsafe(lambda: api_log_data.delete())
-
-    if tracking_exists:
-        logger.info("Archiving tracking data backlog", retention_days=conf.settings.TRACKER_DATA_RETENTION)
-        tracking_data = manager.Tracking.objects.filter(created_at__lt=tracker_retention)
-        utils.failsafe(lambda: _bulk_delete_tracking_data(tracking_data))
-
-    if shipping_exists:
-        logger.info("Archiving shipping data backlog", retention_days=conf.settings.SHIPMENT_DATA_RETENTION)
-        shipping_data = manager.Shipment.objects.filter(created_at__lt=shipment_retention)
-        utils.failsafe(lambda: _bulk_delete_shipment_data(shipping_data))
-
-    if order_exists:
-        logger.info("Archiving order data backlog", retention_days=conf.settings.ORDER_DATA_RETENTION)
-        order_data = orders.Order.objects.filter(created_at__lt=order_retention)
-        utils.failsafe(lambda: _bulk_delete_order_data(order_data))
+    # Prepare querysets once and rely on delete helpers to determine if work was done.
+    tracing_data = tracing.TracingRecord.objects.filter(created_at__lt=log_retention)
+    event_data = events.Event.objects.filter(created_at__lt=log_retention)
+    api_log_data = core.APILog.objects.filter(requested_at__lt=log_retention)
+    tracking_data = manager.Tracking.objects.filter(created_at__lt=tracker_retention)
+    shipping_data = manager.Shipment.objects.filter(created_at__lt=shipment_retention)
+    order_data = orders.Order.objects.filter(created_at__lt=order_retention)
+
+    tracing_deleted = utils.failsafe(lambda: _bulk_delete_tracing_data(tracing_data)) or 0
+    if tracing_deleted:
+        logger.info(
+            "Archiving SDK tracing backlog",
+            retention_days=conf.settings.API_LOGS_DATA_RETENTION,
+            deleted_records=tracing_deleted,
+        )
+
+    events_deleted = utils.failsafe(lambda: event_data.delete()[0]) or 0
+    if events_deleted:
+        logger.info(
+            "Archiving events backlog",
+            retention_days=conf.settings.API_LOGS_DATA_RETENTION,
+            deleted_records=events_deleted,
+        )
+
+    api_logs_deleted = utils.failsafe(lambda: api_log_data.delete()[0]) or 0
+    if api_logs_deleted:
+        logger.info(
+            "Archiving API request logs backlog",
+            retention_days=conf.settings.API_LOGS_DATA_RETENTION,
+            deleted_records=api_logs_deleted,
+        )
+
+    tracking_deleted = utils.failsafe(lambda: _bulk_delete_tracking_data(tracking_data)) or 0
+    if tracking_deleted:
+        logger.info(
+            "Archiving tracking data backlog",
+            retention_days=conf.settings.TRACKER_DATA_RETENTION,
+            deleted_records=tracking_deleted,
+        )
+
+    shipping_deleted = utils.failsafe(lambda: _bulk_delete_shipment_data(shipping_data)) or 0
+    if shipping_deleted:
+        logger.info(
+            "Archiving shipping data backlog",
+            retention_days=conf.settings.SHIPMENT_DATA_RETENTION,
+            deleted_records=shipping_deleted,
+        )
+
+    order_deleted = utils.failsafe(lambda: _bulk_delete_order_data(order_data)) or 0
+    if order_deleted:
+        logger.info(
+            "Archiving order data backlog",
+            retention_days=conf.settings.ORDER_DATA_RETENTION,
+            deleted_records=order_deleted,
+        )
 
     logger.info("Finished scheduled backlog archiving")
 
@@ -69,100 +84,117 @@ def run_data_archiving(*args, **kwargs):
 def _bulk_delete_tracing_data(tracing_queryset):
     """Bulk delete tracing data to avoid N+1 queries with organization links."""
     BATCH_SIZE = 1000
-    
+    queryset = tracing_queryset.order_by("pk")
+
     try:
         from karrio.server.orgs.models import TracingRecordLink
-        
+
         # Process in batches to avoid memory issues
         total_deleted = 0
         while True:
             # Get a batch of IDs to delete
-            batch_ids = list(tracing_queryset.values_list('id', flat=True)[:BATCH_SIZE])
-            
+            batch_ids = list(queryset.values_list("id", flat=True)[:BATCH_SIZE])
+
             if not batch_ids:
                 break
-                
+
             # Bulk delete TracingRecordLink entries first to avoid CASCADE N+1 queries
             TracingRecordLink.objects.filter(item_id__in=batch_ids).delete()
-            
+
             # Delete the tracing records in this batch
-            deleted_count = tracing_queryset.filter(id__in=batch_ids).delete()[0]
+            deleted_count = queryset.filter(id__in=batch_ids).delete()[0]
             total_deleted += deleted_count
-            
+
             logger.info("Deleted tracing records batch", batch_count=deleted_count, total_deleted=total_deleted)
-            
+
+        return total_deleted
+
     except ImportError:
         # Organizations module not installed, just delete in batches
         total_deleted = 0
         while True:
             # Get a batch to delete
-            batch_ids = list(tracing_queryset.values_list('id', flat=True)[:BATCH_SIZE])
-            
+            batch_ids = list(queryset.values_list("id", flat=True)[:BATCH_SIZE])
+
             if not batch_ids:
                 break
-                
-            deleted_count = tracing_queryset.filter(id__in=batch_ids).delete()[0]
+
+            deleted_count = queryset.filter(id__in=batch_ids).delete()[0]
             total_deleted += deleted_count
-            
+
             logger.info("Deleted tracing records batch", batch_count=deleted_count, total_deleted=total_deleted)
 
+        return total_deleted
+
 
 def _bulk_delete_tracking_data(tracking_queryset):
     """Bulk delete tracking data to avoid N+1 queries with organization links."""
+    queryset = tracking_queryset.order_by("pk")
+
     try:
         from karrio.server.orgs.models import TrackingLink
-        
+
         # Get the tracking record IDs that will be deleted
-        tracking_ids = list(tracking_queryset.values_list('id', flat=True))
-        
+        tracking_ids = list(queryset.values_list("id", flat=True))
+
         if tracking_ids:
             # Bulk delete TrackingLink entries first to avoid CASCADE N+1 queries
             TrackingLink.objects.filter(item_id__in=tracking_ids).delete()
-            
+
         # Now delete the tracking records themselves
-        tracking_queryset.delete()
-        
+        deleted = queryset.delete()[0]
+
     except ImportError:
         # Organizations module not installed, just delete normally
-        tracking_queryset.delete()
+        deleted = queryset.delete()[0]
+
+    return deleted
 
 
 def _bulk_delete_shipment_data(shipment_queryset):
     """Bulk delete shipment data to avoid N+1 queries with organization links."""
+    queryset = shipment_queryset.order_by("pk")
+
     try:
         from karrio.server.orgs.models import ShipmentLink
-        
+
         # Get the shipment record IDs that will be deleted
-        shipment_ids = list(shipment_queryset.values_list('id', flat=True))
-        
+        shipment_ids = list(queryset.values_list("id", flat=True))
+
         if shipment_ids:
             # Bulk delete ShipmentLink entries first to avoid CASCADE N+1 queries
             ShipmentLink.objects.filter(item_id__in=shipment_ids).delete()
-            
+
         # Now delete the shipment records themselves
-        shipment_queryset.delete()
-        
+        deleted = queryset.delete()[0]
+
     except ImportError:
         # Organizations module not installed, just delete normally
-        shipment_queryset.delete()
+        deleted = queryset.delete()[0]
+
+    return deleted
 
 
 def _bulk_delete_order_data(order_queryset):
     """Bulk delete order data to avoid N+1 queries with organization links."""
+    queryset = order_queryset.order_by("pk")
+
     try:
         from karrio.server.orgs.models import OrderLink
-        
+
         # Get the order record IDs that will be deleted
-        order_ids = list(order_queryset.values_list('id', flat=True))
-        
+        order_ids = list(queryset.values_list("id", flat=True))
+
         if order_ids:
             # Bulk delete OrderLink entries first to avoid CASCADE N+1 queries
             OrderLink.objects.filter(item_id__in=order_ids).delete()
-            
+
         # Now delete the order records themselves
-        order_queryset.delete()
-        
+        deleted = queryset.delete()[0]
+
     except ImportError:
         # Organizations module not installed, just delete normally
-        order_queryset.delete()
+        deleted = queryset.delete()[0]
+
+    return deleted
 

karrio/server/events/task_definitions/base/tracking.py

@@ -38,6 +38,7 @@ def update_trackers(
 ):
     logger.info("Starting scheduled trackers update", delta_seconds=delta.seconds, tracker_count=len(tracker_ids) if tracker_ids else 0)
 
+    # TrackingManager now handles all necessary prefetching including carrier config
     active_trackers = lib.identity(
         models.Tracking.objects.filter(id__in=tracker_ids)
         if any(tracker_ids)
@@ -152,69 +153,28 @@ def save_updated_trackers(
                     t for t in trackers if t.tracking_number == details.tracking_number
                 ]
                 for tracker in related_trackers:
-                    # update values only if changed; This is important for webhooks notification
-                    changes = []
-                    meta = details.meta or {}
+                    # Compute status from tracking details
                     status = utils.compute_tracking_status(details).value
-                    events = utils.process_events(
-                        response_events=details.events,
-                        current_events=tracker.events,
-                    )
+                    # Merge options with existing tracker options
                     options = {
                         **(tracker.options or {}),
                         tracker.tracking_number: details.meta,
                     }
-                    info = lib.to_dict(details.info or {})
-
-                    if events != tracker.events:
-                        tracker.events = events
-                        changes.append("events")
-
-                    if options != tracker.options:
-                        tracker.options = options
-                        changes.append("options")
-
-                    if details.meta != tracker.meta:
-                        tracker.meta = meta
-                        changes.append("meta")
-
-                    if details.delivered != tracker.delivered:
-                        tracker.delivered = details.delivered
-                        changes.append("delivered")
-
-                    if status != tracker.status:
-                        tracker.status = status
-                        changes.append("status")
-
-                    if details.estimated_delivery != tracker.estimated_delivery:
-                        tracker.estimated_delivery = details.estimated_delivery
-                        changes.append("estimated_delivery")
-
-                    if details.images is not None and (
-                        details.images.delivery_image != tracker.delivery_image
-                        or details.images.signature_image != tracker.signature_image
-                    ):
-                        changes.append("delivery_image")
-                        changes.append("signature_image")
-                        tracker.delivery_image = (
-                            details.images.delivery_image or tracker.delivery_image
-                        )
-                        tracker.signature_image = (
-                            details.images.signature_image or tracker.signature_image
-                        )
-
-                    if any(info.keys()) and info != tracker.info:
-                        tracker.info = serializers.process_dictionaries_mutations(
-                            ["info"], dict(info=info), tracker
-                        )["info"]
-                        changes.append("info")
-
-                    if any(changes):
-                        tracker.save(update_fields=changes)
-                        serializers.update_shipment_tracker(tracker)
-                        logger.debug("Tracking info updated successfully", tracking_number=details.tracking_number, changes=changes)
-                    else:
-                        logger.debug("No changes detected", tracking_number=details.tracking_number)
+
+                    # Use the centralized update_tracker function
+                    serializers.update_tracker(
+                        tracker,
+                        dict(
+                            events=details.events,
+                            delivered=details.delivered,
+                            status=status,
+                            estimated_delivery=details.estimated_delivery,
+                            options=options,
+                            meta=details.meta,
+                            info=lib.to_dict(details.info or {}),
+                            images=details.images,
+                        ),
+                    )
 
             except Exception as update_error:
                 logger.warning("Failed to update tracker", tracking_number=details.tracking_number, error=str(update_error))

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

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

{karrio_server_events-2025.5rc34.dist-info → karrio_server_events-2025.5rc36.dist-info}/RECORD

@@ -4,7 +4,7 @@ karrio/server/events/apps.py,sha256=DIV8JdPB_3hD4DwhcQTevhph3PaceMkFSEGM1lOcdVY,
 karrio/server/events/filters.py,sha256=vMeY42IsoFl482-yX1BI17sw-9x9euOnzTl-860W3sg,2230
 karrio/server/events/models.py,sha256=WQQKpDnbUW97beFmCBJDTckSoE-h-HtxeRfjoNWepQY,2582
 karrio/server/events/router.py,sha256=IBUR7rfBkdEHQzWxYOPcVSM8NBp3fte9G6Q5BVTUNNw,95
-karrio/server/events/signals.py,sha256=lIqouHZ_RGSzZXQgBeTT5Y0YoQL_TpzoifqxQKYJTSo,4539
+karrio/server/events/signals.py,sha256=3VlwVPWEyALcjn1MEbuh3u9Xojq8hSgmwYFz7lulW3M,4544
 karrio/server/events/tasks.py,sha256=kqs-W2VnDHOQNvieN8Ltehk578W5FTXTobj7t_mi9Xk,787
 karrio/server/events/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 karrio/server/events/urls.py,sha256=oLTTzDWPhEFfK93EvzHTDRxqkw8Fr3iXneDXwFUkvcU,217
@@ -25,8 +25,8 @@ karrio/server/events/serializers/event.py,sha256=dKYqldfSEjKMY7uB1rBFfEfSZ_dfEp8
 karrio/server/events/serializers/webhook.py,sha256=Ri5JS1SXpSsPUvQH989T_7Amu1p46y5TP54MEEhK8j8,889
 karrio/server/events/task_definitions/__init__.py,sha256=bpT73UG7mZL_JjEqMwbYx6q69jA8J5Jcoul1LcDokhA,81
 karrio/server/events/task_definitions/base/__init__.py,sha256=3vP52gFdCo9hctLRKnYvEi9iz1UK8GL_a47Nw44h3Nc,1834
-karrio/server/events/task_definitions/base/archiving.py,sha256=n2Jxn6Jj-3fMtNCBnCUXrq4_iePmvU31j4ntCilIXJk,7303
-karrio/server/events/task_definitions/base/tracking.py,sha256=av_uiT_0zNuZEC9X31EUXnuIF6gavtM8_1g300QUtzk,9026
+karrio/server/events/task_definitions/base/archiving.py,sha256=HVUfgzTSsfa-o2u6N1VuyPopnVLdFRwvv-3ix5LjKHc,7270
+karrio/server/events/task_definitions/base/tracking.py,sha256=3i4ArtrPLioVNcPICQiHPkXOpEayVCJqlMYHexWMchY,7081
 karrio/server/events/task_definitions/base/webhook.py,sha256=QNRq3xhLWQEbrs3zSy6Sa0AXUPhWE7YenKpPzZoFwL0,3616
 karrio/server/events/tests/__init__.py,sha256=5szv9hDvu0R0jtm3XWktY19rCaE8bZ2LdjRm4oJ0pYA,220
 karrio/server/events/tests/test_events.py,sha256=Fxi1hv_lyuRJw5Y_ydywhq5P3akpxet4mFMFSiHU96c,4066
@@ -39,7 +39,7 @@ karrio/server/graph/schemas/events/__init__.py,sha256=Yg1rWew5DgSb_OnLy8n7qqwPLf
 karrio/server/graph/schemas/events/inputs.py,sha256=Mgy9qCUrbL-sMI5dNXsnbW8K5_PnGKM13brzZrc5OWk,1526
 karrio/server/graph/schemas/events/mutations.py,sha256=930g2D5TnAEgEjfEfLml1Q9OGCyxe2D592BhzSGDQAQ,1862
 karrio/server/graph/schemas/events/types.py,sha256=TPlrDwQV4LZXu-1t4gFl_eYayU39THmgYT3uv7VXnnw,2759
-karrio_server_events-2025.5rc34.dist-info/METADATA,sha256=P-Rizyp2GNrfNJxOf3naA-6ObqnEKc0-cuj5BOUChxY,705
-karrio_server_events-2025.5rc34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_events-2025.5rc34.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_events-2025.5rc34.dist-info/RECORD,,
+karrio_server_events-2025.5rc36.dist-info/METADATA,sha256=3cWUxQ6QHNZtyeRohQmJ6U9gY509aq_-kRF2hM3omPI,705
+karrio_server_events-2025.5rc36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_events-2025.5rc36.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_events-2025.5rc36.dist-info/RECORD,,