karrio-server-events 2025.5rc35__py3-none-any.whl → 2025.5.1__py3-none-any.whl

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

@@ -1,10 +1,10 @@
-import time
 import logging
 from django.conf import settings
 from huey import crontab
 from huey.contrib.djhuey import db_task, db_periodic_task
 
 import karrio.server.core.utils as utils
+from karrio.server.core.telemetry import with_task_telemetry
 
 logger = logging.getLogger(__name__)
 DATA_ARCHIVING_SCHEDULE = int(getattr(settings, "DATA_ARCHIVING_SCHEDULE", 168))
@@ -14,45 +14,37 @@ DEFAULT_TRACKERS_UPDATE_INTERVAL = int(
 
 
 @db_periodic_task(crontab(minute=f"*/{DEFAULT_TRACKERS_UPDATE_INTERVAL}"))
+@with_task_telemetry("background_trackers_update")
 def background_trackers_update():
     from karrio.server.events.task_definitions.base import tracking
 
     @utils.run_on_all_tenants
     def _run(**kwargs):
-        try:
-            tracking.update_trackers()
-        except Exception as e:
-            logger.error(f"An error occured during tracking statuses update: {e}")
+        tracking.update_trackers()
 
     _run()
 
 
 @db_task(retries=5, retry_delay=60)
 @utils.tenant_aware
+@with_task_telemetry("notify_webhooks")
 def notify_webhooks(*args, **kwargs):
-    try:
-        from karrio.server.events.task_definitions.base import webhook
+    from karrio.server.events.task_definitions.base import webhook
 
-        webhook.notify_webhook_subscribers(*args, **kwargs)
-
-    except Exception as e:
-        logger.error(f"An error occured during webhook notification: {e}")
-        raise e
+    webhook.notify_webhook_subscribers(*args, **kwargs)
 
 
 @db_periodic_task(crontab(hour=f"*/{DATA_ARCHIVING_SCHEDULE}"))
+@with_task_telemetry("periodic_data_archiving")
 def periodic_data_archiving(*args, **kwargs):
     from karrio.server.events.task_definitions.base import archiving
 
     @utils.run_on_all_tenants
     def _run(**kwargs):
-        try:
-            utils.failsafe(
-                lambda: archiving.run_data_archiving(*args, **kwargs),
-                "An error occured during data archiving: $error",
-            )
-        except Exception as e:
-            logger.error(f"An error occured during data archiving: {e}")
+        utils.failsafe(
+            lambda: archiving.run_data_archiving(*args, **kwargs),
+            "An error occured during data archiving: $error",
+        )
 
     _run()
 

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

@@ -153,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/tests/test_webhooks.py

@@ -32,7 +32,7 @@ class TestWebhookDetails(APITestCase):
         super().setUp()
         self.webhook: Webhook = Webhook.objects.create(
             **{
-                "url": "http://localhost:8080",
+                "url": "https://api.karrio.io",
                 "description": "Testing Hook",
                 "enabled_events": ["all"],
                 "test_mode": True,
@@ -84,14 +84,14 @@ class TestWebhookDetails(APITestCase):
 
 
 WEBHOOK_DATA = {
-    "url": "http://localhost:8080",
+    "url": "https://api.karrio.io",
     "description": "Testing Hook",
     "enabled_events": ["all"],
     "test_mode": True,
 }
 
 WEBHOOK_RESPONSE = {
-    "url": "http://localhost:8080",
+    "url": "https://api.karrio.io",
     "description": "Testing Hook",
     "enabled_events": ["all"],
     "test_mode": True,
@@ -108,7 +108,7 @@ WEBHOOK_UPDATE_DATA = {
 }
 
 WEBHOOK_UPDATED_RESPONSE = {
-    "url": "http://localhost:8080",
+    "url": "https://api.karrio.io",
     "description": "Testing Hook Updated",
     "enabled_events": ["shipment_purchased", "shipment_cancelled"],
     "test_mode": True,
@@ -120,7 +120,7 @@ WEBHOOK_UPDATED_RESPONSE = {
 }
 
 WEBHOOK_NOTIFIED_RESPONSE = {
-    "url": "http://localhost:8080",
+    "url": "https://api.karrio.io",
     "description": "Testing Hook",
     "enabled_events": ["all"],
     "test_mode": True,

{karrio_server_events-2025.5rc35.dist-info → karrio_server_events-2025.5.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: karrio_server_events
-Version: 2025.5rc35
+Version: 2025.5.1
 Summary: Multi-carrier shipping API Events module
 Author-email: karrio <hello@karrio.io>
-License-Expression: Apache-2.0
+License-Expression: LGPL-3.0
 Project-URL: Homepage, https://github.com/karrioapi/karrio
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11

{karrio_server_events-2025.5rc35.dist-info → karrio_server_events-2025.5.1.dist-info}/RECORD

@@ -24,14 +24,14 @@ karrio/server/events/serializers/base.py,sha256=Civqqod7X2u8wUfQpx7NejFpQfqQD8UW
 karrio/server/events/serializers/event.py,sha256=dKYqldfSEjKMY7uB1rBFfEfSZ_dfEp8EPxbkBBSWzcc,289
 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/__init__.py,sha256=2c3k6qtrdTZ6gxV3JJIpVo7CV83xzVn0vLF8nBpud28,1622
 karrio/server/events/task_definitions/base/archiving.py,sha256=HVUfgzTSsfa-o2u6N1VuyPopnVLdFRwvv-3ix5LjKHc,7270
-karrio/server/events/task_definitions/base/tracking.py,sha256=rSzNZiRGmchgJj81iSl9X6QXExsTfxegqTyfRkjOvPE,9111
+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
 karrio/server/events/tests/test_tracking_tasks.py,sha256=oOPdjhVax4SzTgBwKxySosgWOX6ZJ2Y-cYvXp3kj0lw,12114
-karrio/server/events/tests/test_webhooks.py,sha256=5Ts3RG_DQ5x0mnWRgTLOX-7FjSAEHXCvT913Sm7FLNM,3860
+karrio/server/events/tests/test_webhooks.py,sha256=RcGPghj8HmWC0mA3KaOiFbXh3PneVf9ufY0kdtxod9I,3860
 karrio/server/events/views/__init__.py,sha256=Y4hfjd_YSOHj6L7oH41bssVW8rXI_l4vD_IthfNuJ2o,90
 karrio/server/events/views/webhooks.py,sha256=191DjXCoSTM_9AA-Kw-JxQ2TYQ6uYOQMrIDv11ZeTo0,5300
 karrio/server/graph/schemas/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81
@@ -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.5rc35.dist-info/METADATA,sha256=udp3Y8My2q74CuIdnd9qte8hrZ-rux6l_o3gjCQaREA,705
-karrio_server_events-2025.5rc35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_events-2025.5rc35.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_events-2025.5rc35.dist-info/RECORD,,
+karrio_server_events-2025.5.1.dist-info/METADATA,sha256=gM1-orecV25tI7kBQ4LA8zqdKZNiVua6rwEzayyb-a4,701
+karrio_server_events-2025.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_events-2025.5.1.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_events-2025.5.1.dist-info/RECORD,,