assemblyline-v4-service 4.5.1.dev265__py3-none-any.whl → 4.5.1.dev270__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.1.dev265
+4.5.1.dev270

assemblyline_v4_service/common/ontology_helper.py

@@ -48,6 +48,7 @@ class OntologyHelper:
         self.log = logger
         self._file_info = dict()
         self._result_parts: Dict[str, Model] = dict()
+        self._other: Dict[str, str] = dict()
         self.results = defaultdict(list)
         self.service = service_name
 
@@ -94,6 +95,9 @@ class OntologyHelper:
         finally:
             return oid
 
+    def add_other_part(self, key: str, data: str) -> None:
+        self._other[key] = data
+
     def attach_parts(self, ontology: Dict) -> None:
         ontology['file'].update({k: v.as_primitives(strip_null=True) for k, v in self._file_info.items()})
 
@@ -106,6 +110,9 @@ class OntologyHelper:
 
         ontology['results'].update(self.results)
 
+        if self._other:
+            ontology['results']['other'] = self._other
+
     def _preprocess_result_for_dump(self, sections: List[ResultSection], current_max: str,
                                     heur_tag_map: Dict[str, Dict[str, Any]], tag_map: Dict[str, List[str]], score: int) -> Tuple[str, Dict[str, Dict[str, Any]], Dict[str, List[str]], int]:
             for section in sections:

{assemblyline_v4_service-4.5.1.dev265.dist-info → assemblyline_v4_service-4.5.1.dev270.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=nREg_OlqjaFgJd3-yx4UROBUPT26qCC-Pw3YKpGzBb0,13
+assemblyline_v4_service/VERSION,sha256=98K2JfxUp_flsJ-9LN_fCymolXK-YIES_roUjckPXmI,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
@@ -9,7 +9,7 @@ assemblyline_v4_service/common/api.py,sha256=Xzp8j4HCCfjPvNSGKiZl5ttH2_Itg47cjlH
 assemblyline_v4_service/common/base.py,sha256=4rnK_183qsSfkRkuVp_0wy-haW49umx4jJIC0OalGDM,14218
 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=d1Ty8jD4KUDyln6ix_lFfNfBt7hoy2Aiq323i3Va65A,8277
+assemblyline_v4_service/common/ontology_helper.py,sha256=9Ad81qbddg_pRMupT8o_KzxbKgpodaRqpc3mPoEKLtw,8494
 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=dJsvRpW0x88CCF_LW6w87jQ_UKTVaOs2Gb117IDNiU8,14233
@@ -33,13 +33,13 @@ test/test_common/test_api.py,sha256=7wlo7wgB12T23zMLbwjJ3GIomLHqE_Qvs3xkibSsR1U,
 test/test_common/test_base.py,sha256=fuJSSlPxIDHq6HU1xbvaMFitw2z1spOZNHD2SJ4UUic,13346
 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=a_bX1MPQnwV1QILGgrUSNsgMgCnl663fAB40cw3ElHI,10237
+test/test_common/test_ontology_helper.py,sha256=Q9-Eqeo8Ih7XlbFmlUAXCtgnfW8JCDqqlYFb56077h4,10331
 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=P44mNcSe-3tJgDk9ppN3KbM7oN4LBVIuhONG-Gveh74,19007
 test/test_common/test_utils.py,sha256=TbnBxqpS_ZC5ptXR9XJX3xtbItD0mTbtiBxxdyP8J5k,5904
-assemblyline_v4_service-4.5.1.dev265.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.1.dev265.dist-info/METADATA,sha256=Utx3_lTaYhIpQuoPp3Q_Gj5EV-xp6i7-52p2SCT1h0I,9493
-assemblyline_v4_service-4.5.1.dev265.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-assemblyline_v4_service-4.5.1.dev265.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.1.dev265.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev270.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev270.dist-info/METADATA,sha256=4LDCUvol5DmPcRESQSakl5hjzuCwb1sjn8wx5wauWXY,9493
+assemblyline_v4_service-4.5.1.dev270.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+assemblyline_v4_service-4.5.1.dev270.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev270.dist-info/RECORD,,

test/test_common/test_ontology_helper.py

@@ -125,7 +125,6 @@ def test_add_result_part():
     assert oh._result_parts[oid_2]["objectid"]["ontology_id"] == "antivirus_7WVybQLECGWqS0DqePtVLp"
     assert oh._result_parts[oid_2]["objectid"]["service_name"] == "blah"
 
-
 def test_attach_parts():
     oh = OntologyHelper(None, "blah")
 
@@ -146,6 +145,7 @@ def test_attach_parts():
     oh._file_info = {"a": Antivirus({"objectid": {"tag": "a", "ontology_id": "b"}, "engine_name": "blah"})}
     ont = {"file": {"blah": "blah"}, "results": {"blah": "blah"}}
     oh.add_result_part(Antivirus, {"engine_name": "blah"})
+    oh.add_other_part("test", "blah")
     oh.attach_parts(ont)
     assert oh.results == {
         'antivirus': [
@@ -179,7 +179,10 @@ def test_attach_parts():
                 },
                 'engine_name': 'blah'
             }
-        ]
+        ],
+        'other': {
+            'test': 'blah'
+        }
     }