lacuscore 1.12.0__tar.gz → 1.12.2__tar.gz

{lacuscore-1.12.0 → lacuscore-1.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.12.0
+Version: 1.12.2
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -29,7 +29,7 @@ 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.7.0,<3.0.0) ; python_version >= "3.9"
 Requires-Dist: eval-type-backport (>=0.2.0,<0.3.0) ; python_version < "3.10"
-Requires-Dist: playwrightcapture[recaptcha] (>=1.27.0,<2.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.27.1,<2.0.0)
 Requires-Dist: pydantic (>=2.9.2,<3.0.0)
 Requires-Dist: redis[hiredis] (>=5.2.0,<6.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)

{lacuscore-1.12.0 → lacuscore-1.12.2}/lacuscore/lacuscore.py

@@ -376,6 +376,10 @@ class LacusCore():
                 logger.warning(f'Settings invalid: {e}')
                 raise CaptureSettingsError('Invalid settings', e)
 
+            # If the class is initialized with max_retries below the one provided in the settings, we use the lowest value
+            # NOTE: make sure the variable is initialized *before* we raise any RetryCapture
+            max_retries = min([to_capture.max_retries, self.max_retries]) if to_capture.max_retries is not None else self.max_retries
+
             if to_capture.document:
                 # we do not have a URL yet.
                 document_as_bytes = b64decode(to_capture.document)
@@ -474,8 +478,6 @@ class LacusCore():
                         cookie['path'] = '/'
                     cookies.append(cookie)
 
-            # If the class is initialized with max_retries below the one provided in the settings, we use the lowest value
-            max_retries = min([to_capture.max_retries, self.max_retries]) if to_capture.max_retries is not None else self.max_retries
             try:
                 logger.debug(f'Capturing {url}')
                 stats_pipeline.sadd(f'stats:{today}:captures', url)
@@ -618,6 +620,8 @@ class LacusCore():
                             self._store_capture_response(p, uuid, result)
                         else:
                             logger.warning('Got no result at all for the capture.')
+                            result = {'error': 'No result at all for the capture, Playwright failed.'}
+                            self._store_capture_response(p, uuid, result)
                         p.delete(f'lacus:capture_settings:{uuid}')
                         p.zrem('lacus:ongoing', uuid)
                         p.execute()
@@ -763,7 +767,7 @@ class LacusCore():
                     continue
                 raise e
             except DNSException as e:
-                logger.info(f'No A record for "{hostname}": {e}')
+                logger.debug(f'No A record for "{hostname}": {e}')
             break
 
         _current_retries = 0
@@ -779,6 +783,6 @@ class LacusCore():
                     continue
                 raise e
             except DNSException as e:
-                logger.info(f'No AAAA record for "{hostname}": {e}')
+                logger.debug(f'No AAAA record for "{hostname}": {e}')
             break
         return resolved_ips

{lacuscore-1.12.0 → lacuscore-1.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lacuscore"
-version = "1.12.0"
+version = "1.12.2"
 description = "Core of Lacus, usable as a module"
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-3-Clause"
@@ -34,7 +34,7 @@ Sphinx = [
    {version = "^7.2", python = ">=3.9,<3.10", optional = true},
    {version = "^8", python = ">=3.10", optional = true}
 ]
-playwrightcapture = {extras = ["recaptcha"], version = "^1.27.0"}
+playwrightcapture = {extras = ["recaptcha"], version = "^1.27.1"}
 defang = "^0.5.3"
 ua-parser = "^0.18.0"
 redis = {version = "^5.2.0", extras = ["hiredis"]}