karrio-server-manager 2025.5.5__py3-none-any.whl → 2025.5.7__py3-none-any.whl

karrio/server/manager/migrations/0068_shipment_extra_documents.py

@@ -0,0 +1,20 @@
+# Generated by Django 6.0 on 2025-12-12 20:16
+
+import functools
+import karrio.server.core.utils
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('manager', '0067_rename_customs_commodities_table'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='shipment',
+            name='extra_documents',
+            field=models.JSONField(blank=True, default=functools.partial(karrio.server.core.utils.identity, value=[]), null=True),
+        ),
+    ]

karrio/server/manager/migrations/0069_alter_tracking_status.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.9 on 2025-12-19 03:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("manager", "0068_shipment_extra_documents"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tracking",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("pending", "pending"),
+                    ("picked_up", "picked_up"),
+                    ("unknown", "unknown"),
+                    ("on_hold", "on_hold"),
+                    ("cancelled", "cancelled"),
+                    ("delivered", "delivered"),
+                    ("in_transit", "in_transit"),
+                    ("delivery_delayed", "delivery_delayed"),
+                    ("out_for_delivery", "out_for_delivery"),
+                    ("ready_for_pickup", "ready_for_pickup"),
+                    ("delivery_failed", "delivery_failed"),
+                    ("return_to_sender", "return_to_sender"),
+                ],
+                db_index=True,
+                default="pending",
+                max_length=25,
+            ),
+        ),
+    ]

karrio/server/manager/models.py

@@ -823,6 +823,9 @@ class Shipment(core.OwnedEntity):
     metadata = models.JSONField(
         blank=True, null=True, default=functools.partial(utils.identity, value={})
     )
+    extra_documents = models.JSONField(
+        blank=True, null=True, default=functools.partial(utils.identity, value=[])
+    )
 
     # System Reference fields
 

karrio/server/manager/serializers/shipment.py

@@ -285,8 +285,14 @@ class ShipmentSerializer(ShipmentData):
         if "docs" in validated_data:
             changes.append("label")
             changes.append("invoice")
+            changes.append("extra_documents")
             instance.label = validated_data["docs"].get("label") or instance.label
             instance.invoice = validated_data["docs"].get("invoice") or instance.invoice
+            instance.extra_documents = (
+                validated_data["docs"].get("extra_documents")
+                or instance.extra_documents
+                or []
+            )
 
         if "selected_rate" in validated_data:
             selected_rate = validated_data.get("selected_rate", {})
@@ -387,6 +393,7 @@ class ShipmentUpdateData(validators.OptionDefaultSerializer):
             "shipment_note": "This is a shipment note",
             "signature_confirmation": true,
             "saturday_delivery": true,
