assemblyline-v4-service 4.5.0.1__py3-none-any.whl → 4.5.1.dev0__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.0.1
+4.5.1.dev0

assemblyline_v4_service/common/request.py

@@ -202,6 +202,9 @@ class ServiceRequest:
         """
         return self.task.get_param(name)
 
+    def partial(self) -> None:
+        self.task.partial()
+
     @property
     def result(self) -> Result:
         """

assemblyline_v4_service/common/task.py

@@ -69,7 +69,8 @@ class Task:
         self.min_classification = task.min_classification.value
         self.max_extracted = task.max_files
         self.metadata = task.metadata
-        self.result: Optional[Result] = None
+        self.partial_result: bool = False
+        self.result: Result = Result()
         self.safelist_config: Dict[str, Any] = task.safelist_config
         self.service_config: Dict[str, Any] = dict(task.service_config)
         self.service_context: Optional[str] = None
@@ -254,11 +255,15 @@ class Task:
             type=self.file_type,
             size=self.file_size,
             drop_file=self.drop_file,
+            partial=self.partial_result,
             temp_submission_data=self.temp_submission_data,
         )
 
         return result
 
+    def partial(self) -> None:
+        self.partial_result = True
+
     def save_error(self, stack_info: str, recoverable: bool) -> None:
         self.error_message = stack_info
 

assemblyline_v4_service/dev/run_service_once.py

@@ -97,6 +97,7 @@ class RunService:
             min_classification=forge.get_classification().UNRESTRICTED,
             max_files=501,  # TODO: get the actual value
             ttl=3600
+
         ))
 
         LOG.info(f"Starting task with SID: {service_task.sid}")

assemblyline_v4_service/healthz.py

@@ -32,4 +32,4 @@ def perform_check():
 
 
 if __name__ == '__main__':
-    perform_check()
+    perform_check()

{assemblyline_v4_service-4.5.0.1.dist-info → assemblyline_v4_service-4.5.1.dev0.dist-info}/METADATA

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

