assemblyline-v4-service 4.5.0.67__py3-none-any.whl → 4.5.0.69__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.0.67
+4.5.0.69

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:
@@ -189,36 +189,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/updater/updater.py

@@ -368,6 +368,11 @@ class ServiceUpdater(ThreadedCoreBase):
             while self.update_queue.qsize():
                 update_attempt = -1
                 source_name = self.update_queue.get()
+
+                if source_name not in sources:
+                    # This source has been removed from the service configuration
+                    continue
+
                 while update_attempt < SOURCE_UPDATE_ATTEMPT_MAX_RETRY:
                     # Introduce an exponential delay between each attempt
                     time.sleep(SOURCE_UPDATE_ATTEMPT_DELAY_BASE**update_attempt)

{assemblyline_v4_service-4.5.0.67.dist-info → assemblyline_v4_service-4.5.0.69.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: assemblyline-v4-service
-Version: 4.5.0.67
+Version: 4.5.0.69
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team
@@ -33,6 +33,17 @@ Requires-Dist: flask; extra == "updater"
 Requires-Dist: gitpython; extra == "updater"
 Requires-Dist: git-remote-codecommit; extra == "updater"
 Requires-Dist: psutil; extra == "updater"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Assemblyline 4 - Service Base
 

{assemblyline_v4_service-4.5.0.67.dist-info → assemblyline_v4_service-4.5.0.69.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=14q-J90tfFEN5l46M9V0N5y2-VndxwzbunvnnOTEils,9
+assemblyline_v4_service/VERSION,sha256=LxkJSiEhrbwFU7aMDp4BnnuKoWGRdIWzrrvZ5U-V-RA,9
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
 assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,14 +15,14 @@ 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=cGwsNGWNp5KcZ4iVqMf76uGHR21faYhpEkEclMwEdcI,10505
+assemblyline_v4_service/dev/run_service_once.py,sha256=1sdxkRBI7x9Sht8EVCTMIW3MgSxIeV6Ufw77Wx9Vf20,10150
 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
 assemblyline_v4_service/updater/client.py,sha256=eBOK8doMu9nsIO6kXWtaBMy4hJIKRtQG0iC_21a5CG4,10849
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=DhxF2TVVpUY6S5dJnjRlTl6eBJrtTqw1uUAcvVWVkhM,9895
-assemblyline_v4_service/updater/updater.py,sha256=8o-vEMMJS388Ci9mVk_6nwFayM5NToliOTFnnPWHTYE,31449
+assemblyline_v4_service/updater/updater.py,sha256=HqRVUs5nNIfKmHu7g1GUkgC7bvYWs2EC9ZFy1kj-Ltw,31609
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/conftest.py,sha256=W3SieQpZsZpGEmtLqY4aIlxREDSsHceyCrFcFsWUM0U,1851
 test/test_healthz.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -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.0.67.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.0.67.dist-info/METADATA,sha256=sBLZmxKEFJkv8sOOxjXKcm4Fututuby8FwVMr_k837s,9489
-assemblyline_v4_service-4.5.0.67.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-assemblyline_v4_service-4.5.0.67.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.0.67.dist-info/RECORD,,
+assemblyline_v4_service-4.5.0.69.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.0.69.dist-info/METADATA,sha256=6Z1W8t9xHIaOT5-BEPdg0H-IVJYyfBFFykzTHa1lqI0,9720
+assemblyline_v4_service-4.5.0.69.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+assemblyline_v4_service-4.5.0.69.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.0.69.dist-info/RECORD,,

{assemblyline_v4_service-4.5.0.67.dist-info → assemblyline_v4_service-4.5.0.69.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any