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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 3.2.0.dev438
+Version: 3.2.0.dev467
 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.dev467}/howler/actions/prioritization.py

@@ -10,7 +10,7 @@ OPERATION_ID = "prioritization"
 VALID_FIELDS = ["reliability", "severity", "volume", "confidence", "score"]
 
 
-def execute(query: str, field: str = "score", value: str = "0.0", **kwargs):
+def execute(query: str, field: str = "score", value: str | float = "0.0", **kwargs):
     """Change one of the priorization fields of a hit
 
     Args:
@@ -34,7 +34,7 @@ def execute(query: str, field: str = "score", value: str = "0.0", **kwargs):
     report = []
 
     try:
-        value: float = float(value)
+        value = float(value)
 
         datastore().hit.update_by_query(
             query,

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/actions/transition.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import Optional
+from typing import Optional, cast
 
 from howler.common.exceptions import InvalidDataException, NotFoundException
 from howler.common.loader import datastore
@@ -115,7 +115,7 @@ def execute(
         try:
             hit_service.transition_hit(
                 hit_id,
-                HitStatusTransition[transition],
+                cast(HitStatusTransition, HitStatusTransition[transition]),
                 user,
                 **kwargs,
             )

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/__init__.py

@@ -28,8 +28,15 @@ def make_subapi_blueprint(name, api_version=1):
 
 
 def _make_api_response(
-    data: Any, err: Union[str, Exception] = "", warnings: list[str] = [], status_code: int = 200, cookies: Any = None
+    data: Any,
+    err: Union[str, Exception] = "",
+    warnings: list[str] | None = None,
+    status_code: int = 200,
+    cookies: Any = None,
 ) -> Response:
+    if not warnings:
+        warnings = []
+
     quota_user = flsk_session.pop("quota_user", None)
     quota_set = flsk_session.pop("quota_set", False)
     if quota_user and quota_set and not request.path.startswith("/api/v1/clue"):
@@ -100,7 +107,7 @@ def not_modified(data=DEFAULT_DATA[True], cookies=None):
     return _make_api_response(data, status_code=304, cookies=cookies)
 
 
-def bad_request(data=DEFAULT_DATA[False], err="", cookies=None, warnings=None):
+def bad_request(data: Any = DEFAULT_DATA[False], err: str = "", cookies: Any = None, warnings: list[str] | None = None):
     """Returns response with status code ies"""
     return _make_api_response(data, err, status_code=400, cookies=cookies, warnings=warnings)
 

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/socket.py

@@ -46,7 +46,7 @@ def emit(event: str):
     return ok()
 
 
-@socket_api.route("/connect", websocket=True)
+@socket_api.route("/connect", websocket=True)  # type: ignore
 @websocket_auth(required_priv=["R"])
 def connect(ws: Server, *args: Any, ws_id: str, **kwargs):
     """Connect to the server to monitor for updates via websocket

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/__init__.py

@@ -7,7 +7,7 @@ from howler.security import api_login
 
 API_PREFIX = "/api/v1"
 apiv1 = Blueprint("apiv1", __name__, url_prefix=API_PREFIX)
-apiv1._doc = "Api Documentation Version 1"  # type: ignore[attr-defined]
+apiv1._doc = "Api Documentation Version 1"  # type: ignore[attr-defined] # type: ignore
 
 
 @apiv1.route("/")

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/action.py

@@ -18,7 +18,7 @@ SUB_API = "action"
 classification_definition = CLASSIFICATION.get_parsed_classification_definition()
 
 action_api = make_subapi_blueprint(SUB_API, api_version=1)
-action_api._doc = "Endpoints relating to bulk actions and automation"
+action_api._doc = "Endpoints relating to bulk actions and automation"  # type: ignore
 
 
 @generate_swagger_docs()
@@ -240,7 +240,7 @@ def execute_action(id: str, **kwargs) -> Response:
     current_user: User | None = kwargs.get("user", None)
 
     for operation in action.operations:
-        op_data = json.loads(operation["data_json"])
+        op_data = json.loads(operation.data_json) if operation.data_json else {}
 
         query = execute_req.get("query", action.query) or action.query
 

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/analytic.py

@@ -27,7 +27,7 @@ from howler.services import analytic_service, user_service
 MAX_COMMENT_LEN = 5000
 SUB_API = "analytic"
 analytic_api = make_subapi_blueprint(SUB_API, api_version=1)
