lacuscore 1.10.12__tar.gz → 1.11.0__tar.gz

{lacuscore-1.10.12 → lacuscore-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.10.12
+Version: 1.11.0
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -30,8 +30,8 @@ Requires-Dist: async-timeout (>=4.0.3,<5.0.0) ; python_version < "3.11"
 Requires-Dist: defang (>=0.5.3,<0.6.0)
 Requires-Dist: dnspython (>=2.6.1,<3.0.0)
 Requires-Dist: eval-type-backport (>=0.2.0,<0.3.0) ; python_version < "3.10"
-Requires-Dist: playwrightcapture[recaptcha] (>=1.25.14,<2.0.0)
-Requires-Dist: pydantic (>=2.8.2,<3.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.26.0,<2.0.0)
+Requires-Dist: pydantic (>=2.9.1,<3.0.0)
 Requires-Dist: redis[hiredis] (>=5.0.8,<6.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: ua-parser (>=0.18.0,<0.19.0)

{lacuscore-1.10.12 → lacuscore-1.11.0}/lacuscore/lacus_monitoring.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Tuple, Dict, Optional, Union, Any, Set
+from typing import Any
 
 from datetime import datetime, date
 
@@ -11,7 +11,7 @@ from redis import Redis
 
 class LacusCoreMonitoring():
 
-    def __init__(self, redis_connector: Redis):  # type: ignore[type-arg]
+    def __init__(self, redis_connector: Redis[str]):
         self.redis = redis_connector
 
     def check_redis_up(self) -> bool:

{lacuscore-1.10.12 → lacuscore-1.11.0}/lacuscore/lacuscore.py

@@ -86,7 +86,7 @@ class LacusCore():
     :param max_retries: How many times should we re-try a capture if it failed.
     """
 
-    def __init__(self, redis_connector: Redis, /, *,  # type: ignore[type-arg]
+    def __init__(self, redis_connector: Redis[bytes], /, *,
                  max_capture_time: int=3600,
                  tor_proxy: str | None=None,
                  only_global_lookups: bool=True,
@@ -107,10 +107,6 @@ class LacusCore():
         # Enable new chromium headless by default.
         os.environ["PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW"] = "1"
 
-        # NOTE: Remove in 1.8.* - clear old ongoing captures queue in case of need
-        if self.redis.type('lacus:ongoing') in ['set', b'set']:  # type: ignore[no-untyped-call]
-            self.redis.delete('lacus:ongoing')
-
     def check_redis_up(self) -> bool:
         """Check if redis is reachable"""
         return bool(self.redis.ping())
@@ -367,7 +363,7 @@ class LacusCore():
                 raise CaptureError(f'No capture settings for {uuid}')
 
             try:
-                to_capture = CaptureSettings(**{k.decode(): v.decode() for k, v in _to_capture.items()})
+                to_capture = CaptureSettings(**{k.decode(): v.decode() for k, v in _to_capture.items()})  # type: ignore[arg-type]
             except ValidationError as e:
                 logger.warning(f'Settings invalid: {e}')
                 raise CaptureSettingsError('Invalid settings', e)
@@ -709,7 +705,7 @@ class LacusCore():
                 # the value is bytes
                 to_return[key.decode()] = value  # type: ignore[literal-required]
             else:
-                logger.critical(f'Unexpected key in response: {key} - {value}')
+                logger.critical(f'Unexpected key in response: {key.decode()} - {value.decode()}')
         return to_return
 
     def clear_capture(self, uuid: str, reason: str) -> None:

{lacuscore-1.10.12 → lacuscore-1.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lacuscore"
-version = "1.10.12"
+version = "1.11.0"
 description = "Core of Lacus, usable as a module"
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-3-Clause"
@@ -35,29 +35,29 @@ Sphinx = [
    {version = "^7.2", python = ">=3.9,<3.10", optional = true},
    {version = "^8", python = ">=3.10", optional = true}
 ]
-playwrightcapture = {extras = ["recaptcha"], version = "^1.25.14"}
+playwrightcapture = {extras = ["recaptcha"], version = "^1.26.0"}
 defang = "^0.5.3"
 ua-parser = "^0.18.0"
 redis = {version = "^5.0.8", extras = ["hiredis"]}
 dnspython = "^2.6.1"
 async-timeout = {version = "^4.0.3", python = "<3.11"}
-pydantic = "^2.8.2"
+pydantic = "^2.9.1"
 eval-type-backport = {version = "^0.2.0", python = "<3.10"}
 
 [tool.poetry.extras]
 docs = ["Sphinx"]
 
 [tool.poetry.group.dev.dependencies]
-types-redis = {version = "^4.6.0.20240819"}
 mypy = "^1.11.2"
-types-requests = "^2.32.0.20240712"
-types-beautifulsoup4 = "^4.12.0.20240511"
+types-redis = {version = "^4.6.0.20240903"}
+types-requests = "^2.32.0.20240914"
+types-beautifulsoup4 = "^4.12.0.20240907"
 ipython = [
     {version = "<8.13.0", python = "<3.9"},
     {version = "^8.18.0", python = ">=3.9"},
     {version = "^8.19.0", python = ">=3.10"}
 ]
-pytest = "^8.3.2"
+pytest = "^8.3.3"
 
 [build-system]
 requires = ["poetry_core"]