karrio 2023.4__py3-none-any.whl → 2023.4.4__py3-none-any.whl

karrio/core/models.py

@@ -4,14 +4,6 @@ from typing import List, Dict, Any, Union
 from jstruct import JList, JStruct, REQUIRED
 
 
-@attr.s(auto_attribs=True)
-class AddressExtra:
-    street_name: str = None
-    street_type: str = None
-    suburb: str = None
-    suite: str = None
-
-
 @attr.s(auto_attribs=True)
 class Address:
     """shipping party (contact and address) data type."""
@@ -35,8 +27,6 @@ class Address:
     federal_tax_id: str = None
     state_tax_id: str = None
 
-    extra: AddressExtra = JStruct[AddressExtra]
-
 
 @attr.s(auto_attribs=True)
 class Commodity:

karrio/core/units.py

@@ -1106,6 +1106,9 @@ class ComputedAddress(models.Address):
         self.address = address
 
     def __getattr__(self, item):
+        if item == "street_number":
+            return self._compute_street_number()
+
         if hasattr(self.address, item):
             return getattr(self.address, item)
 
@@ -1123,6 +1126,33 @@ class ComputedAddress(models.Address):
     def address_lines(self) -> str:
         return self._compute_address_line(join=False)
 
+    @property
+    def street(self) -> typing.Optional[str]:
+        return typing.cast(
+            str,
+            utils.SF.concat_str(
+                self.street_number,
+                self.street_name,
+                join=True,
+            ),
+        )
+
+    @property
+    def street_name(self) -> typing.Optional[str]:
+        """The address line 1 without the street number"""
+        return typing.cast(
+            str,
+            utils.SF.concat_str(
+                *[
+                    _
+                    for _ in self.address.address_line1.split(" ")
+                    if _ != self.street_number
+                ],
+                join=True,
+            ),
+        )
+        return self.address.address_line1.replace(self.street_number, "").strip()
+
     @property
     def tax_id(self) -> typing.Optional[str]:
         return self.address.federal_tax_id or self.address.state_tax_id
@@ -1148,50 +1178,43 @@ class ComputedAddress(models.Address):
     def has_tax_info(self) -> bool:
         return any([self.address.federal_tax_id, self.address.state_tax_id])
 
-    @property
-    def suite(self) -> typing.Optional[str]:
-        return getattr(self.address.extra, "suite", None)
-
     @property
     def contact(self) -> typing.Optional[str]:
         return getattr(self.address, "person_name", None) or getattr(
             self.address, "company_name", None
         )
 
-    @property
-    def street_name(self) -> typing.Optional[str]:
-        return getattr(self.address.extra, "street_name", None)
-
-    @property
-    def street_type(self) -> typing.Optional[str]:
-        return getattr(self.address.extra, "street_type", None)
-
     def _compute_address_line(self, join: bool = True) -> typing.Optional[str]:
         if any(
             [
-                self.address.street_number,
-                self.address.address_line1,
-                self.address.address_line2,
+                self.street_number,
+                self.street_name,
+                self.address_line2,
             ]
         ):
             return utils.SF.concat_str(
-                self.address.street_number,
-                self.address.address_line1,
-                self.address.address_line2,
+                self.street_number,
+                self.street_name,
+                self.address_line2,
                 join=join,
             )  # type:ignore
 
-        if self.address.extra is not None:
-            return utils.SF.concat_str(
-                self.address.extra.suite,
-                self.address.street_number,
-                self.address.extra.street_name,
-                self.address.extra.street_type,
-                join=True,
-            )  # type:ignore
-
         return None
 
+    def _compute_street_number(self):
+        _value = getattr(self.address, "street_number", None)
+
+        if _value is None:
+            words = self.address.address_line1.split(" ")
+
+            if any(_.isdigit() for _ in words[0]):
+                return words[0]
+
+            if any(_.isdigit() for _ in words[-1]):
+                return words[-1]
+
+        return _value
+
 
 class ComputedDocumentFile(models.DocumentFile):
     def __init__(self, document: typing.Optional[models.DocumentFile]):

