karrio-server-core 2025.5rc12__py3-none-any.whl → 2026.1.1__py3-none-any.whl

karrio/server/iam/migrations/0003_remove_permission_groups.py

@@ -0,0 +1,91 @@
+# Generated migration to remove permission groups
+
+from django.db import migrations
+
+
+def remove_permission_groups(apps, schema_editor):
+    """
+    Remove all permission groups that were created by setup_groups().
+
+    This migration removes the following groups:
+    - manage_apps
+    - manage_carriers (deprecated)
+    - read_carriers
+    - write_carriers
+    - manage_orders
+    - manage_team
+    - manage_org_owner
+    - manage_webhooks
+    - manage_data
+    - manage_shipments
+    - manage_system
+    """
+    Group = apps.get_model("user", "Group")
+    ContextPermission = apps.get_model("iam", "ContextPermission")
+
+    # List of groups to remove
+    groups_to_remove = [
+        "manage_apps",
+        "manage_carriers",
+        "read_carriers",
+        "write_carriers",
+        "manage_orders",
+        "manage_team",
+        "manage_org_owner",
+        "manage_webhooks",
+        "manage_data",
+        "manage_shipments",
+        "manage_system",
+        "manage_pickups",
+        "manage_trackers",
+    ]
+
+    # First, remove the groups from all ContextPermissions
+    for group_name in groups_to_remove:
+        group = Group.objects.filter(name=group_name).first()
+        if group:
+            # Remove this group from all context permissions
+            for ctx_perm in ContextPermission.objects.filter(groups=group):
+                ctx_perm.groups.remove(group)
+
+    # Then delete the groups themselves
+    Group.objects.filter(name__in=groups_to_remove).delete()
+
+
+def reverse_migration(apps, schema_editor):
+    """
+    Reverse migration - recreate groups (without permissions, which were set dynamically).
+    Note: This won't restore the full permission setup, only creates empty groups.
+    """
+    Group = apps.get_model("user", "Group")
+
+    groups_to_create = [
+        "manage_apps",
+        "manage_carriers",
+        "read_carriers",
+        "write_carriers",
+        "manage_orders",
+        "manage_team",
+        "manage_org_owner",
+        "manage_webhooks",
+        "manage_data",
+        "manage_shipments",
+        "manage_system",
+        "manage_pickups",
+        "manage_trackers",
+    ]
+
+    for group_name in groups_to_create:
+        Group.objects.get_or_create(name=group_name)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("iam", "0002_setup_carrier_permission_groups"),
+        ("user", "0004_group"),
+    ]
+
+    operations = [
+        migrations.RunPython(remove_permission_groups, reverse_migration),
+    ]

karrio/server/iam/permissions.py

