lacuscore 1.9.6__tar.gz → 1.10.1__tar.gz

{lacuscore-1.9.6 → lacuscore-1.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.9.6
+Version: 1.10.1
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -28,8 +28,8 @@ Requires-Dist: Sphinx (>=7.2,<8.0) ; (python_version >= "3.9") and (extra == "do
 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: playwrightcapture[recaptcha] (>=1.24.11,<2.0.0)
-Requires-Dist: redis[hiredis] (>=5.0.6,<6.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.25.5,<2.0.0)
+Requires-Dist: redis[hiredis] (>=5.0.7,<6.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: ua-parser (>=0.18.0,<0.19.0)
 Project-URL: Documentation, https://lacuscore.readthedocs.io/en/latest/

{lacuscore-1.9.6 → lacuscore-1.10.1}/lacuscore/helpers.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from enum import IntEnum, unique
 from logging import LoggerAdapter
-from typing import MutableMapping, Any, TypedDict
+from typing import MutableMapping, Any, TypedDict, Literal
 
 from playwrightcapture.capture import CaptureResponse as PlaywrightCaptureResponse
 
@@ -77,7 +77,7 @@ class CaptureSettings(TypedDict, total=False):
     url: str | None
     document_name: str | None
     document: str | None
-    browser: str | None
+    browser: Literal['chromium', 'firefox', 'webkit'] | None
     device_name: str | None
     user_agent: str | None
     proxy: str | dict[str, str] | None

{lacuscore-1.9.6 → lacuscore-1.10.1}/lacuscore/lacuscore.py

@@ -30,7 +30,7 @@ from dns.exception import DNSException
 from dns.exception import Timeout as DNSTimeout
 
 from defang import refang  # type: ignore[import-untyped]
-from playwrightcapture import Capture, PlaywrightCaptureException
+from playwrightcapture import Capture, PlaywrightCaptureException, InvalidPlaywrightParameter
 from redis import Redis
 from redis.exceptions import ConnectionError as RedisConnectionError
 from redis.exceptions import DataError
@@ -603,7 +603,7 @@ class LacusCore():
                             stats_pipeline.zincrby(f'stats:{today}:errors', 1, result['error_name'])
             except RetryCapture as e:
                 raise e
-            except PlaywrightCaptureException as e:
+            except (PlaywrightCaptureException, InvalidPlaywrightParameter) as e:
                 logger.warning(f'Invalid parameters for the capture of {url} - {e}')
                 result = {'error': f'Invalid parameters for the capture of {url} - {e}'}
                 raise CaptureError(f'Invalid parameters for the capture of {url} - {e}')
@@ -633,7 +633,7 @@ class LacusCore():
                 logger.debug(f'Retrying {url} for the first time.')
                 retry = True
                 self.redis.setex(f'lacus:capture_retry:{uuid}',
-                                 self.max_capture_time * (self.max_retries + 1),
+                                 self.max_capture_time * (self.max_retries + 10),
                                  self.max_retries)
             else:
                 current_retry = int(_current_retry.decode())

{lacuscore-1.9.6 → lacuscore-1.10.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lacuscore"
-version = "1.9.6"
+version = "1.10.1"
 description = "Core of Lacus, usable as a module"
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-3-Clause"
@@ -34,10 +34,10 @@ Sphinx = [
    {version = "<7.2", python = "<3.9", optional = true},
    {version = "^7.2", python = ">=3.9", optional = true}
 ]
-playwrightcapture = {extras = ["recaptcha"], version = "^1.24.11"}
+playwrightcapture = {extras = ["recaptcha"], version = "^1.25.5"}
 defang = "^0.5.3"
 ua-parser = "^0.18.0"
-redis = {version = "^5.0.6", extras = ["hiredis"]}
+redis = {version = "^5.0.7", extras = ["hiredis"]}
 dnspython = "^2.6.1"
 async-timeout = {version = "^4.0.3", python = "<3.11"}
 
@@ -46,8 +46,8 @@ docs = ["Sphinx"]
 
 [tool.poetry.group.dev.dependencies]
 types-redis = {version = "^4.6.0.20240425"}
-mypy = "^1.10.0"
-types-requests = "^2.32.0.20240602"
+mypy = "^1.10.1"
+types-requests = "^2.32.0.20240712"
 types-beautifulsoup4 = "^4.12.0.20240511"
 ipython = [
     {version = "<8.13.0", python = "<3.9"},