howler-api 3.2.0.dev438__tar.gz → 3.2.0.dev463__tar.gz

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev463}/PKG-INFO

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

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev463}/howler/datastore/collection.py

@@ -422,7 +422,6 @@ class ESCollection(Generic[ModelType]):
         res = None
         while res is None:
             attempt = attempt + 1
-            logger.warning("Checking status of task %s (Attempt %s)", task["task"], attempt)
             try:
                 res = self.with_retries(
                     self.datastore.client.tasks.get,
@@ -443,8 +442,6 @@ class ESCollection(Generic[ModelType]):
 
         result = res.get("response", res["task"]["status"])
 
-        logger.info("Task result:\n%s", str(result))
-
         return result
 
     def _get_current_alias(self, index: str) -> typing.Optional[str]:

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev463}/howler/services/lucene_service.py

@@ -252,6 +252,8 @@ def match(lucene: str, obj: dict[str, Any]):
         # which means the two are equivalent in elastic, but the second one is a lot less ambiguous to parse.
         normalized_query = cast(str, result["explanations"][0]["explanation"])
 
+        normalized_query = re.sub(r"IndexOrDocValuesQuery *\(indexQuery=(.+?), dvQuery=.+?\)", r"\1", normalized_query)
+
         # Elastic's explanation mangles exists queries. Since we will handle them the normal way, reset their changes
         normalized_query = re.sub(r"FieldExistsQuery *\[.*?field=(.+?)]", r"_exists_:\1", normalized_query)
         normalized_query = re.sub(r"ConstantScore", "", normalized_query)

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev463}/howler/utils/lucene.py

@@ -20,7 +20,7 @@ def try_parse_date(date: str) -> Optional[datetime]:
         return None
 
 
-def try_parse_number(number: Union[str, int, float]) -> Optional[Union[int, float]]:
+def try_parse_number(number: str | int | float) -> int | float | None:
     "Try and parse a number string into an integer or float type, or infinity. Returns None if string is invalid."
     if isinstance(number, (int, float)):
         return number

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev463}/pyproject.toml

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