@@ -1,134 +1,7 @@
-import typing
-import logging
-from django.db import models
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission
-
-import karrio.server.core.utils as utils
-import karrio.server.user.models as users
-import karrio.server.iam.serializers as serializers
-
-logger = logging.getLogger(__name__)
-User = get_user_model()
-
-
-@utils.skip_on_loadata
-@utils.async_wrapper
-@utils.tenant_aware
-def setup_groups(**_):
-    """This function create all standard group permissions if they don't exsist."""
-    print("> setting up permissions")
-
-    # manage_apps
-    setup_group(
-        serializers.PermissionGroup.manage_apps.name,
-        permissions=Permission.objects.filter(content_type__app_label="apps"),
-    )
-
-    # manage_carriers
-    setup_group(
-        serializers.PermissionGroup.manage_carriers.name,
-        permissions=[
-            *Permission.objects.filter(content_type__app_label="providers"),
-            *Permission.objects.filter(
-                models.Q(content_type__app_label="orgs")
-                & models.Q(name__icontains="carrier")
-            ),
-        ],
-        override=True,
-    )
-
-    # manage_orders
-    setup_group(
-        serializers.PermissionGroup.manage_orders.name,
-        permissions=Permission.objects.filter(content_type__app_label="orders"),
-    )
-
-    # manage_team
-    setup_group(
-        serializers.PermissionGroup.manage_team.name,
-        permissions=(
-            Permission.objects.filter(
-                content_type__app_label="orgs", name__icontains="organization"
-            ).exclude(name__icontains="owner")
-        ),
-        override=True,
-    )
-
-    # manage_org_owner
-    setup_group(
-        serializers.PermissionGroup.manage_org_owner.name,
-        permissions=Permission.objects.filter(
-            content_type__model="OrganizationOwner".lower()
-        ),
-    )
-
-    # manage_webhooks
-    setup_group(
-        serializers.PermissionGroup.manage_webhooks.name,
-        permissions=Permission.objects.filter(content_type__model="Webhook".lower()),
-    )
-
-    # manage_data
-    setup_group(
-        serializers.PermissionGroup.manage_data.name,
-        permissions=[
-            *Permission.objects.filter(
-                content_type__app_label__in=["data", "graph", "documents"]
-            ),
-            *Permission.objects.filter(
-                content_type__app_label="audit", name__icontains="view"
-            ),
-            *Permission.objects.filter(
-                content_type__app_label="rest_framework_tracking",
-                name__icontains="view",
-            ),
-        ],
-        override=True,
-    )
-
-    # manage_shipments
-    setup_group(
-        serializers.PermissionGroup.manage_shipments.name,
-        permissions=[
-            *Permission.objects.filter(content_type__app_label="manager"),
-            *Permission.objects.filter(
-                models.Q(content_type__app_label="orgs")
-                & (
-                    models.Q(name__icontains="address")
-                    | models.Q(name__icontains="parcel")
-                    | models.Q(name__icontains="commodity")
-                    | models.Q(name__icontains="customs")
-                    | models.Q(name__icontains="pickup")
-                    | models.Q(name__icontains="tracker")
-                    | models.Q(name__icontains="shipment")
-                )
-            ),
-        ],
-    )
-
-    # manage_system
-    setup_group(
-        serializers.PermissionGroup.manage_system.name,
-        permissions=Permission.objects.filter(
-            content_type__app_label__in=[
-                "admin",
-                "user",
-                "pricing",
-                "providers",
-                "audit",
-                "database",
-                "rest_framework_tracking",
-            ]
-        ),
-    )
-
-
-def setup_group(
-    name: str, permissions: typing.List[Permission], override: bool = False
-):
-    group, created = users.Group.objects.get_or_create(name=name)
-
-    if created or override:
-        group.permissions.set(permissions)
-        group.save()
+# This module previously contained permission group setup logic.
+# The setup_groups() function has been removed to:
+# 1. Fix Django warning about database access during app initialization
+# 2. Prepare for a better RBAC implementation in the future
+#
+# The PermissionGroup enum and ROLES_GROUPS mapping are preserved in
+# karrio.server.iam.serializers for organization role management.

karrio/server/iam/serializers.py

@@ -9,7 +9,9 @@ class PermissionGroup(lib.StrEnum):
     manage_orders = "manage_orders"
     manage_data = "manage_data"
     manage_pickups = "manage_pickups"
-    manage_carriers = "manage_carriers"
+    manage_carriers = "manage_carriers"  # Deprecated: use read_carriers + write_carriers
+    read_carriers = "read_carriers"
+    write_carriers = "write_carriers"
     manage_trackers = "manage_trackers"
     manage_webhooks = "manage_webhooks"
     manage_shipments = "manage_shipments"
