karrio-server-core 2025.5rc12__py3-none-any.whl → 2025.5rc13__py3-none-any.whl

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/models/service.py

@@ -60,3 +60,133 @@ class ServiceLevel(core.OwnedEntity):
     @property
     def object_type(self):
         return "service_level"
+    
+    @property 
+    def computed_zones(self):
+        """
+        Computed property that returns zones in legacy format for backward compatibility.
+        If the service belongs to a rate sheet with optimized structure, reconstruct from there.
+        Otherwise, fall back to the service's own zones field.
+        """
+        # Check if this service belongs to a rate sheet with optimized structure
+        rate_sheet = getattr(self, '_rate_sheet_cache', None)
+        if not rate_sheet:
+            # Try to find rate sheet this service belongs to
+            try:
+                rate_sheet = self.service_sheet.first()
+                self._rate_sheet_cache = rate_sheet
+            except:
+                rate_sheet = None
+        
+        if rate_sheet and rate_sheet.zones and rate_sheet.service_rates:
+            # Use optimized structure
+            return rate_sheet.get_service_zones_legacy(self.id)
+        else:
+            # Fall back to legacy zones field
+            return self.zones or []
+    
+    def update_zone_cell(self, zone_id: str, field: str, value):
+        """Update a single field in a zone by ID or index with validation"""
+        # Define allowed fields with their validators
+        allowed_fields = {
+            'rate': float,
+            'min_weight': float,
+            'max_weight': float,
+            'transit_days': int,
+            'transit_time': float,
+            'label': str,
+            'radius': float,
+            'latitude': float,
+            'longitude': float,
+        }
+        
+        if field not in allowed_fields:
+            raise ValueError(f"Field '{field}' is not allowed for zone updates")
+        
+        # Validate and convert the value
+        try:
+            if value is not None and value != '':
+                value = allowed_fields[field](value)
+        except (ValueError, TypeError):
+            raise ValueError(f"Invalid value '{value}' for field '{field}' (expected {allowed_fields[field].__name__})")
+        
+        zones = self.zones or []
+        
+        # First try to find by zone ID
+        for zone in zones:
+            if zone.get('id') == zone_id:
+                zone[field] = value
+                self.save(update_fields=['zones'])
+                return zone
+        
+        # Fallback: try to find by index for zones without IDs
+        try:
+            zone_index = int(zone_id)
+            if 0 <= zone_index < len(zones):
+                zones[zone_index][field] = value
+                self.save(update_fields=['zones'])
+                return zones[zone_index]
+        except (ValueError, IndexError):
+            pass
+        
+        raise ValueError(f"Zone {zone_id} not found")
+    
+    def batch_update_cells(self, updates: list):
+        """
+        Batch update multiple zone cells with validation
+        updates format: [{'zone_id': str, 'field': str, 'value': any}, ...]
+        """
+        # Define allowed fields with their validators
+        allowed_fields = {
+            'rate': float,
+            'min_weight': float,
+            'max_weight': float,
+            'transit_days': int,
+            'transit_time': float,
+            'label': str,
+            'radius': float,
+            'latitude': float,
+            'longitude': float,
+        }
+        
+        zones = list(self.zones or [])
+        
+        for update in updates:
+            zone_id = update.get('zone_id')
+            field = update.get('field')
+            value = update.get('value')
+            
+            if field not in allowed_fields:
+                raise ValueError(f"Field '{field}' is not allowed for zone updates")
+            
+            # Validate and convert the value
+            try:
+                if value is not None and value != '':
+                    value = allowed_fields[field](value)
+            except (ValueError, TypeError):
+                raise ValueError(f"Invalid value '{value}' for field '{field}' (expected {allowed_fields[field].__name__})")
+            
+            # Find zone by ID first, then by index
+            zone_found = False
+            for zone in zones:
+                if zone.get('id') == zone_id:
+                    zone[field] = value
+                    zone_found = True
+                    break
+            
+            # Fallback to index if zone_id is numeric and zone not found by ID
+            if not zone_found:
+                try:
+                    zone_index = int(zone_id)
+                    if 0 <= zone_index < len(zones):
+                        zones[zone_index][field] = value
+                        zone_found = True
+                except (ValueError, IndexError):
+                    pass
+            
+            if not zone_found:
+                raise ValueError(f"Zone {zone_id} not found")
+
+        self.zones = zones
+        self.save(update_fields=['zones'])
+        return self.zones

