brynq-sdk-zermelo 1.0.1__tar.gz → 1.0.2__tar.gz

{brynq_sdk_zermelo-1.0.1 → brynq_sdk_zermelo-1.0.2}/PKG-INFO

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

{brynq_sdk_zermelo-1.0.1 → brynq_sdk_zermelo-1.0.2}/brynq_sdk/zermelo/zermelo.py

@@ -332,7 +332,7 @@ class Zermelo(BrynQ):
         df.index.name = 'appointments_{0}_id'.format(col_name)
         df.to_csv(file, sep='|', decimal=',')
 
-    def get_zermelo_filtered(self, endpoint: str, fields: List = None, startdate = None, enddate = None, filters: dict = None) -> pd.DataFrame:
+    def get_zermelo_filtered(self, endpoint: str, fields: List = None, startdate=None, enddate=None, filters: dict = None) -> pd.DataFrame:
         """
         :param endpoint: endpoint
         :param fields: fields to get, if left empty, all fields are returned
@@ -341,7 +341,7 @@ class Zermelo(BrynQ):
         :param filters: dict of fields with corresponding values to filter
         :return:
         """
-        # Loop through the data per 3 days (3600 seconds * 24 hours * 3 days) because the dataset is too big to receive in once. Start three years back
+        # Loop through the data per 7 days (3600 seconds * 24 hours * 7 days) because the dataset is too big to receive at once.
         df = pd.DataFrame()
         url = f'{self.url}{endpoint}'
         params = {'access_token': self.access_token}
@@ -354,33 +354,55 @@ class Zermelo(BrynQ):
         if startdate is not None:
             start_epoch = int(time.mktime(startdate))
             last_epoch = int(time.mktime(enddate))
-            # loop epoch is 3 days from start_date except when last_epoch is smaller than start + 3days
+            # loop epoch is 7 days from start_date except when last_epoch is smaller than start + 7 days
             end_epoch = int(start_epoch + (3600 * 24 * 7)) if (start_epoch + (3600 * 24 * 7)) < last_epoch else last_epoch
+
             while start_epoch < last_epoch:
                 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)
                     resp.raise_for_status()
+
                     data = resp.json()['response']['data']
 
                     # checks if data is not empty list
                     if len(data) > 0:
                         df = pd.concat([df, pd.DataFrame(data)])
 
+                    # move to next 7-day block
                     start_epoch += (3600 * 24 * 7)
                     end_epoch += (3600 * 24 * 7)
+                    # Adjust end_epoch to not exceed last_epoch
+                    if end_epoch > last_epoch:
+                        end_epoch = last_epoch
+
+                except requests.exceptions.HTTPError as http_err:
+                    # Stop the loop for certain HTTP errors like 403 or 401
+                    if resp.status_code == 403:
+                        print('{} - 403 Forbidden at timestamp {}: {}'.format(time.strftime('%H:%M:%S'), start_epoch, http_err))
+                        break  # Stop the loop for 403 error
+                    elif resp.status_code == 401:
+                        print('{} - 401 Unauthorized at timestamp {}: {}'.format(time.strftime('%H:%M:%S'), start_epoch, http_err))
+                        break  # Stop the loop for 401 error
+
+                    # For other HTTP errors, retry the loop
+                    print('{} - HTTP Error at timestamp {}: {}'.format(time.strftime('%H:%M:%S'), start_epoch, http_err))
+                    start_epoch += (3600 * 24 * 7)  # Move forward to next block to prevent endless retry
 
                 except Exception as e:
-                    print('{} - Error at timestamp {}: {}'.format(time.strftime('%H:%M:%S'), start_epoch, e))
-                    # retries
-                    continue
+                    # Handle other types of exceptions (e.g., network errors)
+                    print('{} - General Error at timestamp {}: {}'.format(time.strftime('%H:%M:%S'), start_epoch, e))
+                    start_epoch += (3600 * 24 * 7)  # Skip this block to avoid infinite retry
         else:
-            resp = requests.get(url=url, params=params)
-            resp.raise_for_status()
-            data = resp.json()['response']['data']
-            df = pd.DataFrame(data)
+            try:
+                resp = requests.get(url=url, params=params)
+                resp.raise_for_status()
+                data = resp.json()['response']['data']
+                df = pd.DataFrame(data)
+            except requests.exceptions.HTTPError as http_err:
+                print('{} - HTTP Error: {}'.format(time.strftime('%H:%M:%S'), http_err))
+            except Exception as e:
+                print('{} - General Error: {}'.format(time.strftime('%H:%M:%S'), e))
 
         return df

{brynq_sdk_zermelo-1.0.1 → brynq_sdk_zermelo-1.0.2}/brynq_sdk_zermelo.egg-info/PKG-INFO

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

{brynq_sdk_zermelo-1.0.1 → brynq_sdk_zermelo-1.0.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='brynq_sdk_zermelo',
-    version='1.0.1',
+    version='1.0.2',
     description='Zermelo wrapper from BrynQ',
     long_description='Zermelo wrapper from BrynQ',
     author='BrynQ',