karrio-server-events 2025.5rc30__py3-none-any.whl → 2025.5rc32__py3-none-any.whl

karrio/server/events/signals.py

@@ -1,22 +1,20 @@
-import logging
 from django.db.models import signals
 
 from karrio.server.core import utils
+from karrio.server.core.logging import logger
 from karrio.server.conf import settings
 from karrio.server.events.serializers import EventTypes
 import karrio.server.core.serializers as serializers
 import karrio.server.manager.models as models
 import karrio.server.events.tasks as tasks
 
-logger = logging.getLogger(__name__)
-
 
 def register_signals():
     signals.post_save.connect(shipment_updated, sender=models.Shipment)
     signals.post_delete.connect(shipment_cancelled, sender=models.Shipment)
     signals.post_save.connect(tracker_updated, sender=models.Tracking)
 
-    logger.info("karrio.events signals registered...")
+    logger.info("Karrio events signals registered")
 
 
 @utils.disable_for_loaddata

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

@@ -1,17 +1,15 @@
-import logging
 import datetime
 import django.utils.timezone as timezone
 
 import karrio.server.conf as conf
 import karrio.server.core.utils as utils
+from karrio.server.core.logging import logger
 import karrio.server.core.models as core
 import karrio.server.events.models as events
 import karrio.server.orders.models as orders
 import karrio.server.tracing.models as tracing
 import karrio.server.manager.models as manager
 
-logger = logging.getLogger(__name__)
-
 
 def run_data_archiving(*args, **kwargs):
     now = timezone.now()
@@ -36,36 +34,36 @@ def run_data_archiving(*args, **kwargs):
     order_exists = orders.Order.objects.filter(created_at__lt=order_retention).exists()
 
     if tracing_exists:
-        logger.info(">> archiving SDK tracing backlog...")
+        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...")
+        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...")
+        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...")
+        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...")
+        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...")
+        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))
 
-    logger.info("> ending scheduled backlog archiving!")
+    logger.info("Finished scheduled backlog archiving")
 
 
 def _bulk_delete_tracing_data(tracing_queryset):
@@ -91,7 +89,7 @@ def _bulk_delete_tracing_data(tracing_queryset):
             deleted_count = tracing_queryset.filter(id__in=batch_ids).delete()[0]
             total_deleted += deleted_count
             
-            logger.info(f"Deleted {deleted_count} tracing records (total: {total_deleted})")
+            logger.info("Deleted tracing records batch", batch_count=deleted_count, total_deleted=total_deleted)
             
     except ImportError:
         # Organizations module not installed, just delete in batches
@@ -106,7 +104,7 @@ def _bulk_delete_tracing_data(tracing_queryset):
             deleted_count = tracing_queryset.filter(id__in=batch_ids).delete()[0]
             total_deleted += deleted_count
             
-            logger.info(f"Deleted {deleted_count} tracing records (total: {total_deleted})")
+            logger.info("Deleted tracing records batch", batch_count=deleted_count, total_deleted=total_deleted)
 
 
 def _bulk_delete_tracking_data(tracking_queryset):

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

@@ -1,6 +1,5 @@
 import time
 import typing
-import logging
 import datetime
 import functools
 from itertools import groupby
@@ -15,12 +14,11 @@ from karrio.api.interface import IRequestFrom
 from karrio.core.models import TrackingDetails, Message, TrackingEvent
 
 import karrio.server.core.utils as utils
+from karrio.server.core.logging import logger
 import karrio.server.manager.models as models
 import karrio.server.tracing.utils as tracing
 import karrio.server.core.datatypes as datatypes
 import karrio.server.manager.serializers as serializers
-
-logger = logging.getLogger(__name__)
 Delay = int
 RequestBatches = typing.Tuple[
     Gateway, IRequestFrom, Delay, typing.List[models.Tracking]
@@ -38,7 +36,7 @@ def update_trackers(
     ),
     tracker_ids: typing.List[str] = [],
 ):
