pylookyloo 1.31.2__tar.gz → 1.36.3__tar.gz

{pylookyloo-1.31.2 → pylookyloo-1.36.3}/PKG-INFO

@@ -1,31 +1,31 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pylookyloo
-Version: 1.31.2
+Version: 1.36.3
 Summary: Python CLI and module for Lookyloo
-License: GPL-2.0-or-later
+License-Expression: GPL-2.0-or-later
+License-File: LICENSE
 Author: Raphaël Vinot
 Author-email: raphael.vinot@circl.lu
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Telecommunications Industry
-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
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: Security
 Provides-Extra: docs
 Provides-Extra: examples
-Requires-Dist: Sphinx (>=8.2.3) ; (python_version >= "3.11") and (extra == "docs")
-Requires-Dist: pylacus (>=1.15.1) ; extra == "examples"
-Requires-Dist: requests (>=2.32.4)
+Requires-Dist: Sphinx (>=9.1.0) ; (python_version >= "3.12") and (extra == "docs")
+Requires-Dist: pylacus (>=1.21.2) ; extra == "examples"
+Requires-Dist: requests (>=2.32.5)
 Project-URL: Documentation, https://pylookyloo.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/lookyloo/PyLookyloo
 Project-URL: issues, https://github.com/lookyloo/PyLookyloo/issues

{pylookyloo-1.31.2 → pylookyloo-1.36.3}/pylookyloo/api.py

@@ -72,9 +72,11 @@ class CaptureSettings(TypedDict, total=False):
     locale: str | None
     color_scheme: str | None
     java_script_enabled: bool
+    with_trusted_timestamps: bool
     headless: bool
     viewport: dict[str, int] | None
     referer: str | None
+    categories: list[str] | None
 
     listing: bool | None
     auto_report: bool | dict[str, str] | None
@@ -89,7 +91,7 @@ class CompareSettings(TypedDict, total=False):
 
 class Lookyloo():
 
-    def __init__(self, root_url: str='https://lookyloo.circl.lu/', useragent: str | None=None,
+    def __init__(self, root_url: str | None=None, useragent: str | None=None,
                  *, proxies: dict[str, str] | None=None, verify: bool | str=True) -> None:
         '''Query a specific lookyloo instance.
 
@@ -97,7 +99,7 @@ class Lookyloo():
         :param useragent: The User Agent used by requests to run the HTTP requests against Lookyloo, it is *not* passed to the captures.
         :param proxies: The proxies to use to connect to lookyloo (not the ones given to the capture itself) - More details: https://requests.readthedocs.io/en/latest/user/advanced/#proxies
         '''
-        self.root_url = root_url
+        self.root_url = root_url if root_url else 'https://lookyloo.circl.lu/'
         self.apikey: str | None = None
 
         if not urlparse(self.root_url).scheme:
@@ -189,11 +191,13 @@ class Lookyloo():
                locale: str | None=None,
                color_scheme: str | None=None,
                java_script_enabled: bool=True,
+               with_trusted_timestamps: bool=False,
                headless: bool=True,
                viewport: dict[str, int] | None=None,
                referer: str | None=None,
                listing: bool | None=None,
-               auto_report: bool | dict[str, str] | None=None
+               auto_report: bool | dict[str, str] | None=None,
+               categories: list[str] | None=None
                ) -> str:
         ...
 
@@ -215,11 +219,13 @@ class Lookyloo():
                locale: str | None=None,
                color_scheme: str | None=None,
                java_script_enabled: bool | None=None,
+               with_trusted_timestamps: bool=False,
                headless: bool=True,
                viewport: dict[str, int] | None=None,
                referer: str | None=None,
                listing: bool | None=None,
-               auto_report: bool | dict[str, str] | None=None
+               auto_report: bool | dict[str, str] | None=None,
+               categories: list[str] | None=None
                ) -> str:
         '''Submit a URL to a lookyloo instance.
 
@@ -244,6 +250,7 @@ class Lookyloo():
         :param locale: The locale of the browser
         :param color_scheme: The prefered color scheme of the browser (light or dark)
         :param java_script_enabled: If False, no JS will run during the capture.
+        :param with_trusted_timestamps: If True, and a trusted timestamp provider is configured, trigger a request for trusted timestamps for forensic archival.
         :param headless: If False, the browser will be headed, it requires the capture to be done on a desktop.
         :param viewport: The viewport of the browser used for capturing
         :param referer: The referer URL for the capture
@@ -252,6 +259,7 @@ class Lookyloo():
                             Pass True if you want to autoreport without any setting, or a dictionary with two keys:
                                 * email (required): the email of the submitter, so the analyst to get in touch
                                 * comment (optional): a comment about the capture to help the analyst
+        :param categories: (v1.37.0+) A list of categories to assign to the capture
         '''
         to_send: CaptureSettings
         if capture_settings:
@@ -300,6 +308,8 @@ class Lookyloo():
                 to_send['color_scheme'] = color_scheme
             if java_script_enabled is not None:
                 to_send['java_script_enabled'] = java_script_enabled
+            if with_trusted_timestamps is not None:
+                to_send['with_trusted_timestamps'] = with_trusted_timestamps
             if headless is not None:
                 to_send['headless'] = headless
             if viewport:
@@ -310,6 +320,8 @@ class Lookyloo():
                 to_send['listing'] = listing
             if auto_report:
                 to_send['auto_report'] = auto_report
+            if categories:
+                to_send['categories'] = categories
 
         response = self.session.post(urljoin(self.root_url, 'submit'), json=to_send)
         response.raise_for_status()
@@ -666,7 +678,8 @@ class Lookyloo():
                        har: Path | BytesIO | str | None = None,
                        html: Path | BytesIO | str | None = None,
                        last_redirected_url: str | None = None,
-                       screenshot: Path | BytesIO | str | None = None) -> str:
+                       screenshot: Path | BytesIO | str | None = None,
+                       categories: list[str] | None=None) -> str:
         ...
 
     @overload
@@ -676,7 +689,8 @@ class Lookyloo():
                        har: Path | BytesIO | str | None = None,
                        html: Path | BytesIO | str | None = None,
                        last_redirected_url: str | None = None,
-                       screenshot: Path | BytesIO | str | None = None) -> tuple[str, dict[str, str]]:
+                       screenshot: Path | BytesIO | str | None = None,
+                       categories: list[str] | None=None) -> tuple[str, dict[str, str]]:
         ...
 
     def upload_capture(self, *, quiet: bool = False,
@@ -685,7 +699,8 @@ class Lookyloo():
                        har: Path | BytesIO | str | None = None,
                        html: Path | BytesIO | str | None = None,
                        last_redirected_url: str | None = None,
-                       screenshot: Path | BytesIO | str | None = None) -> str | tuple[str, dict[str, str]]:
+                       screenshot: Path | BytesIO | str | None = None,
+                       categories: list[str] | None=None) -> str | tuple[str, dict[str, str]]:
         '''Upload a capture via har-file and others
 
         :param quiet: Returns the UUID only, instead of the the UUID and the potential error / warning messages
@@ -695,6 +710,7 @@ class Lookyloo():
         :param html: rendered HTML of the capture
         :param last_redirected_url: The landing page of the capture
         :param screenshot: Screenshot of the capture
+        :param categories: The categories assigned to the capture
         '''
         def encode_document(document: Path | BytesIO | str) -> str:
             if isinstance(document, str):
@@ -707,6 +723,8 @@ class Lookyloo():
             return base64.b64encode(document.getvalue()).decode()
 
         to_send: dict[str, Any] = {'listing': listing}
+        if categories:
+            to_send['categories'] = categories
 
         if full_capture:
             b64_full_capture = encode_document(full_capture)
@@ -728,9 +746,16 @@ class Lookyloo():
         else:
             raise PyLookylooError("Full capture or at least har-file are required")
 
-        r = self.session.post(urljoin(self.root_url, str(PurePosixPath('json', 'upload'))), json=to_send)
-        r.raise_for_status()
-        json_response = r.json()
+        try:
+            r = self.session.post(urljoin(self.root_url, str(PurePosixPath('json', 'upload'))), json=to_send)
+            json_response = r.json()
+            r.raise_for_status()
+        except requests.exceptions.HTTPError:
+            # We should have a response with details
+            raise PyLookylooError(f'Unable to upload capture: {json_response}.')
+        except Exception as e:
+            raise PyLookylooError(f'Unable to upload capture: {e}.')
+
         uuid = json_response['uuid']
         messages = json_response['messages']
 

{pylookyloo-1.31.2 → pylookyloo-1.36.3}/pyproject.toml

@@ -1,18 +1,18 @@
 [project]
 name = "pylookyloo"
-version = "1.31.2"
+version = "1.36.3"
 description = "Python CLI and module for Lookyloo"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
 ]
 license = "GPL-2.0-or-later"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 dynamic = [ "classifiers" ]
 
 dependencies = [
-    "requests (>=2.32.4)"
+    "requests (>=2.32.5)"
 ]
 
 [project.urls]
@@ -36,13 +36,13 @@ classifiers = [
 lookyloo = 'pylookyloo:main'
 
 [project.optional-dependencies]
-docs = ["Sphinx (>=8.2.3) ; python_version >= \"3.11\""]
-examples = ["pylacus (>=1.15.1)"]
+docs = ["Sphinx (>=9.1.0) ; python_version >= \"3.12\""]
+examples = ["pylacus (>=1.21.2)"]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.16.1"
-types-requests = "^2.32.4.20250611"
-pytest = "^8.4.1"
+mypy = "^1.19.1"
+types-requests = "^2.32.4.20260107"
+pytest = "^9.0.2"
 
 [build-system]
 requires = ["poetry-core>=2.0"]