lacuscore 1.15.0__tar.gz → 1.15.2__tar.gz

{lacuscore-1.15.0 → lacuscore-1.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lacuscore
-Version: 1.15.0
+Version: 1.15.2
 Summary: Core of Lacus, usable as a module
 License: BSD-3-Clause
 Author: Raphaël Vinot
@@ -27,7 +27,7 @@ Requires-Dist: defang (>=0.5.3)
 Requires-Dist: dnspython (>=2.7.0)
 Requires-Dist: eval-type-backport (>=0.2.2) ; python_version < "3.10"
 Requires-Dist: playwrightcapture[recaptcha] (>=1.30.0)
-Requires-Dist: pydantic (>=2.11.4)
+Requires-Dist: pydantic (>=2.11.5)
 Requires-Dist: redis[hiredis] (>=5.3.0,<6.0.0)
 Requires-Dist: requests (>=2.32.3)
 Requires-Dist: typing-extensions (>=4.12.2,<5.0.0) ; python_version < "3.12"

{lacuscore-1.15.0 → lacuscore-1.15.2}/lacuscore/helpers.py

@@ -122,12 +122,12 @@ class CaptureSettings(BaseModel):
     storage: dict[str, Any] | None = None
     headers: dict[str, str] | None = None
     http_credentials: dict[str, str] | None = None
-    geolocation: dict[str, float] | None = None
+    geolocation: dict[str, str | int | float] | None = None
     timezone_id: str | None = None
     locale: str | None = None
-    color_scheme: str | None = None
+    color_scheme: Literal['dark', 'light', 'no-preference', 'null'] | None = None
     java_script_enabled: bool = True
-    viewport: dict[str, int] | None = None
+    viewport: dict[str, str | int] | None = None
     referer: str | None = None
     with_screenshot: bool = True
     with_favicon: bool = True

{lacuscore-1.15.0 → lacuscore-1.15.2}/lacuscore/lacuscore.py

@@ -137,12 +137,12 @@ class LacusCore():
                 storage: dict[str, Any] | None=None,
                 headers: dict[str, str] | None=None,
                 http_credentials: dict[str, str] | None=None,
-                geolocation: dict[str, float] | None=None,
+                geolocation: dict[str, str | int | float] | None=None,
                 timezone_id: str | None=None,
                 locale: str | None=None,
                 color_scheme: str | None=None,
                 java_script_enabled: bool=True,
-                viewport: dict[str, int] | None=None,
+                viewport: dict[str, int | str] | None=None,
                 referer: str | None=None,
                 rendered_hostname_only: bool=True,
                 with_screenshot: bool=True,
@@ -171,12 +171,12 @@ class LacusCore():
                 storage: dict[str, Any] | None=None,
                 headers: dict[str, str] | None=None,
                 http_credentials: dict[str, str] | None=None,
-                geolocation: dict[str, float] | None=None,
+                geolocation: dict[str, str | int | float] | None=None,
                 timezone_id: str | None=None,
                 locale: str | None=None,
                 color_scheme: str | None=None,
                 java_script_enabled: bool=True,
-                viewport: dict[str, int] | None=None,
+                viewport: dict[str, int | str] | None=None,
                 referer: str | None=None,
                 rendered_hostname_only: bool=True,
                 with_screenshot: bool=True,
@@ -260,6 +260,10 @@ class LacusCore():
             # Make sure we do not already have a capture with that UUID
             if self.get_capture_status(uuid) == CaptureStatus.UNKNOWN:
                 perma_uuid = uuid
+            elif (self.get_capture_status(uuid) == CaptureStatus.DONE
+                  and self.get_capture(uuid).get('error') is not None):
+                # The UUID exists, the capture is done, but it has an error -> re-capture on the same UUID
+                perma_uuid = uuid
             else:
                 perma_uuid = str(uuid4())
                 self.master_logger.warning(f'UUID {uuid} already exists, forcing a new one: {perma_uuid}.')
@@ -269,7 +273,7 @@ class LacusCore():
         p = self.redis.pipeline()
         p.set(f'lacus:query_hash:{hash_query}', perma_uuid, nx=True, ex=recapture_interval)
         p.hset(f'lacus:capture_settings:{perma_uuid}', mapping=to_enqueue.redis_dump())
-        p.expire(f'lacus:capture_settings:{perma_uuid}', self.max_capture_time * 2)
+        p.expire(f'lacus:capture_settings:{perma_uuid}', self.max_capture_time * 10)
         p.zadd('lacus:to_capture', {perma_uuid: priority if priority is not None else 0})
         try:
             p.execute()
@@ -527,16 +531,16 @@ class LacusCore():
                         headless=to_capture.headless,
                         uuid=uuid) as capture:
                     # required by Mypy: https://github.com/python/mypy/issues/3004
-                    capture.headers = to_capture.headers  # type: ignore[assignment]
+                    capture.headers = to_capture.headers
                     capture.cookies = cookies  # type: ignore[assignment]
-                    capture.storage = to_capture.storage  # type: ignore[assignment]
-                    capture.viewport = to_capture.viewport  # type: ignore[assignment]
-                    capture.user_agent = to_capture.user_agent  # type: ignore[assignment]
-                    capture.http_credentials = to_capture.http_credentials  # type: ignore[assignment]
-                    capture.geolocation = to_capture.geolocation  # type: ignore[assignment]
-                    capture.timezone_id = to_capture.timezone_id  # type: ignore[assignment]
-                    capture.locale = to_capture.locale  # type: ignore[assignment]
-                    capture.color_scheme = to_capture.color_scheme  # type: ignore[assignment]
+                    capture.storage = to_capture.storage
+                    capture.viewport = to_capture.viewport
+                    capture.user_agent = to_capture.user_agent
+                    capture.http_credentials = to_capture.http_credentials
+                    capture.geolocation = to_capture.geolocation
+                    capture.timezone_id = to_capture.timezone_id
+                    capture.locale = to_capture.locale
+                    capture.color_scheme = to_capture.color_scheme
                     capture.java_script_enabled = to_capture.java_script_enabled
 
                     # make sure the initialization doesn't take too long

{lacuscore-1.15.0 → lacuscore-1.15.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lacuscore"
-version = "1.15.0"
+version = "1.15.2"
 description = "Core of Lacus, usable as a module"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
@@ -21,7 +21,7 @@ dependencies = [
     "redis[hiredis] (>=5.3.0,<6.0.0)",
     "dnspython (>=2.7.0)",
     "async-timeout (>=5.0.1) ; python_version < \"3.11\"",
-    "pydantic (>=2.11.4)",
+    "pydantic (>=2.11.5)",
     "eval-type-backport (>=0.2.2) ; python_version < \"3.10\"",
     "typing-extensions (>=4.12.2,<5.0.0) ; python_version < \"3.12\""
 ]
@@ -47,11 +47,11 @@ classifiers = [
 docs = ["Sphinx (>=8.2.3) ; python_version >= \"3.11\""]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.15.0"
+mypy = "^1.16.0"
 types-redis = {version = "^4.6.0.20241004"}
-types-requests = "^2.32.0.20250515"
+types-requests = "^2.32.0.20250602"
 types-beautifulsoup4 = "^4.12.0.20250516"
-pytest = "^8.3.5"
+pytest = "^8.4.0"
 
 [build-system]
 requires = ["poetry-core>=2.0"]