shopware-api-client 1.0.105__py3-none-any.whl → 1.0.107__py3-none-any.whl

shopware_api_client/base.py

@@ -127,7 +127,7 @@ class ClientBase:
         headers = self._get_headers()
         headers.update(kwargs.pop("headers", {}))
 
-        retry_wait_base = int(kwargs.pop("retriy_wait_base", 2))
+        retry_wait_base = int(kwargs.pop("retry_wait_base", 2))
         retries = int(kwargs.pop("retries", 0))
         retry_errors = tuple(
             kwargs.pop("retry_errors", [SWAPIInternalServerError, SWAPIServiceUnavailable, SWAPIGatewayTimeout])
@@ -146,16 +146,20 @@ class ClientBase:
                 await asyncio.sleep(2**retry_count)
                 retry_count += 1
                 continue
-
-            if response.status_code >= 400 and response.status_code != 429:
+            if response.status_code == 429:
+                # directly raise 429
+                error: SWAPIError = SWAPIError.from_response(response)
+                raise error
+            elif response.status_code >= 400:
+                # retry other failure codes
                 try:
                     errors: list = response.json().get("errors")
                     # ensure `errors` attribute is a list/tuple, fallback to from_response if not
                     if not isinstance(errors, (list, tuple)):
                         raise ValueError("`errors` attribute in json not a list/tuple!")
 
-                    error: SWAPIError | SWAPIErrorList = SWAPIError.from_errors(errors)
-                except ValueError:
+                    error: SWAPIError | SWAPIErrorList = SWAPIError.from_errors(errors)  # type: ignore
+                except (json.JSONDecodeError, ValueError):
                     error: SWAPIError | SWAPIErrorList = SWAPIError.from_response(response)  # type: ignore
 
                 if isinstance(error, SWAPIErrorList) and len(error.errors) == 1:

shopware_api_client/exceptions.py

@@ -95,7 +95,7 @@ class SWAPIError(SWAPIException):
     @classmethod
     def from_response(cls, response: Response) -> "SWAPIError":
         exception_class = cls.get_exception_class(response.status_code)
-        response.headers["requested-url"] = response.request.url
+        response.headers["requested-url"] = str(response.request.url)
         return exception_class(
             status=response.status_code,
             title=response.reason_phrase,

{shopware_api_client-1.0.105.dist-info → shopware_api_client-1.0.107.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shopware-api-client
-Version: 1.0.105
+Version: 1.0.107
 Summary:  An api client for the Shopware API
 License: MIT
 Keywords: shopware,api,client

{shopware_api_client-1.0.105.dist-info → shopware_api_client-1.0.107.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shopware_api_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shopware_api_client/base.py,sha256=i1iKwQeR8XBDbo0xXJdXXOaWvxyw0GimI8RHNjR1KlY,25099
+shopware_api_client/base.py,sha256=8KrOSxlFXDzkxvAj9YsjZhuEo07ZcXEvK3UvgZxGzZI,25331
 shopware_api_client/client.py,sha256=vkTZ8WLIu0Q3_73gXvidkTSpMJlWsJUjFyhDY2f2ISM,7583
 shopware_api_client/config.py,sha256=HStgfQcClpo_aqaTRDrqdTUjqSGPFkIMjrPwSruVnM8,1565
 shopware_api_client/endpoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,10 +105,10 @@ shopware_api_client/endpoints/store/__init__.py,sha256=LE_GL4jYVGrRdp6M1cPURI-UJ
 shopware_api_client/endpoints/store/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shopware_api_client/endpoints/store/core/address.py,sha256=Tm7ri-i0zhyt4LVEHaQy3xEvjapCCPRsYAp5lOCDOew,2774
 shopware_api_client/endpoints/store/core/cart.py,sha256=34eNwuv7H9WZUtJGf4TkTGHiGynDT6xeAt0gIl7V4KI,2584
-shopware_api_client/exceptions.py,sha256=wVLAdXegQA9Zqlw_Yh4r8o7R5M_b0kMWGEJT8O1CqCY,4524
+shopware_api_client/exceptions.py,sha256=KnOxav3iBPFfL3DVeURpaP2-lVHNDtiOt8jcmeZgxY8,4529
 shopware_api_client/logging.py,sha256=4QSTK1vcdBew4shvLG-fm-xDOlddhOZeyb5T9Og0fSA,251
 shopware_api_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shopware_api_client-1.0.105.dist-info/LICENSE,sha256=qTihFhbGE2ZJJ7Byc9hnEYBY33yDK2Jw87SpAm0IKUs,1107
-shopware_api_client-1.0.105.dist-info/METADATA,sha256=_d1--GGVad9UVudtS3X-7bptcwQQ1-Et85M3IaTSVkI,22659
-shopware_api_client-1.0.105.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-shopware_api_client-1.0.105.dist-info/RECORD,,
+shopware_api_client-1.0.107.dist-info/LICENSE,sha256=qTihFhbGE2ZJJ7Byc9hnEYBY33yDK2Jw87SpAm0IKUs,1107
+shopware_api_client-1.0.107.dist-info/METADATA,sha256=-kfmkjiQsLqvwM9y4QoeNCnt9qpows2Pg_h8uLbOUd4,22659
+shopware_api_client-1.0.107.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+shopware_api_client-1.0.107.dist-info/RECORD,,