karrio-server-core 2025.5rc22__py3-none-any.whl → 2025.5rc24__py3-none-any.whl

karrio/server/core/dataunits.py

@@ -1,4 +1,4 @@
-import typing
+import logging
 from constance import config
 from django.urls import reverse
 from rest_framework.request import Request
@@ -31,18 +31,29 @@ NON_HUBS_CARRIERS = [
     carrier_name for carrier_name in CARRIER_NAMES if carrier_name not in CARRIER_HUBS
 ]
 
+LOGGER = logging.getLogger(__name__)
+
 
 def contextual_metadata(request: Request):
-    _host: str = typing.cast(
-        str,
-        (
-            request.build_absolute_uri(
-                reverse("karrio.server.core:metadata", kwargs={})
-            )
-            if hasattr(request, "build_absolute_uri")
-            else "/"
-        ),
-    )
+    # Detect HTTPS from headers (for proxied environments like Caddy/ALB)
+    is_https = False
+    if hasattr(request, 'META'):
+        # Check X-Forwarded-Proto header (set by load balancers/proxies)
+        forwarded_proto = request.META.get('HTTP_X_FORWARDED_PROTO', '').lower()
+        # Check if request is secure (Django's built-in HTTPS detection)
+        is_secure = getattr(request, 'is_secure', lambda: False)()
+        is_https = forwarded_proto == 'https' or is_secure
+
+    if hasattr(request, "build_absolute_uri"):
+        _host: str = request.build_absolute_uri(
+            reverse("karrio.server.core:metadata", kwargs={})
+        )
+        # Override protocol if we detected HTTPS but build_absolute_uri returned HTTP
+        if is_https and _host.startswith('http://'):
+            _host = _host.replace('http://', 'https://', 1)
+    else:
+        _host = "/"
+
     host = _host[:-1] if _host[-1] == "/" else _host
     name = lib.identity(
         getattr(conf.settings.tenant, "name", conf.settings.APP_NAME)

karrio/server/core/serializers.py

@@ -323,6 +323,26 @@ class CommodityData(serializers.Serializer):
         choices=COUNTRIES,
         help_text="The origin or manufacture country",
     )
