pylookyloo 1.28.0__tar.gz → 1.29.0__tar.gz

{pylookyloo-1.28.0 → pylookyloo-1.29.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.3
 Name: pylookyloo
-Version: 1.28.0
+Version: 1.29.0
 Summary: Python CLI and module for Lookyloo
-License: BSD-3-Clause
+License: GPL-2.0-or-later
 Author: Raphaël Vinot
 Author-email: raphael.vinot@circl.lu
 Requires-Python: >=3.9
@@ -11,7 +11,7 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Telecommunications Industry
-Classifier: License :: OSI Approved :: BSD License
+Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -23,8 +23,8 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Security
 Provides-Extra: docs
 Provides-Extra: examples
-Requires-Dist: Sphinx (>=8.1.3) ; (python_version >= "3.10") and (extra == "docs")
-Requires-Dist: pylacus (>=1.12.1) ; extra == "examples"
+Requires-Dist: Sphinx (>=8.2.3) ; (python_version >= "3.11") and (extra == "docs")
+Requires-Dist: pylacus (>=1.14.0) ; extra == "examples"
 Requires-Dist: requests (>=2.32.3)
 Project-URL: Documentation, https://pylookyloo.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/lookyloo/PyLookyloo

{pylookyloo-1.28.0 → pylookyloo-1.29.0}/pylookyloo/api.py

@@ -60,8 +60,10 @@ class CaptureSettings(TypedDict, total=False):
     device_name: str | None
     user_agent: str | None
     proxy: str | dict[str, str] | None
+    remote_lacus_name: str | None
     general_timeout_in_sec: int | None
     cookies: list[dict[str, Any]] | None
+    storage: str | dict[str, Any] | None
     headers: str | dict[str, str] | None
     http_credentials: dict[str, int] | None
     geolocation: dict[str, float] | None
@@ -127,6 +129,11 @@ class Lookyloo():
         r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', tree_uuid, 'status'))))
         return r.json()
 
+    def get_remote_lacuses(self) -> list[dict[str, Any]]:
+        '''Get the list of Lacus instances configured on the Lookyloo instance'''
+        r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', 'remote_lacuses'))))
+        return r.json()
+
     def get_capture_stats(self, tree_uuid: str) -> dict[str, Any]:
         '''Get statistics of the capture'''
         r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', tree_uuid, 'stats'))))
@@ -169,8 +176,10 @@ class Lookyloo():
                browser: str | None=None, device_name: str | None=None,
                user_agent: str | None=None,
                proxy: str | dict[str, str] | None=None,
+               remote_lacus_name: str | None=None,
                general_timeout_in_sec: int | None=None,
                cookies: list[dict[str, Any]] | None=None,
+               storage: str | dict[str, Any] | None=None,
                headers: str | dict[str, str] | None=None,
                http_credentials: dict[str, int] | None=None,
                geolocation: dict[str, float] | None=None,
@@ -193,8 +202,10 @@ class Lookyloo():
                browser: str | None=None, device_name: str | None=None,
                user_agent: str | None=None,
                proxy: str | dict[str, str] | None=None,
+               remote_lacus_name: str | None=None,
                general_timeout_in_sec: int | None=None,
                cookies: list[dict[str, Any]] | None=None,
+               storage: str | dict[str, Any] | None=None,
                headers: str | dict[str, str] | None=None,
                http_credentials: dict[str, int] | None=None,
                geolocation: dict[str, float] | None=None,
@@ -220,7 +231,8 @@ class Lookyloo():
         :param browser: The browser to use for the capture, must be something Playwright knows
         :param device_name: The name of the device, must be something Playwright knows
         :param user_agent: The user agent the browser will use for the capture
-        :param proxy: SOCKS5 proxy to use for capturing
+        :param proxy: Capture via a proxy. It can either be the full URL to a SOCKS5 proxy, or the name of a specific proxy configured on a remote lacus instance.
+        :param remote_lacus_name: The name of the remote Lacus instance to use for the capture (only if lookyloo is configured this way)
         :param general_timeout_in_sec: The capture will raise a timeout it it takes more than that time
         :param cookies: A list of cookies
         :param headers: The headers to pass to the capture
@@ -270,6 +282,8 @@ class Lookyloo():
                 to_send['general_timeout_in_sec'] = general_timeout_in_sec
             if cookies:
                 to_send['cookies'] = cookies
+            if storage:
+                to_send['storage'] = storage
             if headers:
                 to_send['headers'] = headers
             if http_credentials:
@@ -425,6 +439,14 @@ class Lookyloo():
         r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', capture_uuid, 'cookies'))))
         return r.json()
 
+    def get_storage(self, capture_uuid: str) -> dict[str, Any]:
+        '''Returns the complete storage state.
+
+        :param capture_uuid: UUID of the capture
+        '''
+        r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', capture_uuid, 'storage'))))
+        return r.json()
+
     def get_html(self, capture_uuid: str) -> StringIO:
         '''Returns the rendered HTML as it would be in the browser after the page loaded.
 

{pylookyloo-1.28.0 → pylookyloo-1.29.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "pylookyloo"
-version = "1.28.0"
+version = "1.29.0"
 description = "Python CLI and module for Lookyloo"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
 ]
-license = "BSD-3-Clause"
+license = "GPL-2.0-or-later"
 readme = "README.md"
 requires-python = ">=3.9"
 
@@ -36,13 +36,13 @@ classifiers = [
 lookyloo = 'pylookyloo:main'
 
 [project.optional-dependencies]
-docs = ["Sphinx (>=8.1.3) ; python_version >= \"3.10\""]
-examples = ["pylacus (>=1.12.1)"]
+docs = ["Sphinx (>=8.2.3) ; python_version >= \"3.11\""]
+examples = ["pylacus (>=1.14.0)"]
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.15.0"
-types-requests = "^2.32.0.20241016"
-pytest = "^8.3.4"
+types-requests = "^2.32.0.20250328"
+pytest = "^8.3.5"
 
 [build-system]
 requires = ["poetry-core>=2.0"]