-analytic_api._doc = "Manage the analytics that create hits"
+analytic_api._doc = "Manage the analytics that create hits"  # type: ignore
 
 logger = get_logger(__file__)
 
@@ -75,7 +75,7 @@ def get_analytic(id, **kwargs):
         if not analytic_service.does_analytic_exist(id):
             return not_found(err="Analytic does not exist")
 
-        return ok(analytic_service.get_analytic(id, as_obj=False))
+        return ok(analytic_service.get_analytic(id, as_odm=False))
     except ValueError as e:
         return bad_request(err=str(e))
 
@@ -251,7 +251,7 @@ def delete_rule(id: str, user: User, **kwargs):
     if not analytic_service.does_analytic_exist(id):
         return not_found(err=f"Analytic {id} does not exist")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     if not analytic.rule:
         return bad_request(err="This is not a rule analytic, and cannot be deleted.")
@@ -304,7 +304,7 @@ def add_comment(id: str, user: dict[str, Any], **kwargs):
     if not analytic_service.does_analytic_exist(id):
         return not_found(err="Analytic %s does not exist" % id)
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     try:
         analytic.comment.append(
@@ -321,8 +321,6 @@ def add_comment(id: str, user: dict[str, Any], **kwargs):
     except DataStoreException as e:
         return bad_request(err=str(e))
 
-    analytic = analytic_service.get_analytic(id)
-
     return ok(analytic)
 
 
@@ -363,7 +361,7 @@ def edit_comment(id: str, comment_id: str, user: dict[str, Any], **kwargs):
     if len(comment_data) > MAX_COMMENT_LEN:
         return bad_request(err="Comment is too long.")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     comment: Optional[Comment] = next((c for c in analytic.comment if c.id == comment_id), None)
 
@@ -420,14 +418,11 @@ def react_comment(id: str, comment_id: str, user: dict[str, Any], **kwargs):
     if not analytic_service.does_analytic_exist(id):
         return not_found(err=f"Analytic {id} does not exist")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     for comment in analytic.comment:
         if comment.id == comment_id:
-            comment["reactions"] = {
-                **comment.get("reactions", {}),
-                user["uname"]: react_data,
-            }
+            comment.reactions[user["uname"]] = react_data
 
     datastore().analytic.save(analytic.analytic_id, analytic)
 
@@ -455,11 +450,11 @@ def remove_react_comment(id: str, comment_id: str, user: dict[str, Any], **kwarg
     if not analytic_service.does_analytic_exist(id):
         return not_found(err=f"Analytic {id} does not exist")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     for comment in analytic.comment:
         if comment.id == comment_id:
-            reactions = comment.get("reactions", {})
+            reactions = comment.reactions
             reactions.pop(user["uname"], None)
             comment["reactions"] = {**reactions}
 
@@ -497,7 +492,7 @@ def delete_comments(id: str, user: User, **kwargs):
     if len(comment_ids) == 0:
         return bad_request(err="Supply at least one comment to delete.")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     new_comments = []
     for comment in analytic.comment:
@@ -548,7 +543,7 @@ def set_analytic_owner(id: str, user: dict[str, Any], **kwargs):
     if not user_service.get_user(data["username"]):
         return not_found(err=f"User {data['username']} does not exist")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     analytic.owner = data["username"]
 
@@ -588,7 +583,7 @@ def set_as_favourite(id, **kwargs):
     try:
         current_user = storage.user.get_if_exists(kwargs["user"]["uname"])
 
-        current_user["favourite_analytics"] = list(set(current_user.get("favourite_analytics", []) + [id]))
+        current_user.favourite_analytics.append(id)
 
         storage.user.save(current_user["uname"], current_user)
 
@@ -622,9 +617,7 @@ def remove_as_favourite(id, **kwargs):
     try:
         current_user = storage.user.get_if_exists(kwargs["user"]["uname"])
 
-        current_user["favourite_analytics"] = list(
-            filter(lambda f: f != id, current_user.get("favourite_analytics", []))
-        )
+        current_user["favourite_analytics"] = list(filter(lambda f: f != id, current_user.favourite_analytics))
 
         storage.user.save(current_user["uname"], current_user)
 
@@ -674,7 +667,7 @@ def add_notebook(id: str, user: dict[str, Any], **kwargs):
     if not analytic_service.does_analytic_exist(id):
         return not_found(err="Analytic %s does not exist" % id)
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     try:
         analytic.notebooks.append(
@@ -692,8 +685,6 @@ def add_notebook(id: str, user: dict[str, Any], **kwargs):
     except DataStoreException as e:
         return bad_request(err=str(e))
 
-    analytic = analytic_service.get_analytic(id)
-
     return ok(analytic)
 
 
@@ -726,7 +717,7 @@ def delete_notebook(id: str, user: User, **kwargs):
     if len(notebook_ids) == 0:
         return bad_request(err="A notebook id is necessary for deletion.")
 
-    analytic: Analytic = analytic_service.get_analytic(id, as_obj=True)
+    analytic = analytic_service.get_analytic(id, as_odm=True)
 
     new_notebooks = []
     for notebook in analytic.notebooks:

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/auth.py

@@ -30,7 +30,7 @@ from howler.common.loader import datastore
 from howler.common.logging import get_logger
 from howler.common.swagger import generate_swagger_docs
 from howler.config import config
-from howler.odm.models.user import User
+from howler.odm.models.user import ApiKey, User
 from howler.security import api_login
 from howler.security.utils import generate_random_secret
 from howler.services import jwt_service
@@ -41,7 +41,7 @@ logger = get_logger(__file__)
 
 SUB_API = "auth"
 auth_api = make_subapi_blueprint(SUB_API, api_version=1)
-auth_api._doc = "Allow user to authenticate to the web server"
+auth_api._doc = "Allow user to authenticate to the web server"  # type: ignore
 
 logger = get_logger(__file__)
 
@@ -117,6 +117,7 @@ def add_apikey(**kwargs):  # noqa: C901
             )
             max_expiry = datetime.fromtimestamp(data["exp"])
 
+    expiry = None
     if expiry_date:
         try:
             expiry = datetime.fromisoformat(expiry_date.replace("Z", ""))
@@ -136,10 +137,10 @@ def add_apikey(**kwargs):  # noqa: C901
             "acl": privs,
         }
 
-        if expiry_date:
+        if expiry:
             new_key["expiry_date"] = expiry.isoformat()
 
-        user_data.apikeys[key_name] = new_key
+        user_data.apikeys[key_name] = ApiKey(new_key)
     except HowlerException as e:
         return bad_request(err=e.message)
 
@@ -235,8 +236,8 @@ def login(**_):  # noqa: C901
     apikey = data.get("apikey", None)
 
     # These variables are what will eventually be returned, if authentication is successful
-    logged_in_uname = None
-    access_token = None
+    logged_in_uname: str | None = None
+    access_token: str | None = None
     refresh_token = data.get("refresh_token", None)
     priv: Optional[list[str]] = []
 
@@ -316,7 +317,7 @@ def login(**_):  # noqa: C901
                 token_data, oauth_provider, skip_setup=False, access_token=access_token
             )
 
