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

karrio/server/graph/schemas/base/__init__.py

@@ -332,6 +332,24 @@ class Mutation:
     ) -> mutations.UpdateRateSheetMutation:
         return mutations.UpdateRateSheetMutation.mutate(info, **input.to_dict())
 
+    @strawberry.mutation
+    def update_rate_sheet_zone_cell(
+        self, info: Info, input: inputs.UpdateRateSheetZoneCellMutationInput
+    ) -> mutations.UpdateRateSheetZoneCellMutation:
+        return mutations.UpdateRateSheetZoneCellMutation.mutate(info, **input.to_dict())
+
+    @strawberry.mutation
+    def batch_update_rate_sheet_cells(
+        self, info: Info, input: inputs.BatchUpdateRateSheetCellsMutationInput
+    ) -> mutations.BatchUpdateRateSheetCellsMutation:
+        return mutations.BatchUpdateRateSheetCellsMutation.mutate(info, **input.to_dict())
+
+    @strawberry.mutation
+    def delete_rate_sheet_service(
+        self, info: Info, input: inputs.DeleteRateSheetServiceMutationInput
+    ) -> mutations.DeleteRateSheetServiceMutation:
+        return mutations.DeleteRateSheetServiceMutation.mutate(info, **input.to_dict())
+
     @strawberry.mutation
     def delete_rate_sheet(
         self, info: Info, input: inputs.DeleteMutationInput

karrio/server/graph/schemas/base/inputs.py

@@ -516,6 +516,35 @@ class UpdateRateSheetMutationInput(utils.BaseInput):
     metadata: typing.Optional[utils.JSON] = strawberry.UNSET
 
 
+@strawberry.input
+class UpdateRateSheetZoneCellMutationInput(utils.BaseInput):
+    id: str  # Rate sheet ID
+    service_id: str  # Service level ID
+    zone_id: str  # Zone ID
+    field: str  # Field name to update
+    value: utils.JSON  # New value
+
+
+@strawberry.input
+class CellUpdate(utils.BaseInput):
+    service_id: str
+    zone_id: str
+    field: str
+    value: utils.JSON
+
+
+@strawberry.input
+class BatchUpdateRateSheetCellsMutationInput(utils.BaseInput):
+    id: str  # Rate sheet ID
+    updates: typing.List[CellUpdate]
+
+
+@strawberry.input
+class DeleteRateSheetServiceMutationInput(utils.BaseInput):
+    rate_sheet_id: str
+    service_id: str
+
+
 @strawberry.input
 class RateSheetFilter(utils.Paginated):
     keyword: typing.Optional[str] = strawberry.UNSET

karrio/server/graph/schemas/base/mutations.py

@@ -538,8 +538,8 @@ class CreateRateSheetMutation(utils.BaseMutation):
                 carrier_name=rate_sheet.carrier_name,
             ).filter(id__in=carriers)
             for _ in _carriers:
-                _.settings.rate_sheet = rate_sheet
-                _.settings.save(update_fields=["rate_sheet"])
+                _.rate_sheet = rate_sheet
+                _.save(update_fields=["rate_sheet"])
 
         return CreateRateSheetMutation(rate_sheet=rate_sheet)
 
@@ -558,9 +558,10 @@ class UpdateRateSheetMutation(utils.BaseMutation):
         instance = providers.RateSheet.access_by(info.context.request).get(
             id=input["id"]
         )
+        data = input.copy()
         serializer = serializers.RateSheetModelSerializer(
             instance,
-            data=input,
+            data=data,
             context=info.context.request,
             partial=True,
         )
@@ -568,11 +569,136 @@ class UpdateRateSheetMutation(utils.BaseMutation):
         serializer.is_valid(raise_exception=True)
         rate_sheet = serializer.save()
 
+        # Handle services updates like in CreateRateSheetMutation
+        if "services" in data:
+            save_many_to_many_data(
+                "services",
+                serializers.ServiceLevelModelSerializer,
+                rate_sheet,
+                payload=data,
+                context=info.context.request,
+            )
+
         return UpdateRateSheetMutation(
             rate_sheet=providers.RateSheet.objects.get(id=input["id"])
         )
 
 
