karrio-generic 2025.5rc14__py3-none-any.whl → 2025.5rc15__py3-none-any.whl

karrio/mappers/generic/settings.py

@@ -1,17 +1,17 @@
 """Karrio Generic client settings."""
 
-from typing import List
 import attr
-from jstruct.types import JList, JStruct
-from karrio.core.models import ServiceLevel, LabelTemplate
-from karrio.universal.mappers.rating_proxy import RatingMixinSettings
-from karrio.universal.mappers.shipping_proxy import ShippingMixinSettings
-from karrio.providers.generic.units import DEFAULT_SERVICES
-from karrio.providers.generic.utils import Settings as BaseSettings
+import typing
+import jstruct
+import karrio.core.models as models
+import karrio.providers.generic.units as provider_units
+import karrio.providers.generic.utils as provider_utils
+import karrio.universal.mappers.rating_proxy as rating_proxy
+import karrio.universal.mappers.shipping_proxy as shipping_proxy
 
 
 @attr.s(auto_attribs=True)
-class Settings(BaseSettings, RatingMixinSettings, ShippingMixinSettings):
+class Settings(provider_utils.Settings, rating_proxy.RatingMixinSettings, shipping_proxy.ShippingMixinSettings):
     """Generic connection settings."""
 
     display_name: str
@@ -25,5 +25,12 @@ class Settings(BaseSettings, RatingMixinSettings, ShippingMixinSettings):
     config: dict = {}
     id: str = None
 
-    label_template: LabelTemplate = JStruct[LabelTemplate]
-    services: List[ServiceLevel] = JList[ServiceLevel, False, dict(default=DEFAULT_SERVICES)]  # type: ignore
+    label_template: models.LabelTemplate = jstruct.JStruct[models.LabelTemplate]
+    services: typing.List[models.ServiceLevel] = jstruct.JList[models.ServiceLevel, False, dict(default=provider_units.DEFAULT_SERVICES)]  # type: ignore
+
+    @property
+    def shipping_services(self) -> typing.List[models.ServiceLevel]:
+        if any(self.services or []):
+            return self.services
+
+        return provider_units.DEFAULT_SERVICES

{karrio_generic-2025.5rc14.dist-info → karrio_generic-2025.5rc15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_generic
-Version: 2025.5rc14
+Version: 2025.5rc15
 Summary: Karrio - Custom carrier Shipping extension
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0

{karrio_generic-2025.5rc14.dist-info → karrio_generic-2025.5rc15.dist-info}/RECORD

@@ -1,13 +1,13 @@
 karrio/mappers/generic/__init__.py,sha256=eizJesNxYg-FdtvbWso16wcpdnuClROT4Q-Df3d3eec,149
 karrio/mappers/generic/mapper.py,sha256=vzWGp4DzadAmrUqzBZbVtDdy0-g55iPKCXeSTWuXiCk,1182
 karrio/mappers/generic/proxy.py,sha256=nQxbLSwouoP_Vm0sjiutsELSEQEfz96ZYEqR7I3QAgM,438
-karrio/mappers/generic/settings.py,sha256=qxjExbUEje19cf4VVDFaxQIKddAAzWuBR8BiQzM2LtE,1012
+karrio/mappers/generic/settings.py,sha256=O8HmiZUtJZRbGSCnYL-Y_ILrsJP-kPM8bK0HXDcdFfc,1226
 karrio/plugins/generic/__init__.py,sha256=2jRHdsHUevSCaW1WbQXNIucu3iplmPDp2ajJHlASHvw,535
 karrio/providers/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/providers/generic/units.py,sha256=-nN2LvdEDVVbciU3iGyKn8zjm0L3TAfzju0PBzaawsY,2212
 karrio/providers/generic/utils.py,sha256=dBlGrhkD4g2ZmkYnxKUF3H8hQgdhF5bpBKr8NQ5_bGA,523
-karrio_generic-2025.5rc14.dist-info/METADATA,sha256=INrsnKLp0d9ek2WfNPP0TpnjP6jYTpOUBxvfPA8B2Qc,1004
-karrio_generic-2025.5rc14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_generic-2025.5rc14.dist-info/entry_points.txt,sha256=mvK1B8xIjTUc-b1CSXV7mlKxVW6F6qqRjW21i0COUOo,59
-karrio_generic-2025.5rc14.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_generic-2025.5rc14.dist-info/RECORD,,
+karrio_generic-2025.5rc15.dist-info/METADATA,sha256=n8aPIeMGdp_zdbGDx1x22pLtSfItHFTzzc3xR9scgow,1004
+karrio_generic-2025.5rc15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_generic-2025.5rc15.dist-info/entry_points.txt,sha256=mvK1B8xIjTUc-b1CSXV7mlKxVW6F6qqRjW21i0COUOo,59
+karrio_generic-2025.5rc15.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_generic-2025.5rc15.dist-info/RECORD,,