-            logged_in_uname = cur_user["uname"]
+            logged_in_uname = cur_user.uname
 
             priv = ["R", "W", "E"]
 
@@ -336,7 +337,7 @@ def login(**_):  # noqa: C901
             if not user_data:
                 raise AuthenticationException("User does not exist, or authentication was invalid")  # noqa: TRY301
 
-            logged_in_uname = user_data["uname"]
+            logged_in_uname = user_data.uname
 
         else:
             raise AuthenticationException("Not enough information to proceed with authentication")  # noqa: TRY301
@@ -366,9 +367,10 @@ def login(**_):  # noqa: C901
 
     # Generate the token this user can use to authenticate from now on
 
+    app_token = None
     if access_token:
         app_token = access_token
-    else:
+    elif logged_in_uname:
         app_token = f"{logged_in_uname}:{auth_service.create_token(logged_in_uname, typing.cast(list[str], priv))}"
 
     return ok(

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/clue.py

@@ -2,8 +2,8 @@ import sys
 import time
 from typing import Callable, Optional
 
-import elasticapm
 import requests
+from elasticapm.traces import capture_span
 from flask import request
 
 from howler.api import bad_gateway, make_subapi_blueprint, ok
@@ -16,7 +16,7 @@ from howler.security import api_login
 
 SUB_API = "clue"
 clue_api = make_subapi_blueprint(SUB_API, api_version=1)
-clue_api._doc = "Proxy enrichment requests to clue"
+clue_api._doc = "Proxy enrichment requests to clue"  # type: ignore
 
 logger = get_logger(__file__)
 
@@ -74,7 +74,7 @@ def proxy_to_clue(path, **kwargs):
     clue_token = get_token(auth_token)
 
     start = time.perf_counter()
-    with elasticapm.capture_span("clue", span_type="http"):
+    with capture_span("clue", span_type="http"):
         if request.method.lower() == "get":
             response = requests.get(
                 f"{config.core.clue.url}/{path}",

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/configs.py

@@ -10,7 +10,7 @@ from howler.security.utils import get_disco_url
 
 SUB_API = "configs"
 config_api = make_subapi_blueprint(SUB_API, api_version=1)
-config_api._doc = "Read configuration data about the system"
+config_api._doc = "Read configuration data about the system"  # type: ignore
 
 
 @generate_swagger_docs()

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/dossier.py

@@ -12,7 +12,7 @@ from howler.services import dossier_service
 
 SUB_API = "dossier"
 dossier_api = make_subapi_blueprint(SUB_API, api_version=1)
-dossier_api._doc = "Manage the different dossiers created for filtering hits"
+dossier_api._doc = "Manage the different dossiers created for filtering hits"  # type: ignore
 
 logger = get_logger(__file__)
 

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/help.py

@@ -7,7 +7,7 @@ SUB_API = "help"
 classification_definition = CLASSIFICATION.get_parsed_classification_definition()
 
 help_api = make_subapi_blueprint(SUB_API, api_version=1)
-help_api._doc = "Provide information about the system configuration"
+help_api._doc = "Provide information about the system configuration"  # type: ignore
 
 
 @generate_swagger_docs()

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/hit.py

@@ -36,7 +36,7 @@ MAX_COMMENT_LEN = 5000
 
 SUB_API = "hit"
 hit_api = make_subapi_blueprint(SUB_API, api_version=1)
-hit_api._doc = "Manage the different hits in the system"
+hit_api._doc = "Manage the different hits in the system"  # type: ignore
 
 FIELDS = Hit.flat_fields()
 
@@ -118,7 +118,7 @@ def create_hits(user: User, **kwargs):
                 # Ensure all ids are consistent
                 if odm.event is not None:
                     odm.event.id = odm.howler.id
-                hit_service.create_hit(odm.howler.id, odm, user=user["uname"])
+                hit_service.create_hit(odm.howler.id, odm, user=user.uname)
                 analytic_service.save_from_hit(odm, user)
 
             datastore().hit.commit()
@@ -311,12 +311,15 @@ def overwrite_hit(id: str, server_version: str, **kwargs):
         return bad_request(err="The JSON payload must be a subset of a valid Hit object.")
 
     try:
-        new_hit = merge(
-            hit_service.flatten(hit.as_primitives(), odm=Hit),
-            hit_service.flatten(new_fields),
-            strategy=Strategy.REPLACE
-            if bool(request.args.get("replace", False, type=lambda v: v.lower() == "true"))
-            else Strategy.ADDITIVE,
+        new_hit = cast(
+            dict[str, Any],
+            merge(
+                hit_service.flatten(hit.as_primitives(), odm=Hit),
+                hit_service.flatten(new_fields),
+                strategy=Strategy.REPLACE
+                if bool(request.args.get("replace", False, type=lambda v: v.lower() == "true"))
+                else Strategy.ADDITIVE,
+            ),
         )
 
         new_hit, new_version = hit_service.save_hit(Hit(new_hit), server_version)
@@ -486,9 +489,9 @@ def get_assigned_hits(user, **kwargs):
         deep_paging_id=request.args.get("deep_paging_id", None),
         offset=request.args.get("offset", 0, type=int),  # type: ignore[union-attr]
         rows=request.args.get("rows", None, type=int),  # type: ignore[union-attr]
-        sort=request.args.get("sort", None),
-        fl=request.args.get("fl", None),
-        timeout=request.args.get("timeout", None),
+        sort=request.args.get("sort", None, type=str),
+        fl=request.args.get("fl", None, type=str),
+        timeout=request.args.get("timeout", None, type=int),
         as_obj=False,
     )["items"]
 
@@ -554,7 +557,7 @@ def add_label(id, label_set, user, **kwargs):
         user=user,
     )
 
-    hit, version = hit_service.get_hit(id, version=True)
+    hit, version = hit_service.get_hit(id, as_odm=False, version=True)
 
     return ok(hit), version
 
@@ -612,7 +615,7 @@ def remove_labels(id, label_set, user, **kwargs):
         user=user,
     )
 