karrio/server/providers/models/sheet.py

@@ -29,6 +29,22 @@ class RateSheet(core.OwnedEntity):
     services = models.ManyToManyField(
         "ServiceLevel", blank=True, related_name="service_sheet"
     )
+    
+    # New optimized structure
+    zones = models.JSONField(
+        blank=True,
+        null=True,
+        default=core.field_default([]),
+        help_text="Shared zone definitions: [{'id': 'zone_1', 'label': 'Zone 1', 'cities': [...], 'country_codes': [...]}]"
+    )
+    service_rates = 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}]"
+    )
+    
+    # Keep old structure for backward compatibility during migration
     metadata = models.JSONField(
         blank=True,
         null=True,
@@ -58,3 +74,214 @@ class RateSheet(core.OwnedEntity):
         return providers.Carrier.objects.filter(
             carrier_code=self.carrier_name, rate_sheet__id=self.id
         )
+    
+    def get_service_zones_legacy(self, service_id: str):
+        """
+        Backward compatible method - returns zones in old format for SDK compatibility
+        Combines shared zones with service-specific rates
+        """
+        zones = self.zones or []
+        service_rates = self.service_rates or []
+        
+        # Get rates for this service
+        service_rate_map = {
+            sr['zone_id']: sr for sr in service_rates 
+            if sr.get('service_id') == service_id
+        }
+        
+        # Combine zone definitions with service rates
+        legacy_zones = []
+        for zone in zones:
+            zone_id = zone.get('id')
+            rate_data = service_rate_map.get(zone_id, {})
+            
+            legacy_zone = {
+                **zone,  # Zone definition (label, cities, country_codes, etc.)
+                'rate': rate_data.get('rate', 0),
+                'min_weight': rate_data.get('min_weight'),
+                'max_weight': rate_data.get('max_weight'),
+                'transit_days': rate_data.get('transit_days'),
+                'transit_time': rate_data.get('transit_time'),
+            }
+            legacy_zones.append(legacy_zone)
+        
+        return legacy_zones
+    
+    def update_service_zone_rate(self, service_id: str, zone_id: str, field: str, value):
+        """
+        Update a rate field for a specific service-zone combination
+        """
+        allowed_fields = {
+            'rate': float,
+            'min_weight': float,
+            'max_weight': float,
+            'transit_days': int,
+            'transit_time': float,
+        }
+        
+        if field not in allowed_fields:
+            raise ValueError(f"Field '{field}' is not allowed for rate updates")
+        
+        # Validate value
+        try:
+            if value is not None and value != '':
+                value = allowed_fields[field](value)
+        except (ValueError, TypeError):
+            raise ValueError(f"Invalid value '{value}' for field '{field}'")
+        
+        service_rates = list(self.service_rates or [])
+        
+        # Find existing rate record
+        for rate_record in service_rates:
+            if (rate_record.get('service_id') == service_id and 
+                rate_record.get('zone_id') == zone_id):
+                rate_record[field] = value
+                break
+        else:
+            # Create new rate record
+            service_rates.append({
+                'service_id': service_id,
+                'zone_id': zone_id,
+                field: value
+            })
+        
+        self.service_rates = service_rates
+        self.save(update_fields=['service_rates'])
+    
+    def batch_update_service_rates(self, updates):
+        """
+        Batch update service rates
+        updates format: [{'service_id': str, 'zone_id': str, 'field': str, 'value': any}]
+        """
+        allowed_fields = {
+            'rate': float,
+            'min_weight': float,
+            'max_weight': float, 
+            'transit_days': int,
+            'transit_time': float,
+        }
+        
+        service_rates = list(self.service_rates or [])
+        service_rate_map = {}
+        
+        # Create lookup map for existing rates
+        for i, rate in enumerate(service_rates):
+            key = f"{rate.get('service_id')}:{rate.get('zone_id')}"
+            service_rate_map[key] = i
+        
+        for update in updates:
+            service_id = update.get('service_id')
+            zone_id = update.get('zone_id')
+            field = update.get('field')
+            value = update.get('value')
+            
+            if field not in allowed_fields:
+                continue
+            
+            # Validate value
+            try:
+                if value is not None and value != '':
+                    value = allowed_fields[field](value)
+            except (ValueError, TypeError):
+                continue
+            
+            key = f"{service_id}:{zone_id}"
+            
+            if key in service_rate_map:
+                # Update existing rate
+                service_rates[service_rate_map[key]][field] = value
+            else:
+                # Create new rate record
+                new_rate = {
+                    'service_id': service_id,
+                    'zone_id': zone_id,
+                    field: value
+                }
+                service_rates.append(new_rate)
+                service_rate_map[key] = len(service_rates) - 1
+        
+        self.service_rates = service_rates
+        self.save(update_fields=['service_rates'])
+    
+    def add_zone(self, zone_data):
+        """
+        Add a new shared zone definition
+        """
+        zones = list(self.zones or [])
+        
+        # Generate zone ID if not provided
+        if not zone_data.get('id'):
+            zone_data['id'] = f"zone_{len(zones) + 1}"
+        
+        zones.append(zone_data)
+        self.zones = zones
+        self.save(update_fields=['zones'])
+        return zone_data['id']
+    
+    def remove_zone(self, zone_id: str):
+        """
+        Remove a zone and all its associated rates
+        """
+        # Remove zone definition
+        zones = [z for z in (self.zones or []) if z.get('id') != zone_id]
+        self.zones = zones
+        
+        # Remove all rates for this zone
+        service_rates = [sr for sr in (self.service_rates or []) if sr.get('zone_id') != zone_id]
+        self.service_rates = service_rates
+        
+        self.save(update_fields=['zones', 'service_rates'])
+    
+    def migrate_from_legacy_format(self):
+        """
+        Migrate from old format where zones are stored per service to new shared format
+        """
+        if self.zones or self.service_rates:
+            # Already in new format
+            return
+        
+        all_zones = {}
+        service_rates = []
+        zone_counter = 1
+        
+        # Extract unique zones across all services
+        for service in self.services.all():
+            service_zones = service.zones or []
+            
+            for zone_index, zone_data in enumerate(service_zones):
+                # Create zone signature for deduplication
+                zone_signature = {
+                    'label': zone_data.get('label', f'Zone {zone_index + 1}'),
+                    'cities': sorted(zone_data.get('cities', [])),
+                    'postal_codes': sorted(zone_data.get('postal_codes', [])),
+                    'country_codes': sorted(zone_data.get('country_codes', [])),
+                }
+                
+                # Use signature as key for deduplication
+                sig_key = str(zone_signature)
+                
+                if sig_key not in all_zones:
+                    zone_id = f"zone_{zone_counter}"
+                    all_zones[sig_key] = {
+                        'id': zone_id,
+                        **zone_signature
+                    }
+                    zone_counter += 1
+                
+                zone_id = all_zones[sig_key]['id']
+                
+                # Store service rate
+                service_rates.append({
+                    'service_id': service.id,
+                    'zone_id': zone_id,
+                    'rate': zone_data.get('rate', 0),
+                    'min_weight': zone_data.get('min_weight'),
+                    'max_weight': zone_data.get('max_weight'),
+                    'transit_days': zone_data.get('transit_days'),
+                    'transit_time': zone_data.get('transit_time'),
+                })
+        
+        # Save optimized structure
+        self.zones = list(all_zones.values())
+        self.service_rates = service_rates
+        self.save(update_fields=['zones', 'service_rates'])

{karrio_server_core-2025.5rc12.dist-info → karrio_server_core-2025.5rc13.dist-info}/METADATA

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

{karrio_server_core-2025.5rc12.dist-info → karrio_server_core-2025.5rc13.dist-info}/RECORD

@@ -106,6 +106,7 @@ karrio/server/providers/extension/models/usps_international.py,sha256=k3opE3W4sv
 karrio/server/providers/extension/models/usps_wt.py,sha256=6RkR8mnFT9AWMEtW7l-ZB1BY9TkEYnLKtIiLyhwIqw0,731
 karrio/server/providers/extension/models/usps_wt_international.py,sha256=5QJdeNeshl1KCbQ6ravoh3vrU94QEN89noYZEF9kAW0,825
 karrio/server/providers/extension/models/zoom2u.py,sha256=3RvkZkAYvpXDW9fCmViOJB5NrSPo2_d_qpjcsWuCVtQ,585
+karrio/server/providers/management/commands/migrate_rate_sheets.py,sha256=piRV1n0itHQR4HZiWXVSjJKzHZPnFGKlrCjWOcy723A,3814
 karrio/server/providers/migrations/0001_initial.py,sha256=DkKU91a1tMqRisLoarYndyKX3PJplT4Bor6tT53yETw,6772
 karrio/server/providers/migrations/0002_carrier_active.py,sha256=zW_6cFEKmsZIbiuLimcUlwzVvpckYroJmzkCwep-D2A,378
 karrio/server/providers/migrations/0003_auto_20201230_0820.py,sha256=qkvoSgtkGxg0XX0Srd35hanzl5tI7bBo3znli_h002g,699
@@ -187,12 +188,14 @@ karrio/server/providers/migrations/0078_auto_20240813_1552.py,sha256=1DXKf6Ak_GP
 karrio/server/providers/migrations/0079_alter_carrier_options_alter_ratesheet_created_by.py,sha256=wppkE5LZaPiedrLMAkUpVly5FlSg6zbLBzO7a_yyUuk,864
 karrio/server/providers/migrations/0080_alter_aramexsettings_account_country_code_and_more.py,sha256=ETTlvcAP1kk9Sr4u6f2EaG0hXcIaYVZKz0c6k7f-Cg8,101848
 karrio/server/providers/migrations/0081_remove_alliedexpresssettings_carrier_ptr_and_more.py,sha256=Lb8w5LEnJgCd-a4suFAdZ3-gWHlIbLIJLahTGlUmi_U,9557
+karrio/server/providers/migrations/0082_add_zone_identifiers.py,sha256=0gRIFemNGNRkvV_pt0u3e-wL2LI89AKwaFWoqOqjAsA,1509
+karrio/server/providers/migrations/0083_add_optimized_rate_sheet_structure.py,sha256=K9jj1LGEs5WQvIUxWac1wbCI6YnrrzTIcD3PzjZZcHA,1057
 karrio/server/providers/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/providers/models/__init__.py,sha256=7D-pgQDTDSfptHhWxfJlOzSQqvYB_71D22zmNqjuBqk,628
 karrio/server/providers/models/carrier.py,sha256=E3zPcypTAQi1ninAQjKbelGAV8cZI8g_voRJ2KETrxQ,9436
 karrio/server/providers/models/config.py,sha256=8zuDXFGXBrC4fj2dW1-NpLAtFYPunEJi8uK-PezD7eo,759
-karrio/server/providers/models/service.py,sha256=_iT6Cty3HJJmjEXB423PjhEcQ4ArtMPKaxBZYTmhdaY,2161
-karrio/server/providers/models/sheet.py,sha256=GokxEfSAkjtKw5AkCtN0enP204RWRI0ZcQI5Lz-XgBU,1683
+karrio/server/providers/models/service.py,sha256=XTkZKyzE2g0I7HxGluty6Nk4El7iSyj2Ze0YXnrF7WQ,7038
+karrio/server/providers/models/sheet.py,sha256=Fuy8KIA719ZOeoqe-VfL6ZjLjhzdYS6Jp-hgE9680u4,9943
 karrio/server/providers/models/template.py,sha256=rrQXfimqFEFkelKzjyVeAruiu3UmrhpOT4M7JrGOtI0,1109
 karrio/server/providers/models/utils.py,sha256=fuvrpDz2KzcRC7w94zFQAaI4qtQPvs8f1r6jZ5xM-64,1703
 karrio/server/providers/serializers/__init__.py,sha256=bc5x1z7wkHyrHA2jP1wZVQF5SoPG-ueRVfn1RndK8VM,140
@@ -235,7 +238,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.5rc12.dist-info/METADATA,sha256=mUiD-2FjXZNzxvJy-7eXCtYoIWjUCN2ra_z07f5E7Uc,797
-karrio_server_core-2025.5rc12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_core-2025.5rc12.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_core-2025.5rc12.dist-info/RECORD,,
+karrio_server_core-2025.5rc13.dist-info/METADATA,sha256=U9GaWNyppHXD7rf279KJ33gn2l_Xv-fybNL9Im13L44,797
+karrio_server_core-2025.5rc13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_core-2025.5rc13.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_core-2025.5rc13.dist-info/RECORD,,