+            "shipping_charges": 10.00,
             "is_return": true,
             "doc_files": [
                 {
@@ -443,6 +450,7 @@ class ShipmentRateData(validators.OptionDefaultSerializer):
         {
             "currency": "USD",
             "insurance": 100.00,
+            "insured_by": "carrier",
             "cash_on_delivery": 30.00,
             "dangerous_good": true,
             "declared_value": 150.00,
@@ -450,6 +458,7 @@ class ShipmentRateData(validators.OptionDefaultSerializer):
             "email_notification": true,
             "email_notification_to": "shipper@mail.com",
             "hold_at_location": true,
+            "locker_id": "123456789",
             "paperless_trade": true,
             "preferred_service": "fedex_express_saver",
             "shipment_date": "2020-01-01",  # TODO: deprecate
@@ -457,6 +466,7 @@ class ShipmentRateData(validators.OptionDefaultSerializer):
             "shipment_note": "This is a shipment note",
             "signature_confirmation": true,
             "saturday_delivery": true,
+            "shipping_charges": 10.00,
             "is_return": true,
             "doc_files": [
                 {
@@ -500,6 +510,7 @@ class ShipmentPurchaseSerializer(Shipment):
         {
             "currency": "USD",
             "insurance": 100.00,
+            "insured_by": "carrier",
             "cash_on_delivery": 30.00,
             "dangerous_good": true,
             "declared_value": 150.00,
@@ -507,6 +518,7 @@ class ShipmentPurchaseSerializer(Shipment):
             "email_notification": true,
             "email_notification_to": "shipper@mail.com",
             "hold_at_location": true,
+            "locker_id": "123456789",
             "paperless_trade": true,
             "preferred_service": "fedex_express_saver",
             "shipment_date": "2020-01-01",  # TODO: deprecate
@@ -514,6 +526,7 @@ class ShipmentPurchaseSerializer(Shipment):
             "shipment_note": "This is a shipment note",
             "signature_confirmation": true,
             "saturday_delivery": true,
+            "shipping_charges": 10.00,
             "is_return": true,
             "doc_files": [
                 {

karrio/server/manager/serializers/tracking.py

@@ -67,11 +67,14 @@ class TrackingSerializer(TrackingDetails):
             raise_on_error=(pending_pickup is not True),
         )
 
+        # Apply picked_up transformation for initial events
+        events = utils._ensure_picked_up_status(lib.to_dict(response.tracking.events))
+
         return models.Tracking.objects.create(
             created_by=context.user,
             tracking_number=tracking_number,
             account_number=account_number,
-            events=lib.to_dict(response.tracking.events),
+            events=events,
             test_mode=response.tracking.test_mode,
             delivered=response.tracking.delivered,
             status=response.tracking.status,
@@ -191,6 +194,8 @@ def update_shipment_tracker(tracker: models.Tracking):
             status = ShipmentStatus.delivered.value
         elif tracker.status == TrackerStatus.pending.value:
             status = tracker.shipment.status
+        elif tracker.status == TrackerStatus.picked_up.value:
+            status = ShipmentStatus.shipped.value
         elif tracker.status == TrackerStatus.out_for_delivery.value:
             status = ShipmentStatus.out_for_delivery.value
         elif tracker.status == TrackerStatus.delivery_failed.value:

karrio/server/manager/tests/test_shipments.py

@@ -1205,6 +1205,7 @@ class TestShipmentCancelIdempotent(APITestCase):
 LABEL_DOCUMENT_RESPONSE = {
     "category": "label",
     "format": "PDF",
+    "print_format": None,
     "base64": "==apodifjoefr",
     "url": ANY,
 }

karrio/server/manager/tests/test_trackers.py

@@ -130,6 +130,8 @@ TRACKING_RESPONSE = {
             "latitude": None,
             "longitude": None,
             "reason": None,
+            "status": None,
+            "timestamp": None,
         }
     ],
     "messages": [],
@@ -182,6 +184,8 @@ UPDATE_TRACKING_RESPONSE = {
             "longitude": None,
             "time": "20:34",
             "reason": None,
+            "status": None,
+            "timestamp": None,
         }
     ],
     "delivered": False,

karrio/server/manager/views/manifests.py

@@ -11,6 +11,7 @@ import rest_framework.throttling as throttling
 import django_filters.rest_framework as django_filters
 
 from karrio.server.core.utils import validate_resource_token
+from karrio.server.core.authentication import AccessMixin
 import karrio.server.openapi as openapi
 import karrio.server.core.views.api as api
 import karrio.server.core.filters as filters
@@ -106,7 +107,7 @@ class ManifestDetails(api.APIView):
         return response.Response(serializers.Manifest(manifest).data)
 
 
-class ManifestDoc(django_downloadview.VirtualDownloadView):
+class ManifestDoc(AccessMixin, django_downloadview.VirtualDownloadView):
     @openapi.extend_schema(exclude=True)
     def get(self, req: request.Request, pk: str, doc: str = "manifest", format: str = "pdf", **kwargs):
         """Retrieve a manifest file."""

karrio/server/manager/views/shipments.py

@@ -15,6 +15,7 @@ import karrio.server.openapi as openapi
 import karrio.server.core.filters as filters
 import karrio.server.manager.models as models
 from karrio.server.core.views.api import GenericAPIView, APIView
+from karrio.server.core.authentication import AccessMixin
 from karrio.server.core.filters import ShipmentFilters
 from karrio.server.manager.router import router
 from karrio.server.manager.serializers import (
@@ -267,7 +268,7 @@ class ShipmentPurchase(APIView):
         return Response(PurchasedShipment(update).data)
 
 
-class ShipmentDocs(VirtualDownloadView):
+class ShipmentDocs(AccessMixin, VirtualDownloadView):
     @openapi.extend_schema(exclude=True)
     def get(
         self,

{karrio_server_manager-2025.5.5.dist-info → karrio_server_manager-2025.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_manager
-Version: 2025.5.5
+Version: 2025.5.7
 Summary: Multi-carrier shipping API Shipments manager module
 Author-email: karrio <hello@karrio.io>
 License-Expression: LGPL-3.0

{karrio_server_manager-2025.5.5.dist-info → karrio_server_manager-2025.5.7.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=WruyZDTfqKlqu81fwAyxVCwxDu1lvl9l4bo9FbnFbos,34329
+karrio/server/manager/models.py,sha256=eMBARl00oZVE_L1YMXV79bNBp5n36mVQO-MlSexBA3M,34458
 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,6 +73,8 @@ 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/0067_rename_customs_commodities_table.py,sha256=WPACK9Ab5QUdcX9yxBkV6_MXTAkB9F8vETDOlVqOrT4,1933
+karrio/server/manager/migrations/0068_shipment_extra_documents.py,sha256=DL4FqB5bf5Rq3YuWVJsBMStkwMDmHIp_WN1BA6hKSTI,536
+karrio/server/manager/migrations/0069_alter_tracking_status.py,sha256=p7rra3Iva_FT6eBmfKcpvC-E5Zll4bH69kMX9Us3Q-w,1170
 karrio/server/manager/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/manager/serializers/__init__.py,sha256=FyL9pqzoV7umSJut5P2KzqPFxn1ZWu07Qx7I58H2AQc,1454
 karrio/server/manager/serializers/address.py,sha256=yGKvZiNukeI15LEDdbo1ycqqK8QW77ak_vyLMIKyglI,2779
@@ -83,8 +85,8 @@ karrio/server/manager/serializers/manifest.py,sha256=mSneCk_7HMXpi64_7hggWvkR7Ma
 karrio/server/manager/serializers/parcel.py,sha256=733Bg26lVbEkoWtAVM5Qt2IRBS2QDuVxhG40Hiqh3bw,2621
 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=ByVrnexMI_fgSGBWO95qOPQn65Xzcfb8Vna9nF3k7Bk,37004
-karrio/server/manager/serializers/tracking.py,sha256=ixrAjIiZQsvSt4y0qtisGkt6TFOJ3ORNkJAQVt6YQrA,12483
+karrio/server/manager/serializers/shipment.py,sha256=XuqCsB8TBYtn270JNKyvmYglDZttEfLED69NYN-uVyA,37500
+karrio/server/manager/serializers/tracking.py,sha256=BViFnLlojwbRuy3U1rP2Vp_UqWRjwTd_4OVrhNAfkEA,12712
 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
@@ -92,18 +94,18 @@ karrio/server/manager/tests/test_errors.py,sha256=x2-mSsXknHkE4V7TajEu8d3rpqV38T
 karrio/server/manager/tests/test_manifests.py,sha256=X35ZTXTFEM4Gxdjz598yiNNkOOKZGpILjHWRC0oM5U4,2764
 karrio/server/manager/tests/test_parcels.py,sha256=lVLBOsHzXgXQvYjHIUy5oiPvrMfxYpueVvvhtuhstWk,2559
 karrio/server/manager/tests/test_pickups.py,sha256=8jxddwTnBvBM9FOyWxW9TtZ-GOVYUje7HQ2EZjsbtD8,10681
-karrio/server/manager/tests/test_shipments.py,sha256=I9DIx4l7zrHZ_vEvAKgdrnIx_euZtreSj9W40fouqSU,39725
-karrio/server/manager/tests/test_trackers.py,sha256=VIGT8OVH51mf_6F2HEr5C-kYvsMnhUods_rpq543RbI,7207
+karrio/server/manager/tests/test_shipments.py,sha256=S_mDZtCFd1R5S40AA83LfmQsGJGrJ52gwDzh2SY4YIM,39751
+karrio/server/manager/tests/test_trackers.py,sha256=DNeGR-MQ6E_HIARuDUod7bIfhRgem3by-_rMLJR5JfM,7325
 karrio/server/manager/views/__init__.py,sha256=kDFUaORRQ3Xh0ZPm-Jk88Ss8dgGYM57iUFXb9TPMzh0,401
 karrio/server/manager/views/addresses.py,sha256=7YCAs2ZYgd1icYwMcGGWfX7A7vZEL4BEAbU4eIxhiMY,4620
 karrio/server/manager/views/customs.py,sha256=-ZreiKyJ1xeLeNVG53nMfRQFeURduWr1QkDItdLPnE8,4875
 karrio/server/manager/views/documents.py,sha256=znW54qJ_k7WInIut5FBZFDT93CioozXTOYFKRSUTBhA,4005
-karrio/server/manager/views/manifests.py,sha256=bk-8XoGLVqgjDfpTZbTKjXW7r8DYNDp2ce2xGG73sbI,7012
+karrio/server/manager/views/manifests.py,sha256=KwDoV7GSdRv7YDAzl0SLaNoAx4R-gBguO_WiW_qwfBM,7083
 karrio/server/manager/views/parcels.py,sha256=hZY45rg6SrTWfQqyJ38MGKSor1yqgPUEVHtu16aG37g,4594
 karrio/server/manager/views/pickups.py,sha256=gmpxz9ot1OR-BP1qh-0MXU3kUJi1ht_74hfaLJzJ42w,5503
-karrio/server/manager/views/shipments.py,sha256=YOFcZy-ymn3YfIKtcfNjFO4R_tPocrmEqMkQUXSSDCM,13083
+karrio/server/manager/views/shipments.py,sha256=vdJFgIKnSHEb2FVGtqJbiMoHuMqzWtDpINMH4UaEtQQ,13154
 karrio/server/manager/views/trackers.py,sha256=3oGn2qDpHgk8GZvuz-Cb93Fc0j_h_HbXQR692Zhfiok,12363
-karrio_server_manager-2025.5.5.dist-info/METADATA,sha256=fj_XMA52xNVPSCUZYh2CywQdx6mZSiqtMP0DJ51gtrQ,730
-karrio_server_manager-2025.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_manager-2025.5.5.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_manager-2025.5.5.dist-info/RECORD,,
+karrio_server_manager-2025.5.7.dist-info/METADATA,sha256=XazOdL7uDHjIEM2eIv1ZOJcLQjqXo92DMzGTsivtK2k,730
+karrio_server_manager-2025.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_manager-2025.5.7.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_manager-2025.5.7.dist-info/RECORD,,