howler-api 4.0.0.dev669__tar.gz → 4.0.0.dev676__tar.gz

{howler_api-4.0.0.dev669 → howler_api-4.0.0.dev676}/PKG-INFO

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

{howler_api-4.0.0.dev669 → howler_api-4.0.0.dev676}/howler/api/v1/view.py

@@ -261,7 +261,7 @@ def remove_as_favourite(view_id: str, **kwargs):
     """Remove a view from a list of the user's favourites
 
     Variables:
-    id => The id of the view to remove as a favourite
+    view_id => The id of the view to remove as a favourite
 
     Optional Arguments:
     None

{howler_api-4.0.0.dev669 → howler_api-4.0.0.dev676}/howler/datastore/collection.py

@@ -270,14 +270,17 @@ class ESCollection(Generic[ModelType]):
         if index is None:
             index = self.index_name
 
+        client = self.datastore.client
+        if request_timeout is not None:
+            client = client.options(request_timeout=request_timeout)
+
         # initial search
         resp = self.with_retries(
-            self.datastore.client.search,
+            client.search,
             index=index,
             query=query,
             scroll=scroll,
             size=size,
-            request_timeout=request_timeout,
             sort=sort,
             _source=source,
         )
@@ -305,16 +308,18 @@ class ESCollection(Generic[ModelType]):
 
         finally:
             if scroll_id:
-                resp = self.with_retries(
-                    self.datastore.client.clear_scroll,
-                    scroll_id=[scroll_id],
-                    ignore=(404,),
-                )
-                if not resp.get("succeeded", False):
-                    logger.warning(
-                        f"Could not clear scroll ID {scroll_id}, there is potential "
-                        "memory leak in you Elastic cluster..."
+                try:
+                    resp = self.with_retries(
+                        self.datastore.client.clear_scroll,
+                        scroll_id=[scroll_id],
                     )
+                    if not resp.get("succeeded", False):
+                        logger.warning(
+                            f"Could not clear scroll ID {scroll_id}, there is potential "
+                            "memory leak in your Elastic cluster..."
+                        )
+                except elasticsearch.exceptions.NotFoundError:
+                    pass
 
     def with_retries(self, func, *args, raise_conflicts=False, **kwargs):
         """This function performs the passed function with the given args and kwargs and reconnect if it fails
@@ -470,7 +475,9 @@ class ESCollection(Generic[ModelType]):
                     raise
 
     def _safe_index_copy(self, copy_function, src, target, settings=None, min_status="yellow"):
-        ret = copy_function(index=src, target=target, settings=settings, request_timeout=60)
+        options_client = self.datastore.client.options(request_timeout=60)
+        timed_function = getattr(options_client.indices, copy_function.__name__)
+        ret = timed_function(index=src, target=target, settings=settings)
         if not ret["acknowledged"]:
             raise DataStoreException(f"Failed to create index {target} from {src}.")
 
@@ -1657,19 +1664,23 @@ class ESCollection(Generic[ModelType]):
 
         # Check if the scroll is finished and close it
         if deep_paging_id is not None and new_deep_paging_id is None:
-            self.with_retries(
-                self.datastore.client.clear_scroll,
-                scroll_id=[deep_paging_id],
-                ignore=(404,),
-            )
+            try:
+                self.with_retries(
+                    self.datastore.client.clear_scroll,
+                    scroll_id=[deep_paging_id],
+                )
+            except elasticsearch.exceptions.NotFoundError:
+                pass
 
         # Check if we can tell from inspection that we have finished the scroll
         if new_deep_paging_id is not None and len(ret_data["items"]) < ret_data["rows"]:
-            self.with_retries(
-                self.datastore.client.clear_scroll,
-                scroll_id=[new_deep_paging_id],
-                ignore=(404,),
-            )
+            try:
+                self.with_retries(
+                    self.datastore.client.clear_scroll,
+                    scroll_id=[new_deep_paging_id],
+                )
+            except elasticsearch.exceptions.NotFoundError:
+                pass
             new_deep_paging_id = None
 
         if new_deep_paging_id is not None:

{howler_api-4.0.0.dev669 → howler_api-4.0.0.dev676}/howler/datastore/store.py

@@ -9,7 +9,6 @@ from typing import Any, Optional, cast
 from urllib.parse import urlparse
 
 import elasticsearch
-import elasticsearch.client
 
 from howler.common.logging.format import HWL_DATE_FORMAT, HWL_LOG_FORMAT
 from howler.datastore.collection import ESCollection
@@ -138,7 +137,6 @@ class ESStore(object):
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
             )
-        self.eql = elasticsearch.client.EqlClient(self.client)
         self.archive_access = archive_access
         self.url_path = "elastic"
 
@@ -218,14 +216,12 @@ class ESStore(object):
             max_retries=0,
             request_timeout=TRANSPORT_TIMEOUT,
         )
-        self.eql = elasticsearch.client.EqlClient(self.client)
 
     def close(self):
         self._closed = True
         # Flatten the client object so that attempts to access without reconnecting errors hard
         # But 'cast' it so that mypy and other linters don't think that its normal for client to be None
         self.client = cast(elasticsearch.Elasticsearch, None)
-        self.eql = cast(elasticsearch.client.EqlClient, None)
 
     def get_hosts(self, safe=False):
         if not safe:

{howler_api-4.0.0.dev669 → howler_api-4.0.0.dev676}/howler/remote/datatypes/__init__.py

@@ -4,7 +4,7 @@ import json
 import logging
 import os
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 
 import redis
@@ -30,7 +30,7 @@ pool: dict[tuple[str, str, bool], redis.BlockingConnectionPool] = {}
 
 
 def now_as_iso():
-    s = datetime.utcfromtimestamp(time.time()).isoformat()
+    s = datetime.now(timezone.utc).replace(tzinfo=None).isoformat()
     return f"{s}Z"
 
 

{howler_api-4.0.0.dev669 → howler_api-4.0.0.dev676}/pyproject.toml

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