brynq-sdk-zermelo 2.0.1__tar.gz → 2.1.1__tar.gz

{brynq_sdk_zermelo-2.0.1 → brynq_sdk_zermelo-2.1.1}/PKG-INFO

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

{brynq_sdk_zermelo-2.0.1 → brynq_sdk_zermelo-2.1.1}/brynq_sdk_zermelo/zermelo.py

@@ -27,6 +27,7 @@ class Zermelo(BrynQ):
         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:
@@ -75,14 +76,12 @@ class Zermelo(BrynQ):
                                                        'lastName', 'prefix', 'clockHoursLessons'])
         self.get_zermelo(endpoint='departmentsofbranches', fields=['id', 'code', 'yearOfEducation', 'branchOfSchool', 'clockHoursPerLesson', 'schoolInSchoolYearId', 'schoolInSchoolYearName', 'studentCount', 'prognosticStudentCount'])
         self.get_zermelo(endpoint='employees', fields=['userCode', 'commencementTeaching', 'commencementSchool', 'prefix', 'gender', 'dateOfBirth', 'firstName', 'lastName', 'street', 'houseNumber', 'postalCode', 'city'])
-        self.get_zermelo(endpoint='groups', fields=['id', 'code'])
         self.get_zermelo(endpoint='groupindepartments', fields=['id', 'departmentOfBranch', 'name', 'isMainGroup', 'isMentorGroup', 'extendedName'])
         self.get_zermelo(endpoint='holidays', fields=['id', 'schoolInSchoolYear', 'name', 'start', 'end'])
         self.get_zermelo(endpoint='jobs', fields=['id', 'contract', 'functionCategory', 'employmentType', 'start', 'end', 'fteReal', 'fteManually', 'fte', 'type', 'employee', 'clockHoursGross'])
         self.get_zermelo(endpoint='jobextensions', fields=['id', 'contract', 'start', 'end', 'fteReal', 'lessonsAndTasks', 'total', 'employee', 'fte', 'generalTasks', 'professionalDevelopment', 'personalBudget'])
         self.get_zermelo(endpoint='leaves', fields=['id', 'contract', 'leaveType', 'leaveTypeName', 'start', 'end', 'total', 'leaveApproved', 'employee', 'fteReal'])
         self.get_zermelo(endpoint='leavetypes', fields=['id', 'name', 'fixed', 'affectsPersonalBudget'])
-        self.get_zermelo(endpoint='locations', fields=['code'])
         self.get_zermelo(endpoint='locationofbranches', fields=['id', 'name', 'parentteachernightCapacity', 'courseCapacity', 'branchOfSchool'])
         self.get_zermelo(endpoint='plannedlessons', fields=['id', 'clockHoursPerLesson', 'clockHoursPerLessonManually', 'plannedGroups', 'lessonDemand', 'branchOfSchool', 'departmentOfBranches',
                                                             'lessonHoursInClassPeriods', 'subjects', 'sectionOfBranches', 'maxTeachingLevel', 'regularTeachingAssignments',
@@ -141,7 +140,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()
@@ -183,7 +182,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'])
@@ -234,7 +233,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:
@@ -276,7 +275,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:
@@ -361,7 +360,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']
@@ -396,7 +395,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.0.1 → brynq_sdk_zermelo-2.1.1}/brynq_sdk_zermelo.egg-info/PKG-INFO

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

{brynq_sdk_zermelo-2.0.1 → brynq_sdk_zermelo-2.1.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_zermelo',
-    version='2.0.1',
+    version='2.1.1',
     description='Zermelo wrapper from BrynQ',
     long_description='Zermelo wrapper from BrynQ',
     author='BrynQ',