scrapely-python 0.1.34__py3-none-any.whl → 0.1.35__py3-none-any.whl

scrapely/__init__.py

@@ -227,7 +227,7 @@ if TYPE_CHECKING:  # Static analysers and IDEs see the lazy names as plain impor
         set_api_storage,
     )
 
-__version__ = '0.1.34'
+__version__ = '0.1.35'
 __all__ = [
     # Core
     'Actor',

scrapely/actor.py

@@ -349,6 +349,10 @@ class Actor(metaclass=_ActorMeta):
     _cached_input: Optional[Dict[str, Any]] = None
     _exit_code: int = 0
     _status_message: Optional[str] = None
+    # Set by fail() for the rest of the lifecycle: (exit code, status message).
+    # A later exit() keeps them, so `fail()` followed by the usual `exit()` in a
+    # `finally:` block still ends the run as FAILED (it used to exit with 0).
+    _failure: Optional[Tuple[int, Optional[str]]] = None
     _charging_manager: Optional[ChargingManager] = None
     _use_state_stores: set = set()
     # Lifecycle bookkeeping set in init() / cleared in _shutdown().
@@ -392,9 +396,11 @@ class Actor(metaclass=_ActorMeta):
         elif exc_type is not None:
             cls._exit_code = 1
             logger.error(f'Actor failed: {exc_val}')
+        elif cls._failure is not None:
+            cls._exit_code = cls._failure[0]  # fail(exit=False) earlier: the run stays failed
         else:
             cls._exit_code = self._instance_exit_code
-        if self._instance_status_message:
+        if self._instance_status_message and cls._failure is None:
             cls._status_message = self._instance_status_message
             await cls._persist_terminal_status_message(self._instance_status_message)
         await cls._shutdown(timeout_secs=int(self._cleanup_timeout.total_seconds()))
@@ -410,6 +416,7 @@ class Actor(metaclass=_ActorMeta):
         cls._main_loop = asyncio.get_running_loop()  # for debug_capture_sync from worker threads
         if cls._initialized:
             return
+        cls._failure = None  # a new lifecycle starts unfailed
 
         if options is None or options.configure_logging:
             _lazy('_configure_logging')()
@@ -701,13 +708,33 @@ class Actor(metaclass=_ActorMeta):
         if exit_code is not None:
             opts.exit_code = exit_code
 
-        if opts.status_message:
+        if cls._failure is not None:
+            # Actor.fail() already ran: the run stays failed. Keep its exit code and
+            # status message; a later exit() (e.g. in a `finally:` block) only
+            # finishes the shutdown and exits with the failure's code.
+            if opts.status_message:
+                logger.info(f'[Scrapely] {opts.status_message}')
+            logger.info(
+                '[Scrapely] Actor.exit() after Actor.fail(): the run stays failed (exit code %s).',
+                cls._failure[0],
+            )
+            opts = ExitOptions(**{**opts.__dict__})
+            opts.exit_code, opts.status_message = cls._failure
+            await cls._exit_with(opts, persist_message=False)
+            return
+
+        await cls._exit_with(opts)
+
+    @classmethod
+    async def _exit_with(cls, opts: ExitOptions, persist_message: bool = True) -> None:
+        if opts.status_message and persist_message:
             logger.info(f'[Scrapely] {opts.status_message}')
 
         cls._exit_code = opts.exit_code
         cls._status_message = opts.status_message
 
-        await cls._persist_terminal_status_message(opts.status_message)
+        if persist_message:
+            await cls._persist_terminal_status_message(opts.status_message)
         await cls._shutdown(timeout_secs=opts.timeout_secs)
 
         if opts.exit:
@@ -736,7 +763,7 @@ class Actor(metaclass=_ActorMeta):
         if isinstance(message_or_options, str):
             opts = ExitOptions(exit_code=1, status_message=message_or_options)
         else:
-            # Options-object form: an explicit exit_code in the object wins over
+            # Options-object form: a non-zero exit_code in the object wins over
             # the fail() default of 1 (JS SDK semantics). Build the dict first —
             # passing it alongside exit_code=1 as kwargs raises
             # "got multiple values for keyword argument 'exit_code'".
@@ -751,12 +778,24 @@ class Actor(metaclass=_ActorMeta):
             opts.status_message = status_message
         if exit_code is not None:
             opts.exit_code = exit_code
+        elif not opts.exit_code:
+            # ExitOptions always carries exit_code (default 0), so 0 from an options
+            # object means "not set": a failed run must not exit with 0. Only an
+            # explicit exit_code=0 keyword keeps 0.
+            opts.exit_code = 1
 
         logger.error(
             f'[Scrapely] Actor failed: {opts.status_message or "Unknown error"}',
             exc_info=exception,
         )
-        await cls.exit(opts)
+        if cls._failure is not None:
+            # Failed already: the first failure's code and message stay.
+            opts = ExitOptions(**{**opts.__dict__})
+            opts.exit_code, opts.status_message = cls._failure
+            await cls._exit_with(opts, persist_message=False)
+            return
+        cls._failure = (opts.exit_code, opts.status_message)
+        await cls._exit_with(opts)
 
     @classmethod
     def is_at_home(cls) -> bool:

{scrapely_python-0.1.34.dist-info → scrapely_python-0.1.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrapely-python
-Version: 0.1.34
+Version: 0.1.35
 Summary: Scrapely Python SDK - A toolkit for building Actors on the Scrapely platform
 Author-email: Scrapely <support@scrape.ly>
 License-Expression: MIT AND Apache-2.0

{scrapely_python-0.1.34.dist-info → scrapely_python-0.1.35.dist-info}/RECORD

@@ -1,6 +1,6 @@
-scrapely/__init__.py,sha256=5lWyf7hHuDQXopBE8Koi2joSWNZWECE2DvPKu7CvkX0,9668
+scrapely/__init__.py,sha256=SmvxiukorN0XL3Y1vuRgnzxUfSfHd9waw2EHX_-06XU,9668
 scrapely/_browser_locations.py,sha256=8QVVnkms2bDn3_LDYgYDR59MvFx8757l_JYnZ7xb3oI,145269
-scrapely/actor.py,sha256=DmDnwPSmqmdEq_HIBgW0JivKl-8FrUBhNKNGXYh6QGA,91407
+scrapely/actor.py,sha256=z-kL24Y6m98v6lKLOxGYCnFmhVhaHJ6c0uOdYZW_4ak,93514
 scrapely/browser_configuration.py,sha256=jAZapNSHLFW05B96df4wNBtcyiiU9DA3ml0yTL1FwfA,5770
 scrapely/cdp_retry.py,sha256=hdTJEAIKhApM7IOk1DrQEl8NoflSJSmqd4RbNJ2IsgI,8540
 scrapely/charging.py,sha256=osi2Ys99IyIJwFj0eRtV_RshokPs4mA2CE7oftNbN58,95559
@@ -55,10 +55,10 @@ scrapely/storage/_file_system/_key_value_store_client.py,sha256=1C22qY-RWlARzMyW
 scrapely/storage/_file_system/_storage_client.py,sha256=QHa3IULEb6AmgRFwpBqHD2OUTmtA_gl3lId-j6QdSFo,2027
 scrapely/storage_clients/__init__.py,sha256=q2pC-Rwe-BfHl018OyN_P0EDSx4-hNdxbk3pOCLLd4U,618
 scrapely/storages/__init__.py,sha256=kDNtd9VodjdHd4u7GzruJo0aB2HeiBN2_-HrkeqjmFg,139
-scrapely_python-0.1.34.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
-scrapely_python-0.1.34.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
-scrapely_python-0.1.34.dist-info/licenses/NOTICE,sha256=1ltrzKk2ez7x2BPNpXeyvOlTty5AfABYDBlwNilpORk,788
-scrapely_python-0.1.34.dist-info/METADATA,sha256=f84Jwc8hXM7jbHFipBYO1dlAojlHDxBpm1B8-BNmeYY,3582
-scrapely_python-0.1.34.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-scrapely_python-0.1.34.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
-scrapely_python-0.1.34.dist-info/RECORD,,
+scrapely_python-0.1.35.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
+scrapely_python-0.1.35.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
+scrapely_python-0.1.35.dist-info/licenses/NOTICE,sha256=1ltrzKk2ez7x2BPNpXeyvOlTty5AfABYDBlwNilpORk,788
+scrapely_python-0.1.35.dist-info/METADATA,sha256=TxvBCz5CkTKVznM0IpAU7LGEpOYNyptkKi1DzSNeKWQ,3582
+scrapely_python-0.1.35.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+scrapely_python-0.1.35.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
+scrapely_python-0.1.35.dist-info/RECORD,,