-    hit, version = hit_service.get_hit(id, version=True)
+    hit, version = hit_service.get_hit(id, as_odm=False, version=True)
 
     return ok(hit), version
 
@@ -672,7 +675,7 @@ def transition(id: str, user: User, **kwargs):
     except HowlerException as e:
         return internal_error(err=str(e))
 
-    hit, version = hit_service.get_hit(id, version=True)
+    hit, version = hit_service.get_hit(id, as_odm=False, version=True)
     return ok(hit), version
 
 
@@ -759,7 +762,7 @@ def add_comment(id: str, user: dict[str, Any], **kwargs):
     except DataStoreException as e:
         return bad_request(err=str(e))
 
-    hit, version = hit_service.get_hit(id, version=True)
+    hit, version = hit_service.get_hit(id, as_odm=False, version=True)
 
     return ok(hit), version
 
@@ -822,7 +825,7 @@ def edit_comment(id: str, comment_id: str, user: dict[str, Any], **kwargs):
         if line[:3] not in ("+++", "---", "@@ "):
             diff.append(line)
 
-    (hit, version) = hit_service.update_hit(
+    (new_hit, version) = hit_service.update_hit(
         id,
         [
             hit_helper.list_remove("howler.comment", comment, silent=True),
@@ -834,7 +837,8 @@ def edit_comment(id: str, comment_id: str, user: dict[str, Any], **kwargs):
         ],
         user["uname"],
     )
-    return ok(hit), version
+
+    return ok(new_hit), version
 
 
 @generate_swagger_docs()
@@ -889,13 +893,14 @@ def delete_comments(id: str, user: User, **kwargs):
                 )
                 for comment in comments
             ],
