assemblyline-service-client 4.5.1.dev98__py3-none-any.whl → 4.5.1.dev102__py3-none-any.whl

assemblyline_service_client/VERSION

@@ -1 +1 @@
-4.5.1.dev98
+4.5.1.dev102

assemblyline_service_client/task_handler.py

@@ -177,7 +177,8 @@ class TaskHandler(ServerBase):
                 except Exception:
                     pass
 
-    def request_with_retries(self, method: str, url: str, get_api_response=True, max_retry=None, **kwargs) -> Optional[Any]:
+    def request_with_retries(self, method: str, url: str,
+                             get_api_response=True, max_retry=None, **kwargs) -> Optional[Any]:
         if 'headers' in kwargs:
             self.session.headers.update(kwargs['headers'])
             kwargs.pop('headers')
@@ -344,7 +345,7 @@ class TaskHandler(ServerBase):
     def get_task(self) -> ServiceTask:
         self.status = STATUSES.WAITING_FOR_TASK
         task = None
-        headers = dict(timeout=str(TASK_REQUEST_TIMEOUT))
+        headers = {"Timeout": str(TASK_REQUEST_TIMEOUT)}
         self.log.info(f"Requesting a task with {TASK_REQUEST_TIMEOUT}s timeout...")
         r = self.request_with_retries('get', self._path('task'), headers=headers, timeout=TASK_REQUEST_TIMEOUT*2)
         if r['task'] is False:  # No task received
@@ -369,7 +370,8 @@ 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, timeout=FILE_REQUEST_TIMEOUT)
+                                             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:
@@ -418,8 +420,8 @@ class TaskHandler(ServerBase):
         new_tool_version = result.get('response', {}).get('service_tool_version', None)
         if new_tool_version is not None and self.service_tool_version != new_tool_version:
             self.service_tool_version = new_tool_version
-            self.session.headers.update({'service_tool_version': self.service_tool_version})
-            self.headers.update({'service_tool_version': self.service_tool_version})
+            self.session.headers.update({'Service-Tool-Version': self.service_tool_version})
+            self.headers.update({'Service-Tool-Version': self.service_tool_version})
 
         data = dict(task=task.as_primitives(), result=result, freshen=True)
         try:
@@ -429,19 +431,19 @@ class TaskHandler(ServerBase):
                 while not r['success'] and r['missing_files']:
                     for f_sha256 in r['missing_files']:
                         file_info = result_files[f_sha256]
-                        headers = dict(
-                            sha256=file_info['sha256'],
-                            classification=file_info['classification'],
-                            ttl=str(task.ttl),
-                            is_section_image=str(file_info.get('is_section_image', False))
-                        )
+                        headers = {
+                            "Sha256": file_info['sha256'],
+                            "Classification": file_info['classification'],
+                            "Ttl": str(task.ttl),
+                            "Is-Section-Image": str(file_info.get('is_section_image', False))
+                        }
 
                         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']}]")
                             try:
                                 self.request_with_retries('put', self._path('file'), files=dict(file=fh),
-                                                          headers=headers,timeout=FILE_REQUEST_TIMEOUT)
+                                                          headers=headers, timeout=FILE_REQUEST_TIMEOUT)
                             except ServiceServerException as e:
                                 if "does not match expected file hash" in str(e):
                                     self.log.warning(f"File upload of '{file_info['path']}' failed.")

{assemblyline_service_client-4.5.1.dev98.dist-info → assemblyline_service_client-4.5.1.dev102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-service-client
-Version: 4.5.1.dev98
+Version: 4.5.1.dev102
 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.dev102.dist-info/RECORD

@@ -0,0 +1,8 @@
+assemblyline_service_client/VERSION,sha256=X78dpda2kBIKcnROwJjsv-VuIP-eDSqv5N2SzKgFUOQ,13
+assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+assemblyline_service_client/task_handler.py,sha256=xZ7BdEAzlUnJIAcz8zepi2cNe_sD6ziOCDmiBc9Rg6Q,23315
+assemblyline_service_client-4.5.1.dev102.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_service_client-4.5.1.dev102.dist-info/METADATA,sha256=8JtxTCO34aH6uF2tfSYRC4S-cPVmGCm8U3GR4XAe5oM,1578
+assemblyline_service_client-4.5.1.dev102.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_service_client-4.5.1.dev102.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
+assemblyline_service_client-4.5.1.dev102.dist-info/RECORD,,

assemblyline_service_client-4.5.1.dev98.dist-info/RECORD

@@ -1,8 +0,0 @@
-assemblyline_service_client/VERSION,sha256=NxTYIb4TeI-fwiSdZ6FGC9h7rpr9cCfPxWcXtCxv7gU,12
-assemblyline_service_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_service_client/task_handler.py,sha256=U6OmqDSbBY9p-JccwdFImZ436McK_PK-A5Pl6d54Kko,23233
-assemblyline_service_client-4.5.1.dev98.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_service_client-4.5.1.dev98.dist-info/METADATA,sha256=bk3CtKSK_zIE3ieUYl3Snv3Swc8iYd7AXOyF1Dd2He8,1577
-assemblyline_service_client-4.5.1.dev98.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-assemblyline_service_client-4.5.1.dev98.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
-assemblyline_service_client-4.5.1.dev98.dist-info/RECORD,,