lacuscore 1.13.4__tar.gz → 1.13.6__tar.gz

{lacuscore-1.13.4 → lacuscore-1.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lacuscore
-Version: 1.13.4
+Version: 1.13.6
 Summary: Core of Lacus, usable as a module
 License: BSD-3-Clause
 Author: Raphaël Vinot

{lacuscore-1.13.4 → lacuscore-1.13.6}/lacuscore/helpers.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import json
 import sys
 
+from datetime import datetime, timedelta
 from enum import IntEnum, unique
 from logging import LoggerAdapter
 from typing import Any, Literal
@@ -218,6 +219,28 @@ class CaptureSettings(BaseModel):
     @field_validator('cookies', mode='before')
     @classmethod
     def load_cookies_json(cls, cookies: Any) -> list[dict[str, Any]] | None:
+
+        def __prepare_cookie(cookie: dict[str, Any]) -> dict[str, str | float | bool]:
+            if len(cookie) == 1:
+                # {'name': 'value'} => {'name': 'name', 'value': 'value'}
+                name, value = cookie.popitem()
+                if name and value:
+                    cookie = {'name': name, 'value': value}
+            if not cookie.get('name') or not cookie.get('value'):
+                # invalid cookie, ignoring
+                return {}
+
+            if 'expires' in cookie and isinstance(cookie['expires'], str):
+                # Make it a float, as expected by Playwright
+                try:
+                    cookie['expires'] = datetime.fromisoformat(cookie['expires']).timestamp()
+                except ValueError:
+                    # if it ends with a Z, it fails in python < 3.12
+                    # And we don't really care.
+                    # make it expire 10 days from now
+                    cookie['expires'] = (datetime.now() + timedelta(days=10)).timestamp()
+            return cookie
+
         if not cookies:
             return None
         if isinstance(cookies, str):
@@ -236,16 +259,7 @@ class CaptureSettings(BaseModel):
             to_return = []
             for cookie in cookies:
                 if isinstance(cookie, dict):
-                    if 'name' in cookie and 'value' in cookie:
-                        to_return.append(cookie)
-                    elif len(cookie) == 1:
-                        # {'name': 'value'} => {'name': 'name', 'value': 'value'}
-                        name, value = cookie.popitem()
-                        if name and value:
-                            to_return.append({'name': name, 'value': value})
-                    else:
-                        # invalid cookie, ignoring
-                        pass
+                    to_return.append(__prepare_cookie(cookie))
             return to_return
         return None
 

{lacuscore-1.13.4 → lacuscore-1.13.6}/lacuscore/lacuscore.py

@@ -132,7 +132,7 @@ class LacusCore():
                 user_agent: str | None=None,
                 proxy: str | dict[str, str] | None=None,
                 general_timeout_in_sec: int | None=None,
-                cookies: list[dict[str, Any]] | None=None,
+                cookies: list[dict[str, Any]] | list[Cookie] | None=None,
                 storage: dict[str, Any] | None=None,
                 headers: dict[str, str] | None=None,
                 http_credentials: dict[str, str] | None=None,
@@ -164,7 +164,7 @@ class LacusCore():
                 user_agent: str | None=None,
                 proxy: str | dict[str, str] | None=None,
                 general_timeout_in_sec: int | None=None,
-                cookies: list[dict[str, Any]] | None=None,
+                cookies: list[dict[str, Any]] | list[Cookie] | None=None,
                 storage: dict[str, Any] | None=None,
                 headers: dict[str, str] | None=None,
                 http_credentials: dict[str, str] | None=None,

{lacuscore-1.13.4 → lacuscore-1.13.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lacuscore"
-version = "1.13.4"
+version = "1.13.6"
 description = "Core of Lacus, usable as a module"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}