assemblyline-v4-service 4.5.0.64__py3-none-any.whl → 4.5.0.65__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.0.64
+4.5.0.65

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

@@ -70,7 +70,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
@@ -263,11 +264,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-4.5.0.64.dist-info → assemblyline_v4_service-4.5.0.65.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.5.0.64
+Version: 4.5.0.65
 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.64.dist-info → assemblyline_v4_service-4.5.0.65.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=glDcmo_TI9B72qG6u3dZOf7DlHNMv80lFKQ2kz3j2p0,9
+assemblyline_v4_service/VERSION,sha256=E_iXl-HgK7HYS4gbsgYeSgzQd02MgKgmBaFYBaE-HBY,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
@@ -10,9 +10,9 @@ assemblyline_v4_service/common/base.py,sha256=4rnK_183qsSfkRkuVp_0wy-haW49umx4jJ
 assemblyline_v4_service/common/helper.py,sha256=xs9quuf-M1JOdKieBqOmWaOece0CtzXFhhe85xQYmuY,3289
 assemblyline_v4_service/common/ocr.py,sha256=3fV0PyY3oui_ucAM9dkolP0VRYKACKJuGY4M64DudIE,8841
 assemblyline_v4_service/common/ontology_helper.py,sha256=9Ad81qbddg_pRMupT8o_KzxbKgpodaRqpc3mPoEKLtw,8494
-assemblyline_v4_service/common/request.py,sha256=ZP80rDWIyVotwVDN70L7ujN9RoxZRdmaeUN0DFIvrT4,11732
+assemblyline_v4_service/common/request.py,sha256=W7fqC2xQE3i5i2jlCDyUDp3ZqJQQqSshNW0mQfJMkFg,11792
 assemblyline_v4_service/common/result.py,sha256=9AqM6qCYiia_Bpyn_fBFhzNQMcqJbtFSiGjp57fXW2E,32713
-assemblyline_v4_service/common/task.py,sha256=CJ5Mw1Lre09HGf9rbWfKxQdxmRS_mImnHLlE1oQk5dM,14089
+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
@@ -34,12 +34,12 @@ test/test_common/test_base.py,sha256=fuJSSlPxIDHq6HU1xbvaMFitw2z1spOZNHD2SJ4UUic
 test/test_common/test_helper.py,sha256=sO6YAiBhKTqaxlpLhFYDuy2ZdbuF2cg07Ylzo83ZzQs,2575
 test/test_common/test_ocr.py,sha256=mt_PgElgwQKJmNrp2nRVx9NjfMedVk40I6IV317vATI,1753
 test/test_common/test_ontology_helper.py,sha256=Q9-Eqeo8Ih7XlbFmlUAXCtgnfW8JCDqqlYFb56077h4,10331
-test/test_common/test_request.py,sha256=zoBURe3QbycWK4I7uvkixcmykrOCqY_TchmxJinNXjU,11822
+test/test_common/test_request.py,sha256=Ceyds8BNO1O0f1kH1VEb84faJcaupvSjVKIrGdHexsc,11842
 test/test_common/test_result.py,sha256=6BiOKxEPrKBjOY44jv3TY-yiXm0qI1ok_CZBnjP9TM4,45447
-test/test_common/test_task.py,sha256=LzEIfFHJEcB_YPucOZGtm1TwyHnqJE-0Qc2MDsH4TN4,18957
+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.64.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.0.64.dist-info/METADATA,sha256=3KEghl9lwtO8Q0IzJ6EI_l3miqNw74VMVwUGXdkNfk0,9489
-assemblyline_v4_service-4.5.0.64.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-assemblyline_v4_service-4.5.0.64.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.0.64.dist-info/RECORD,,
+assemblyline_v4_service-4.5.0.65.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.0.65.dist-info/METADATA,sha256=VaZWzEvbw3Z8prRUZRUoezm7jQ3zTFEogDAziAmDVV0,9489
+assemblyline_v4_service-4.5.0.65.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+assemblyline_v4_service-4.5.0.65.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.0.65.dist-info/RECORD,,

test/test_common/test_request.py

@@ -5,7 +5,7 @@ from test.test_common import TESSERACT_LIST, setup_module
 
 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
@@ -303,7 +303,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
@@ -380,6 +379,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,
@@ -423,6 +423,7 @@ def test_task_get_service_result(servicetask):
         "result": {
             "score": 0,
         },
+        "partial": False,
         "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "type": "text/plain",
         "size": 0,
@@ -486,6 +487,7 @@ def test_task_save_result(servicetask):
             "service_debug_info": None,
         },
         "result": {"score": 0, "sections": []},
+        "partial": False,
         "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "type": "text/plain",
         "size": 0,