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

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

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

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

@@ -316,18 +316,14 @@ def convert_hit(data: dict[str, Any], unique: bool, ignore_extra_values: bool =
 
     if re.search(r"^([A-Za-z ])+$", odm.howler.analytic) is None:
         warnings.append(
-            (
-                f"The value {odm.howler.analytic} does not match best practices for Howler analytic names. "
-                "See howler's documentation for more information."
-            )
+            f"The value {odm.howler.analytic} does not match best practices for Howler analytic names. "
+            "See howler's documentation for more information."
         )
 
     if odm.howler.detection and re.search(r"^([A-Za-z ])+$", odm.howler.detection) is None:
         warnings.append(
-            (
-                f"The value {odm.howler.detection} does not match best practices for Howler detection names. "
-                "See howler's documentation for more information."
-            )
+            f"The value {odm.howler.detection} does not match best practices for Howler detection names. "
+            "See howler's documentation for more information."
         )
 
     if odm.event:

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

@@ -136,25 +136,28 @@ def unflatten(data: _Mapping) -> _Mapping:
 
 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
+    from howler.odm.base import Mapping, Optional
 
     data = flatten_deep(data)
 
     result: set[str] = set()
     for key in data.keys():
         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
+                if isinstance(current_odm, Optional):
+                    current_odm = current_odm.child_type
+
+                if isinstance(current_odm, Mapping):
+                    current_odm = current_odm.child_type
+                else:
+                    result.add(key)
+                    break
 
     return result
 

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

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