assemblyline-v4-service 4.5.1.dev407__py3-none-any.whl → 4.5.1.dev408__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.1.dev407
+4.5.1.dev408

assemblyline_v4_service/dev/run_service_once.py

@@ -19,7 +19,7 @@ from assemblyline.common.uid import get_random_id
 from assemblyline.odm.messages.task import Task as ServiceTask
 from assemblyline.odm.models.result import Result
 from assemblyline.odm.models.service import Service
-from assemblyline_v4_service.common.helper import get_heuristics
+from assemblyline_v4_service.common.helper import get_heuristics, get_service_manifest
 
 
 class RunService:
@@ -190,36 +190,29 @@ class RunService:
         self.identify.stop()
 
     def load_service_manifest(self, return_heuristics=False) -> Union[None, Dict]:
-        service_manifest_yml = os.path.join(os.getcwd(), 'service_manifest.yml')
+        service_manifest_data = get_service_manifest()
+        heuristics = service_manifest_data.get('heuristics', None)
 
-        if os.path.exists(service_manifest_yml):
-            with open(service_manifest_yml) as yml_fh:
-                service_manifest_data = yaml.safe_load(yml_fh.read())
+        # Pop the 'extra' data from the service manifest
+        for x in ['file_required', 'tool_version', 'heuristics']:
+            service_manifest_data.pop(x, None)
 
-            heuristics = service_manifest_data.get('heuristics', None)
-
-            # Pop the 'extra' data from the service manifest
-            for x in ['file_required', 'tool_version', 'heuristics']:
-                service_manifest_data.pop(x, None)
-
-            # Validate the service manifest
-            try:
-                self.service = Service(service_manifest_data)
-            except Exception as e:
-                LOG.error(f"Invalid service manifest: {str(e)}")
+        # Validate the service manifest
+        try:
+            self.service = Service(service_manifest_data)
+        except Exception as e:
+            LOG.error(f"Invalid service manifest: {str(e)}")
 
-            service_config = {}
-            if service_manifest_data:
-                service_config = service_manifest_data.get('config', {})
+        service_config = {}
+        if service_manifest_data:
+            service_config = service_manifest_data.get('config', {})
 
-            self.submission_params = {x['name']: x['value']
-                                      for x in service_manifest_data.get('submission_params', [])}
+        self.submission_params = {x['name']: x['value']
+                                    for x in service_manifest_data.get('submission_params', [])}
 
-            self.service = self.service_class(config=service_config)
-            if return_heuristics:
-                return heuristics
-        else:
-            raise Exception("Service manifest YAML file not found in root folder of service.")
+        self.service = self.service_class(config=service_config)
+        if return_heuristics:
+            return heuristics
 
 
 if __name__ == '__main__':

{assemblyline_v4_service-4.5.1.dev407.dist-info → assemblyline_v4_service-4.5.1.dev408.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-v4-service
-Version: 4.5.1.dev407
+Version: 4.5.1.dev408
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team

{assemblyline_v4_service-4.5.1.dev407.dist-info → assemblyline_v4_service-4.5.1.dev408.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=rH6Z41Gv7N6_2A-KjhDIdbLWAitcLtRzwidtwPngDgI,13
+assemblyline_v4_service/VERSION,sha256=LB-fD4DlO44lXp2t8adWksIjWTJ6TDOThRlO2Eeb-h0,13
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=sS1cFkDLw8hUPMpj7tbHXFv8ZmHcazrwZ0l6oQDwwkQ,1575
 assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,7 +15,7 @@ assemblyline_v4_service/common/result.py,sha256=9AqM6qCYiia_Bpyn_fBFhzNQMcqJbtFS
 assemblyline_v4_service/common/task.py,sha256=dJsvRpW0x88CCF_LW6w87jQ_UKTVaOs2Gb117IDNiU8,14233
 assemblyline_v4_service/common/utils.py,sha256=k2__d-V5LjB6o2IKbjVe7tJWKcKuUHto5TyT5oKhIa0,3890
 assemblyline_v4_service/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_v4_service/dev/run_service_once.py,sha256=iEWkLnF4cWN0V3Mc6GhMKjDAPYfY0YjESmtReTAJg88,10506
+assemblyline_v4_service/dev/run_service_once.py,sha256=BicBzWVArRzGf8Qxi-_NfP-Cgy9J_1gEQpQb3HBPGTg,10151
 assemblyline_v4_service/updater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfvesNLiEeszU4ujXA,133
 assemblyline_v4_service/updater/app.py,sha256=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lCovxAVyvPs,3317
@@ -38,8 +38,8 @@ test/test_common/test_request.py,sha256=Ceyds8BNO1O0f1kH1VEb84faJcaupvSjVKIrGdHe
 test/test_common/test_result.py,sha256=6BiOKxEPrKBjOY44jv3TY-yiXm0qI1ok_CZBnjP9TM4,45447
 test/test_common/test_task.py,sha256=P44mNcSe-3tJgDk9ppN3KbM7oN4LBVIuhONG-Gveh74,19007
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.5.1.dev407.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.1.dev407.dist-info/METADATA,sha256=x6ov4VqmhS5Y7asvtQcyW4ZGsrdSTriz2Y5JXjZ2mOg,9724
-assemblyline_v4_service-4.5.1.dev407.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-assemblyline_v4_service-4.5.1.dev407.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.1.dev407.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev408.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev408.dist-info/METADATA,sha256=2LwhYm26sUhEh2fjIP5oocChpDV_GWmZ_r3wg3QHsUo,9724
+assemblyline_v4_service-4.5.1.dev408.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+assemblyline_v4_service-4.5.1.dev408.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev408.dist-info/RECORD,,