howler-api 3.0.0.dev366__tar.gz → 3.0.0.dev369__tar.gz

{howler_api-3.0.0.dev366 → howler_api-3.0.0.dev369}/PKG-INFO

@@ -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 → howler_api-3.0.0.dev369}/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_api-3.0.0.dev366 → howler_api-3.0.0.dev369}/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_api-3.0.0.dev366 → howler_api-3.0.0.dev369}/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 → howler_api-3.0.0.dev369}/pyproject.toml

@@ -148,7 +148,7 @@ suppress-none-returning = true
 [tool.poetry]
 package-mode = true
 name = "howler-api"
-version = "3.0.0.dev366"
+version = "3.0.0.dev369"
 description = "Howler - API server"
 authors = [
     "Canadian Centre for Cyber Security <howler@cyber.gc.ca>",