@@ -20,14 +22,26 @@ PERMISSION_GROUPS = [(p.name, p.name) for p in list(PermissionGroup)]
 ROLES_GROUPS: typing.Dict[str, typing.List[str]] = {
     "owner": [
         PermissionGroup.manage_org_owner.value,
+        PermissionGroup.manage_team.value,
+        PermissionGroup.manage_apps.value,
+        PermissionGroup.read_carriers.value,
+        PermissionGroup.write_carriers.value,
+        PermissionGroup.manage_webhooks.value,
+        PermissionGroup.manage_data.value,
+        PermissionGroup.manage_orders.value,
+        PermissionGroup.manage_pickups.value,
+        PermissionGroup.manage_trackers.value,
+        PermissionGroup.manage_shipments.value,
     ],
     "admin": [
         PermissionGroup.manage_team.value,
         PermissionGroup.manage_apps.value,
-        PermissionGroup.manage_carriers.value,
+        PermissionGroup.read_carriers.value,
+        PermissionGroup.write_carriers.value,
     ],
     "developer": [
         PermissionGroup.manage_webhooks.value,
+        PermissionGroup.read_carriers.value,
     ],
     "member": [
         PermissionGroup.manage_data.value,
@@ -35,5 +49,6 @@ ROLES_GROUPS: typing.Dict[str, typing.List[str]] = {
         PermissionGroup.manage_pickups.value,
         PermissionGroup.manage_trackers.value,
         PermissionGroup.manage_shipments.value,
+        PermissionGroup.read_carriers.value,
     ],
 }

karrio/server/iam/signals.py

@@ -1,17 +1,15 @@
-import logging
 from django.db.models import signals
 
+from karrio.server.core.logging import logger
 import karrio.server.core.utils as utils
 import karrio.server.user.models as user
 import karrio.server.iam.models as models
 
-logger = logging.getLogger(__name__)
-
 
 def register_all():
     signals.post_delete.connect(context_object_deleted, sender=user.Token)
 
-    logger.info("karrio.iam signals registered...")
+    logger.info("Signal registration complete", module="karrio.iam")
 
 
 @utils.disable_for_loaddata

karrio/server/providers/admin.py

@@ -354,7 +354,7 @@ class LabelTemplateAdmin(admin.ModelAdmin):
         return False
 
 
-@utils.skip_on_commands()
+@utils.skip_on_commands(["loaddata", "migrate", "makemigrations", "shell"])
 def register_carrier_admins():
     for carrier_name, display_name in ref.REFERENCES["carriers"].items():
         proxy = providers.create_carrier_proxy(carrier_name, display_name)

karrio/server/providers/management/commands/migrate_rate_sheets.py

@@ -0,0 +1,101 @@
+from django.core.management.base import BaseCommand
+from karrio.server.providers.models import RateSheet
+
+
+class Command(BaseCommand):
+    help = 'Migrate existing rate sheets from legacy format to optimized zone reuse structure'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--dry-run',
+            action='store_true',
+            help='Show what would be migrated without making changes',
+        )
+        parser.add_argument(
+            '--force',
+            action='store_true',
+            help='Force migration even if rate sheet already has optimized structure',
+        )
+
+    def handle(self, *args, **options):
+        dry_run = options['dry_run']
+        force = options['force']
+        
+        rate_sheets = RateSheet.objects.all()
+        
+        if not rate_sheets.exists():
+            self.stdout.write(self.style.WARNING('No rate sheets found.'))
+            return
+        
+        migrated_count = 0
+        skipped_count = 0
+        error_count = 0
+        
+        for rate_sheet in rate_sheets:
+            try:
+                # Check if already migrated
+                if not force and (rate_sheet.zones or rate_sheet.service_rates):
+                    self.stdout.write(
+                        self.style.WARNING(f'Skipping {rate_sheet.name} - already has optimized structure')
+                    )
+                    skipped_count += 1
+                    continue
+                
+                # Check if has services with zones to migrate
+                has_zones = any(
+                    service.zones for service in rate_sheet.services.all()
+                )
+                
+                if not has_zones:
+                    self.stdout.write(
+                        self.style.WARNING(f'Skipping {rate_sheet.name} - no zones to migrate')
+                    )
+                    skipped_count += 1
+                    continue
+                
+                if dry_run:
+                    self.stdout.write(
+                        self.style.SUCCESS(f'Would migrate: {rate_sheet.name}')
+                    )
+                    migrated_count += 1
+                else:
+                    # Perform migration
+                    old_zones_count = sum(
+                        len(service.zones or []) for service in rate_sheet.services.all()
+                    )
+                    
+                    rate_sheet.migrate_from_legacy_format()
+                    
+                    new_zones_count = len(rate_sheet.zones or [])
+                    new_rates_count = len(rate_sheet.service_rates or [])
+                    
+                    self.stdout.write(
+                        self.style.SUCCESS(
+                            f'Migrated {rate_sheet.name}: '
+                            f'{old_zones_count} duplicated zones → '
+                            f'{new_zones_count} shared zones + {new_rates_count} rates'
+                        )
+                    )
+                    migrated_count += 1
+                    
+            except Exception as e:
+                self.stdout.write(
+                    self.style.ERROR(f'Error migrating {rate_sheet.name}: {str(e)}')
+                )
+                error_count += 1
+        
+        # Summary
+        if dry_run:
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f'\nDry run complete: {migrated_count} rate sheets would be migrated, '
+                    f'{skipped_count} skipped, {error_count} errors'
+                )
+            )
+        else:
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f'\nMigration complete: {migrated_count} rate sheets migrated, '
+                    f'{skipped_count} skipped, {error_count} errors'
+                )
+            )

