karrio 2023.1.11__py3-none-any.whl → 2023.1.12__py3-none-any.whl

karrio/core/models.py

@@ -410,16 +410,16 @@ class DocumentUploadRequest:
     """shipment document upload request unified data type."""
 
     document_files: List[DocumentFile] = JList[DocumentFile, REQUIRED]
-    options: Dict = {}
-    reference: str = None
     tracking_number: str = None
+    reference: str = None
+    options: Dict = {}
 
 
 @attr.s(auto_attribs=True)
 class DocumentDetails:
     """Karrio unified uploaded document id info data type."""
 
-    document_id: str
+    doc_id: str
     file_name: str
 
 

karrio/core/units.py

@@ -887,6 +887,14 @@ class ShippingOptions(Options):
     def signature_confirmation(self) -> utils.OptionEnum:
         return self[ShippingOption.signature_confirmation.name]
 
+    @property
+    def doc_files(self) -> utils.OptionEnum:
+        return self[ShippingOption.doc_files.name]
+
+    @property
+    def doc_references(self) -> utils.OptionEnum:
+        return self[ShippingOption.doc_references.name]
+
 
 class CustomsOption(utils.Enum):
     """common shipment customs identifiers"""

karrio/core/utils/helpers.py

@@ -2,9 +2,10 @@ import io
 import re
 import ssl
 import uuid
+import string
+import base64
 import asyncio
 import logging
-import base64
 import urllib.parse
 from PyPDF2 import PdfMerger
 from PIL import Image, ImageFile
@@ -26,6 +27,15 @@ def identity(value: Any) -> Any:
     return value
 
 
+def failsafe(callable: Callable[[], T], warning: str = None) -> T:
+    try:
+        return callable()
+    except Exception as e:
+        if warning:
+            logger.warning(string.Template(warning).substitute(error=e))
+        return None
+
+
 def to_buffer(encoded_file: str, **kwargs) -> io.BytesIO:
     content = base64.b64decode(encoded_file, **kwargs)
     buffer = io.BytesIO()
@@ -107,7 +117,11 @@ def bundle_base64(base64_strings: List[str], format: str = "PDF") -> str:
 
 
 def decode_bytes(byte):
