scrapely-python 0.1.24__py3-none-any.whl → 0.1.26__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.24'
+__version__ = '0.1.26'
 __all__ = [
     # Core
     'Actor',

scrapely/actor.py

@@ -360,6 +360,7 @@ class Actor(metaclass=_ActorMeta):
 
     @classmethod
     async def init(cls, options: Optional[InitOptions] = None) -> None:
+        cls._main_loop = asyncio.get_running_loop()  # for debug_capture_sync from worker threads
         if cls._initialized:
             return
 
@@ -934,6 +935,29 @@ class Actor(metaclass=_ActorMeta):
         import hashlib
         return 'DEBUG_CAPTURE_' + hashlib.sha1(str(key).strip().encode('utf-8')).hexdigest()[:24]
 
+    _main_loop: Optional[asyncio.AbstractEventLoop] = None
+
+    @classmethod
+    def debug_capture_sync(cls, key: str, payload: Any) -> None:
+        """debug_capture for synchronous code (also from worker threads, e.g. asyncio.to_thread).
+        Does nothing unless the platform enabled capture for this run."""
+        if os.environ.get('SCRAPELY_DEBUG_CAPTURE') != '1' or not key:
+            return
+        loop = cls._main_loop
+        if loop is None or loop.is_closed():
+            return
+        try:
+            try:
+                running = asyncio.get_running_loop()
+            except RuntimeError:
+                running = None
+            if running is loop:
+                loop.create_task(cls.debug_capture(key, payload))
+            else:
+                asyncio.run_coroutine_threadsafe(cls.debug_capture(key, payload), loop).result(timeout=15)
+        except Exception as err:  # never break the run
+            logging.getLogger('scrapely').debug('debug_capture_sync failed: %s', err)
+
     @classmethod
     async def debug_capture(cls, key: str, payload: Any) -> None:
         """Save the raw source payload (API JSON or HTML) an item was extracted from, keyed by

scrapely/solver.py

@@ -1,6 +1,6 @@
 """Anti-bot solver helpers for Scrapely Actors.
 
-The platform runs the challenge solver (xhr.dev today) behind
+The platform runs the challenge solver behind
 ``/v2/solver``. Actors never hold a solver key: the platform injects
 ``SCRAPELY_SOLVER_URL`` and ``SCRAPELY_SOLVER_API_KEY`` (the run's own token)
 into runs of Actors that may use it.
@@ -88,7 +88,7 @@ DEGRADED_STATUS_MESSAGE = "Site protection temporarily unavailable, results may
 # Codes the platform answers with when a vendor cannot be solved right now.
 UNAVAILABLE_CODES = ("vendor_degraded", "vendor_down", "provider_unavailable", "vendor_unsupported", "solver_not_enabled")
 
-_COMPAT_SUFFIX = "/compat/xhrdev"
+_COMPAT_SUFFIXES = ("/compat/v1", "/compat/xhrdev")
 _STATUS_TTL_SECS = 15.0
 _MAX_BODY = 4 * 1024 * 1024
 
@@ -118,9 +118,10 @@ def _gateway() -> tuple[str, str] | None:
     if env is None:
         return None
     url, key = env
-    if not url.endswith(_COMPAT_SUFFIX):
-        return None
-    return url[: -len(_COMPAT_SUFFIX)], key
+    for suffix in _COMPAT_SUFFIXES:
+        if url.endswith(suffix):
+            return url[: -len(suffix)], key
+    return None
 
 
 # ─── errors ──────────────────────────────────────────────────────────────────

{scrapely_python-0.1.24.dist-info → scrapely_python-0.1.26.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
-scrapely/__init__.py,sha256=LwOxrcG5TcZ24X2RRNQl45zIwZY3UfvuIfHCRmWjuf4,9661
+scrapely/__init__.py,sha256=z-CyEPAlCd07V32Wnv8bNeSubMhXAuoejvSW7-XG4co,9661
 scrapely/_browser_locations.py,sha256=8QVVnkms2bDn3_LDYgYDR59MvFx8757l_JYnZ7xb3oI,145269
-scrapely/actor.py,sha256=l-GDt7mqARs1RUk9u_HBVxj7TWcgRGCUKVqLduSstkw,86895
+scrapely/actor.py,sha256=1SBHZYBRLmU4k_erjKL7yRfP0EgR7ZKXefAK8wWKRz0,88004
 scrapely/browser_configuration.py,sha256=jAZapNSHLFW05B96df4wNBtcyiiU9DA3ml0yTL1FwfA,5770
 scrapely/cdp_retry.py,sha256=hdTJEAIKhApM7IOk1DrQEl8NoflSJSmqd4RbNJ2IsgI,8540
 scrapely/charging.py,sha256=ns-kuUJtl8hBI4-3iBisC62BggJG67yYOa1yVVItoUI,83800
@@ -12,7 +12,7 @@ scrapely/patch_browser_pool.py,sha256=R-1QDKa-ZvfdQ9wgyA8JCtmQqD9v7dOsaCZnSUoyf7
 scrapely/pricing_types.py,sha256=J6wCddZd-U1MYeOtaaEdeHSsp1HBgiQLfvSInBOvhIo,5305
 scrapely/proxy_configuration.py,sha256=mQhUjXnqM1PcUrnRmXxVWdLnlaRlb8Je4K2j54lC6YQ,38129
 scrapely/py.typed,sha256=XtWlywqUjc6x_M2gAXlDtYXbAsYkCjKZEjFyJvaHvm4,105
-scrapely/solver.py,sha256=ahuORJwZu9aJzCKWF14qTjQSnwT6dEbhMophQQ03JHw,35854
+scrapely/solver.py,sha256=QO7sl_M5AbXRqmCzUowNWG2kBHoXoH7CgtYwAdp36VM,35880
 scrapely/types.py,sha256=ceVuHvhYbPai2CL3vFmXLTMoGaMR27IefJFgWhzd7ws,8900
 scrapely/webhook.py,sha256=4WOM42ypOSOs4lKtP5ofxAh6lX-7c8p5U9lOfuFzx-g,2830
 scrapely/crypto/__init__.py,sha256=MbMPs7Eq_fGSVjOZxNts_JckDCUtxCVqdkHU0VCfN4M,481
@@ -39,10 +39,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.24.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
-scrapely_python-0.1.24.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
-scrapely_python-0.1.24.dist-info/licenses/NOTICE,sha256=DEsNrw6UdSIqdYYqMWVFgJnyt6jUivTD7iFU6YM_e1A,1122
-scrapely_python-0.1.24.dist-info/METADATA,sha256=YghofuDx8qPhqglQgjX-OD0tS5LXhskO5xNaV6BDHlg,3487
-scrapely_python-0.1.24.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-scrapely_python-0.1.24.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
-scrapely_python-0.1.24.dist-info/RECORD,,
+scrapely_python-0.1.26.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
+scrapely_python-0.1.26.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
+scrapely_python-0.1.26.dist-info/licenses/NOTICE,sha256=DEsNrw6UdSIqdYYqMWVFgJnyt6jUivTD7iFU6YM_e1A,1122
+scrapely_python-0.1.26.dist-info/METADATA,sha256=mag9UA_ijOHkoBHTTvSWq2Nai46Okg-M-wkW0aAO-Hk,3487
+scrapely_python-0.1.26.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+scrapely_python-0.1.26.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
+scrapely_python-0.1.26.dist-info/RECORD,,