Move retry decorators from APIBaseClient to LotsClient and AssetsClient

Author: Scandie

openprocurement_client/clients.py

@@ -9,7 +9,6 @@
 from retrying import retry
 from munch import munchify
 
-from .exceptions import RequestFailed
 from openprocurement_client.resources.document_service import \
     DocumentServiceClient
 
@@ -78,10 +77,6 @@ def _delete_resource_item(self, url, headers=None):
             return munchify(loads(response_item.text))
         raise InvalidResponse(response_item)
 
-    @retry(wait_exponential_multiplier=200,
-           wait_exponential_max=1200,
-           stop_max_delay=45000,
-           retry_on_exception=lambda exc: isinstance(exc, RequestFailed))
     def _get_resource_item(self, url, headers=None):
         _headers = self.headers.copy()
         _headers.update(headers or {})
@@ -107,10 +102,6 @@ def _get_resource_items(self, params=None, feed='changes'):
 
         raise InvalidResponse(response)
 
-    @retry(wait_exponential_multiplier=200,
-           wait_exponential_max=1200,
-           stop_max_delay=45000,
-           retry_on_exception=lambda exc: isinstance(exc, RequestFailed))
     def _patch_resource_item(self, url, payload, headers=None):
         _headers = self.headers.copy()
         _headers.update(headers or {})

openprocurement_client/resources/assets.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
+from retrying import retry
+
 from openprocurement_client.clients import APIResourceClient
 from openprocurement_client.constants import ASSETS
+from openprocurement_client.exceptions import RequestFailed
 
 
 class AssetsClient(APIResourceClient):
@@ -12,6 +15,18 @@ def __init__(self, *args, **kwargs):
         super(AssetsClient, self).__init__(resource=self.resource, *args,
                                            **kwargs)
 
-    get_asset = APIResourceClient.get_resource_item
-
     get_assets = APIResourceClient.get_resource_items
+
+    @retry(wait_exponential_multiplier=200,
+           wait_exponential_max=1200,
+           stop_max_delay=45000,
+           retry_on_exception=lambda exc: isinstance(exc, RequestFailed))
+    def patch_asset(self, asset_id, patch_data):
+        return self.patch_resource_item(asset_id, patch_data)
+
+    @retry(wait_exponential_multiplier=200,
+           wait_exponential_max=1200,
+           stop_max_delay=45000,
+           retry_on_exception=lambda exc: isinstance(exc, RequestFailed))
+    def get_asset(self, asset_id):
+        return self.get_resource_item(asset_id)

openprocurement_client/resources/lots.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
+from retrying import retry
+
 from openprocurement_client.clients import APIResourceClient
 from openprocurement_client.constants import LOTS
+from openprocurement_client.exceptions import RequestFailed
 
 
 class LotsClient(APIResourceClient):
@@ -12,6 +15,18 @@ def __init__(self, *args, **kwargs):
         super(LotsClient, self).__init__(resource=self.resource, *args,
                                          **kwargs)
 
-    get_lot = APIResourceClient.get_resource_item
-
     get_lots = APIResourceClient.get_resource_items
+
+    @retry(wait_exponential_multiplier=200,
+           wait_exponential_max=1200,
+           stop_max_delay=45000,
+           retry_on_exception=lambda exc: isinstance(exc, RequestFailed))
+    def patch_lot(self, lot_id, patch_data):
+        return self.patch_resource_item(lot_id, patch_data)
+
+    @retry(wait_exponential_multiplier=200,
+           wait_exponential_max=1200,
+           stop_max_delay=45000,
+           retry_on_exception=lambda exc: isinstance(exc, RequestFailed))
+    def get_lot(self, lot_id):
+        return self.get_resource_item(lot_id)