assemblyline-v4-service 4.5.1.dev17__py3-none-any.whl → 4.5.1.dev18__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.5.1.dev17
+4.5.1.dev18

assemblyline_v4_service/updater/client.py

@@ -8,7 +8,7 @@ from assemblyline_core.badlist_client import BadlistClient
 from assemblyline_core.safelist_client import SafelistClient
 from assemblyline_core.signature_client import SignatureClient
 
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Optional, Set, Union
 
 SIGNATURE_UPDATE_BATCH = int(os.environ.get('SIGNATURE_UPDATE_BATCH', '1000'))
 
@@ -43,8 +43,8 @@ def hashlist_add_update_many(client: Union[SyncableBadlistClient, SyncableSafeli
     if not data:
         return {"success": 0, "errors": False}
 
-    current_ids = set()
-    source = None
+    current_ids: Set[str] = set()
+    source: Optional[str] = None
 
     # Iterate over the list of signatures given
     for i, d in enumerate(data):
@@ -62,7 +62,7 @@ def hashlist_add_update_many(client: Union[SyncableBadlistClient, SyncableSafeli
         data[i] = d
 
     if client.sync:
-        # Get the list of items that currently existing in the system for the source
+        # Get the list of items that currently exists in the system for the source
         existing_ids = set(
             [
                 i["id"]
@@ -73,7 +73,8 @@ def hashlist_add_update_many(client: Union[SyncableBadlistClient, SyncableSafeli
         )
 
         # Find the IDs that don't exist at this source anymore and remove the source from the source list
-        for missing_id in existing_ids - current_ids:
+        missing_ids = existing_ids - current_ids
+        for missing_id in missing_ids:
             missing_item = collection.get(missing_id)
             original_sources = missing_item.sources
             missing_item.sources = [
@@ -103,7 +104,7 @@ def hashlist_add_update_many(client: Union[SyncableBadlistClient, SyncableSafeli
         def update_response(r: Dict[str, Any]):
             # Response has to be in the same format, but show the accumulation of batches
             response["success"]: int = response["success"] + r["success"]
-            response["errors"]: bool = response["errors"] and r["errors"]
+            response["errors"]: bool = response["errors"] or r["errors"]
 
         # Split up data into batches to avoid server timeouts handling requests
         batch_num = 0
@@ -212,4 +213,7 @@ class UpdaterClient(object):
     @sync.setter
     def sync(self, value: bool):
         # Set sync state across clients
-        self.badlist.sync = self.safelist.sync = self.signature.sync = self._sync = value
+        self.badlist.sync = value
+        self.safelist.sync = value
+        self.signature.sync = value
+        self._sync = value

{assemblyline_v4_service-4.5.1.dev17.dist-info → assemblyline_v4_service-4.5.1.dev18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.5.1.dev17
+Version: 4.5.1.dev18
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team
@@ -24,7 +24,7 @@ Requires-Dist: assemblyline-core
 Requires-Dist: cart
 Requires-Dist: fuzzywuzzy
 Requires-Dist: pefile
-Requires-Dist: pillow ==10.2.0
+Requires-Dist: pillow !=10.1.0,!=10.2.0
 Requires-Dist: python-Levenshtein
 Requires-Dist: regex
 Provides-Extra: updater

{assemblyline_v4_service-4.5.1.dev17.dist-info → assemblyline_v4_service-4.5.1.dev18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=VNaeZcbiphmuY6ck3JA5TMsQKAG9jDoy_Hmmhu0B8nA,12
+assemblyline_v4_service/VERSION,sha256=h6E5ws5IauZrCNriaOV0jEyvWhYiOuGV5uk53ACXZDg,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
@@ -19,7 +19,7 @@ assemblyline_v4_service/dev/run_service_once.py,sha256=4K3ljw0MnfPGw0-6lzc_vtUYg
 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=G5zvFo1--ZB-jCP7lCmIK5p8mXE5ptLBa41Uq6IN4W0,9405
+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/updater.py,sha256=5cJH82VTP3VrwoNE97ubKP2dr90AI_T-AKRistvN5rI,29013
@@ -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.dev17.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.5.1.dev17.dist-info/METADATA,sha256=lLvzhHJNG0UKuStrVekSiEJXuMAKPhtA42RCWSymdR8,9489
-assemblyline_v4_service-4.5.1.dev17.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-assemblyline_v4_service-4.5.1.dev17.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
-assemblyline_v4_service-4.5.1.dev17.dist-info/RECORD,,
+assemblyline_v4_service-4.5.1.dev18.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.5.1.dev18.dist-info/METADATA,sha256=Xn_veKJC6ngbhR0N3-Z1Qod0AuzTzZMjrCbENp2CQ38,9498
+assemblyline_v4_service-4.5.1.dev18.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+assemblyline_v4_service-4.5.1.dev18.dist-info/top_level.txt,sha256=LpTOEaVCatkrvbVq3EZseMSIa2PQZU-2rhuO_FTpZgY,29
+assemblyline_v4_service-4.5.1.dev18.dist-info/RECORD,,