assemblyline-v4-service 4.5.1.dev20__py3-none-any.whl → 4.5.1.dev46__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.1.dev20
+4.5.1.dev46

assemblyline_v4_service/common/ocr.py

@@ -207,8 +207,17 @@ def detections(ocr_output: str) -> Dict[str, List[str]]:
             # Legacy support (before configurable indicator thresholds)
             terms = indicator_config
         elif isinstance(indicator_config, dict):
-            # Set indicator threshold before variable overwrite with terms list
-            terms = indicator_config.get("terms", [])
+            # Either you're exclusively overwriting the terms list or you're selectively including/excluding terms
+            if indicator_config.get("terms"):
+                # Overwrite terms list with service configuration
+                terms = indicator_config["terms"]
+            else:
+                included_terms = set(indicator_config.get("include", []))
+                excluded_terms = set(indicator_config.get("exclude", []))
+                # Compute the new terms list for indicator type
+                terms = list(set(terms).union(included_terms) - excluded_terms)
+
+            # Set the indicator hit threshold
             hit_threshold = indicator_config.get("threshold", 1)
 
         # Perform a pre-check to see if the terms even exist in the OCR text

assemblyline_v4_service/updater/helper.py

@@ -35,6 +35,9 @@ class SkipSource(RuntimeError):
 def add_cacert(cert: str) -> None:
     # Add certificate to requests
     cafile = certifi.where()
+    with open(cafile, 'r') as ca_reader:
+        if cert in ca_reader.read():
+            return
     with open(cafile, 'a') as ca_editor:
         ca_editor.write(f"\n{cert}")
 

{assemblyline_v4_service-4.5.1.dev20.dist-info → assemblyline_v4_service-4.5.1.dev46.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=TAhlcUII3pD_wKVNMhe7ZJC8ZOHYU_5dEKWdK2jW6XE,12
+assemblyline_v4_service/VERSION,sha256=sQM09FS0BK9FrsHaapzAtmW4sNxx-dHBnjL5R7rkljk,12
 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
@@ -8,7 +8,7 @@ assemblyline_v4_service/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 assemblyline_v4_service/common/api.py,sha256=Xzp8j4HCCfjPvNSGKiZl5ttH2_Itg47cjlH0NXNtth0,6849
 assemblyline_v4_service/common/base.py,sha256=mKkkzbxVL_wVMy_VieU9mlHYLqZXndga_4dWWbnEnx8,14045
 assemblyline_v4_service/common/helper.py,sha256=xs9quuf-M1JOdKieBqOmWaOece0CtzXFhhe85xQYmuY,3289
-assemblyline_v4_service/common/ocr.py,sha256=XHHD0bOKu7DdBEMQ3sPZxQjp4K4G3js_Ib2GKWD6Xuw,7897
+assemblyline_v4_service/common/ocr.py,sha256=A8OnjpEor-S3OUC_jZzJ-Er3KKAsMdQLEXTtMS81Xbk,8397
 assemblyline_v4_service/common/ontology_helper.py,sha256=QpwerYoS5hXjWzpx3Pmwv6j2330PQVYqxYGamjcpW3I,7890
 assemblyline_v4_service/common/request.py,sha256=XXBafAQCV43_OBLXOSHxYoDHmqwERBkNul8fb_X6Ves,11774
 assemblyline_v4_service/common/result.py,sha256=9AqM6qCYiia_Bpyn_fBFhzNQMcqJbtFSiGjp57fXW2E,32713
@@ -21,7 +21,7 @@ assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfve
 assemblyline_v4_service/updater/app.py,sha256=Mtmx4bkXfP4nFqqa5q15jW8QIXr4JK84lCovxAVyvPs,3317
 assemblyline_v4_service/updater/client.py,sha256=oOOIzh-Q-b5uOTo3C4rVSfQxqUO5Y_ogDmUhvWfm5uo,9518
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
-assemblyline_v4_service/updater/helper.py,sha256=HbH5p6UTdHyIgoctF1c1pQkoqTtzaxfHOi9KXGwn0eM,9435
+assemblyline_v4_service/updater/helper.py,sha256=-B35wdjpeY4t1R9SPDrTFHFKHwE3uzy9N69mV6mHy-g,9532
 assemblyline_v4_service/updater/updater.py,sha256=5cJH82VTP3VrwoNE97ubKP2dr90AI_T-AKRistvN5rI,29013
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/conftest.py,sha256=W3SieQpZsZpGEmtLqY4aIlxREDSsHceyCrFcFsWUM0U,1851
@@ -38,8 +38,8 @@ test/test_common/test_request.py,sha256=wxSwnOj-_YOv2SuZjOJsw09q8A7p8GJmJuK4vozq
 test/test_common/test_result.py,sha256=Wm0Cs5kZRzlZr0jL-l8OTsYAvkoN2eaB3NkeXzvyssI,42208
 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.1.dev20.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.1.dev20.dist-info/METADATA,sha256=LULhCe11K4XePN0ExIgT_JwOViBOChjxhzJrQAwoc_k,9498
-assemblyline_v4_service-4.5.1.dev20.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-assemblyline_v4_service-4.5.1.dev20.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.1.dev20.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev46.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev46.dist-info/METADATA,sha256=WMqxrxQMu_e8Zj5DbSRC_p1nA8VhyrDScDlSGGOk63Q,9498
+assemblyline_v4_service-4.5.1.dev46.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+assemblyline_v4_service-4.5.1.dev46.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev46.dist-info/RECORD,,

{assemblyline_v4_service-4.5.1.dev20.dist-info → assemblyline_v4_service-4.5.1.dev46.dist-info}/WHEEL

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