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

assemblyline_service_client/VERSION

@@ -1 +1 @@
-4.5.1.dev93
+4.5.1.dev94

assemblyline_service_client/task_handler.py

@@ -439,8 +439,13 @@ 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,
-                                                      timeout=FILE_REQUEST_TIMEOUT)
+                            try:
+                                self.request_with_retries('put', self._path('file'), files=dict(file=fh),
+                                                          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.")
+                                raise
 
                     data['freshen'] = False
                     r = self.request_with_retries('post', self._path('task'), json=data, timeout=TASK_REQUEST_TIMEOUT)

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

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

@@ -0,0 +1,8 @@
+assemblyline_service_client/VERSION,sha256=Q8x9DlxKf8FOY8Q5vV_cD68TuE8Yhnvdqry611XBSqY,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.dev94.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_service_client-4.5.1.dev94.dist-info/METADATA,sha256=opjQGjjr54fCy60NrNSmkezSsj3N6E06RpVimDIqGHI,1577
+assemblyline_service_client-4.5.1.dev94.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_service_client-4.5.1.dev94.dist-info/top_level.txt,sha256=clNWHvn8nw0kR15l5TASxWxIQvKGKe5Pso3kVPMiJv0,28
+assemblyline_service_client-4.5.1.dev94.dist-info/RECORD,,

assemblyline_service_client-4.5.1.dev93.dist-info/RECORD

@@ -1,8 +0,0 @@
-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,,