howler-api 2.10.0.dev155__tar.gz → 2.10.0.dev160__tar.gz

{howler_api-2.10.0.dev155 → howler_api-2.10.0.dev160}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: howler-api
-Version: 2.10.0.dev155
+Version: 2.10.0.dev160
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-2.10.0.dev155 → howler_api-2.10.0.dev160}/howler/odm/base.py

@@ -20,7 +20,6 @@ from enum import Enum as PyEnum
 from enum import EnumMeta
 from typing import Any as _Any
 from typing import Dict, Tuple, Union
-from typing import Mapping as _Mapping
 from venv import logger
 
 import arrow
@@ -28,12 +27,7 @@ import validators
 from dateutil.tz import tzutc
 
 from howler.common import loader
-from howler.common.exceptions import (
-    HowlerKeyError,
-    HowlerNotImplementedError,
-    HowlerTypeError,
-    HowlerValueError,
-)
+from howler.common.exceptions import HowlerKeyError, HowlerNotImplementedError, HowlerTypeError, HowlerValueError
 from howler.common.net import is_valid_domain, is_valid_ip
 from howler.utils.dict_utils import flatten, recursive_update
 from howler.utils.isotime import now_as_iso
@@ -1050,7 +1044,7 @@ class Optional(_Field):
 
 class Model:
     @classmethod
-    def fields(cls, skip_mappings=False) -> _Mapping[str, _Field]:
+    def fields(cls, skip_mappings=False) -> dict[str, _Field]:
         """Describe the elements of the model.
 
         For compound fields return the field object.
@@ -1122,7 +1116,7 @@ class Model:
         return out
 
     @classmethod
-    def flat_fields(cls, show_compound=False, skip_mappings=False) -> _Mapping[str, _Field]:
+    def flat_fields(cls, show_compound=False, skip_mappings=False) -> dict[str, _Field]:
         """Describe the elements of the model.
 
         Recurse into compound fields, concatenating the names with '.' separators.

{howler_api-2.10.0.dev155 → howler_api-2.10.0.dev160}/howler/services/hit_service.py

@@ -25,7 +25,6 @@ from howler.helper.hit import (
     vote_hit,
 )
 from howler.helper.workflow import Transition, Workflow
-from howler.odm.base import BANNED_FIELDS
 from howler.odm.models.ecs.event import Event
 from howler.odm.models.hit import Hit
 from howler.odm.models.howler_data import HitOperationType, HitStatus, HitStatusTransition, Log
@@ -296,6 +295,7 @@ def convert_hit(data: dict[str, Any], unique: bool, ignore_extra_values: bool =
     if "bundle_size" not in data and "howler.hits" in data:
         data["howler.bundle_size"] = len(data["howler.hits"])
 
+    # TODO: This is a really strange double-validation check we should look to refactor
     try:
         odm = Hit(data, ignore_extra_values=ignore_extra_values)
     except TypeError as e:
@@ -303,7 +303,7 @@ def convert_hit(data: dict[str, Any], unique: bool, ignore_extra_values: bool =
 
     # Check for deprecated field and unused fields
     odm_flatten = odm.flat_fields(show_compound=True)
-    unused_keys = extra_keys(data, set(odm_flatten.keys()) - BANNED_FIELDS)
+    unused_keys = extra_keys(Hit, data)
 
     if unused_keys and not ignore_extra_values:
         raise HowlerValueError(f"Hit was created with invalid parameters: {', '.join(unused_keys)}")

{howler_api-2.10.0.dev155 → howler_api-2.10.0.dev160}/howler/utils/dict_utils.py

@@ -134,32 +134,27 @@ def unflatten(data: _Mapping) -> _Mapping:
     return out
 
 
-def extra_keys(data: _Mapping, keys: set[str], parent_key: Optional[str] = None) -> set[str]:
+def extra_keys(odm: type["Model"], data: _Mapping) -> set[str]:
     "Geta list of extra keys when compared to a list of permitted keys"
+    from howler.odm.base import Mapping
+
+    data = flatten_deep(data)
+
     result: set[str] = set()
     for key in data.keys():
-        if isinstance(data[key], dict):
-            result = result | extra_keys(
-                data[key],
-                {sub_key[(len(sub_key) + 1) :] for sub_key in keys if sub_key.startswith(f"{key}.")},
-                parent_key=key if not parent_key else f"{parent_key}.{key}",
-            )
-        elif isinstance(data[key], list):
-            if key in keys:
-                continue
-
-            for entry in data[key]:
-                if not isinstance(entry, dict):
-                    result.add(key if not parent_key else f"{parent_key}.{key}")
-                    break
-                else:
-                    result = result | extra_keys(
-                        entry,
-                        {sub_key[(len(key) + 1) :] for sub_key in keys if sub_key.startswith(f"{key}.")},
-                        parent_key=key if not parent_key else f"{parent_key}.{key}",
-                    )
-        elif key not in keys:
-            result.add(key if not parent_key else f"{parent_key}.{key}")
+        parts = key.split(".")
+
+        current_odm = odm
+        for part in parts:
+            sub_fields: dict[str, Any] = current_odm.fields()
+
+            if part in sub_fields:
+                current_odm = sub_fields[part]
+            elif isinstance(current_odm, Mapping):
+                current_odm = current_odm.child_type
+            else:
+                result.add(key)
+                break
 
     return result
 

{howler_api-2.10.0.dev155 → howler_api-2.10.0.dev160}/pyproject.toml

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