howler-api 3.0.0.dev366__py3-none-any.whl → 3.0.0.dev369__py3-none-any.whl

howler/datastore/collection.py

@@ -430,7 +430,7 @@ class ESCollection(Generic[ModelType]):
                     wait_for_completion=True,
                     timeout="10s",
                 )
-            except elasticsearch.exceptions.TransportError as e:
+            except (elasticsearch.exceptions.TransportError, elasticsearch.exceptions.ApiError) as e:
                 err_code, msg, _ = e.args
                 if (err_code == 500 or err_code == "500") and msg in [
                     "timeout_exception",

howler/external/reindex_data.py

@@ -9,10 +9,6 @@ DELAY = 5
 if __name__ == "__main__":
     print("This script will allow you to reindex all indexes in elasticsearch.")
     print("For obvious reasons, be EXTREMELY CAREFUL running this code.")
-
-    for i in range(DELAY):
-        print(f"Continuing in {str(DELAY - i)}...", end="\r")
-        time.sleep(1)
     print()
     answer = input("Are you sure you want to reindex data for an index in this cluster? [yes/NO]\n")
 
@@ -28,15 +24,15 @@ if __name__ == "__main__":
 
     ds = loader.datastore(archive_access=False)
 
-    indexes: dict[str, tuple[list[str], Callable]] = {
-        "analytic": (ds.analytic.index_list_full, ds.analytic.reindex),
-        "hit": (ds.hit.index_list_full, ds.hit.reindex),
-        "view": (ds.view.index_list_full, ds.view.reindex),
-        "template": (ds.template.index_list_full, ds.template.reindex),
-        "overview": (ds.overview.index_list_full, ds.overview.reindex),
-        "action": (ds.action.index_list_full, ds.action.reindex),
-        "user": (ds.user.index_list_full, ds.user.reindex),
-        "dossier": (ds.dossier.index_list_full, ds.dossier.reindex),
+    indexes: dict[str, tuple[ESCollection, Callable]] = {
+        "analytic": (ds.analytic, ds.analytic.reindex),
+        "hit": (ds.hit, ds.hit.reindex),
+        "view": (ds.view, ds.view.reindex),
+        "template": (ds.template, ds.template.reindex),
+        "overview": (ds.overview, ds.overview.reindex),
+        "action": (ds.action, ds.action.reindex),
+        "user": (ds.user, ds.user.reindex),
+        "dossier": (ds.dossier, ds.dossier.reindex),
     }
 
     print("Which index will you reindex?")
@@ -47,10 +43,10 @@ if __name__ == "__main__":
         sys.exit(1)
 
     print("Index schema:")
-    print(json.dumps(ds.hit._get_index_mappings(), indent=2))
+    print(json.dumps(indexes[index_answer][0]._get_index_mappings(), indent=2))
 
     print("\nYou will be reindexing the following indexes:")
-    print("\n".join(indexes[index_answer][0]))
+    print("\n".join(indexes[index_answer][0].index_list_full))
 
     answer = input(("\nAre you sure you want to reindex these indexes? [yes/NO]\n"))
     print()

howler/odm/base.py

@@ -1093,8 +1093,8 @@ class Model:
         return out
 
     @classmethod
-    def add_namespace(cls, namespace: str, field: _Field):
-        field.name = namespace
+    def add_namespace(cls, namespace: str, field: _Field, index=None, store=None, description=None):
+        recursive_set_name(field, namespace)
 
         if hasattr(cls, "_odm_field_cache_skip"):
             cls._odm_field_cache_skip[namespace.rstrip("_")] = field
@@ -1102,7 +1102,25 @@ class Model:
         if hasattr(cls, "_odm_field_cache"):
             cls._odm_field_cache[namespace.rstrip("_")] = field
 
-        return setattr(cls, namespace, field)
+        setattr(cls, namespace, field)
+
+        field._Model__description = description
+        for name, field_data in field.fields().items():
+            if not FIELD_SANITIZER.match(name) or name in BANNED_FIELDS:
+                raise HowlerValueError(f"Illegal variable name: {name}")
+
+            recursive_set_name(field_data, name)
+            field_data.apply_defaults(index=index, store=store)
+
+    @classmethod
+    def remove_namespace(cls, namespace: str):
+        if hasattr(cls, "_odm_field_cache_skip"):
+            del cls._odm_field_cache_skip[namespace.rstrip("_")]
+
+        if hasattr(cls, "_odm_field_cache"):
+            del cls._odm_field_cache[namespace.rstrip("_")]
+
+        delattr(cls, namespace)
 
     @staticmethod
     def _recurse_fields(name, field, show_compound, skip_mappings, multivalued=False):

{howler_api-3.0.0.dev366.dist-info → howler_api-3.0.0.dev369.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 3.0.0.dev366
+Version: 3.0.0.dev369
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-3.0.0.dev366.dist-info → howler_api-3.0.0.dev369.dist-info}/RECORD

@@ -53,7 +53,7 @@ howler/cronjobs/view_cleanup.py,sha256=ULWLR1uFcRemRgkEDrMqmBamHiE0dgDvu49VK0qDk
 howler/datastore/README.md,sha256=ekWl1YJSrHlZpU5PgBkPEzPWjdbTdav6Rd2P0ccIesw,4758
 howler/datastore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/datastore/bulk.py,sha256=VfolZfiaBD4ZTK3j6IVVVq4GMjVXb5elrsGwwM_nONE,2829
-howler/datastore/collection.py,sha256=69VhtrFp24Alssm-yTuDHqPZ1XWhN5Ty-eeRJaPQEP4,91154
+howler/datastore/collection.py,sha256=joi4-lUMWGH1DBO3ag36GriSI7J2n-UpIfb1-KaBdTU,91191
 howler/datastore/constants.py,sha256=x7ODomtOQmDjmXoAxly4onPAnUkq4BLZ1TBg-UgpU1g,2415
 howler/datastore/exceptions.py,sha256=yZvQXRI4mR50ltGFHbdZAD4TIbhdKJku6LLTPQ0JZRk,955
 howler/datastore/howler_store.py,sha256=kW7FKM-tILcfTmrjSB1yZm-ZnumPS_tiQEZUDaQoDkg,2915
@@ -70,7 +70,7 @@ howler/external/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/external/generate_mitre.py,sha256=B4ALOP9OdAuq45u0UahprtFkG-B0SuMw-PwuUdZFFfM,2638
 howler/external/generate_sigma_rules.py,sha256=QkdgEtOYqazRqvc0sfkP_sZmooDbmog6BUfgTJ2zhPY,831
 howler/external/generate_tlds.py,sha256=S_J-x3QUaRjpZKOcBrnL8w7-FfTNKLOIrvW3qJDcj4Y,1386
-howler/external/reindex_data.py,sha256=37rHW3vsL0oUYZ9EDEyEzZKmnonUuSA6Q9ueM-6dshg,2219
+howler/external/reindex_data.py,sha256=NyVZ0fXnsVGeuI3DZF5Ufq8Wqp9giimyRzdJOT8Dyh0,2016
 howler/external/wipe_databases.py,sha256=CO_mUdezp24h6xz6Di_K5-Mid61d9EVcBO4ap5qnVao,1610
 howler/gunicorn_config.py,sha256=0X7DPFcVDu3qAgMbNsdYGqCuvQGn5ZNx_eapOMyuXuI,750
 howler/healthz.py,sha256=nvb8MBBERYIkA_UxxLIyNEQazYOnPCcm0sH0Jm5nF0k,769
@@ -84,7 +84,7 @@ howler/helper/workflow.py,sha256=fsYhjeZo1foM0J8AW3nMjTEJOAnh9R6L0f4ZL12pE4E,480
 howler/helper/ws.py,sha256=ONxC7DFYGQKpp0AmrFqQLeIyxOMD4nHk5i6lFyWOtqo,15911
 howler/odm/README.md,sha256=Ihc_DyjVQlLaIOEbPoQNPkum9Ecn8kn37-PMFQsX77s,5645
 howler/odm/__init__.py,sha256=1n6vgBOrFcCHSBFysqgODERvqP7s5DIeJe8N8UeE5pM,44
-howler/odm/base.py,sha256=uAgEaccEfoLZpNPlRheDzZTuDWTz-UJrTWNrKHeSFmo,52254
+howler/odm/base.py,sha256=uK405FXmcSKqgTyLutPTMDSmcBvAfa94PUlAjJFyg2w,52987
 howler/odm/charter.txt,sha256=-Wgrv7nqugZmeQknJk0_m6klLJStjVbuqKbi_KaDinQ,15277
 howler/odm/helper.py,sha256=EELMg3pvE7Kb9VDeKSYJQHiq6uCO2YuS095CPRgWrEM,13927
 howler/odm/howler_enum.py,sha256=JzRK3_adlhvfkoGdMZD1jgOwlneZs8-x7OxGEj3zcpY,768
@@ -192,7 +192,7 @@ howler/utils/path.py,sha256=DfOU4i4zSs4wchHoE8iE7aWVLkTxiC_JRGepF2hBYBk,690
 howler/utils/socket_utils.py,sha256=nz1SklC9xBHUSfHyTJjpq3mbozX1GDf01WzdGxfaUII,2212
 howler/utils/str_utils.py,sha256=HE8Hqh2HlOLaj16w0H9zKOyDJLp-f1LQ50y_WeGZaEk,8389
 howler/utils/uid.py,sha256=p9dsqyvZ-lpiAuzZWCPCeEM99kdk0Ly9czf04HNdSuw,1341
-howler_api-3.0.0.dev366.dist-info/METADATA,sha256=mtydac9xvKXb19JTlx8d0dfZayCfp8kDq2L7W17SO7o,2804
-howler_api-3.0.0.dev366.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-howler_api-3.0.0.dev366.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
-howler_api-3.0.0.dev366.dist-info/RECORD,,
+howler_api-3.0.0.dev369.dist-info/METADATA,sha256=_tAldPmKk79tk451OlRf3WOaUVYqpbpbYChJvVGDEA4,2804
+howler_api-3.0.0.dev369.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+howler_api-3.0.0.dev369.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
+howler_api-3.0.0.dev369.dist-info/RECORD,,