-            user["uname"],
+            user.uname,
         )
 
     except DataStoreException as e:
         return bad_request(err=str(e))
-    hit, version = hit_service.get_hit(id, version=True)
-    return ok(hit), version
+
+    new_hit, version = hit_service.get_hit(id, as_odm=False, version=True)
+    return ok(new_hit), version
 
 
 @generate_swagger_docs()
@@ -1028,7 +1033,7 @@ def create_bundle(user: User, **kwargs):
             if hit_id not in odm.howler.hits:
                 odm.howler.hits.append(hit_id)
 
-        hit_service.create_hit(odm.howler.id, odm, user=user["uname"])
+        hit_service.create_hit(odm.howler.id, odm, user=user.uname)
         analytic_service.save_from_hit(odm, user)
 
         for hit_id in odm.howler.hits:
@@ -1039,9 +1044,7 @@ def create_bundle(user: User, **kwargs):
                     err=f"You cannot specify a bundle as a child of another bundle - {child_hit.howler.id} is a bundle."
                 )
 
-            new_bundle_list = child_hit.howler.get("bundles", [])
-            new_bundle_list.append(odm.howler.id)
-            child_hit.howler.bundles = new_bundle_list
+            child_hit.howler.bundles.append(odm.howler.id)
             datastore().hit.save(child_hit.howler.id, child_hit)
 
         return created(odm)
@@ -1165,12 +1168,10 @@ def remove_bundle_children(id, **kwargs):
         for hit_id in hit_ids:
             child_hit: Hit = hit_service.get_hit(hit_id, as_odm=True)
 
-            new_bundle_list = child_hit.howler.get("bundles", [])
             try:
-                new_bundle_list.remove(bundle_hit.howler.id)
+                child_hit.howler.bundles.remove(bundle_hit.howler.id)
             except ValueError:
                 logger.warning("Bundle isn't included in child %s!", bundle_hit.howler.id)
-            child_hit.howler.bundles = new_bundle_list
 
             datastore().hit.save(child_hit.howler.id, child_hit)
 

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/notebook.py

@@ -7,7 +7,7 @@ from howler.services import notebook_service
 
 SUB_API = "notebook"
 notebook_api = make_subapi_blueprint(SUB_API, api_version=1)
-notebook_api._doc = "Get notebook information"
+notebook_api._doc = "Get notebook information"  # type: ignore
 
 
 @generate_swagger_docs()

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/overview.py

@@ -21,7 +21,7 @@ from howler.utils.str_utils import sanitize_lucene_query
 
 SUB_API = "overview"
 overview_api = make_subapi_blueprint(SUB_API, api_version=1)
