lacuscore 1.16.5__tar.gz → 1.16.6__tar.gz

{lacuscore-1.16.5 → lacuscore-1.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lacuscore
-Version: 1.16.5
+Version: 1.16.6
 Summary: Core of Lacus, usable as a module
 License: BSD-3-Clause
 Author: Raphaël Vinot
@@ -26,7 +26,7 @@ Requires-Dist: async-timeout (>=5.0.1) ; python_version < "3.11"
 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.31.6)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.31.7)
 Requires-Dist: pydantic (>=2.11.7)
 Requires-Dist: redis[hiredis] (>=5.3.0,<6.0.0)
 Requires-Dist: requests (>=2.32.4)

{lacuscore-1.16.5 → lacuscore-1.16.6}/lacuscore/helpers.py

@@ -15,40 +15,12 @@ from defang import refang
 from pydantic import BaseModel, field_validator, model_validator, ValidationError
 from pydantic_core import from_json
 
-from playwrightcapture.capture import CaptureResponse as PlaywrightCaptureResponse
-
+from playwrightcapture import CaptureResponse as PlaywrightCaptureResponse, SetCookieParam, Cookie
 
 if sys.version_info < (3, 12):
-    # This bit is required as long as we need to support python < 3.12, stop removing it, you idiot
-    # That's the runtime failure: https://github.com/ail-project/lacus/actions/runs/16447900822/job/46484807036
-    # And the MyPy failure: https://github.com/ail-project/LacusCore/actions/runs/16447753492/job/46484287947
     from typing_extensions import TypedDict
-
-    class SetCookieParam(TypedDict, total=False):
-        name: str
-        value: str
-        url: str
-        domain: str
-        path: str
-        expires: float
-        httpOnly: bool
-        secure: bool
-        sameSite: Literal["Lax", "None", "Strict"]
-        partitionKey: str
-
-    class Cookie(TypedDict, total=False):
-        name: str
-        value: str
-        domain: str
-        path: str
-        expires: float
-        httpOnly: bool
-        secure: bool
-        sameSite: Literal["Lax", "None", "Strict"]
-        partitionKey: str
 else:
     from typing import TypedDict
-    from playwright._impl._api_structures import SetCookieParam, Cookie  # , StorageState
 
 
 class LacusCoreException(Exception):

{lacuscore-1.16.5 → lacuscore-1.16.6}/lacuscore/lacuscore.py

@@ -55,10 +55,8 @@ else:
         if timeout_cm.expired():
             logger.warning(f'Timeout expired: {error_message}')
 
-if sys.version_info < (3, 12):
-    from .helpers import SetCookieParam, Cookie
-else:
-    from playwright._impl._api_structures import SetCookieParam, Cookie
+if TYPE_CHECKING:
+    from playwrightcapture import SetCookieParam
 
 
 BROWSER = Literal['chromium', 'firefox', 'webkit']
@@ -135,7 +133,7 @@ class LacusCore():
                 proxy: str | dict[str, str] | None=None,
                 socks5_dns_resolver: str | list[str] | None=None,
                 general_timeout_in_sec: int | None=None,
-                cookies: list[dict[str, Any]] | list[Cookie] | None=None,
+                cookies: list[dict[str, Any]] | list[SetCookieParam] | None=None,
                 storage: dict[str, Any] | None=None,
                 headers: dict[str, str] | None=None,
                 http_credentials: dict[str, str] | None=None,
@@ -170,7 +168,7 @@ class LacusCore():
                 proxy: str | dict[str, str] | None=None,
                 socks5_dns_resolver: str | list[str] | None=None,
                 general_timeout_in_sec: int | None=None,
-                cookies: list[dict[str, Any]] | list[Cookie] | None=None,
+                cookies: list[dict[str, Any]] | list[SetCookieParam] | None=None,
                 storage: dict[str, Any] | None=None,
                 headers: dict[str, str] | None=None,
                 http_credentials: dict[str, str] | None=None,

{lacuscore-1.16.5 → lacuscore-1.16.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lacuscore"
-version = "1.16.5"
+version = "1.16.6"
 description = "Core of Lacus, usable as a module"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
@@ -15,7 +15,7 @@ dynamic = [ "classifiers" ]
 
 dependencies = [
     "requests (>=2.32.4)",
-    "playwrightcapture[recaptcha] (>=1.31.6)",
+    "playwrightcapture[recaptcha] (>=1.31.7)",
     "defang (>=0.5.3)",
     "ua-parser[regex] (>=1.0.1)",
     "redis[hiredis] (>=5.3.0,<6.0.0)",