karrio/server/providers/migrations/0082_add_zone_identifiers.py

@@ -0,0 +1,50 @@
+# Generated migration to add unique identifiers to ServiceLevel zones
+from django.db import migrations
+import uuid
+
+
+def add_zone_identifiers(apps, schema_editor):
+    """Add unique IDs to existing zones in ServiceLevel objects"""
+    ServiceLevel = apps.get_model('providers', 'ServiceLevel')
+    
+    for service in ServiceLevel.objects.all():
+        if service.zones:
+            updated = False
+            for i, zone in enumerate(service.zones):
+                if 'id' not in zone:
+                    # Generate unique zone ID
+                    zone['id'] = f"zone_{uuid.uuid4().hex[:8]}"
+                    updated = True
+            
+            if updated:
+                service.save(update_fields=['zones'])
+
+
+def reverse_zone_identifiers(apps, schema_editor):
+    """Remove zone IDs (for rollback)"""
+    ServiceLevel = apps.get_model('providers', 'ServiceLevel')
+    
+    for service in ServiceLevel.objects.all():
+        if service.zones:
+            updated = False
+            for zone in service.zones:
+                if 'id' in zone:
+                    del zone['id']
+                    updated = True
+            
+            if updated:
+                service.save(update_fields=['zones'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('providers', '0081_remove_alliedexpresssettings_carrier_ptr_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            add_zone_identifiers,
+            reverse_zone_identifiers
+        ),
+    ]

karrio/server/providers/migrations/0083_add_optimized_rate_sheet_structure.py

@@ -0,0 +1,33 @@
+# Generated migration to add optimized rate sheet structure
+
+from django.db import migrations, models
+import karrio.server.core.models as core
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('providers', '0082_add_zone_identifiers'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ratesheet',
+            name='zones',
+            field=models.JSONField(
+                blank=True,
+                null=True,
+                default=core.field_default([]),
+                help_text="Shared zone definitions: [{'id': 'zone_1', 'label': 'Zone 1', 'cities': [...], 'country_codes': [...]}]"
+            ),
+        ),
+        migrations.AddField(
+            model_name='ratesheet',
+            name='service_rates',
+            field=models.JSONField(
+                blank=True,
+                null=True,
+                default=core.field_default([]),
+                help_text="Service-zone rate mapping: [{'service_id': 'svc_1', 'zone_id': 'zone_1', 'rate': 10.50}]"
+            ),
+        ),
+    ]

karrio/server/providers/migrations/0084_alter_servicelevel_currency.py

