howler-api 4.1.0.dev1573__tar.gz → 4.1.0.dev1577__tar.gz

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/PKG-INFO

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

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/howler/remote/datatypes/__init__.py

@@ -7,7 +7,7 @@ import socket
 import time
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any
+from typing import Any, Protocol
 
 import redis
 from packaging.version import parse
@@ -29,6 +29,11 @@ if parse(redis.__version__) <= parse("2.10.0"):
 
 APP_NAME = os.environ.get("APP_NAME", "howler")
 
+
+class RedisScriptClient(Protocol):
+    def register_script(self, script: str) -> Any: ...
+
+
 log = logging.getLogger(f"{APP_NAME}.queue")
 pool: dict[tuple[str, str, bool], redis.BlockingConnectionPool] = {}
 

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/howler/remote/datatypes/hash.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import json
 import time
-from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar, cast
 
 from redis import RedisCluster
 
 from howler.common.exceptions import HowlerValueError
-from howler.remote.datatypes import get_client, retry_call
+from howler.remote.datatypes import RedisScriptClient, get_client, retry_call
 
 if TYPE_CHECKING:
     from redis import Redis
@@ -78,9 +78,9 @@ class Hash(Generic[T]):
     ):
         self.c: Any = get_client(host, port, False)
         self.name = name
-        self._pop = self.c.register_script(h_pop_script)
-        self._limited_add = self.c.register_script(_limited_add)
-        self._conditional_remove = self.c.register_script(_conditional_remove_script)
+        self._pop = cast(RedisScriptClient, self.c).register_script(h_pop_script)
+        self._limited_add = cast(RedisScriptClient, self.c).register_script(_limited_add)
+        self._conditional_remove = cast(RedisScriptClient, self.c).register_script(_conditional_remove_script)
 
     def __iter__(self):
         return HashIterator(self)

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/howler/remote/datatypes/lock.py

@@ -1,6 +1,6 @@
-from typing import Any
+from typing import Any, cast
 
-from howler.remote.datatypes import get_client, retry_call
+from howler.remote.datatypes import RedisScriptClient, get_client, retry_call
 from howler.utils.uid import get_random_id
 
 lock_acquire_script = """
@@ -33,8 +33,8 @@ class Lock(object):
         self.lock_release = "-".join(("lock", str(timeout), name, "released"))
         self.lock_holder = "-".join(("lock", str(timeout), name, "holder"))
         self.timeout = timeout
-        self._acquire = self.c.register_script(lock_acquire_script)
-        self._release = self.c.register_script(lock_release_script)
+        self._acquire = cast(RedisScriptClient, self.c).register_script(lock_acquire_script)
+        self._release = cast(RedisScriptClient, self.c).register_script(lock_release_script)
 
     def __enter__(self):
         while not retry_call(self._acquire, args=[self.lock_holder, self.uuid, self.timeout]):

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/howler/remote/datatypes/queues/priority.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 import json
 import time
-from typing import Any, Generic, Optional, TypeVar, Union
+from typing import Any, Generic, Optional, TypeVar, Union, cast
 
 from howler.common.exceptions import HowlerTypeError
-from howler.remote.datatypes import decode, get_client, retry_call
+from howler.remote.datatypes import RedisScriptClient, decode, get_client, retry_call
 
 SORTING_KEY_LEN = 21
 
@@ -37,7 +37,7 @@ T = TypeVar("T")
 class PriorityQueue(Generic[T]):
     def __init__(self, name, host=None, port=None, private=False):
         self.c: Any = get_client(host, port, private)
-        self._deque_range = self.c.register_script(pq_dequeue_range_script)
+        self._deque_range = cast(RedisScriptClient, self.c).register_script(pq_dequeue_range_script)
         self.name = name
 
     def __enter__(self):

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/howler/remote/datatypes/set.py

@@ -1,8 +1,8 @@
 import json
 import time
-from typing import Any
+from typing import Any, cast
 
-from howler.remote.datatypes import get_client, retry_call
+from howler.remote.datatypes import RedisScriptClient, get_client, retry_call
 
 _drop_card_script = """
 local set_name = ARGV[1]
@@ -29,8 +29,8 @@ class Set(object):
     def __init__(self, name, host=None, port=None):
         self.c: Any = get_client(host, port, False)
         self.name = name
-        self._drop_card = self.c.register_script(_drop_card_script)
-        self._limited_add = self.c.register_script(_limited_add)
+        self._drop_card = cast(RedisScriptClient, self.c).register_script(_drop_card_script)
+        self._limited_add = cast(RedisScriptClient, self.c).register_script(_limited_add)
 
     def __enter__(self):
         return self

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/howler/remote/datatypes/user_quota_tracker.py

@@ -1,8 +1,8 @@
-from typing import Any
+from typing import Any, cast
 
 from redis.exceptions import ResponseError
 
-from howler.remote.datatypes import get_client, retry_call
+from howler.remote.datatypes import RedisScriptClient, get_client, retry_call
 
 begin_script = """
 local t = redis.call('time')
@@ -25,7 +25,7 @@ end
 class UserQuotaTracker(object):
     def __init__(self, prefix, timeout=120, redis=None, host=None, port=None, private=False):
         self.c: Any = redis or get_client(host, port, private)
-        self.bs = self.c.register_script(begin_script)
+        self.bs = cast(RedisScriptClient, self.c).register_script(begin_script)
         self.prefix = prefix
         self.timeout = timeout
 

{howler_api-4.1.0.dev1573 → howler_api-4.1.0.dev1577}/pyproject.toml

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