scrapely-python 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

scrapely/__init__.py

@@ -132,7 +132,7 @@ from .errors import (
     raise_for_status,
 )
 
-__version__ = '0.1.12'
+__version__ = '0.1.14'
 __all__ = [
     # Core
     'Actor',

scrapely/actor.py

@@ -213,6 +213,14 @@ class _ClassProperty:
         return self.func(owner)
 
 
+def _system_exit_code(exc: Any) -> int:
+    """Process exit code carried by a SystemExit (sys.exit semantics)."""
+    code = getattr(exc, 'code', None)
+    if code is None:
+        return 0
+    return code if isinstance(code, int) else 1
+
+
 class _ActorMeta(type):
     """Metaclass enabling async with Actor: by delegating to classmethods."""
 
@@ -226,7 +234,11 @@ class _ActorMeta(type):
         return cls
 
     async def __aexit__(cls, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
-        if exc_type is not None:
+        if exc_type is not None and issubclass(exc_type, SystemExit):
+            # Actor.exit()/fail()/sys.exit() inside `async with Actor:` is a deliberate
+            # exit, not a failure (Apify parity): keep its exit code, log nothing.
+            cls._exit_code = _system_exit_code(exc_val)
+        elif exc_type is not None:
             cls._exit_code = 1
             logger.error(f'Actor failed: {exc_val}')
         await cls._shutdown()
@@ -286,7 +298,10 @@ class Actor(metaclass=_ActorMeta):
 
     async def __aexit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
         cls = type(self)
-        if exc_type is not None:
+        if exc_type is not None and issubclass(exc_type, SystemExit):
+            # Deliberate exit via Actor.exit()/fail()/sys.exit(), not a failure.
+            cls._exit_code = _system_exit_code(exc_val)
+        elif exc_type is not None:
             cls._exit_code = 1
             logger.error(f'Actor failed: {exc_val}')
         else:
@@ -652,12 +667,12 @@ class Actor(metaclass=_ActorMeta):
 
     @classmethod
     def is_at_home(cls) -> bool:
-        return cls._config.get('is_at_home', False) if cls._config else False
+        return bool(cls._env_config().get('is_at_home', False))
 
     @classmethod
     def is_standby(cls) -> bool:
         """Return True when the actor run was started in standby mode (Node SDK ``isStandby`` parity)."""
-        return (cls._config.get('meta_origin') == 'STANDBY') if cls._config else False
+        return cls._env_config().get('meta_origin') == 'STANDBY'
 
     @_ClassProperty
     def is_paying(cls) -> bool:
@@ -721,7 +736,7 @@ class Actor(metaclass=_ActorMeta):
             return cast(Dict[str, Any], cls._cached_input)
 
         kvs = await cls.open_key_value_store()
-        input_key = cls._config.get('input_key', 'INPUT') if cls._config else 'INPUT'
+        input_key = cls._env_config().get('input_key', 'INPUT')
         result = await kvs.get_value(input_key)
         if isinstance(result, dict):
             result = decrypt_secret_inputs(result)
@@ -848,7 +863,7 @@ class Actor(metaclass=_ActorMeta):
                 name = name_or_id
 
         if alias is not None:
-            storages_json = cls._config.get('actor_storages_json') if cls._config else None
+            storages_json = cls._env_config().get('actor_storages_json')
             resolved = resolve_alias_from_storages_json(alias, storage_type, storages_json)
             if resolved is not None:
                 id = resolved
@@ -1129,6 +1144,12 @@ class Actor(metaclass=_ActorMeta):
             cls._config = Configuration.get_global_config()
         return cls._config
 
+    @classmethod
+    def _env_config(cls) -> Configuration:
+        # Apify parity: is_at_home() and friends read the environment even
+        # before init(). Doesn't set cls._config, so init() state is unchanged.
+        return cls._config if cls._config is not None else Configuration.get_global_config()
+
     @classmethod
     def new_client(cls, token: Optional[str] = None, base_url: Optional[str] = None) -> ApiClient:
         config = cls.get_config()

scrapely/configuration.py

@@ -266,6 +266,22 @@ class Configuration:
         value = self.get('standby_port')
         return value if isinstance(value, int) else 4321
 
+    @property
+    def web_server_port(self) -> int:
+        """Apify name for the container port (ACTOR_WEB_SERVER_PORT, default 4321)."""
+        value = self.get('container_port')
+        return value if isinstance(value, int) else 4321
+
+    @property
+    def web_server_url(self) -> str:
+        """Apify name for the container URL (ACTOR_WEB_SERVER_URL)."""
+        return cast(str, self.get('container_url'))
+
+    @property
+    def standby_url(self) -> str:
+        """Public standby URL (ACTOR_STANDBY_URL), falling back to the container URL."""
+        return cast(str, self.get('standby_url') or self.get('container_url'))
+
     @property
     def token(self) -> Optional[str]:
         """Get the authentication token."""

scrapely/storage/api_client.py

@@ -5,6 +5,7 @@ Base API client for Scrapely storage operations.
 from __future__ import annotations
 
 import asyncio
+import json
 import logging
 import os
 import random
@@ -311,6 +312,10 @@ class ApiClient:
         request_headers = dict(headers or {})
         if json_data is not None and 'Content-Type' not in request_headers:
             request_headers['Content-Type'] = 'application/json'
+        if json_data is not None:
+            # Apify/crawlee parity: unknown objects (datetimes, LLM result
+            # objects, ...) are stored as strings instead of raising.
+            content = json.dumps(json_data, ensure_ascii=False, default=str).encode('utf-8')
 
         if idempotent is None:
             idempotent = method.upper() in IDEMPOTENT_METHODS
@@ -343,7 +348,6 @@ class ApiClient:
                     method,
                     url,
                     params=params,
-                    json=json_data,
                     content=content,
                     headers=request_headers or None,
                     **request_kwargs,

scrapely/storage/client.py

@@ -6,6 +6,7 @@ Ports the patterns from the TypeScript ApiStorageClient.
 
 from __future__ import annotations
 
+import os
 import logging
 import re
 import uuid
@@ -358,7 +359,14 @@ class ApiStorageClient:
         return cast(Dict[str, Any], await self.api_client.get_json(f'/v2/key-value-stores/{store_id}/keys', params=params))
 
     def kvs_public_url(self, store_id: str, key: str) -> str:
-        return f'{self.api_client.api_url}{kvs_record_path(store_id, key)}'
+        # api_url is the container-internal API address; links handed to users
+        # must use the public base URL the platform injects.
+        public_base = (
+            os.environ.get('APIFY_API_PUBLIC_BASE_URL')
+            or os.environ.get('ACTOR_API_PUBLIC_BASE_URL')
+            or self.api_client.api_url
+        ).rstrip('/')
+        return f'{public_base}{kvs_record_path(store_id, key)}'
 
     # --- Request queue resource ops ---
 

{scrapely_python-0.1.12.dist-info → scrapely_python-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrapely-python
-Version: 0.1.12
+Version: 0.1.14
 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.12.dist-info → scrapely_python-0.1.14.dist-info}/RECORD

@@ -1,11 +1,11 @@
-scrapely/__init__.py,sha256=R7A3fQmfkS8LtiN04-32fWvjo6kjNrBSlaeFJCLNgjc,5746
+scrapely/__init__.py,sha256=ufWE21XlAwFdGRoSHi0mdTUUnJ4OMaa7ShbGFO-V6mM,5746
 scrapely/_browser_locations.py,sha256=8QVVnkms2bDn3_LDYgYDR59MvFx8757l_JYnZ7xb3oI,145269
-scrapely/actor.py,sha256=xo25KfueM_quEFrD9buWqIjja69LSt-koCVIdg3arqg,77912
+scrapely/actor.py,sha256=dGim2A5OqA0raiRNJk7E2O19QnEik4xgypFv0rXx3PA,78892
 scrapely/browser_configuration.py,sha256=jAZapNSHLFW05B96df4wNBtcyiiU9DA3ml0yTL1FwfA,5770
 scrapely/cdp_retry.py,sha256=hdTJEAIKhApM7IOk1DrQEl8NoflSJSmqd4RbNJ2IsgI,8540
 scrapely/charging.py,sha256=_GHEKEgQ7lRYTVPacBiBuvlaqGTNcsF65K8xhiJ0dNM,68526
 scrapely/charging_client.py,sha256=-4q-Ww7gu9EZXpM9QIn1Vd4vwAXmgL_WEKqaQIx3ViA,3961
-scrapely/configuration.py,sha256=GjMr3YsxM16HYjAOTUzWZKG2E8FuMzAoFXmkn5dbDPM,16396
+scrapely/configuration.py,sha256=Of-lKm7hoPGUQO8d08kV7fAy2co9QTfb8Of_8ds5PSA,17028
 scrapely/errors.py,sha256=DCAlVvE3jToZuPEG2HVDL7i8D8hLboomQ5JpSOcsXoQ,4107
 scrapely/log.py,sha256=iVKoQdMLQXEWz1STzbSXrNUxsS_FNwiIdqoEg7CzeqU,1440
 scrapely/patch_browser_pool.py,sha256=qZstdQ1rFw8kGjzB9fm3GXco8Jt40eklTw1Czf_vh-8,38018
@@ -23,8 +23,8 @@ scrapely/request_loaders/__init__.py,sha256=aNgr4pRt3MziUbU6UQ_bjTT3moMNvvyUsPeC
 scrapely/request_loaders/_scrapely_request_list.py,sha256=vguj-EvBjvrGY5_vf2fGXnJBfnhlPeRjdkjPFaxUA7g,7628
 scrapely/storage/__init__.py,sha256=diAhxEvOXjc3YVhZvzkO3MttJUXQWJ5ogxstiApsh7U,1405
 scrapely/storage/_metadata.py,sha256=WWawBnVN0b1iK2K-SlxZXUc6czb5wXWf8iC_0tzkgAQ,4764
-scrapely/storage/api_client.py,sha256=aWuMwMlHiOkKDCxcN3KDH8Fgf-W2SCSCtphlm80d8nw,17935
-scrapely/storage/client.py,sha256=Ln_NA8nJz62nXldkcj54PFZopX5P3Lp8HGot_8friNM,22015
+scrapely/storage/api_client.py,sha256=SRtDOR58fggYwWjcz-S5RshDCM4kO2opxqn_k9Wdyxg,18183
+scrapely/storage/client.py,sha256=qQtFf1G2wv2RU5uHil521j3EAI7JDLX9VngPePe3VMU,22353
 scrapely/storage/patch_storage.py,sha256=o3Fv0BByeZ1T9HhkzhY6bjolOFsIQcnqBoHq1EdG8Fw,8758
 scrapely/storage/scrapely_dataset_client.py,sha256=u5dnXxe1BAsq7rh-haR5W1ChE7UZ_k7B9ShR8YtwFkg,10695
 scrapely/storage/scrapely_kvs_client.py,sha256=ItQhe2rcSl20NkSmegfqHiRyKncH4Qg9BjQVpF6jHfk,7403
@@ -38,10 +38,10 @@ scrapely/storage/_file_system/_key_value_store_client.py,sha256=4Ipgbh4qEqAkwQJ9
 scrapely/storage/_file_system/_storage_client.py,sha256=aaGJ4P0QAtIgEMl6yHpuobeWFD5M4rMC5HwhOOvuGuo,1794
 scrapely/storage_clients/__init__.py,sha256=cs1YX7JV2_GKBXeiiJgkQFali08b5_y_jH6Yw7iROAA,656
 scrapely/storages/__init__.py,sha256=4PAELhJNZ3exJ7Uouicn-bCQ58NafKjhLBixQ8ATQc4,173
-scrapely_python-0.1.12.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
-scrapely_python-0.1.12.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
-scrapely_python-0.1.12.dist-info/licenses/NOTICE,sha256=DEsNrw6UdSIqdYYqMWVFgJnyt6jUivTD7iFU6YM_e1A,1122
-scrapely_python-0.1.12.dist-info/METADATA,sha256=zVfjqlKUO2cXYOX8JTl6b8d8mjpS6qXocCrY8PDK9qI,3487
-scrapely_python-0.1.12.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-scrapely_python-0.1.12.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
-scrapely_python-0.1.12.dist-info/RECORD,,
+scrapely_python-0.1.14.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
+scrapely_python-0.1.14.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
+scrapely_python-0.1.14.dist-info/licenses/NOTICE,sha256=DEsNrw6UdSIqdYYqMWVFgJnyt6jUivTD7iFU6YM_e1A,1122
+scrapely_python-0.1.14.dist-info/METADATA,sha256=81hJV4H066ZpErdWq7wvAKXDta_3xjcnMWdAVr_zu2g,3487
+scrapely_python-0.1.14.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+scrapely_python-0.1.14.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
+scrapely_python-0.1.14.dist-info/RECORD,,