karrio-server-core 2025.5rc25__py3-none-any.whl → 2025.5rc26__py3-none-any.whl

karrio/server/core/dataunits.py

@@ -104,30 +104,31 @@ def contextual_reference(request: Request = None, reduced: bool = True):
     }
 
     def _get_generic_carriers():
+        # Get all carriers, then filter by extension instead of hardcoded slug
         system_custom_carriers = [
-            c for c in gateway.Carriers.list(system_only=True, carrier_name="generic")
+            c for c in gateway.Carriers.list(system_only=True)
+            if c.ext == "generic"
         ]
         custom_carriers = [
             c
             for c in (
-                gateway.Carriers.list(context=request, carrier_name="generic").exclude(
-                    is_system=True
-                )
+                gateway.Carriers.list(context=request).exclude(is_system=True)
                 if is_authenticated
                 else []
             )
+            if c.ext == "generic"
         ]
 
         extra_carriers = {
-            f"{c.credentials.get('custom_carrier_name') or 'generic'}": c.display_name
+            c.carrier_code: c.display_name
             for c in custom_carriers
         }
         system_carriers = {
-            f"{c.credentials.get('custom_carrier_name') or 'generic'}": c.display_name
+            c.carrier_code: c.display_name
             for c in system_custom_carriers
         }
         extra_services = {
-            f"{c.credentials.get('custom_carrier_name') or 'generic'}": {
+            c.carrier_code: {
                 s.service_code: s.service_code
                 for s in c.services
                 or [

karrio/server/core/gateway.py

@@ -190,6 +190,7 @@ class Shipments:
             rate_provider = (
                 (parent.meta or {}).get("rate_provider") or carrier.carrier_name
             ).lower()
+            custom_carrier_name = carrier.credentials.get("custom_carrier_name")
 
             return {
                 **(parent.meta or {}),
@@ -197,6 +198,7 @@ class Shipments:
                 "carrier": rate_provider,
                 "service_name": service_name,
                 "rate_provider": rate_provider,  # TODO: deprecate 'rate_provider' in favor of 'carrier'
+                **({"custom_carrier_name": custom_carrier_name} if custom_carrier_name else {}),
             }
 
         def process_selected_rate() -> dict:

karrio/server/user/migrations/0007_user_metadata.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.7 on 2025-10-14 01:00
+
+import functools
+import karrio.server.core.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("user", "0006_workspaceconfig"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="metadata",
+            field=models.JSONField(
+                default=functools.partial(
+                    karrio.server.core.models._identity, *(), **{"value": {}}
+                ),
+                help_text="User defined metadata",
+            ),
+        ),
+    ]

karrio/server/user/models.py

@@ -45,6 +45,9 @@ class UserManager(auth.UserManager):
 class User(auth.AbstractUser):
     full_name = models.CharField(_("full name"), max_length=150, blank=True)
     email = models.EmailField(_("email address"), unique=True)
+    metadata = models.JSONField(
+        default=core.field_default({}), help_text="User defined metadata"
+    )
 
     USERNAME_FIELD = "email"
     REQUIRED_FIELDS: list = []
@@ -75,15 +78,24 @@ class User(auth.AbstractUser):
         ctx = middleware.SessionContext.get_current_request()
         _permissions = []
 
-        if conf.settings.MULTI_ORGANIZATIONS and ctx is not None and hasattr(ctx, 'org') and ctx.org is not None:
+        if (
+            conf.settings.MULTI_ORGANIZATIONS
+            and ctx is not None
+            and hasattr(ctx, "org")
+            and ctx.org is not None
+        ):
             org_user = ctx.org.organization_users.filter(user_id=self.pk)
             if org_user.exists():
                 try:
                     context_permission = iam.ContextPermission.objects.get(
-                    object_pk=org_user.first().pk,
-                    content_type=ContentType.objects.get_for_model(org_user.first()),
-                )
-                    _permissions = list(context_permission.groups.all().values_list("name", flat=True))
+                        object_pk=org_user.first().pk,
+                        content_type=ContentType.objects.get_for_model(
+                            org_user.first()
+                        ),
+                    )
+                    _permissions = list(
+                        context_permission.groups.all().values_list("name", flat=True)
+                    )
                 except iam.ContextPermission.DoesNotExist:
                     pass
 
@@ -94,9 +106,11 @@ class User(auth.AbstractUser):
             return list(Group.objects.all().values_list("name", flat=True))
 
         if not any(_permissions) and self.is_staff:
-            return list(Group.objects.exclude(
-                name__in=["manage_system", "manage_team", "manage_org_owner"]
-            ).values_list("name", flat=True))
+            return list(
+                Group.objects.exclude(
+                    name__in=["manage_system", "manage_team", "manage_org_owner"]
+                ).values_list("name", flat=True)
+            )
 
         return _permissions
 

karrio/server/user/templates/registration/registration_confirm_email.html

@@ -5,6 +5,6 @@
 
 <p>{% trans "Please click the following link to verify your email address." %}</p>
 
-{{ link }}
+<p><a href="{{ link }}">{{ link }}</a></p>
 
 {% endautoescape %}

{karrio_server_core-2025.5rc25.dist-info → karrio_server_core-2025.5rc26.dist-info}/METADATA

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

{karrio_server_core-2025.5rc25.dist-info → karrio_server_core-2025.5rc26.dist-info}/RECORD

@@ -7,11 +7,11 @@ karrio/server/core/apps.py,sha256=VKRPRoB2YY1JlEpCe2AE6k57M1qkPADfq5RYZuLjEOw,21
 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=8yXrsxhGYN-Q7pondiuitcFbnJeTTG2IJmVskzm-SGs,5673
+karrio/server/core/dataunits.py,sha256=myuZ0BNJ-EZPbf3hsi7JP7nlRqGcUYh_TOQUEQOhlD4,5602
 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
-karrio/server/core/gateway.py,sha256=TH3-RIxZ2BUrteyDAXWxH_GvY4pC4A_l7t-pRbLDO-M,25747
+karrio/server/core/gateway.py,sha256=lyPN-oCnviH3U2an5SdVw_jeyUfALfFN9JMkLxvNVSA,25925
 karrio/server/core/middleware.py,sha256=euRkeIvNv3G-b_U3fKDO6po-2dbYF0LiXUYg2nyeCI0,3017
 karrio/server/core/oauth_validators.py,sha256=5JxDkXB_HX4a4xJltZcFGukO7o2cUl9h2t9O8Gp87Zc,6673
 karrio/server/core/permissions.py,sha256=JY3_hTEnyDTWG-weAWPx8xMoaRZwpNL2HaSssBzjH7Y,1189
@@ -182,7 +182,7 @@ karrio/server/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 karrio/server/user/admin.py,sha256=psRIcm1IjR6K_69cJJCDBUQT226I9gPvfFhHoAeA_3Q,2514
 karrio/server/user/apps.py,sha256=hCTQ-YXuDd7eW4ZMkVf6OcmmFCu5uVpFWCxfb1lzdCw,209
 karrio/server/user/forms.py,sha256=hgEbEs17Cwib5KsckVweapEmAQvE0fWpwxkJMDc__Y0,1049
-karrio/server/user/models.py,sha256=j9Oh9MOGfnX2SKkWe72nxaVW8018tzUtSr2gw2dMQmM,6380
+karrio/server/user/models.py,sha256=cBQU7523rm71ibAAswaGGYbqAho-83wUU6MipP6c7Nc,6703
 karrio/server/user/serializers.py,sha256=tdTB0g4q3EIY2Uv7rrpWlkKEuHms-fTK6XXUr_Z6hBY,1557
 karrio/server/user/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 karrio/server/user/urls.py,sha256=3p-ZivD78caBDDeV63XJjMuILdr258JXED788OJ_hLQ,243
@@ -194,11 +194,12 @@ karrio/server/user/migrations/0003_token_test_mode.py,sha256=YEqSXx6FDysbTqAuZmw
 karrio/server/user/migrations/0004_group.py,sha256=ki5yjRYDwgNk-Wmy8slb_PvPJmFAOrXf9k7o3rm4JZw,791
 karrio/server/user/migrations/0005_token_label.py,sha256=YlKQMJs5OjInq-seb5r-0hwPzIZlb3ay0nuKoLJgGDk,515
 karrio/server/user/migrations/0006_workspaceconfig.py,sha256=vhprvPvdt7AIUr44KLVd-cVQh4opEL1lIVoW5HHTiYI,2089
+karrio/server/user/migrations/0007_user_metadata.py,sha256=ndv3eHZWPIExC1JR6ChpkzuXCIsHXTvWgg0bXnRIWbc,619
 karrio/server/user/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.html,sha256=haJ1DVM27umaxegACs4tNAj296HxVZfWCSTyD0Nt5I8,279
 karrio/server/user/templates/registration/registration_confirm_email.txt,sha256=I_zN_pJTRigfyiYbyQK0wFfrI5Zq1JG8lf0TyLA9fN0,94
-karrio_server_core-2025.5rc25.dist-info/METADATA,sha256=kaUiZHAwqnLTbZHMXCShe3C4MAfpmZ81cVh0W5hGz0o,797
-karrio_server_core-2025.5rc25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_core-2025.5rc25.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_core-2025.5rc25.dist-info/RECORD,,
+karrio_server_core-2025.5rc26.dist-info/METADATA,sha256=JwltRzVVakiHjj1wLen6UWzQ0EXg_1mqkE4CR70J8E8,797
+karrio_server_core-2025.5rc26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_core-2025.5rc26.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_core-2025.5rc26.dist-info/RECORD,,