brynq-sdk-zermelo 2.1.0__tar.gz → 3.0.0__tar.gz

{brynq_sdk_zermelo-2.1.0 → brynq_sdk_zermelo-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_zermelo
-Version: 2.1.0
+Version: 3.0.0
 Summary: Zermelo wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_zermelo-2.1.0 → brynq_sdk_zermelo-3.0.0}/brynq_sdk_zermelo/zermelo.py

@@ -1,7 +1,7 @@
 from brynq_sdk_brynq import BrynQ
 from pandas import json_normalize
 from time import mktime
-from typing import List, Union
+from typing import List, Union, Literal, Optional
 import requests
 import pandas as pd
 import numpy as np
@@ -12,7 +12,7 @@ import sys
 
 
 class Zermelo(BrynQ):
-    def __init__(self, label: Union[str, List], storage_location, initial_zermelo_extract=False, extract_cancelled_appointments=True, debug=False):
+    def __init__(self, storage_location, system_type: Optional[Literal['source', 'target']] = None, initial_zermelo_extract=False, extract_cancelled_appointments=True, debug=False):
         """
         Extracts data from source based on the entered parameters
         For documentation see: https://wartburg.zportal.nl/static/swagger/ & https://zermelo.atlassian.net/wiki/display/DEV/API+Entities
@@ -21,12 +21,14 @@ class Zermelo(BrynQ):
         :param extract_cancelled_appointments: doesn't get the cancelled appointments by default. Can be changed to an empty string to get the cancelled appointments
         """
         super().__init__()
-        credentials = self.get_system_credential(system='zermelo', label=label)
+        credentials = self.interfaces.credentials.get(system="zermelo", system_type=system_type)
+        credentials = credentials.get('data')
         self.access_token = credentials['token']
         self.url = f"https://{credentials['customer']}.zportal.nl/api/v3/"
         self.storage_location = storage_location
         self.initial_zermelo_extract = initial_zermelo_extract
         self.debug = debug
+        self.timeout = 3600
         if extract_cancelled_appointments:
             self.cancelled_appointments = ''
         else:
@@ -139,7 +141,7 @@ class Zermelo(BrynQ):
 
             if nested:
                 # Get the response without any transformation
-                response = requests.get(url).json()['response']['data']
+                response = requests.get(url, timeout=self.timeout).json()['response']['data']
 
                 # From all the fields, hold only the meta_fields (the not nested fields)
                 meta_fields = fields.copy()
@@ -181,7 +183,7 @@ class Zermelo(BrynQ):
                     df = pd.merge(df, df_temp, how='left', on=meta_fields)
                 data = df
             else:
-                init_response = json.loads(requests.get(url).content)
+                init_response = json.loads(requests.get(url, timeout=self.timeout).content)
                 status = init_response['response']['status']
                 if status == 200:
                     data = pd.DataFrame(init_response['response']['data'])
@@ -232,7 +234,7 @@ class Zermelo(BrynQ):
                     end_epoch = int(start_epoch + (3600 * 24 * 7))
 
                 url = '{0}{1}?access_token={2}&fields={3}&start={4}&end={5}'.format(self.url, endpoint, self.access_token, fields, start_epoch, end_epoch)
-                data = requests.get(url).json()['response']['data']
+                data = requests.get(url, timeout=self.timeout).json()['response']['data']
 
                 # checks if data is not empty list
                 if data:
@@ -274,7 +276,7 @@ class Zermelo(BrynQ):
                     end_epoch = int(start_epoch + (3600 * 24 * 7))
                 print(start_epoch, end_epoch)
                 url = '{0}{1}?access_token={2}&fields={3}&start={4}&end={5}&includeHidden=True{6}&valid=True'.format(self.url, endpoint, self.access_token, fields, start_epoch, end_epoch, self.cancelled_appointments)
-                data = requests.get(url).json()['response']['data']
+                data = requests.get(url, timeout=self.timeout).json()['response']['data']
 
                 # checks if data is not empty list
                 if data:
@@ -359,7 +361,7 @@ class Zermelo(BrynQ):
                 try:
                     # merge params with loop params
                     time_params = params | {'start': start_epoch, 'end': end_epoch}
-                    resp = requests.get(url=url, params=time_params)
+                    resp = requests.get(url=url, params=time_params, timeout=self.timeout)
                     resp.raise_for_status()
 
                     data = resp.json()['response']['data']
@@ -394,7 +396,7 @@ class Zermelo(BrynQ):
                     start_epoch += (3600 * 24 * 7)  # Skip this block to avoid infinite retry
         else:
             try:
-                resp = requests.get(url=url, params=params)
+                resp = requests.get(url=url, params=params, timeout=self.timeout)
                 resp.raise_for_status()
                 data = resp.json()['response']['data']
                 df = pd.DataFrame(data)

{brynq_sdk_zermelo-2.1.0 → brynq_sdk_zermelo-3.0.0}/brynq_sdk_zermelo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-zermelo
-Version: 2.1.0
+Version: 3.0.0
 Summary: Zermelo wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_zermelo-2.1.0 → brynq_sdk_zermelo-3.0.0}/brynq_sdk_zermelo.egg-info/requires.txt

@@ -1,3 +1,3 @@
-brynq-sdk-brynq>=2
+brynq-sdk-brynq<5,>=4
 pandas<3,>=1
 requests<=3,>=2

{brynq_sdk_zermelo-2.1.0 → brynq_sdk_zermelo-3.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_zermelo',
-    version='2.1.0',
+    version='3.0.0',
     description='Zermelo wrapper from BrynQ',
     long_description='Zermelo wrapper from BrynQ',
     author='BrynQ',
@@ -10,7 +10,7 @@ setup(
     packages=find_namespace_packages(include=['brynq_sdk*']),
     license='BrynQ License',
     install_requires=[
-        'brynq-sdk-brynq>=2',
+        'brynq-sdk-brynq>=4,<5',
         'pandas>=1,<3',
         'requests>=2,<=3'
     ],