-    return byte.decode("utf-8")
+    return (
+        failsafe(lambda: byte.decode("utf-8")) or
+        failsafe(lambda: byte.decode("ISO-8859-1")) or
+        byte.decode("utf-8")
+    )
 
 
 def process_request(
@@ -170,7 +184,7 @@ def process_error(
     if on_error is not None:
         _error = on_error(error)
     else:
-        _error = error.read().decode("utf-8")
+        _error = decode_bytes(error.read())
 
     if trace:
         trace({"request_id": request_id, "error": _error}, "error")

karrio/lib.py

@@ -65,7 +65,7 @@ def text(
     separator: str = None,
 ) -> typing.Optional[str]:
     """Returns a joined text
-    
+
     Example:
         result1 = text("string text 1", "string text 2")
         print(result1) # "string text 1 string text 2"
@@ -87,7 +87,7 @@ def text(
 
     if _text is None:
         return None
-    
+
     return typing.cast(str, _text[0:max] if max else _text)
 
 
@@ -622,9 +622,4 @@ def failsafe(callable: typing.Callable[[], T], warning: str = None) -> T:
     Only use it when you are running something unstable that you
     don't mind if it fails.
     """
-    try:
-        return callable()
-    except Exception as e:
-        if warning:
-            logger.warning(string.Template(warning).substitute(error=e))
-        return None
+    return utils.failsafe(callable, warning=warning)

{karrio-2023.1.11.dist-info → karrio-2023.1.12.dist-info}/METADATA

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

{karrio-2023.1.11.dist-info → karrio-2023.1.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 karrio/__init__.py,sha256=MGaZGiMfGOpYY5gTQaOT-FgpyAmRoBio8dfXl1IcRWA,3149
-karrio/lib.py,sha256=_AEz34J3Z7U2yWrhz3jqjBh2k2bb50urPvYHz29FVM0,17371
+karrio/lib.py,sha256=1ucAphYpt2aeOGHKeq2c2rEXvsosfWn9TC8tN4U_7JE,17241
 karrio/references.py,sha256=0z-b2U2Z8ghhvC-hH6XpMhiVKrGcizyq5FTD4G1XsRg,4673
 karrio/addons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 karrio/addons/label.py,sha256=WwC1o97Ztyj3kRNTlAkHmYh4It7dC7l8bsC3fc-5yMA,10316
@@ -14,14 +14,14 @@ 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=kJUov6vdVZVrNaRF-J0RP4Papb8hZifAVY97TxcYQO0,1029
-karrio/core/models.py,sha256=OcSKYVmdJMHAZTGCx_yAH6OUyEeF1N_dIty-6j6GLqw,9599
+karrio/core/models.py,sha256=OuSW62aEdzvOspSKXsssudemeQ-LZ7BiYKg4v-E3_j4,9594
 karrio/core/settings.py,sha256=mjL6vtKZnjK7ITcmkxvmOZHshHc7LDuhseF5wAojt_4,518
-karrio/core/units.py,sha256=-fiWXifRNybo7r-9DGbiHY8muR8sBIHJnnj3hT4KMXs,54563
+karrio/core/units.py,sha256=iCBA0dMwQfVwa1ZmPkpvmDSCd9gO1hoVn3yTNcbWbuU,54795
 karrio/core/utils/__init__.py,sha256=537Hel7VeqWPbcFp41Dr5E-pzOCEHHD5oqhuA58X4P4,695
 karrio/core/utils/datetime.py,sha256=aFMqLB_AdRGM0By2TO8mYce-UlqExf_J2s2eLNtDClY,2311
 karrio/core/utils/dict.py,sha256=fUsyMwRduh3qJ6D6Vf4LUVcljEqDHJVn8Av9x4rUadg,2312
 karrio/core/utils/enum.py,sha256=qCrqP49wXyypfQ7rw4kFGjJ6rawptOxq_RPwqaz09dk,4420
-karrio/core/utils/helpers.py,sha256=i3GqwN_7Shsgc5VVmnxf8LOAKvE4A4faYYb5Fucidc0,7216
+karrio/core/utils/helpers.py,sha256=wqrMYUX2_JpQbXBd0eLnmE1R3I0qKDbGJ2EoR0Wv4wc,7593
 karrio/core/utils/log.py,sha256=G0JqUqNiS7JwkFMurtHtbxa42miAs28dPfNZZdlZid4,434
 karrio/core/utils/number.py,sha256=z455Zbx5V92Ofo8PEaC_UEfmVEwnb-nq7fIoSeApz4o,1176
 karrio/core/utils/pipeline.py,sha256=sr4YCkqTeJjXPPPOCXZqzljn9OZyFqRPhCqGr1WTt74,1237
@@ -44,7 +44,7 @@ karrio/universal/providers/rating/utils.py,sha256=zNbBahziUqbh3g-Uo7gbJ4jXmp7cWQ
 karrio/universal/providers/shipping/__init__.py,sha256=JRcfJWSeDSjO2g2fRnLgBurBXn01nVpdi21ShxLpG34,188
 karrio/universal/providers/shipping/shipment.py,sha256=FwpIAaRMLhwINNRGSRTCcSB0xmPS2yGGbGHNAf4O8Cg,1468
 karrio/universal/providers/shipping/utils.py,sha256=1LuO31RMhpUls6-h5xhWkfky4G7tdWmGKmRhLkj-e98,593
-karrio-2023.1.11.dist-info/METADATA,sha256=5AWzW2Rd1sdoaDTXPQaokhAVSUuVk4IO-RfetZK_9m4,4706
-karrio-2023.1.11.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-karrio-2023.1.11.dist-info/top_level.txt,sha256=mfkVZXzNuVRmA7NRlck_Ub-C8Zgtqxbx3gX1Rq_W-i0,7
-karrio-2023.1.11.dist-info/RECORD,,
+karrio-2023.1.12.dist-info/METADATA,sha256=-vHB_oDdaKQdAsefKAhQMQoRG8SScrGqoGq3qSoO5a0,4706
+karrio-2023.1.12.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+karrio-2023.1.12.dist-info/top_level.txt,sha256=mfkVZXzNuVRmA7NRlck_Ub-C8Zgtqxbx3gX1Rq_W-i0,7
+karrio-2023.1.12.dist-info/RECORD,,