+@strawberry.type
+class UpdateRateSheetZoneCellMutation(utils.BaseMutation):
+    rate_sheet: typing.Optional[types.RateSheetType] = None
+
+    @staticmethod
+    @transaction.atomic
+    @utils.authentication_required
+    @utils.authorization_required(["manage_carriers"])
+    def mutate(
+        info: Info, **input: inputs.UpdateRateSheetZoneCellMutationInput
+    ) -> "UpdateRateSheetZoneCellMutation":
+        rate_sheet = providers.RateSheet.access_by(info.context.request).get(
+            id=input["id"]
+        )
+        service = rate_sheet.services.get(id=input["service_id"])
+
+        try:
+            service.update_zone_cell(
+                zone_id=input["zone_id"], field=input["field"], value=input["value"]
+            )
+        except ValueError as e:
+            logger.error(f"Invalid zone id: {e}")
+            raise exceptions.ValidationError({"zone_id": "invalid zone id"})
+
+        return UpdateRateSheetZoneCellMutation(rate_sheet=rate_sheet)
+
+
+@strawberry.type
+class BatchUpdateRateSheetCellsMutation(utils.BaseMutation):
+    rate_sheet: typing.Optional[types.RateSheetType] = None
+
+    @staticmethod
+    @transaction.atomic
+    @utils.authentication_required
+    @utils.authorization_required(["manage_carriers"])
+    def mutate(
+        info: Info, **input: inputs.BatchUpdateRateSheetCellsMutationInput
+    ) -> "BatchUpdateRateSheetCellsMutation":
+        rate_sheet = providers.RateSheet.access_by(info.context.request).get(
+            id=input["id"]
+        )
+
+        # Group updates by service_id for efficient processing
+        service_updates = {}
+        for update in input["updates"]:
+            service_id = update["service_id"]
+            if service_id not in service_updates:
+                service_updates[service_id] = []
+            service_updates[service_id].append(
+                {
+                    "zone_id": update["zone_id"],
+                    "field": update["field"],
+                    "value": update["value"],
+                }
+            )
+
+        # Use optimized structure if available, otherwise fall back to legacy
+        if rate_sheet.zones is not None and rate_sheet.service_rates is not None:
+            # Use optimized batch update on rate sheet
+            all_updates = []
+            for service_id, updates in service_updates.items():
+                for update in updates:
+                    all_updates.append(
+                        {
+                            "service_id": service_id,
+                            "zone_id": update["zone_id"],
+                            "field": update["field"],
+                            "value": update["value"],
+                        }
+                    )
+            try:
+                rate_sheet.batch_update_service_rates(all_updates)
+            except Exception as e:
+                logger.error(f"Invalid zone id: {e}")
+                raise exceptions.ValidationError(
+                    {"rate_sheet": "failed to update rate sheet"}
+                )
+        else:
+            # Fall back to legacy per-service updates
+            for service_id, updates in service_updates.items():
+                try:
+                    service = rate_sheet.services.get(id=service_id)
+                    service.batch_update_cells(updates)
+                except ValueError as e:
+                    logger.error(f"Invalid zone id: {e}")
+                    raise exceptions.ValidationError(
+                        {"service_id": "failed to update service"}
+                    )
+
+        return BatchUpdateRateSheetCellsMutation(rate_sheet=rate_sheet)
+
+
+@strawberry.type
+class DeleteRateSheetServiceMutation(utils.BaseMutation):
+    rate_sheet: typing.Optional[types.RateSheetType] = None
+
+    @staticmethod
+    @transaction.atomic
+    @utils.authentication_required
+    @utils.authorization_required(["manage_carriers"])
+    def mutate(
+        info: Info, **input: inputs.DeleteRateSheetServiceMutationInput
+    ) -> "DeleteRateSheetServiceMutation":
+        rate_sheet = providers.RateSheet.access_by(info.context.request).get(
+            id=input["rate_sheet_id"]
+        )
+        service = rate_sheet.services.get(id=input["service_id"])
+
+        # Remove service from rate sheet and delete it
+        rate_sheet.services.remove(service)
+        service.delete()
+
+        return DeleteRateSheetServiceMutation(rate_sheet=rate_sheet)
+
+
 @strawberry.type
 class PartialShipmentMutation(utils.BaseMutation):
     shipment: typing.Optional[types.ShipmentType] = None

karrio/server/graph/schemas/base/types.py

@@ -1117,6 +1117,7 @@ class ShipmentType:
 @strawberry.type
 class ServiceZoneType:
     object_type: str
+    id: typing.Optional[str] = None
     label: typing.Optional[str] = None
     rate: typing.Optional[float] = None
 