-    logger.info("> starting scheduled trackers update")
+    logger.info("Starting scheduled trackers update", delta_seconds=delta.seconds, tracker_count=len(tracker_ids) if tracker_ids else 0)
 
     active_trackers = lib.identity(
         models.Tracking.objects.filter(id__in=tracker_ids)
@@ -61,9 +59,9 @@ def update_trackers(
         save_tracing_records(request_batches)
         save_updated_trackers(responses, active_trackers)
     else:
-        logger.info("no active trackers found needing update")
+        logger.info("No active trackers found needing update")
 
-    logger.info("> ending scheduled trackers update")
+    logger.info("Finished scheduled trackers update")
 
 
 def create_request_batches(
@@ -86,7 +84,7 @@ def create_request_batches(
                 lambda acc, t: {**acc, **(t.options or {})}, batch_trackers, {}
             )
 
-            logger.debug(f"prepare tracking request for {tracking_numbers}")
+            logger.debug("Preparing tracking request", tracking_numbers=tracking_numbers, batch_range=(start, end))
 
             # Prepare and send tracking request(s) using the karrio interface.
             request: IRequestFrom = karrio.Tracking.fetch(
@@ -99,8 +97,8 @@ def create_request_batches(
             batches.append((gateway, request, delay, batch_trackers))
 
         except Exception as request_error:
-            logger.warning(f"failed to prepare tracking batch ({start}, {end}) request")
-            logger.error(request_error, exc_info=True)
+            logger.warning("Failed to prepare tracking batch request", batch_range=(start, end), error=str(request_error))
+            logger.exception("Tracking batch request preparation error", batch_range=(start, end))
 
         end += 10
         start += 10
@@ -110,21 +108,22 @@ def create_request_batches(
 
 def fetch_tracking_info(request_batch: RequestBatches) -> BatchResponse:
     gateway, request, delay, trackers = request_batch
-    logger.debug(f"fetching batch {[t.tracking_number for t in trackers]}")
+    tracking_numbers = [t.tracking_number for t in trackers]
+    logger.debug("Fetching tracking batch", tracking_numbers=tracking_numbers, delay_seconds=delay)
     time.sleep(delay)  # apply delay before request
 
     try:
         return utils.identity(lambda: request.from_(gateway).parse())
     except Exception as request_error:
-        logger.warning("batch request failed")
-        logger.error(request_error, exc_info=True)
+        logger.warning("Tracking batch request failed", tracking_numbers=tracking_numbers, error=str(request_error))
+        logger.exception("Tracking batch request error", tracking_numbers=tracking_numbers)
 
     return []
 
 
 @utils.error_wrapper
 def save_tracing_records(request_batches: typing.List[RequestBatches]):
-    logger.info("> saving tracing records...")
+    logger.info("Saving tracing records", batch_count=len(request_batches))
 
     try:
         for request_batch in request_batches:
@@ -136,20 +135,19 @@ def save_tracing_records(request_batches: typing.List[RequestBatches]):
             context = serializers.get_object_context(trackers[0])
             tracing.bulk_save_tracing_records(gateway.tracer, context=context)
     except Exception as error:
-        print(error)
-        logger.warning("Failed failed saving tracing record...")
-        logger.error(error, exc_info=True)
+        logger.warning("Failed to save tracing records", error=str(error))
+        logger.exception("Tracing record save error")
 
 
 def save_updated_trackers(
     responses: typing.List[BatchResponse], trackers: typing.List[models.Tracking]
 ):
-    logger.info("> saving updated trackers")
+    logger.info("Saving updated trackers", tracker_count=len(trackers))
 
     for tracking_details, _ in responses:
         for details in tracking_details or []:
             try:
-                logger.debug(f"update tracking info for {details.tracking_number}")
+                logger.debug("Updating tracking info", tracking_number=details.tracking_number)
                 related_trackers = [
                     t for t in trackers if t.tracking_number == details.tracking_number
                 ]
@@ -214,14 +212,10 @@ def save_updated_trackers(
                     if any(changes):
                         tracker.save(update_fields=changes)
                         serializers.update_shipment_tracker(tracker)
-                        logger.debug(
-                            f"tracking info {details.tracking_number} updated successfully"
-                        )
+                        logger.debug("Tracking info updated successfully", tracking_number=details.tracking_number, changes=changes)
                     else:
-                        logger.debug(f"no changes detect")
+                        logger.debug("No changes detected", tracking_number=details.tracking_number)
 
             except Exception as update_error:
-                logger.warning(
-                    f"failed to update tracker with tracking number: {details.tracking_number}"
-                )
-                logger.error(update_error, exc_info=True)
+                logger.warning("Failed to update tracker", tracking_number=details.tracking_number, error=str(update_error))
+                logger.exception("Tracker update error", tracking_number=details.tracking_number)

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

@@ -1,6 +1,5 @@
 import typing
 import requests
-import logging
 from datetime import datetime
 from django.conf import settings
 from django.db.models import Q
@@ -8,11 +7,10 @@ from django.contrib.auth import get_user_model
 
 from karrio.core import utils
 from karrio.server.core.utils import identity
+from karrio.server.core.logging import logger
 from karrio.server.serializers import Context
 from karrio.server.events import models
 import karrio.server.events.serializers.event as serializers
-
-logger = logging.getLogger(__name__)
 NotificationResponse = typing.Tuple[str, requests.Response]
 User = get_user_model()
 
@@ -24,7 +22,7 @@ def notify_webhook_subscribers(
     ctx: dict,
     **kwargs,
 ):
-    logger.info(f"> starting {event} subscribers notification")
+    logger.info("Starting webhook subscribers notification", event=event)
     context = retrieve_context(ctx)
     query = (
         (Q(enabled_events__icontains=event) | Q(enabled_events__icontains="all")),
@@ -49,9 +47,9 @@ def notify_webhook_subscribers(
         )
         update_notified_webhooks(webhooks, responses, event_at)
     else:
-        logger.info("no subscribers found")
+        logger.info("No webhook subscribers found", event=event)
 
-    logger.info(f"> ending {event} subscribers notification")
+    logger.info("Finished webhook subscribers notification", event=event)
 
 
 def notify_subscribers(webhooks: typing.List[models.Webhook], payload: dict):
@@ -77,11 +75,11 @@ def update_notified_webhooks(
     responses: typing.List[NotificationResponse],
     event_at: datetime,
 ):
-    logger.info("> saving updated webhooks")
+    logger.info("Saving updated webhooks")
 
     for webhook_id, response in responses:
         try:
-            logger.debug(f"update webhook {webhook_id}")
+            logger.debug("Updating webhook", webhook_id=webhook_id)
 
             webhook = next((w for w in webhooks if w.id == webhook_id))
             if response.ok:
@@ -94,11 +92,11 @@ def update_notified_webhooks(
 
             webhook.save()
 
-            logger.debug(f"webhook {webhook_id} updated successfully")
+            logger.debug("Webhook updated successfully", webhook_id=webhook_id)
 
         except Exception as update_error:
-            logger.warning(f"failed to update webhook {webhook_id}")
-            logger.error(update_error, exc_info=True)
+            logger.warning("Failed to update webhook", webhook_id=webhook_id, error=str(update_error))
+            logger.exception("Webhook update error", webhook_id=webhook_id)
 
 
 def retrieve_context(info: dict) -> Context:

karrio/server/events/tasks.py

@@ -1,9 +1,7 @@
 import typing
-import logging
 import pkgutil
+from karrio.server.core.logging import logger
 import karrio.server.events.task_definitions as definitions
-
-logger = logging.getLogger(__name__)
 DEFINITIONS: typing.List[typing.Any] = []
 
 # Register karrio background tasks
@@ -13,8 +11,8 @@ for _, name, _ in pkgutil.iter_modules(definitions.__path__):  # type: ignore
         if hasattr(definition, "TASK_DEFINITIONS"):
             DEFINITIONS += definition.TASK_DEFINITIONS
     except Exception as e:
-        logger.warning(f'Failed to register "{name}" schema')
-        logger.exception(e)
+        logger.warning(f"Failed to register task definition", task_name=name, error=str(e))
+        logger.exception(f"Task definition registration error", task_name=name)
 
 for wrapper in DEFINITIONS:
     globals()[wrapper.task_class.__name__] = wrapper

{karrio_server_events-2025.5rc30.dist-info → karrio_server_events-2025.5rc32.dist-info}/METADATA

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

{karrio_server_events-2025.5rc30.dist-info → karrio_server_events-2025.5rc32.dist-info}/RECORD

@@ -4,8 +4,8 @@ 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=gQ1FHwd-LXpg9OcV0inaqNBxSkqQVaztOgCOFNbo7I8,4549
-karrio/server/events/tasks.py,sha256=RVLJ2cNEQnT-3bUoitw9C_ST6g7tlLyzuJvu8omLOHc,712
+karrio/server/events/signals.py,sha256=lIqouHZ_RGSzZXQgBeTT5Y0YoQL_TpzoifqxQKYJTSo,4539
+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
 karrio/server/events/migrations/0001_initial.py,sha256=c_HS1Pt89fnDgc839eh2VGBN4mvICBGWH5OUC5Xsz8k,2212
@@ -25,9 +25,9 @@ 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=MtQoW5y4TwoFphg96hXrz_3wBoKxrmI5yQRiHm98pL4,6987
-karrio/server/events/task_definitions/base/tracking.py,sha256=UL7-z1nVp3Scz-Nm6xuJB8S6obfaiHd-IyBXXIcrwOo,8533
-karrio/server/events/task_definitions/base/webhook.py,sha256=NgXMJw_55pwZ5z4bu49VUekFNkUJ_cwvs01PNnLxhI4,3506
+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/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
@@ -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.5rc30.dist-info/METADATA,sha256=NnYeZbHvx4wo_uhsNk14pUptfRSZxeLjF-Oc4q-yT8A,705
-karrio_server_events-2025.5rc30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_events-2025.5rc30.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_events-2025.5rc30.dist-info/RECORD,,
+karrio_server_events-2025.5rc32.dist-info/METADATA,sha256=QQ8nCIksva7rWXw-ygn4COHUMOrwrgRVAxPc0EZMFQQ,705
+karrio_server_events-2025.5rc32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_events-2025.5rc32.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_events-2025.5rc32.dist-info/RECORD,,