@@ -0,0 +1,168 @@
+# Generated by Django 5.2.5 on 2025-08-19 19:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("providers", "0083_add_optimized_rate_sheet_structure"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="servicelevel",
+            name="currency",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("EUR", "EUR"),
+                    ("AED", "AED"),
+                    ("USD", "USD"),
+                    ("XCD", "XCD"),
+                    ("AMD", "AMD"),
+                    ("ANG", "ANG"),
+                    ("AOA", "AOA"),
+                    ("ARS", "ARS"),
+                    ("AUD", "AUD"),
+                    ("AWG", "AWG"),
+                    ("AZN", "AZN"),
+                    ("BAM", "BAM"),
+                    ("BBD", "BBD"),
+                    ("BDT", "BDT"),
+                    ("XOF", "XOF"),
+                    ("BGN", "BGN"),
+                    ("BHD", "BHD"),
+                    ("BIF", "BIF"),
+                    ("BMD", "BMD"),
+                    ("BND", "BND"),
+                    ("BOB", "BOB"),
+                    ("BRL", "BRL"),
+                    ("BSD", "BSD"),
+                    ("BTN", "BTN"),
+                    ("BWP", "BWP"),
+                    ("BYN", "BYN"),
+                    ("BZD", "BZD"),
+                    ("CAD", "CAD"),
+                    ("CDF", "CDF"),
+                    ("XAF", "XAF"),
+                    ("CHF", "CHF"),
+                    ("NZD", "NZD"),
+                    ("CLP", "CLP"),
+                    ("CNY", "CNY"),
+                    ("COP", "COP"),
+                    ("CRC", "CRC"),
+                    ("CUC", "CUC"),
+                    ("CVE", "CVE"),
+                    ("CZK", "CZK"),
+                    ("DJF", "DJF"),
+                    ("DKK", "DKK"),
+                    ("DOP", "DOP"),
+                    ("DZD", "DZD"),
+                    ("EGP", "EGP"),
+                    ("ERN", "ERN"),
+                    ("ETB", "ETB"),
+                    ("FJD", "FJD"),
+                    ("GBP", "GBP"),
+                    ("GEL", "GEL"),
+                    ("GHS", "GHS"),
+                    ("GMD", "GMD"),
+                    ("GNF", "GNF"),
+                    ("GTQ", "GTQ"),
+                    ("GYD", "GYD"),
+                    ("HKD", "HKD"),
+                    ("HNL", "HNL"),
+                    ("HRK", "HRK"),
+                    ("HTG", "HTG"),
+                    ("HUF", "HUF"),
+                    ("IDR", "IDR"),
+                    ("ILS", "ILS"),
+                    ("INR", "INR"),
+                    ("IRR", "IRR"),
+                    ("ISK", "ISK"),
+                    ("JMD", "JMD"),
+                    ("JOD", "JOD"),
+                    ("JPY", "JPY"),
+                    ("KES", "KES"),
+                    ("KGS", "KGS"),
+                    ("KHR", "KHR"),
+                    ("KMF", "KMF"),
+                    ("KPW", "KPW"),
+                    ("KRW", "KRW"),
+                    ("KWD", "KWD"),
+                    ("KYD", "KYD"),
+                    ("KZT", "KZT"),
+                    ("LAK", "LAK"),
+                    ("LKR", "LKR"),
+                    ("LRD", "LRD"),
+                    ("LSL", "LSL"),
+                    ("LYD", "LYD"),
+                    ("MAD", "MAD"),
+                    ("MDL", "MDL"),
+                    ("MGA", "MGA"),
+                    ("MKD", "MKD"),
+                    ("MMK", "MMK"),
+                    ("MNT", "MNT"),
+                    ("MOP", "MOP"),
+                    ("MRO", "MRO"),
+                    ("MUR", "MUR"),
+                    ("MVR", "MVR"),
+                    ("MWK", "MWK"),
+                    ("MXN", "MXN"),
+                    ("MYR", "MYR"),
+                    ("MZN", "MZN"),
+                    ("NAD", "NAD"),
+                    ("XPF", "XPF"),
+                    ("NGN", "NGN"),
+                    ("NIO", "NIO"),
+                    ("NOK", "NOK"),
+                    ("NPR", "NPR"),
+                    ("OMR", "OMR"),
+                    ("PEN", "PEN"),
+                    ("PGK", "PGK"),
+                    ("PHP", "PHP"),
+                    ("PKR", "PKR"),
+                    ("PLN", "PLN"),
+                    ("PYG", "PYG"),
+                    ("QAR", "QAR"),
+                    ("RON", "RON"),
+                    ("RSD", "RSD"),
+                    ("RUB", "RUB"),
+                    ("RWF", "RWF"),
+                    ("SAR", "SAR"),
+                    ("SBD", "SBD"),
+                    ("SCR", "SCR"),
+                    ("SDG", "SDG"),
+                    ("SEK", "SEK"),
+                    ("SGD", "SGD"),
+                    ("SHP", "SHP"),
+                    ("SLL", "SLL"),
+                    ("SOS", "SOS"),
+                    ("SRD", "SRD"),
+                    ("SSP", "SSP"),
+                    ("STD", "STD"),
+                    ("SYP", "SYP"),
+                    ("SZL", "SZL"),
+                    ("THB", "THB"),
+                    ("TJS", "TJS"),
+                    ("TND", "TND"),
+                    ("TOP", "TOP"),
+                    ("TRY", "TRY"),
+                    ("TTD", "TTD"),
+                    ("TWD", "TWD"),
+                    ("TZS", "TZS"),
+                    ("UAH", "UAH"),
+                    ("UYU", "UYU"),
+                    ("UZS", "UZS"),
+                    ("VEF", "VEF"),
+                    ("VND", "VND"),
+                    ("VUV", "VUV"),
+                    ("WST", "WST"),
+                    ("YER", "YER"),
+                    ("ZAR", "ZAR"),
+                ],
+                max_length=4,
+                null=True,
+            ),
+        ),
+    ]