lacuscore 1.9.5__py3-none-any.whl → 1.10.0__py3-none-any.whl

lacuscore/lacuscore.py

@@ -531,6 +531,27 @@ class LacusCore():
                     browser_engine = 'firefox'
                 else:
                     browser_engine = 'webkit'
+
+            cookies: list[dict[str, Any]] = []
+            if to_capture.get('cookies') and to_capture['cookies'] is not None:
+                # 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
+                # Name and value are mandatory, and we cannot auto-fill them.
+                # If the cookie doesn't have a domain + path OR a URL, we fill the domain
+                # with the hostname of the URL we try to capture and the path with "/"
+                for cookie in to_capture['cookies']:
+                    if len(cookie) == 1:
+                        # we have a cookie in the format key: value
+                        name, value = cookie.popitem()
+                        cookie = {'name': name, 'value': value}
+                    if 'name' not in cookie or 'value' not in cookie:
+                        logger.warning(f'Invalid cookie: {cookie}')
+                        continue
+                    if 'domain' not in cookie and 'url' not in cookie:
+                        cookie['domain'] = splitted_url.hostname
+                        cookie['path'] = '/'
+                    cookies.append(cookie)
+
             try:
                 logger.debug(f'Capturing {url}')
                 stats_pipeline.sadd(f'stats:{today}:captures', url)
@@ -543,7 +564,7 @@ class LacusCore():
                         uuid=uuid) as capture:
                     # required by Mypy: https://github.com/python/mypy/issues/3004
                     capture.headers = to_capture.get('headers')  # type: ignore[assignment]
-                    capture.cookies = to_capture.get('cookies')  # type: ignore[assignment]
+                    capture.cookies = cookies  # type: ignore[assignment]
                     capture.viewport = to_capture.get('viewport')  # type: ignore[assignment]
                     capture.user_agent = to_capture.get('user_agent')  # type: ignore[assignment]
                     capture.http_credentials = to_capture.get('http_credentials')  # type: ignore[assignment]
@@ -583,7 +604,7 @@ class LacusCore():
             except RetryCapture as e:
                 raise e
             except PlaywrightCaptureException as e:
-                logger.exception(f'Invalid parameters for the capture of {url} - {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}')
             except asyncio.CancelledError:
@@ -612,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.5.dist-info → lacuscore-1.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.9.5
+Version: 1.10.0
 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.4,<6.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.25.0,<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.5.dist-info → lacuscore-1.10.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 lacuscore/__init__.py,sha256=hM4lKoPNybDCUMWdXTVVI1gRk_riLvRZ7IwFbamZLzE,341
 lacuscore/helpers.py,sha256=lULN7HhY-4a4HG-ybIt4jO3wEGTxkm_jKNqsGpNZo4Y,2711
 lacuscore/lacus_monitoring.py,sha256=UOfE_1-_rhVeKJXQ_m9XxYkr7VwyQnA6iK-x_tcXJfo,2775
-lacuscore/lacuscore.py,sha256=6YQ6ORW9yJP-cEf7zmPC196zVJI2-nI3Sq9M0VoDxWQ,42843
+lacuscore/lacuscore.py,sha256=n0hjyuJpz5G4s5mRzTAtSCHaPtPqdMaTEO7o-2N88JI,44048
 lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lacuscore/task_logger.py,sha256=8WbdJdKnGeFCxt9gtCNLI9vAQQZbsy2I5PRQpHP7XFU,1916
-lacuscore-1.9.5.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
-lacuscore-1.9.5.dist-info/METADATA,sha256=aNJ8gH24KtwIpcyHRkCsfz-kfcC8dLQfVkadqY7knko,2629
-lacuscore-1.9.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lacuscore-1.9.5.dist-info/RECORD,,
+lacuscore-1.10.0.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
+lacuscore-1.10.0.dist-info/METADATA,sha256=PmC32J2hEc1hyXiX4wQOjAcnJDLlVIqvj-Yw8pJc13Q,2629
+lacuscore-1.10.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lacuscore-1.10.0.dist-info/RECORD,,