-overview_api._doc = "Manage the different overviews created for viewing hits"
+overview_api._doc = "Manage the different overviews created for viewing hits"  # type: ignore
 
 logger = get_logger(__file__)
 

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/search.py

@@ -1,10 +1,10 @@
 import re
 from copy import deepcopy
-from typing import Any, Union
+from typing import Any
 
 from elasticsearch import BadRequestError
 from elasticsearch._sync.client.indices import IndicesClient
-from flask import request
+from flask import Request, request
 from sigma.backends.elasticsearch import LuceneBackend
 from sigma.rule import SigmaRule
 from werkzeug.exceptions import BadRequest
@@ -21,12 +21,12 @@ from howler.services import hit_service, lucene_service
 
 SUB_API = "search"
 search_api = make_subapi_blueprint(SUB_API, api_version=1)
-search_api._doc = "Perform search queries"
+search_api._doc = "Perform search queries"  # type: ignore
 
 logger = get_logger(__file__)
 
 
-def generate_params(request, fields, multi_fields, params=None):
+def generate_params(request: Request, fields: list[str], multi_fields: list[str], params: dict[str, Any] | None = None):
     """Generate a list of parameters, combining the request data and the query arguments"""
     # I hate you, python
     if params is None:
@@ -49,7 +49,7 @@ def generate_params(request, fields, multi_fields, params=None):
         params = {
             **params,
             **{k: req_data[k] for k in fields if k in req_data},
-            **{k: req_data.getlist(k, None) for k in multi_fields if k in req_data},
+            **{k: req_data.getlist(k) for k in multi_fields if k in req_data},
         }
 
     return params, req_data
@@ -130,7 +130,6 @@ def search(index, **kwargs):
     if has_access_control(index):
         params.update({"access_control": user["access_control"]})
 
-    params["as_obj"] = False
     params.update({"sort": (params.get("sort", None) or default_sort).split(",")})
 
     query = req_data.get("query", None)
@@ -139,7 +138,7 @@ def search(index, **kwargs):
 
     try:
         metadata = params.pop("metadata", [])
-        result = collection().search(query, **params)
+        result = collection().search(query, as_obj=False, **params)
 
         if index == "hit" and len(metadata) > 0:
             hit_service.augment_metadata(result["items"], metadata, user)
@@ -703,7 +702,7 @@ def histogram(index, field, **kwargs):
 
     # Get fields default values
     field_info = collection().fields().get(field, None)
-    params: dict[str, Union[str, int]] = {}
+    params: dict[str, Any] = {}
     if field_info is None:
         return bad_request(err=f"Field '{field}' is not a valid field in index: {index}")
     elif field_info["type"] == "integer":

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/template.py

@@ -22,7 +22,7 @@ from howler.utils.str_utils import sanitize_lucene_query
 
 SUB_API = "template"
 template_api = make_subapi_blueprint(SUB_API, api_version=1)
-template_api._doc = "Manage the different templates created for viewing hits"
+template_api._doc = "Manage the different templates created for viewing hits"  # type: ignore
 
 logger = get_logger(__file__)
 

{howler_api-3.2.0.dev438 → howler_api-3.2.0.dev467}/howler/api/v1/tool.py

@@ -20,7 +20,7 @@ from howler.utils.uid import get_random_id
 
 SUB_API = "tools"
 tool_api = make_subapi_blueprint(SUB_API, api_version=1)
-tool_api._doc = "Manage the tools"
+tool_api._doc = "Manage the tools"  # type: ignore
 
 logger = get_logger(__file__)
 
@@ -167,12 +167,12 @@ def create_one_or_many_hits(tool_name: str, user: User, **kwargs):  # noqa: C901
                 bundle_hit.howler.bundle_size += 1
                 odm.howler.bundles.append(bundle_hit.howler.id)
 
-            hit_service.create_hit(odm.howler.id, odm, user=user["uname"])
+            hit_service.create_hit(odm.howler.id, odm, user=user.uname)
 
             analytic_service.save_from_hit(odm, user)
 
         if bundle_hit:
-            hit_service.create_hit(bundle_hit.howler.id, bundle_hit, user=user["uname"])
+            hit_service.create_hit(bundle_hit.howler.id, bundle_hit, user=user.uname)
 
             analytic_service.save_from_hit(bundle_hit, user)