brynq-sdk-zoho 2.0.3__tar.gz → 3.0.0__tar.gz

{brynq_sdk_zoho-2.0.3 → brynq_sdk_zoho-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_zoho
-Version: 2.0.3
+Version: 3.0.0
 Summary: ZOHO wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_zoho-2.0.3 → brynq_sdk_zoho-3.0.0}/brynq_sdk_zoho/extract_zoho_desk.py

@@ -1,7 +1,7 @@
 import os
 import sys
 import pandas as pd
-from typing import Union, List
+from typing import Union, List, Optional, Literal
 import requests
 import json
 from brynq_sdk_brynq import BrynQ
@@ -12,28 +12,28 @@ sys.path.append(basedir)
 
 class ExtractZohoDesk(BrynQ):
 
-    def __init__(self, label: Union[str, List], debug: bool = False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug: bool = False):
         """
         For the full documentation, see: https://avisi-apps.gitbook.io/tracket/api/
         """
         super().__init__()
-        self.headers = self._get_authentication(label=label)
+        self.headers = self._get_authentication(system_type)
         self.base_url = "https://desk.zoho.com/api/v1/"
         self.payload = {}
+        self.timeout = 3600
 
-    def _get_authentication(self, label):
+    def _get_authentication(self, system_type):
         """
         Get the credentials for the Tracket API from BrynQ, with those credentials, get the access_token for Tracket.
         Return the headers with the access_token.
         """
         # Get credentials from BrynQ
-        credentials = self.get_system_credential(system='zoho-desk', label=label)
+        credentials = self.interfaces.credentials.get(system="zoho-desk", system_type=system_type)
+        credentials = credentials.get('data')
 
         # With those credentials, get the access_token from Tracket
-        zoho_system_id = credentials["id"]
-        token = BrynQ().refresh_system_credential(system="zoho-desk", system_id=zoho_system_id)["access_token"]
         headers = {
-            'Authorization': f'Zoho-oauthtoken {token}'
+            'Authorization': f'Zoho-oauthtoken {credentials.get("access_token")}'
         }
         return headers
 
@@ -156,9 +156,9 @@ class ExtractZohoDesk(BrynQ):
         This function helps the API calls to do a single call in one function
         :return:
         """
-        response = requests.request("GET", url, headers=self.headers, data=self.payload)
+        response = requests.request("GET", url, headers=self.headers, data=self.payload, timeout=self.timeout)
         if response.status_code == 401:
-            response = requests.request("GET", url, headers=self.headers, data=self.payload)
+            response = requests.request("GET", url, headers=self.headers, data=self.payload, timeout=self.timeout)
         if response.status_code == 200:
             df = response.json()
             if 'data' in df:

{brynq_sdk_zoho-2.0.3 → brynq_sdk_zoho-3.0.0}/brynq_sdk_zoho/upload_zoho_desk.py

@@ -1,38 +1,36 @@
 import os
 import sys
 import pandas as pd
-from typing import Union, List
+from typing import Union, List, Optional, Literal
 import requests
 import json
 from brynq_sdk_brynq import BrynQ
-
 basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(basedir)
 
 
 class UploadZohoDesk(BrynQ):
 
-    def __init__(self, label: Union[str, List], debug: bool = False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug: bool = False):
         """
         For the full documentation, see: https://avisi-apps.gitbook.io/tracket/api/
         """
         super().__init__()
-        self.headers = self._get_authentication(label=label)
+        self.headers = self._get_authentication(system_type)
         self.base_url = "https://desk.zoho.com/api/v1/"
+        self.timeout = 3600
 
-    def _get_authentication(self, label):
+    def _get_authentication(self, system_type):
         """
         Get the credentials for the Traket API from BrynQ, with those credentials, get the access_token for Tracket.
         Return the headers with the access_token.
         """
         # Get credentials from BrynQ
-        credentials = self.get_system_credential(system='zoho-desk', label=label)
+        credentials = self.interfaces.credentials.get(system="zoho-desk", system_type=system_type)
+        credentials = credentials.get('data')
 
-        # With those credentials, get the access_token from Tracket
-        zoho_system_id = credentials["id"]
-        token = BrynQ().refresh_system_credential(system="zoho-desk", system_id=zoho_system_id)["access_token"]
         headers = {
-            'Authorization': f'Zoho-oauthtoken {token}',
+            'Authorization': f'Zoho-oauthtoken {credentials.get("access_token")}',
             'Content-Type': 'application/json'
         }
         return headers
@@ -45,5 +43,5 @@ class UploadZohoDesk(BrynQ):
         :param payload: dict
         """
         url = f"{self.base_url}tickets/{ticket_id}/timeEntry/{time_entry_id}"
-        response = requests.request("PATCH", url, headers=self.headers, data=json.dumps(payload))
+        response = requests.request("PATCH", url, headers=self.headers, data=json.dumps(payload), timeout=self.timeout)
         return response

{brynq_sdk_zoho-2.0.3 → brynq_sdk_zoho-3.0.0}/brynq_sdk_zoho.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-zoho
-Version: 2.0.3
+Version: 3.0.0
 Summary: ZOHO wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_zoho-2.0.3 → brynq_sdk_zoho-3.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_zoho',
-    version='2.0.3',
+    version='3.0.0',
     description='ZOHO wrapper from BrynQ',
     long_description='ZOHO wrapper from BrynQ',
     author='BrynQ',