+    product_url = serializers.CharField(
+        required=False,
+        allow_null=True,
+        help_text="The product url",
+    )
+    image_url = serializers.CharField(
+        required=False,
+        allow_null=True,
+        help_text="The image url",
+    )
+    product_id = serializers.CharField(
+        required=False,
+        allow_null=True,
+        help_text="The product id",
+    )
+    variant_id = serializers.CharField(
+        required=False,
+        allow_null=True,
+        help_text="The variant id",
+    )
     parent_id = serializers.CharField(
         required=False,
         allow_null=True,

karrio/server/samples.py

@@ -349,4 +349,4 @@ CARRIER_OPTIONS_SAMPLE = """{
     "type": "boolean",
   }
 }
-"""
+"""

karrio/server/serializers/abstract.py

@@ -3,7 +3,7 @@ import pydoc
 import typing
 import logging
 from django.db import models
-from django.conf import settings
+from django.conf import empty, settings
 from django.db import transaction
 from rest_framework import serializers
 from django.forms.models import model_to_dict
@@ -458,7 +458,11 @@ def field_to_serializer(args: dict):
     if type == "string":
         return serializers.CharField(
             required=required,
-            **(dict(default=default) if not required else {}),
+            **(
+                dict(default=default, allow_blank=True, allow_null=True)
+                if not required
+                else {}
+            ),
         )
     if type == "integer":
         return serializers.IntegerField(

{karrio_server_core-2025.5rc22.dist-info → karrio_server_core-2025.5rc24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server_core
-Version: 2025.5rc22
+Version: 2025.5rc24
 Summary: Multi-carrier shipping API Core module
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0

{karrio_server_core-2025.5rc22.dist-info → karrio_server_core-2025.5rc24.dist-info}/RECORD

@@ -1,13 +1,13 @@
 karrio/server/conf.py,sha256=DbO3cm_P9f6Ga9Cd5xaaVso1FhxWTFXgOziI1OEkLqA,1568
 karrio/server/openapi.py,sha256=eQl1fHpWC2WwokBkkb0y7N7zeXHrC-Eba4gob7YLsMA,2411
-karrio/server/samples.py,sha256=qPtP71e2ANsXEvNEAKcwmUvy0L9NWKFrO4Bl-bIxFr8,9219
+karrio/server/samples.py,sha256=2BAImCmIrmqhFad08GkPreeTlt04cc4ucn3Nf2HXR8w,9220
 karrio/server/core/__init__.py,sha256=CxNflBwGLO7AIGWybF61j7Mk9-a3iCxSjz2nRaER6BM,140
 karrio/server/core/admin.py,sha256=2h43pTXd3NKV8-_fkUEkzkS4zqih0qBLE8q6Yj7fpEg,33
 karrio/server/core/apps.py,sha256=VKRPRoB2YY1JlEpCe2AE6k57M1qkPADfq5RYZuLjEOw,211
 karrio/server/core/authentication.py,sha256=NiXbfcz3SJjYSKBGLT9-HRYATZXfPRuyALS5bzpNT9U,10555
 karrio/server/core/context_processors.py,sha256=B80cJ_7-uviNRYyrfsCcOaUQFBf_eAgQ0hHZPtM5Olw,323
 karrio/server/core/datatypes.py,sha256=lM0kKKcEoULrEvpJajbBfiz0xAU4OgOQoiAvalKllNg,10085
-karrio/server/core/dataunits.py,sha256=Mbmh6Bi9CwlxdAYLIfLlQjxCSZd_uWN0Dux-GIYTrko,5019
+karrio/server/core/dataunits.py,sha256=8yXrsxhGYN-Q7pondiuitcFbnJeTTG2IJmVskzm-SGs,5673
 karrio/server/core/exceptions.py,sha256=AR4FNT_1wkMkuv_ZELB9pVRL3RRWsSJ7hrNgBP7H3EU,6038
 karrio/server/core/fields.py,sha256=5i5eetbxFkIQ9uoFk8k2xPl1mXXnaVKlPV4xwlF3inY,345
 karrio/server/core/filters.py,sha256=nHj742vPWE3Xs_tpwRRVUh00OwxnF22xKfIK7rx-sw4,27434
@@ -17,7 +17,7 @@ karrio/server/core/oauth_validators.py,sha256=5JxDkXB_HX4a4xJltZcFGukO7o2cUl9h2t
 karrio/server/core/permissions.py,sha256=JY3_hTEnyDTWG-weAWPx8xMoaRZwpNL2HaSssBzjH7Y,1189
 karrio/server/core/renderers.py,sha256=IUEUhvvrk_CeqnmnYQgWKHiH3uQhNc0eqDxyO9CuUS4,290
 karrio/server/core/router.py,sha256=IBUR7rfBkdEHQzWxYOPcVSM8NBp3fte9G6Q5BVTUNNw,95
-karrio/server/core/serializers.py,sha256=3jDctixu0yqR7PBJOVWgeSGMES5fnOhiwXEkUwRdtVg,60225
+karrio/server/core/serializers.py,sha256=P6mH8pv3gxnq3EzaJkcUzan2Q9O0YbipI9v_y2qkGEk,60749
 karrio/server/core/signals.py,sha256=thHh4K4uP3smWuy9kWavFfdOAttH9xN3og_j4lDWdKM,1742
 karrio/server/core/tests.py,sha256=rmZoZfPBRoMO-U3HtDxeKofnzsfijYeDVQrnw5Mb_dU,3164
 karrio/server/core/urls.py,sha256=JQrN6dI7A7c_M498EcDKdjDqlp_d64Ov-RS4HHmssRk,337
@@ -163,7 +163,7 @@ karrio/server/providers/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 karrio/server/providers/views/carriers.py,sha256=_uD_soDZDmMxzfu8mQqeLLcDd4ixnE7f8HjoUlybym8,8808
 karrio/server/providers/views/connections.py,sha256=3Y1rfNsZxkn4YBA03WRQiI-y-AC4EYaOGaMjLmCcz1g,6038
 karrio/server/serializers/__init__.py,sha256=TzD3Lt8Gf7VV5ibGITGg5-ki-M8CR0hzZFulcI2ASJM,90
-karrio/server/serializers/abstract.py,sha256=WS4ey0W_NIMGl-5a2rpaZPdU9bKJmfDSpyHNs81PsGo,15583
+karrio/server/serializers/abstract.py,sha256=KmW1s-wODQe5UOROSt5ojRgWdGm9dKQA4Ib-gbm_jPc,15687
 karrio/server/tracing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/tracing/admin.py,sha256=6BZCJiBhJVg3vt8cYx9HF_FgcjanMD42la6bBORlSL8,1904
 karrio/server/tracing/apps.py,sha256=6BfIomUwBV8k7yaypl6kYYAkLSG1aceUmuxvbhw04fI,247
@@ -198,7 +198,7 @@ karrio/server/user/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 karrio/server/user/templates/registration/login.html,sha256=3_tj-0rKfwkCk-fp_GT8xFQhLqjGcJs3uZzOAaI40Sw,3690
 karrio/server/user/templates/registration/registration_confirm_email.html,sha256=zFDkNN_BHMQyrBv_mU8aoqXxYxG91TGuf6pKwRa5jxE,247
 karrio/server/user/templates/registration/registration_confirm_email.txt,sha256=I_zN_pJTRigfyiYbyQK0wFfrI5Zq1JG8lf0TyLA9fN0,94
-karrio_server_core-2025.5rc22.dist-info/METADATA,sha256=1PXNF5RMu-VkjkTnX4niEJDASgApbpHqRS54XEXt71E,797
-karrio_server_core-2025.5rc22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_core-2025.5rc22.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_core-2025.5rc22.dist-info/RECORD,,
+karrio_server_core-2025.5rc24.dist-info/METADATA,sha256=Ra4PaKLACd7kdEEayDxC9bH7aWnjvbdNQVBvOPowsPo,797
+karrio_server_core-2025.5rc24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_core-2025.5rc24.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_core-2025.5rc24.dist-info/RECORD,,