lacuscore 1.16.4__py3-none-any.whl → 1.16.6__py3-none-any.whl

lacuscore/helpers.py

@@ -15,16 +15,13 @@ 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):
     from typing_extensions import TypedDict
 else:
     from typing import TypedDict
 
-from playwright._impl._api_structures import Cookie  # , StorageState
-
 
 class LacusCoreException(Exception):
     pass
@@ -107,7 +104,7 @@ class CaptureSettings(BaseModel):
     proxy: str | dict[str, str] | None = None
     socks5_dns_resolver: str | list[str] | None = None
     general_timeout_in_sec: int | None = None
-    cookies: list[Cookie] | None = None
+    cookies: list[SetCookieParam] | None = None
     # NOTE: should be that, but StorageState doesn't define the indexeddb
     # storage: StorageState | None = None
     storage: dict[str, Any] | None = None
@@ -242,8 +239,8 @@ class CaptureSettings(BaseModel):
             try:
                 cookies = json.loads(cookies)
             except json.JSONDecodeError as e:
-                print(e)
                 # Cookies are invalid, ignoring.
+                print(f'Broken cookie: {e}')
                 return None
         if isinstance(cookies, dict):
             # might be a single cookie in the format name: value, make it a list

lacuscore/lacuscore.py

@@ -56,7 +56,7 @@ else:
             logger.warning(f'Timeout expired: {error_message}')
 
 if TYPE_CHECKING:
-    from playwright._impl._api_structures import Cookie
+    from playwrightcapture import SetCookieParam
 
 
 BROWSER = Literal['chromium', 'firefox', 'webkit']
@@ -133,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,
@@ -168,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,
@@ -503,7 +503,7 @@ class LacusCore():
                 else:
                     browser_engine = 'webkit'
 
-            cookies: list[Cookie] = []
+            cookies: list[SetCookieParam] = []
             if to_capture.cookies:
                 # In order to properly pass the cookies to playwright,
                 # each of then must have a name, a value and either a domain + path or a URL

{lacuscore-1.16.4.dist-info → lacuscore-1.16.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lacuscore
-Version: 1.16.4
+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.5)
+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.6.dist-info/RECORD

@@ -0,0 +1,10 @@
+lacuscore/__init__.py,sha256=aLBshQPT9IBDKn5qWrX9A_exqtLFPyLsQiPWdfpAFjA,537
+lacuscore/helpers.py,sha256=dTt-FM7SnwEgIeGTCAvREwa1K224iNb16mmaCwcY_eg,14096
+lacuscore/lacus_monitoring.py,sha256=r6IaYuh6sMq43eOWdZx0fU8p4PWVZlqSD6nr6yOaTUU,2713
+lacuscore/lacuscore.py,sha256=UTaMvDCGIzrs2K2GAOpBj6DQTJIQ_I0BrjQmJ1BXA9s,45086
+lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lacuscore/task_logger.py,sha256=2wDotU6r6vn-aKO8nZNdxSuisSj11LlcxuvW60qPL0Y,1909
+lacuscore-1.16.6.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
+lacuscore-1.16.6.dist-info/METADATA,sha256=tj2PdgbP3l3ROjVt-Xvt32gvdgPOadCXC1eAFuLESCQ,2654
+lacuscore-1.16.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lacuscore-1.16.6.dist-info/RECORD,,

lacuscore-1.16.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-lacuscore/__init__.py,sha256=aLBshQPT9IBDKn5qWrX9A_exqtLFPyLsQiPWdfpAFjA,537
-lacuscore/helpers.py,sha256=cWH-Y2_XKMVlByczH8I8u4-pDCPgbFfdUw9SBQVpQxo,14124
-lacuscore/lacus_monitoring.py,sha256=r6IaYuh6sMq43eOWdZx0fU8p4PWVZlqSD6nr6yOaTUU,2713
-lacuscore/lacuscore.py,sha256=8Z3ES5865I-6mqgrhAcu52PIRxUPWmDChxSZhHLuawQ,45069
-lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lacuscore/task_logger.py,sha256=2wDotU6r6vn-aKO8nZNdxSuisSj11LlcxuvW60qPL0Y,1909
-lacuscore-1.16.4.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
-lacuscore-1.16.4.dist-info/METADATA,sha256=kA3k7wrywae6WnN8gCX6OsAnKqtNw87RXKa_r1ej3wU,2654
-lacuscore-1.16.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lacuscore-1.16.4.dist-info/RECORD,,