howler-api 4.0.0.dev847__tar.gz → 4.0.0.dev850__tar.gz

{howler_api-4.0.0.dev847 → howler_api-4.0.0.dev850}/PKG-INFO

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

{howler_api-4.0.0.dev847 → howler_api-4.0.0.dev850}/howler/api/v2/ingest.py

@@ -162,8 +162,23 @@ def delete(indexes: str, user: User, **kwargs):
     if non_existing_hit_ids := [id for id in ids if all(not ds[index].exists(id) for index in index_list)]:
         return not_found(err=f"Record ids [{','.join(non_existing_hit_ids)}] do not exist.")
 
-    # TODO: Reimplement in a generic function
-    # hit_service.delete_hits(hit_ids, indexes=index_list)
+    try:
+        remaining = set(ids)
+        for index in index_list:
+            if not remaining:
+                break
+
+            existing = [record_id for record_id in remaining if ds[index].exists(record_id)]
+            if not existing:
+                continue
+
+            for record_id in existing:
+                ds[index].delete(record_id)
+
+            remaining -= set(existing)
+            ds[index].commit()
+    except DataStoreException as e:
+        return internal_error(err=str(e))
 
     return no_content()
 

{howler_api-4.0.0.dev847 → howler_api-4.0.0.dev850}/howler/odm/base.py

@@ -1081,10 +1081,10 @@ class Model:
         Args:
             skip_mappings (bool): Skip over mappings where the real subfield names are unknown.
         """
-        if skip_mappings and hasattr(cls, "_odm_field_cache_skip"):
+        if not no_cache and skip_mappings and "_odm_field_cache_skip" in cls.__dict__:
             return cls._odm_field_cache_skip
 
-        if not skip_mappings and hasattr(cls, "_odm_field_cache"):
+        if not no_cache and not skip_mappings and "_odm_field_cache" in cls.__dict__:
             return cls._odm_field_cache
 
         out = dict()
@@ -1113,10 +1113,10 @@ class Model:
     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"):
+        if "_odm_field_cache_skip" in cls.__dict__:
             cls._odm_field_cache_skip[namespace.rstrip("_")] = field
 
-        if hasattr(cls, "_odm_field_cache"):
+        if "_odm_field_cache" in cls.__dict__:
             cls._odm_field_cache[namespace.rstrip("_")] = field
 
         setattr(cls, namespace, field)
@@ -1131,10 +1131,10 @@ class Model:
 
     @classmethod
     def remove_namespace(cls, namespace: str):
-        if hasattr(cls, "_odm_field_cache_skip"):
+        if "_odm_field_cache_skip" in cls.__dict__:
             del cls._odm_field_cache_skip[namespace.rstrip("_")]
 
-        if hasattr(cls, "_odm_field_cache"):
+        if "_odm_field_cache" in cls.__dict__:
             del cls._odm_field_cache[namespace.rstrip("_")]
 
         delattr(cls, namespace)
@@ -1212,7 +1212,7 @@ class Model:
         include_autogen_note=True,
         defaults=None,
         url_prefix="/howler/odm/class/",
-    ) -> dict | str:
+    ) -> str:
         markdown_content = (
             (
                 '??? success "Auto-Generated Documentation"\n    '
@@ -1524,12 +1524,23 @@ def model(index=None, store=None, description=None, id_field=None):
 
     def _finish_model(cls):
         cls._Model__description = description
-        cls._Model__id_field = id_field
+        fields = cls.fields()
 
-        if cls._Model__id_field is None:
+        if id_field is None:
             cls._Model__id_field = f"{cls.__name__.lower()}_id"
+        else:
+            if not isinstance(id_field, str):
+                raise HowlerTypeError(f"id_field must be a str, got {type(id_field).__name__}")
+
+            if not FLATTENED_OBJECT_SANITIZER.match(id_field) or id_field in BANNED_FIELDS:
+                raise HowlerValueError(f"Illegal id_field name: {id_field}")
+
+            if id_field not in fields and id_field not in cls.flat_fields():
+                raise HowlerValueError(f"id_field must reference a declared field: {id_field}")
+
+            cls._Model__id_field = id_field
 
-        for name, field_data in cls.fields().items():
+        for name, field_data in fields.items():
             if not FIELD_SANITIZER.match(name) or name in BANNED_FIELDS:
                 raise HowlerValueError(f"Illegal variable name: {name}")
 

{howler_api-4.0.0.dev847 → howler_api-4.0.0.dev850}/howler/utils/compat.py

@@ -14,6 +14,12 @@ else:
     class StrEnum(str, _Enum):  # type: ignore[no-redef]
         """str + Enum backport for Python < 3.11."""
 
+        def __str__(self) -> str:
+            return str.__str__(self)
+
+        def __format__(self, format_spec: str) -> str:
+            return str.__format__(self, format_spec)
+
     # typing_extensions.TypedDict supports Generic[T] mixing on Python < 3.11;
     # the stdlib version does not gain that until 3.11.
     from typing_extensions import NotRequired, TypedDict  # noqa: F401

{howler_api-4.0.0.dev847 → howler_api-4.0.0.dev850}/pyproject.toml

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