assemblyline-service-client 4.5.1.dev91__py3-none-any.whl → 4.5.1.dev93__py3-none-any.whl

assemblyline_service_client/VERSION

@@ -1 +1 @@
-4.5.1.dev91
+4.5.1.dev93

assemblyline_service_client/task_handler.py

@@ -35,6 +35,7 @@ LOG_LEVEL = logging.getLevelName(os.environ.get("LOG_LEVEL", "INFO"))
 SHUTDOWN_SECONDS_LIMIT = 10
 SUPPORTED_API = 'v1'
 TASK_REQUEST_TIMEOUT = int(os.environ.get('TASK_REQUEST_TIMEOUT', 30))
+FILE_REQUEST_TIMEOUT = int(os.environ.get('FILE_REQUEST_TIMEOUT', 180))
 
 
 # The number of tasks a service will complete before stopping, letting the environment start a new container.
@@ -212,7 +213,8 @@ class TaskHandler(ServerBase):
                 elif retry % 10 == 0:
                     self.log.warning(f"Service server has been unreachable for the past {retry} attempts. "
                                      "Is there something wrong with it?")
-            except requests.Timeout:  # Handles ConnectTimeout and ReadTimeout
+            except requests.Timeout as e:  # Handles ConnectTimeout and ReadTimeout
+                self.log.warning(f"We've timed out on: {url} ({e}) Retrying..")
                 pass
             except requests.HTTPError as e:
                 self.log.error(str(e))
@@ -367,7 +369,7 @@ class TaskHandler(ServerBase):
         file_path = None
         self.log.info(f"[{sid}] Downloading file: {sha256}")
         response = self.request_with_retries('get', self._path('file', sha256),
-                                             get_api_response=False, max_retry=3, headers=self.headers)
+                                             get_api_response=False, max_retry=3, headers=self.headers, timeout=FILE_REQUEST_TIMEOUT)
         if response is not None:
             # Check if we got a 'good' response
             if response.status_code == 200:
@@ -421,7 +423,7 @@ class TaskHandler(ServerBase):
 
         data = dict(task=task.as_primitives(), result=result, freshen=True)
         try:
-            r = self.request_with_retries('post', self._path('task'), json=data)
+            r = self.request_with_retries('post', self._path('task'), json=data, timeout=TASK_REQUEST_TIMEOUT)
 
             if not r['success'] and r['missing_files']:
                 while not r['success'] and r['missing_files']:
@@ -437,10 +439,11 @@ class TaskHandler(ServerBase):
                         with open(file_info['path'], 'rb') as fh:
                             # Upload the file requested by service server
                             self.log.info(f"[{task.sid}] Uploading file {file_info['path']} [{file_info['sha256']}]")
-                            self.request_with_retries('put', self._path('file'), files=dict(file=fh), headers=headers)
+                            self.request_with_retries('put', self._path('file'), files=dict(file=fh), headers=headers,
+                                                      timeout=FILE_REQUEST_TIMEOUT)
 
                     data['freshen'] = False
-                    r = self.request_with_retries('post', self._path('task'), json=data)
+                    r = self.request_with_retries('post', self._path('task'), json=data, timeout=TASK_REQUEST_TIMEOUT)
         except (ServiceServerException, requests.HTTPError) as e:
             self.handle_task_error(task, message=str(e), error_type='EXCEPTION', status='FAIL_NONRECOVERABLE')
 
@@ -473,7 +476,7 @@ class TaskHandler(ServerBase):
                 self.log.exception(f"[{task.sid}] An error occurred while loading service error file.")
 
         data = dict(task=task.as_primitives(), error=error)
-        self.request_with_retries('post', self._path('task'), json=data)
+        self.request_with_retries('post', self._path('task'), json=data, timeout=TASK_REQUEST_TIMEOUT)
 
     def stop(self):
         if self.status == STATUSES.WAITING_FOR_TASK:

{assemblyline_service_client-4.5.1.dev91.dist-info → assemblyline_service_client-4.5.1.dev93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-service-client
-Version: 4.5.1.dev91
+Version: 4.5.1.dev93
 Summary: Assemblyline 4 - Service client
 Home-page: https://github.com/CybercentreCanada/assemblyline-service-client/
 Author: CCCS Assemblyline development team

assemblyline_service_client-4.5.1.dev93.dist-info/RECORD

@@ -0,0 +1,8 @@
+assemblyline_service_client/VERSION,sha256=G9pBMQfRxZ-eeKDX_TxdkLhDvwbvQLuRw3bfiEq6Zo8,12
+assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+assemblyline_service_client/task_handler.py,sha256=uJuYbd5tU1DlJXy7f0CjL0912x-Mvw1U4rOB2IiIV48,22907
+assemblyline_service_client-4.5.1.dev93.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_service_client-4.5.1.dev93.dist-info/METADATA,sha256=ILHXAMHYhKPxUClL6Xl28hWl_9Oll6C5ntyuOCtoXNM,1577
+assemblyline_service_client-4.5.1.dev93.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_service_client-4.5.1.dev93.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
+assemblyline_service_client-4.5.1.dev93.dist-info/RECORD,,

assemblyline_service_client-4.5.1.dev91.dist-info/RECORD

@@ -1,8 +0,0 @@
-assemblyline_service_client/VERSION,sha256=INi_c2y2tbN0fW0holMAsDpKSSWXAB28SFZQOntdJ9A,12
-assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_service_client/task_handler.py,sha256=uiAOFBy-8Cylv2hwK2d3I58nPGKe1nmvtVOc0C0x1l8,22546
-assemblyline_service_client-4.5.1.dev91.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_service_client-4.5.1.dev91.dist-info/METADATA,sha256=zf6b_5QROfyklnMNCfM8c0zkl-1IZqWYUYI0Bd70V2g,1577
-assemblyline_service_client-4.5.1.dev91.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-assemblyline_service_client-4.5.1.dev91.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
-assemblyline_service_client-4.5.1.dev91.dist-info/RECORD,,