{assemblyline_v4_service-4.5.0.1.dist-info → assemblyline_v4_service-4.5.1.dev0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-assemblyline_v4_service/VERSION,sha256=sN7A4hYxrUFsQk3N7yZz7AYTQZVRAKZFbN32Lrd0_Lo,8
+assemblyline_v4_service/VERSION,sha256=tihKsYXrkYV1JcrkKoMgPTQedjk_wl0d4ZAkFLNIA5Y,11
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
+assemblyline_v4_service/healthz.py,sha256=sS1cFkDLw8hUPMpj7tbHXFv8ZmHcazrwZ0l6oQDwwkQ,1575
 assemblyline_v4_service/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/run_privileged_service.py,sha256=qd4DmHo5G_Tpv8tb0A96qNfCGuXBu5MlIKB205z5e5w,14514
 assemblyline_v4_service/run_service.py,sha256=NiFX52NfsbBQY6E3nrjoB3e2XxIlwFcQpYYY-rADIk4,5996
@@ -10,12 +10,12 @@ assemblyline_v4_service/common/base.py,sha256=mKkkzbxVL_wVMy_VieU9mlHYLqZXndga_4
 assemblyline_v4_service/common/helper.py,sha256=xs9quuf-M1JOdKieBqOmWaOece0CtzXFhhe85xQYmuY,3289
 assemblyline_v4_service/common/ocr.py,sha256=XHHD0bOKu7DdBEMQ3sPZxQjp4K4G3js_Ib2GKWD6Xuw,7897
 assemblyline_v4_service/common/ontology_helper.py,sha256=QpwerYoS5hXjWzpx3Pmwv6j2330PQVYqxYGamjcpW3I,7890
-assemblyline_v4_service/common/request.py,sha256=NxtWxp8-ttC72i3Vnchc3fZTRKqPQAoMC4KAVwEj8-4,11714
+assemblyline_v4_service/common/request.py,sha256=XXBafAQCV43_OBLXOSHxYoDHmqwERBkNul8fb_X6Ves,11774
 assemblyline_v4_service/common/result.py,sha256=9AqM6qCYiia_Bpyn_fBFhzNQMcqJbtFSiGjp57fXW2E,32713
-assemblyline_v4_service/common/task.py,sha256=7yNvXk5B27QookJNp4-Y1iGhV8LfhLDaYWzF-uFGWgo,13576
+assemblyline_v4_service/common/task.py,sha256=-AhtT6qSMLndBB3IOqOF-MV5K8Xp_67yvcgMuzr1IT0,13720
 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=caqUHYc27JLuJPOwkEuhf8-wlaYPvzDrRqfEuhMMxqw,10455
+assemblyline_v4_service/dev/run_service_once.py,sha256=4K3ljw0MnfPGw0-6lzc_vtUYg1EbntJbbsWvNU-ZM_A,10456
 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
@@ -33,12 +33,12 @@ test/test_common/test_base.py,sha256=d61an3lRaes_cx0AOPMNFMVWxTOjilrcGpuVP0dqTvM
 test/test_common/test_helper.py,sha256=sO6YAiBhKTqaxlpLhFYDuy2ZdbuF2cg07Ylzo83ZzQs,2575
 test/test_common/test_ocr.py,sha256=s5kL0vKjLmbyXuCg-9v6V6wQwwFRu0w2hYpjG0_BXy4,1874
 test/test_common/test_ontology_helper.py,sha256=TuvTeP9BTRqklOlsLu_yMdN9wdPWlVAENx2JqUe9a-A,7856
-test/test_common/test_request.py,sha256=K-gaHe20AUztfU3pLdWYv5bc6088GBBKP-eb833cis0,11729
+test/test_common/test_request.py,sha256=wxSwnOj-_YOv2SuZjOJsw09q8A7p8GJmJuK4vozqCNg,11749
 test/test_common/test_result.py,sha256=Wm0Cs5kZRzlZr0jL-l8OTsYAvkoN2eaB3NkeXzvyssI,42208
-test/test_common/test_task.py,sha256=RWsGEN0L-xKoRAsGv2x4JZcSAySS9aBF4dwL9t7tepo,18668
+test/test_common/test_task.py,sha256=jnfF68EgJIu30Pz_4jiJHkncfI-3XpGaut5r79KIXOA,18718
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.5.0.1.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.0.1.dist-info/METADATA,sha256=bUhaqoY-R18d2STAxKPxhB0QT6G-QZRjrjcZw9tV-Sw,9735
-assemblyline_v4_service-4.5.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-assemblyline_v4_service-4.5.0.1.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.0.1.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev0.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev0.dist-info/METADATA,sha256=8vWvEo6k0dCXU2u4NUATHAZH-NB0R408l-EX2oNwv_k,9738
+assemblyline_v4_service-4.5.1.dev0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+assemblyline_v4_service-4.5.1.dev0.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev0.dist-info/RECORD,,

test/test_common/test_request.py

@@ -5,7 +5,7 @@ from test.test_common import TESSERACT_LIST
 
 import pytest
 from assemblyline_v4_service.common.request import ServiceRequest
-from assemblyline_v4_service.common.result import get_heuristic_primitives
+from assemblyline_v4_service.common.result import Result, get_heuristic_primitives
 from assemblyline_v4_service.common.task import MaxExtractedExceeded, Task
 
 from assemblyline.odm.messages.task import Task as ServiceTask
@@ -289,7 +289,7 @@ def test_get_param(service_request):
 
 
 def test_result_getter(service_request):
-    assert service_request.result is None
+    assert isinstance(service_request.result, Result)
 
 
 def test_result_setter(service_request):

test/test_common/test_task.py

@@ -61,7 +61,6 @@ def test_task_init(servicetask):
     assert t.metadata == {}
     assert t.md5 == "d41d8cd98f00b204e9800998ecf8427e"
     assert t.mime is None
-    assert t.result is None
     assert isinstance(t.safelist_config, ServiceSafelist)
     assert t.service_config == {}
     assert t.service_context is None
@@ -375,6 +374,7 @@ def test_task_get_service_result(servicetask):
             "service_debug_info": None,
         },
         "result": {"score": 0, "sections": []},
+        "partial": False,
         "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "type": "text/plain",
         "size": 0,
@@ -417,6 +417,7 @@ def test_task_get_service_result(servicetask):
         "result": {
             "score": 0,
         },
+        "partial": False,
         "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "type": "text/plain",
         "size": 0,
@@ -480,6 +481,7 @@ def test_task_save_result(servicetask):
             "service_debug_info": None,
         },
         "result": {"score": 0, "sections": []},
+        "partial": False,
         "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "type": "text/plain",
         "size": 0,