@@ -1175,7 +1176,8 @@ class ServiceLevelType:
 
     @strawberry.field
     def zones(self: providers.ServiceLevel) -> typing.List[ServiceZoneType]:
-        return [ServiceZoneType.parse(zone) for zone in self.zones or []]
+        # Use computed_zones for backward compatibility with optimized structure
+        return [ServiceZoneType.parse(zone) for zone in self.computed_zones]
 
     @strawberry.field
     def metadata(self: providers.RateSheet) -> typing.Optional[utils.JSON]:

karrio/server/graph/serializers.py

@@ -12,6 +12,7 @@ import karrio.server.manager.models as manager
 import karrio.server.graph.models as graph
 import karrio.server.core.models as core
 import karrio.server.user.models as auth
+import karrio.server.core.gateway as gateway
 
 
 class UserModelSerializer(serializers.ModelSerializer):
@@ -268,10 +269,10 @@ class ServiceLevelModelSerializer(serializers.ModelSerializer):
         )
         self.instance.save(update_fields=["zones"])
 
-    def update(self, instance, validated_data):
+    def update(self, instance, validated_data, context=None, **kwargs):
         """Handle partial updates of service level data including zones."""
         zones_data = validated_data.pop("zones", None)
-        instance = super().update(instance, validated_data)
+        instance = super().update(instance, validated_data, context=context)
 
         if zones_data is not None:
             # Handle zone updates if provided
@@ -362,10 +363,10 @@ class RateSheetModelSerializer(serializers.ModelSerializer):
             ).filter(id__in=list(_ids))
 
             for carrier in _carriers:
-                carrier.settings.rate_sheet = (
+                carrier.rate_sheet = (
                     self.instance if carrier.id in carriers else None
                 )
-                carrier.settings.save(update_fields=["rate_sheet"])
+                carrier.save(update_fields=["rate_sheet"])
 
     def update(self, instance, validated_data, **kwargs):
         """Handle updates of rate sheet data including services and carriers."""

karrio/server/graph/tests/test_rate_sheets.py

@@ -305,8 +305,14 @@ UPDATE_RATE_SHEET_RESPONSE = {
                 "services": [
                     {
                         "id": ANY,
-                        "service_name": "UPS Standard",
-                        "zones": [{"label": "Zone 1", "rate": 10.0}],
+                        "service_name": "Updated Service",
+                        "zones": [
+                            {
+                                "country_codes": ["US", "CA"],
+                                "label": "Updated Zone",
+                                "rate": 20.0,
+                            }
+                        ],
                     }
                 ],
             }

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

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

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

@@ -4,7 +4,7 @@ karrio/server/graph/apps.py,sha256=grL5ySDnW2amzj0nTXFm-WCoTWViVYvKqGlsi4k5epI,9
 karrio/server/graph/forms.py,sha256=5iGC3hj6dsAsupYz4QubyygTeTKDRR56Q5mYq0vbGhI,1962
 karrio/server/graph/models.py,sha256=CEnE4AsVyjBufyK6ebWmUH3s8DwA0HvZg0fUoZb5Pn4,1321
 karrio/server/graph/schema.py,sha256=2dXM8nD1usOc1S6QSalajoFmgwYuXxsrwj20AJ5HtT4,1151
-karrio/server/graph/serializers.py,sha256=vwP_U59aLnsnYVjwn3jrpz7SxOFzT_vplzSK-2FcsrU,13692
+karrio/server/graph/serializers.py,sha256=kAVpyoN74gkA20ZnmDycvr_yrwFOb_A9di2-vrkdL7U,13760
 karrio/server/graph/urls.py,sha256=HKo0gkx5TgoWDV0ap2QCtueNTmaAqvX6qVDe3c2UT1E,183
 karrio/server/graph/utils.py,sha256=eeIKeTfGP-8U6MkdMdTyobnk6wbNEE75Bm0cFu85RfU,9031
 karrio/server/graph/views.py,sha256=qWfa-wteB-Mb7glAYz6SVlZSwHPw_ImMm7XVmewdmTQ,2889
@@ -15,10 +15,10 @@ karrio/server/graph/migrations/0001_initial.py,sha256=oeaS5JSkQP6w9ulYar3mdn695y
 karrio/server/graph/migrations/0002_auto_20210512_1353.py,sha256=TnUwR9EP0qp3gJ38f9w0PYawK2VheDtqXEgyRhYZS2M,538
 karrio/server/graph/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/server/graph/schemas/__init__.py,sha256=Kn-I1j3HP3jwZccpz6FL9r1k6b3UEAMVh2kFPCKNS0w,80
-karrio/server/graph/schemas/base/__init__.py,sha256=aarmPw7csVZCeRxRaU6FNZ6tbN8SOla-nbYqlXFn3lw,14272
-karrio/server/graph/schemas/base/inputs.py,sha256=saFN6Sh4lU4_gcmq844Odi4WDBQXaH8Vyk4KcXURUOU,20710
-karrio/server/graph/schemas/base/mutations.py,sha256=F42QNh-rOnErprxK9DB_MAxe2q4H4fU1freGW9lVZcw,28859
-karrio/server/graph/schemas/base/types.py,sha256=Q0zpVP9ZlmLDmTYtBuZVxlvvmL1uCjirU1aPOu2ulYk,46338
+karrio/server/graph/schemas/base/__init__.py,sha256=J6pf4SzfAtQ4yaNapEuHuoyOA0-UGhueqDD3n0JzTb0,15118
+karrio/server/graph/schemas/base/inputs.py,sha256=T1T7cNVGudgVGOkPnus6TfK_i-lT_cjOBlpaPTHummk,21363
+karrio/server/graph/schemas/base/mutations.py,sha256=1S-aUpoKwwDslLtbReJb_5kx9tDr3-EfAhQQ9D7-6K0,33583
+karrio/server/graph/schemas/base/types.py,sha256=lKC-mdLluLNaPn9DXQDxh7Vl8JT9b_s_CIqZkiO0NWo,46458
 karrio/server/graph/templates/graphql/graphiql.html,sha256=MQjQbBqoRE0QLsOUck8SaXo6B2oJO8dT6YZzUqbDan0,3786
 karrio/server/graph/templates/karrio/email_change_email.html,sha256=YHqTy9VGV_s7kio57Tg3v7TCIN3QlnPHi2ioTOcHJLE,467
 karrio/server/graph/templates/karrio/email_change_email.txt,sha256=NXXuzLR63hn2F1fVAjzmuguptuuTvujwqI7YLSrQoio,431
@@ -28,11 +28,11 @@ karrio/server/graph/tests/base.py,sha256=m3k1CE-d9JHDsqfyXX0Fwksmkel33S7sh9-zkyp
 karrio/server/graph/tests/test_carrier_connections.py,sha256=PoXxJB53jBIz8j1GYCzTiaTW14Q0D1McdOkDYgcOqNM,6140
 karrio/server/graph/tests/test_metafield.py,sha256=K7Oon0CLEm_MUMbmcu0t2iAZvFN8Wl7Kp4QAWeUXo_Y,12783
 karrio/server/graph/tests/test_partial_shipments.py,sha256=dPIdIq4wiyovOaIIzbIX69eZnBqCA4ZvBSiGKYADM2g,19031
-karrio/server/graph/tests/test_rate_sheets.py,sha256=iNdN0GR26wv8lZd7slUbHTs1HbasKlMk8gk-A-XRZ5c,10079
+karrio/server/graph/tests/test_rate_sheets.py,sha256=cUzPV8dXQFPFh1r7W8bY6Lou3fjh8f9VGpyZrfbMXec,10300
 karrio/server/graph/tests/test_templates.py,sha256=WVU6vcfr6tEk917uSn1dECU8bkQtgD7FNuE-GJuFido,21626
 karrio/server/graph/tests/test_user_info.py,sha256=K91BL7SgxLWflCZriSVI8Vt5M5RIqmSCHKrgN2w8GmM,1928
 karrio/server/settings/graph.py,sha256=cz2yQHbp3xCfyFKuUkPEFfkI2fFVggExIY49wGz7mt0,106
-karrio_server_graph-2025.5rc12.dist-info/METADATA,sha256=vQUivfRKLBanFOj5sLCUrQi96NbfcL9awu5AYsDzb4g,744
-karrio_server_graph-2025.5rc12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server_graph-2025.5rc12.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server_graph-2025.5rc12.dist-info/RECORD,,
+karrio_server_graph-2025.5rc13.dist-info/METADATA,sha256=qUDbtpb-Ih-hHRixZXLIiLxsPIcnsCJaqIf14lzGcJk,744
+karrio_server_graph-2025.5rc13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server_graph-2025.5rc13.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server_graph-2025.5rc13.dist-info/RECORD,,