{karrio-2023.4.dist-info → karrio-2023.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: karrio
-Version: 2023.4
+Version: 2023.4.4
 Summary: Multi-carrier shipping API integration with python
 Home-page: https://github.com/karrioapi/karrio
 Author: karrio

{karrio-2023.4.dist-info → karrio-2023.4.4.dist-info}/RECORD

@@ -14,9 +14,9 @@ karrio/api/proxy.py,sha256=Mx5tpcL0L_02lIZ84AvnEfroVu5Qi22iz7AVueX4YjI,6320
 karrio/core/__init__.py,sha256=BboTt3huAYrsqcTcaq1lFX5O4uKiIi2cpWEXp68ItMo,71
 karrio/core/errors.py,sha256=iMwiwCwK0eiYzk5KJ9Qu86JMWpymw1zDCvmqY67ghSw,3006
 karrio/core/metadata.py,sha256=vs4doqUjxDSRbDulbdBeTAyFUIZ8MdjsRP74YjtdNEY,1081
-karrio/core/models.py,sha256=FaUyZ3SmkANPC4CfXKw6T8O4YAnXpvLmSM9GaxF9YaE,11152
+karrio/core/models.py,sha256=wkqD4M7cCDFJmdpI3shDvxX4M9mFirL6K3yHUl0GIbM,10953
 karrio/core/settings.py,sha256=1d-w-U5nODMxsbmR0B4CdgggvYCzsgtSipP7GUWmFkI,753
-karrio/core/units.py,sha256=upyiW7PG2QyNxdiMtjJfH632IrHTh5qc4XNNLHQJCA0,57529
+karrio/core/units.py,sha256=PyHjHEdge6fY-xZph9_NUQdbExROoyIpUSdRT8MgKIs,58015
 karrio/core/utils/__init__.py,sha256=NPxAugvQ4lhWOngITOagexXrsTQqlJQ0gyaXc9iBivg,739
 karrio/core/utils/caching.py,sha256=zx0R1XAWPuA0q2hz5xUw0-OLZhHd7haS41uO_Prg8Ng,1734
 karrio/core/utils/datetime.py,sha256=aFMqLB_AdRGM0By2TO8mYce-UlqExf_J2s2eLNtDClY,2311
@@ -45,7 +45,7 @@ karrio/universal/providers/rating/utils.py,sha256=WVyJWdxCdKM1YlhTHVFxEMyac0FKIG
 karrio/universal/providers/shipping/__init__.py,sha256=JRcfJWSeDSjO2g2fRnLgBurBXn01nVpdi21ShxLpG34,188
 karrio/universal/providers/shipping/shipment.py,sha256=t7PO4uSzD1ZL3q3UZWHAPD3UUZUKXReQvED8mVKUe1A,1512
 karrio/universal/providers/shipping/utils.py,sha256=1LuO31RMhpUls6-h5xhWkfky4G7tdWmGKmRhLkj-e98,593
-karrio-2023.4.dist-info/METADATA,sha256=dhVsyoub0aSABLGIyUP5-4BrtsGzMnBW11zS-YsHUA0,4703
-karrio-2023.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-karrio-2023.4.dist-info/top_level.txt,sha256=mfkVZXzNuVRmA7NRlck_Ub-C8Zgtqxbx3gX1Rq_W-i0,7
-karrio-2023.4.dist-info/RECORD,,
+karrio-2023.4.4.dist-info/METADATA,sha256=dRozbMtKfDyrdjkZtVUAHMOyE4vbgM3M-dzUyicgKJo,4705
+karrio-2023.4.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+karrio-2023.4.4.dist-info/top_level.txt,sha256=mfkVZXzNuVRmA7NRlck_Ub-C8Zgtqxbx3gX1Rq_W-i0,7
+karrio-2023.4.4.dist-info/RECORD,,