lacuscore 1.7.5__py3-none-any.whl → 1.7.7__py3-none-any.whl

lacuscore/lacuscore.py

@@ -604,7 +604,9 @@ class LacusCore():
             except asyncio.CancelledError:
                 logger.warning(f'The capture of {url} has been cancelled.')
                 result = {'error': f'The capture of {url} has been cancelled.'}
-                raise CaptureError
+                # The capture can be canceled if it has been running for way too long.
+                # We can give it another short.
+                raise RetryCapture
             except (TimeoutError, asyncio.exceptions.TimeoutError):
                 logger.warning(f'The capture of {url} took longer than the allowed max capture time ({self.max_capture_time}s)')
                 result = {'error': f'The capture of {url} took longer than the allowed max capture time ({self.max_capture_time}s)'}
@@ -790,8 +792,16 @@ class LacusCore():
     def clear_capture(self, uuid: str, reason: str):
         '''Remove a capture from the list, shouldn't happen unless it is in error'''
         logger = LacusCoreLogAdapter(self.master_logger, {'uuid': uuid})
-        if self.get_capture_status(uuid) in [CaptureStatus.ONGOING, CaptureStatus.QUEUED]:
-            logger.warning('Attempted to clear capture that is still being processed.')
+        capture_status = self.get_capture_status(uuid)
+        if capture_status == CaptureStatus.ONGOING:
+            # Check when it was started.
+            if start_time := self.redis.zscore('lacus:ongoing', uuid):
+                if start_time > time.time() - self.max_capture_time * 1.1:
+                    # The capture started recently, wait before clearing it.
+                    logger.warning('The capture is (probably) still going, not clearing.')
+                    return
+        elif capture_status == CaptureStatus.QUEUED:
+            logger.warning('The capture is queued, not clearing.')
             return
         logger.warning(f'Clearing capture: {reason}')
         result: CaptureResponse = {'error': reason}

{lacuscore-1.7.5.dist-info → lacuscore-1.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.7.5
+Version: 1.7.7
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -26,7 +26,7 @@ Provides-Extra: docs
 Requires-Dist: Sphinx (<7.2) ; (python_version < "3.9") and (extra == "docs")
 Requires-Dist: Sphinx (>=7.2,<8.0) ; (python_version >= "3.9") and (extra == "docs")
 Requires-Dist: defang (>=0.5.3,<0.6.0)
-Requires-Dist: playwrightcapture[recaptcha] (>=1.22.4,<2.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.22.5,<2.0.0)
 Requires-Dist: redis[hiredis] (>=5.0.1,<6.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: ua-parser (>=0.18.0,<0.19.0)

lacuscore-1.7.7.dist-info/RECORD

@@ -0,0 +1,8 @@
+lacuscore/__init__.py,sha256=ytBrQRBXO1Q5yV72qyS16Q7Auqebl3EMhhLQUa0Sg4g,169
+lacuscore/lacus_monitoring.py,sha256=3kbjz_ONjOXzaLzc8Vp7bUmEDKQDMi2uQgVSSfpqdXQ,2732
+lacuscore/lacuscore.py,sha256=rxlO85jzeHbfQhzqO2qpAoJPZII5vAUHrbsIR0SUCeE,39687
+lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lacuscore-1.7.7.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
+lacuscore-1.7.7.dist-info/METADATA,sha256=vsMzvdv2h6le5KrOnSp2_Ppj9rpnPtLvohjd1M1BSwg,2514
+lacuscore-1.7.7.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+lacuscore-1.7.7.dist-info/RECORD,,

lacuscore-1.7.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-lacuscore/__init__.py,sha256=ytBrQRBXO1Q5yV72qyS16Q7Auqebl3EMhhLQUa0Sg4g,169
-lacuscore/lacus_monitoring.py,sha256=3kbjz_ONjOXzaLzc8Vp7bUmEDKQDMi2uQgVSSfpqdXQ,2732
-lacuscore/lacuscore.py,sha256=006MUIMLdI-ZzTL2CbL9kM85kQknYjqWQA-hxQ0G7lY,39122
-lacuscore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lacuscore-1.7.5.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
-lacuscore-1.7.5.dist-info/METADATA,sha256=_4Rz7umz6gJqgbbWiv9-Q4b9crEF7SvmfzMc7IHgba0,2514
-lacuscore-1.7.5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-lacuscore-1.7.5.dist-info/RECORD,,