CS 13656

openprocurement_client/clients.py

@@ -68,12 +68,13 @@ def _obtain_cookie(self):
     def _get_access_token(obj):
         return getattr(getattr(obj, 'access', ''), 'token', '')
 
+    @retry(stop_max_attempt_number=5)
     def _create_resource_item(self, url, payload, headers=None, method='POST'):
         _headers = self.headers.copy()
         _headers.update(headers or {})
 
         response_item = self.request(method, url, headers=_headers, json=payload)
-        if ((response_item.status_code == 201 and method == 'POST') or
+        if ((response_item.status_code in (200, 201) and method == 'POST') or
                 (response_item.status_code in (200, 204) and method in ('PUT', 'DELETE'))):
             return munchify(loads(response_item.text))
         raise InvalidResponse(response_item)
@@ -109,6 +110,7 @@ def _get_resource_items(self, params=None, feed='changes'):
 
         raise InvalidResponse(response)
 
+    @retry(stop_max_attempt_number=5)
     def _patch_resource_item(self, url, payload, headers=None):
         _headers = self.headers.copy()
         _headers.update(headers or {})
@@ -117,6 +119,14 @@ def _patch_resource_item(self, url, payload, headers=None):
             return munchify(loads(response_item.text))
         raise InvalidResponse(response_item)
 
+    def _put_resource_item(self, url, payload, headers=None):
+        _headers = self.headers.copy()
+        _headers.update(headers or {})
+        response_item = self.request('PUT', url, headers=_headers, json=payload)
+        if response_item.status_code == 200:
+            return munchify(loads(response_item.text))
+        raise InvalidResponse(response_item)
+
     def _patch_obj_resource_item(self, patched_obj, item_obj, items_name):
         return self._patch_resource_item(
             '{}/{}/{}/{}'.format(self.prefix_path, patched_obj.data.id, items_name, item_obj['data']['id']),
@@ -146,6 +156,20 @@ def upload_document(self, file_, resource_item_id, subitem_name=DOCUMENTS, doc_t
                                           file_=file_, headers=headers, doc_registration=doc_registration,
                                           doc_type=doc_type, use_ds_client=use_ds_client)
 
+    @verify_file
+    def register_and_upload_document(self, file_, use_ds_client=True, doc_registration=True):
+        headers = None
+        return self._register_and_upload_file(file_=file_, headers=headers, use_ds_client=use_ds_client,
+                                              doc_registration=doc_registration)
+
+    def _register_and_upload_file(self, file_=None, headers=None, use_ds_client=True, doc_registration=True):
+        if hasattr(self, 'ds_client') and use_ds_client:
+            if doc_registration:
+                response = self.ds_client.document_upload_registered(file_=file_, headers=headers)
+            else:
+                response = self.ds_client.document_upload_not_registered(file_=file_, headers=headers)
+        return response
+
     def _update_params(self, params):
         for key in params:
             if key not in IGNORE_PARAMS:
@@ -226,6 +250,23 @@ def create_resource_item_subitem(self, resource_item_id, subitem_obj,
                                     subitem_name)
         return self._create_resource_item(url, subitem_obj, headers=headers)
 
+    def create_resource_item_sub_subitem(self, resource_item_id, sub_subitem_obj,
+                                         sub_subitem_name, access_token=None,
+                                         depth_path=None):
+        headers = None
+        if access_token:
+            headers = {'X-Access-Token': access_token}
+        if isinstance(resource_item_id, dict):
+            headers = {'X-Access-Token': self._get_access_token(resource_item_id)}
+            resource_item_id = resource_item_id['data']['id']
+        if depth_path:
+            url = '{}/{}/{}/{}'.format(self.prefix_path, resource_item_id,
+                                       depth_path, sub_subitem_name)
+        else:
+            url = '{}/{}/{}'.format(self.prefix_path, resource_item_id,
+                                    sub_subitem_name)
+        return self._create_resource_item(url, sub_subitem_obj, headers=headers)
+
     ###########################################################################
     #                        DELETE CLIENT METHODS
     ###########################################################################
@@ -363,6 +404,27 @@ def patch_document(self, resource_item_id, document_data, document_id,
             access_token, depth_path
         )
 
+    def put_resource_item_subitem(self, resource_item_id, put_data, subitem_name, subitem_id=None,
+                                  access_token=None, depth_path=None):
+        headers = None
+        if access_token:
+            headers = {'X-Access-Token': access_token}
+        if isinstance(resource_item_id, dict):
+            headers = {'X-Access-Token': self._get_access_token(resource_item_id)}
+            resource_item_id = resource_item_id['data']['id']
+        if not subitem_id:
+            subitem_id = put_data['data']['id']
+        if depth_path:
+            url = '{}/{}/{}/{}/{}'.format(
+                self.prefix_path, resource_item_id, depth_path, subitem_name,
+                subitem_id
+            )
+        else:
+            url = '{}/{}/{}/{}'.format(
+                self.prefix_path, resource_item_id, subitem_name, subitem_id
+            )
+        return self._put_resource_item(url, put_data, headers=headers)
+
     ###########################################################################
     #                          UPLOAD CLIENT METHODS
     ###########################################################################

openprocurement_client/constants.py

@@ -4,6 +4,7 @@
 AWARDS = 'awards'
 BIDS = 'bids'
 CANCELLATIONS = 'cancellations'
+CATEGORIES = 'categories'
 CHANGES = 'changes'
 COMPLAINTS = 'complaints'
 CONTRACTS = 'contracts'
@@ -14,10 +15,20 @@
 LOTS = 'lots'
 MILESTONES = 'milestones'
 PLANS = 'plans'
+PROFILES = 'profiles'
 PROLONGATIONS = 'prolongations'
+SUPPLIERS = 'suppliers'
 QUALIFICATIONS = 'qualifications'
 QUALIFICATION_DOCUMENTS = 'qualificationDocuments'
 QUESTIONS = 'questions'
 TENDERS = 'tenders'
 TRANSFERS = 'transfers'
-AGREEMENTS= 'agreements'
+AGREEMENTS = 'agreements'
+PUSH = 'push'
+CRITERIA = 'criteria'
+REQUIREMENT_RESPONSES = 'requirement_responses'
+EVIDENCES = 'evidences'
+REQUIREMENT_GROUPS = 'requirement_groups'
+REQUIREMENTS = 'requirements'
+FRAMEWORKS = 'frameworks'
+SUBMISSIONS = 'submissions'

openprocurement_client/dasu_client.py

@@ -21,21 +21,22 @@
 class DasuClient(APIBaseClient, APITemplateClient):
     """client for monitorings"""
 
-    host_url = 'https://audit-api-sandbox.prozorro.gov.ua'
-    api_version = '2.4'
+    host_url = 'https://audit-api-staging.prozorro.gov.ua'
+    api_version = '2.5'
     headers = {'Content-Type': 'application/json'}
 
     def __init__(self,
-                 key,
                  resource='monitorings',
                  host_url=None,
                  api_version=None,
+                 username=None,
+                 password=None,
                  params=None,
                  ds_client=None,
                  user_agent=None,
                  ds_config=None):
 
-        APITemplateClient.__init__(self, login_pass=(key, ''), headers=self.headers,
+        APITemplateClient.__init__(self, login_pass=(username, password), headers=self.headers,
                                    user_agent=user_agent)
 
         if ds_config:
@@ -85,6 +86,24 @@ def create_party(self, monitoring, party):
             headers={'X-Access-Token': self._get_access_token(monitoring)}
         )
 
+    def create_liability(self, monitoring, monitoring_id):
+        return self._create_resource_item(
+            '{}/{}/{}'.format(
+                self.prefix_path, monitoring_id, 'liabilities'
+            ),
+            payload=monitoring,
+            headers={'X-Access-Token': self._get_access_token(monitoring)},
+        )
+
+    def patch_liability(self, monitoring, monitoring_id, liability_id):
+        return self._patch_resource_item(
+            '{}/{}/{}/{}'.format(
+                self.prefix_path, monitoring_id, 'liabilities', liability_id
+            ),
+            payload=monitoring,
+            headers={'X-Access-Token': self._get_access_token(monitoring)}
+        )
+
     def patch_monitoring(self, monitoring, monitoring_id):
         return self._patch_resource_item(
             '{}/{}'.format(self.prefix_path, monitoring_id),
@@ -113,7 +132,7 @@ def patch_eliminationReport(self, monitoring, report):
             method='PUT'
         )
 
-    def patch_appeal(self, monitoring, appeal):
+    def create_appeal(self, monitoring, appeal):
         return self._create_resource_item(
             '{}/{}/{}'.format(
                 self.prefix_path, monitoring.data.id,
@@ -124,6 +143,16 @@ def patch_appeal(self, monitoring, appeal):
             method='PUT'
         )
 
+    def patch_appeal(self, monitoring, appeal):
+        return self._patch_resource_item(
+            '{}/{}/{}'.format(
+                self.prefix_path, monitoring.data.id,
+                'appeal'
+            ),
+            payload=appeal,
+            headers={'X-Access-Token': self._get_access_token(monitoring)},
+        )
+
     @verify_file
     def upload_obj_document(self, file_):
         response = self.ds_client.document_upload_registered(

openprocurement_client/resources/agreements.py

@@ -1,13 +1,18 @@
 # -*- coding: utf-8 -*-
 from zope.deprecation import deprecation
+from simplejson import loads
 
+from openprocurement_client.compatibility_utils import munchify_factory
+from openprocurement_client.exceptions import InvalidResponse
 from openprocurement_client.clients import APIResourceClient
 from openprocurement_client.constants import (
    AGREEMENTS,
    CHANGES,
    DOCUMENTS,
 )
 
+munchify = munchify_factory()
+
 
 class AgreementClient(APIResourceClient):
     """ Client for agreements """
@@ -32,4 +37,28 @@ def patch_change(self, agreement_id, data, change_id, access_token=None):
 
     def patch_document(self, agreement_id, data, document_id, access_token=None):
         return self.patch_resource_item_subitem(
-            agreement_id, data, DOCUMENTS, document_id, access_token=access_token)
+            agreement_id, data, DOCUMENTS, document_id, access_token=access_token)
+
+    def find_agreements_by_classification_id(self, classification_id, additional_classifications=()):
+        url = "{}_by_classification/{}".format(self.prefix_path, classification_id)
+        params = {}
+        if additional_classifications:
+            params["additional_classifications"] = ",".join(additional_classifications)
+        response = self.request('GET', url, params_dict=params)
+        if response.status_code == 200:
+            resource_items_list = munchify(loads(response.text))
+            return resource_items_list.data
+
+        raise InvalidResponse(response)
+
+    def find_recursive_agreements_by_classification_id(self, classification_id, additional_classifications=()):
+        if "-" in classification_id:
+            classification_id = classification_id[:classification_id.find("-")]
+        needed_level = 2
+        while classification_id[needed_level] != '0':
+            agreements = self.find_agreements_by_classification_id(classification_id, additional_classifications)
+            if agreements:
+                return agreements
+
+            pos = classification_id[1:].find('0')
+            classification_id = classification_id[:pos] + '0' + classification_id[pos+1:]

openprocurement_client/resources/document_service.py

@@ -14,7 +14,7 @@
 class DocumentServiceClient(APITemplateClient):
     """class for work with Document Service"""
 
-    host_url = 'https://upload.docs-sandbox.openprocurement.org'
+    host_url = 'https://upload-docs-staging.prozorro.gov.ua'
     url_register_part = 'register'
     url_upload_part = 'upload'
 

openprocurement_client/resources/ecatalogues.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from openprocurement_client.clients import APIResourceClient
+from openprocurement_client.constants import CATEGORIES, PROFILES, SUPPLIERS
+
+
+class CategoriesClient(APIResourceClient):
+    """ Client for eCatalogues categories """
+    resource = CATEGORIES
+
+    def get_category(self, category_id):
+        return self.get_resource_item(category_id)
+
+    def get_category_suppliers(self, category_id):
+        return self.get_resource_item_subitem(category_id, SUPPLIERS)
+
+
+class ProfilesClient(APIResourceClient):
+    """ Client for eCatalogues profiles """
+    resource = PROFILES
+
+    def get_profile(self, profile_id):
+        return self.get_resource_item(profile_id)
+
+
+class ECataloguesClient(object):
+
+    def __init__(self, *args, **kwargs):
+        self.categories = CategoriesClient(*args, **kwargs)
+        self.profiles = ProfilesClient(*args, **kwargs)

openprocurement_client/resources/edr.py

@@ -13,8 +13,8 @@
 class EDRClient(APITemplateClient):
     """ Client for validate members by EDR """
 
-    host_url = 'https://api-sandbox.openprocurement.org'
-    api_version = '2.0'
+    host_url = 'https://lb-api-staging.prozorro.gov.ua'
+    api_version = '2.5'
 
     def __init__(self, host_url=None, api_version=None, username=None,
                  password=None):

openprocurement_client/resources/frameworks.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+import logging
+from retrying import retry
+
+from openprocurement_client.clients import APIResourceClient
+from openprocurement_client.constants import (FRAMEWORKS, DOCUMENTS, SUBMISSIONS, QUALIFICATIONS)
+
+LOGGER = logging.getLogger(__name__)
+
+
+class FrameworksClient(APIResourceClient):
+    """Client for frameworks"""
+
+    resource = FRAMEWORKS
+
+    ###########################################################################
+    #             GET ITEMS LIST API METHODS
+    ###########################################################################
+
+    retry(stop_max_attempt_number=5)
+    def get_qualifications(self, params=None, feed='changes'):
+        return self.get_resource_items(params=params, feed=feed)
+
+    ###########################################################################
+    #             CREATE ITEM API METHODS
+    ###########################################################################
+
+    def create_qualification(self, framework):
+        return self.create_resource_item(framework)
+
+    ###########################################################################
+    #             GET ITEM API METHODS
+    ###########################################################################
+
+    @retry(stop_max_attempt_number=5)
+    def get_qualification(self, framework_id):
+        return self.get_resource_item(framework_id)
+
+    def get_documents(self, framework_id, access_token=None):
+        return self.get_resource_item_subitem(framework_id, DOCUMENTS, access_token=access_token)
+
+    def get_submissions(self, framework_id, access_token=None):
+        return self.get_resource_item_subitem(framework_id, SUBMISSIONS, access_token=access_token)
+
+    def get_qualifications(self, framework_id, access_token=None):
+        return self.get_resource_item_subitem(framework_id, QUALIFICATIONS, access_token=access_token)
+
+    ###########################################################################
+    #             PATCH ITEM API METHODS
+    ###########################################################################
+    def patch_framework(self, framework_id, patch_data={}, access_token=None):
+        return self.patch_resource_item(framework_id, patch_data, access_token=access_token)
+
+    ###########################################################################
+    #             UPLOAD FILE API METHODS
+    ###########################################################################
+    def upload_framework_document(self, file, framework_id, use_ds_client=True,
+                              doc_registration=True, access_token=None):
+        return self.upload_document(file, framework_id,
+                                    use_ds_client=use_ds_client,
+                                    doc_registration=doc_registration,
+                                    access_token=access_token)

openprocurement_client/resources/plans.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
+from retrying import retry
 
 from zope.deprecation import deprecation
 
@@ -45,6 +46,7 @@ def _create_plan_resource_item(self, plan, item_obj, items_name):
     #             GET ITEM API METHODS
     ###########################################################################
 
+    @retry(stop_max_attempt_number=5)
     def get_plan(self, plan_id):
         return self.get_resource_item(plan_id)