howler-api 3.3.0.dev735__tar.gz → 3.3.0.dev739__tar.gz

{howler_api-3.3.0.dev735 → howler_api-3.3.0.dev739}/PKG-INFO

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

{howler_api-3.3.0.dev735 → howler_api-3.3.0.dev739}/howler/api/v1/search.py

@@ -556,11 +556,13 @@ def count(index, **kwargs):
         params.update({"access_control": user["access_control"]})
 
     query = req_data.get("query", None)
+    filters = req_data.get("filters", [])
+
     if not query:
         return bad_request(err="There was no search query.")
 
     try:
-        return ok(collection().count(query, **params))
+        return ok(collection().count(query, filters=filters, **params))
     except (SearchException, BadRequestError) as e:
         return bad_request(err=f"SearchException: {e}")
 

{howler_api-3.3.0.dev735 → howler_api-3.3.0.dev739}/howler/datastore/collection.py

@@ -1898,6 +1898,7 @@ class ESCollection(Generic[ModelType]):
     def count(
         self,
         query,
+        filters,
         access_control=None,
     ):
         """This function should perform a count operation through the datastore and return a
@@ -1911,7 +1912,21 @@ class ESCollection(Generic[ModelType]):
         :param access_control: access control parameters to limit the scope of the query
         :return: a count result object
         """
-        result = self.with_retries(self.datastore.client.count, index=self.name, q=query)
+        if filters is None:
+            filters = []
+        elif isinstance(filters, str):
+            filters = [filters]
+
+        query_body: dict[str, Any] = {
+            "query": {
+                "bool": {
+                    "must": {"query_string": {"query": query}},
+                    "filter": [{"query_string": {"query": ff}} for ff in filters],
+                }
+            }
+        }
+
+        result = self.with_retries(self.datastore.client.count, index=self.name, **query_body)
 
         ret_data: dict[str, Any] = {
             "count": result["count"],

{howler_api-3.3.0.dev735 → howler_api-3.3.0.dev739}/pyproject.toml

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