scrapely-python 0.1.7__tar.gz → 0.1.10__tar.gz

scrapely_python-0.1.10/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025-2026 TeraShift GmbH (Scrape.ly)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

scrapely_python-0.1.10/LICENSE-APACHE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Apify Technologies s.r.o.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

scrapely_python-0.1.10/NOTICE

@@ -0,0 +1,27 @@
+Scrapely Python SDK
+===================
+
+Copyright (c) 2025-2026 TeraShift GmbH (Scrape.ly).
+
+This package is licensed under the MIT License (see LICENSE), except for
+the files listed below, which are derived from apify-sdk-python
+(https://github.com/apify/apify-sdk-python),
+Copyright Apify Technologies s.r.o., licensed under the Apache License,
+Version 2.0 (see LICENSE-APACHE). Those files have been modified by
+TeraShift GmbH and remain under the Apache License, Version 2.0:
+
+  - src/scrapely/events/_types.py (from src/apify/events/_types.py)
+  - src/scrapely/events/event_manager.py (from src/apify/events/_apify_event_manager.py)
+  - src/scrapely/request_loaders/_scrapely_request_list.py
+    (from src/apify/request_loaders/_apify_request_list.py)
+
+You may obtain a copy of the Apache License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+This product includes software developed by Apify Technologies s.r.o.
+(https://apify.com/). The original source code is available at
+https://github.com/apify/apify-sdk-python.
+
+Scrape.ly is not affiliated with Apify. Apify is a trademark of
+Apify Technologies s.r.o.

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: scrapely-python
-Version: 0.1.7
+Version: 0.1.10
 Summary: Scrapely Python SDK - A toolkit for building Actors on the Scrapely platform
 Author-email: Scrapely <support@scrape.ly>
-License-Expression: MIT
+License-Expression: MIT AND Apache-2.0
 Project-URL: Homepage, https://scrape.ly
 Project-URL: Documentation, https://docs.scrape.ly
 Project-URL: Repository, https://github.com/SandeepDev1/scrapely
@@ -18,6 +18,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
+License-File: LICENSE-APACHE
+License-File: NOTICE
 Requires-Dist: httpx>=0.25.0
 Requires-Dist: crawlee<2.0.0,>=1.8.0
 Requires-Dist: websockets>=12.0
@@ -32,6 +35,7 @@ Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: playwright>=1.40.0; extra == "dev"
 Requires-Dist: browserforge>=1.2.0; extra == "dev"
+Dynamic: license-file
 
 # Scrapely Python SDK
 
@@ -80,3 +84,9 @@ if __name__ == "__main__":
 - Apify-compatible environment aliases and asynchronous client access
 
 See the [complete Python SDK guide](../docs/sdk-python.md) for lifecycle details, option objects, storage selection, events, CDP behavior, run control, environment variables, errors, and the full public export list.
+
+## License
+
+MIT (see [LICENSE](./LICENSE)), except for three files derived from the Apache-2.0 licensed
+[apify-sdk-python](https://github.com/apify/apify-sdk-python), which stay under the Apache License 2.0
+(see [LICENSE-APACHE](./LICENSE-APACHE) and [NOTICE](./NOTICE)).

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/README.md

@@ -45,3 +45,9 @@ if __name__ == "__main__":
 - Apify-compatible environment aliases and asynchronous client access
 
 See the [complete Python SDK guide](../docs/sdk-python.md) for lifecycle details, option objects, storage selection, events, CDP behavior, run control, environment variables, errors, and the full public export list.
+
+## License
+
+MIT (see [LICENSE](./LICENSE)), except for three files derived from the Apache-2.0 licensed
+[apify-sdk-python](https://github.com/apify/apify-sdk-python), which stay under the Apache License 2.0
+(see [LICENSE-APACHE](./LICENSE-APACHE) and [NOTICE](./NOTICE)).

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/pyproject.toml

@@ -4,10 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scrapely-python"
-version = "0.1.7"
+version = "0.1.10"
 description = "Scrapely Python SDK - A toolkit for building Actors on the Scrapely platform"
 readme = "README.md"
-license = "MIT"
+license = "MIT AND Apache-2.0"
+license-files = ["LICENSE", "LICENSE-APACHE", "NOTICE"]
 authors = [
     {name = "Scrapely", email = "support@scrape.ly"}
 ]

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/__init__.py

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

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/actor.py

@@ -607,11 +607,14 @@ class Actor(metaclass=_ActorMeta):
         *,
         status_message: Optional[str] = None,
         exit_code: Optional[int] = None,
+        exception: Optional[BaseException] = None,
     ) -> None:
         """Fail the Actor run (exit code defaults to ``1``).
 
-        Apify-Python parity: supports keyword-only ``status_message`` and
-        ``exit_code`` arguments (``await Actor.fail(status_message="Boom")``).
+        Apify-Python parity: supports keyword-only ``status_message``,
+        ``exit_code`` and ``exception`` arguments
+        (``await Actor.fail(status_message="Boom", exception=e)``). When
+        ``exception`` is given its traceback is logged.
         The pre-existing positional forms (``Actor.fail("message")`` /
         ``Actor.fail(ExitOptions(...))``) remain supported; explicit keyword
         arguments take precedence over the positional values when provided.
@@ -635,7 +638,10 @@ class Actor(metaclass=_ActorMeta):
         if exit_code is not None:
             opts.exit_code = exit_code
 
-        logger.error(f'[Scrapely] Actor failed: {opts.status_message or "Unknown error"}')
+        logger.error(
+            f'[Scrapely] Actor failed: {opts.status_message or "Unknown error"}',
+            exc_info=exception,
+        )
         await cls.exit(opts)
 
     @classmethod

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/charging.py

@@ -1333,7 +1333,9 @@ async def push_data_and_charge(
                         raise
                 return ChargeResult(
                     chargeable_within_limit=charging_manager.compute_chargeable(),
-                    charged_count=accepted_for_items * len(results) if results else 0,
+                    # Rows charged, as Apify reports it for the pushed event; the
+                    # implicit default-dataset event is not counted on top.
+                    charged_count=accepted_for_items,
                     event_charge_limit_reached=any(
                         result.event_charge_limit_reached for result in results
                     )

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/events/_types.py

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# Derived from apify-sdk-python (src/apify/events/_types.py),
+# Copyright Apify Technologies s.r.o., licensed under the Apache License 2.0.
+# Modified by TeraShift GmbH. See LICENSE-APACHE and NOTICE.
 """Scrapely event types - extends Crawlee's event types with Scrapely-specific data models."""
 
 from __future__ import annotations

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/events/event_manager.py

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# Derived from apify-sdk-python (src/apify/events/_apify_event_manager.py),
+# Copyright Apify Technologies s.r.o., licensed under the Apache License 2.0.
+# Modified by TeraShift GmbH. See LICENSE-APACHE and NOTICE.
 """Event manager for Scrapely Actors.
 
 Extends Crawlee's EventManager with WebSocket connectivity to the Scrapely platform

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/request_loaders/_scrapely_request_list.py

@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# Derived from apify-sdk-python (src/apify/request_loaders/_apify_request_list.py),
+# Copyright Apify Technologies s.r.o., licensed under the Apache License 2.0.
+# Modified by TeraShift GmbH. See LICENSE-APACHE and NOTICE.
 """ScrapelyRequestList - a request list that parses the standard Scrapely/Apify requestListSources input format."""
 
 from __future__ import annotations

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely/storage/scrapely_rq_client.py

@@ -233,7 +233,11 @@ class ScrapelyRequestQueueClient(RequestQueueClient):
         )
         if not head.items:
             return None
-        api_req = head.items[0]
+        head_req = head.items[0]
+        # The head lists only id/uniqueKey/url/method (as on Apify); load the full
+        # request so userData and headers survive. Keep the head item if it vanished.
+        full_req = await self._api.rq_get_request(self._metadata.id, head_req.id) if head_req.id else None
+        api_req = full_req or head_req
         request = _request_from_api({
             'id': api_req.id,
             'uniqueKey': api_req.unique_key,
@@ -243,10 +247,10 @@ class ScrapelyRequestQueueClient(RequestQueueClient):
             'userData': api_req.user_data,
             'retryCount': api_req.retry_count,
             'handledAt': api_req.handled_at,
-            'lockExpiresAt': api_req.lock_expires_at,
+            'lockExpiresAt': head_req.lock_expires_at,
         })
-        if api_req.id:
-            self._in_progress[request.unique_key] = api_req.id
+        if head_req.id:
+            self._in_progress[request.unique_key] = head_req.id
         return request
 
     @override

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely_python.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: scrapely-python
-Version: 0.1.7
+Version: 0.1.10
 Summary: Scrapely Python SDK - A toolkit for building Actors on the Scrapely platform
 Author-email: Scrapely <support@scrape.ly>
-License-Expression: MIT
+License-Expression: MIT AND Apache-2.0
 Project-URL: Homepage, https://scrape.ly
 Project-URL: Documentation, https://docs.scrape.ly
 Project-URL: Repository, https://github.com/SandeepDev1/scrapely
@@ -18,6 +18,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
+License-File: LICENSE-APACHE
+License-File: NOTICE
 Requires-Dist: httpx>=0.25.0
 Requires-Dist: crawlee<2.0.0,>=1.8.0
 Requires-Dist: websockets>=12.0
@@ -32,6 +35,7 @@ Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: playwright>=1.40.0; extra == "dev"
 Requires-Dist: browserforge>=1.2.0; extra == "dev"
+Dynamic: license-file
 
 # Scrapely Python SDK
 
@@ -80,3 +84,9 @@ if __name__ == "__main__":
 - Apify-compatible environment aliases and asynchronous client access
 
 See the [complete Python SDK guide](../docs/sdk-python.md) for lifecycle details, option objects, storage selection, events, CDP behavior, run control, environment variables, errors, and the full public export list.
+
+## License
+
+MIT (see [LICENSE](./LICENSE)), except for three files derived from the Apache-2.0 licensed
+[apify-sdk-python](https://github.com/apify/apify-sdk-python), which stay under the Apache License 2.0
+(see [LICENSE-APACHE](./LICENSE-APACHE) and [NOTICE](./NOTICE)).

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/src/scrapely_python.egg-info/SOURCES.txt

@@ -1,3 +1,6 @@
+LICENSE
+LICENSE-APACHE
+NOTICE
 README.md
 pyproject.toml
 src/scrapely/__init__.py

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/tests/test_charging_parity.py

@@ -338,3 +338,41 @@ async def test_local_mode_never_posts_charges_despite_client_and_run_id() -> Non
     # Flushing must not attempt any remote POST either.
     assert await mgr.flush_pending() == 0
     assert client.post_calls == []
+
+
+@pytest.mark.asyncio
+async def test_push_data_with_explicit_event_reports_rows_not_rows_times_events() -> None:
+    """charged_count is the number of rows charged, not rows x events.
+
+    With an explicit event on the default dataset the SDK also charges the
+    (unpriced) default-dataset-item event. Apify returns the explicit event's
+    count; summing both reported twice the rows pushed.
+    """
+    from scrapely.charging import push_data_and_charge
+
+    pricing = '{"pricingModel": "PAY_PER_EVENT", "pricingPerEvent": {"actorChargeEvents": {"profile": {"eventPriceUsd": 0.001, "eventTitle": "Profile"}}}}'
+    config = _config_with({
+        'is_at_home': False,
+        'actor_pricing_info': pricing,
+        'charged_event_counts': '{}',
+        'max_total_charge_usd': '10',
+    })
+    mgr = ChargingManager(config, None)
+    await mgr.init()
+
+    pushed: List[Any] = []
+
+    async def push_fn(items: List[Any]) -> None:
+        pushed.extend(items)
+
+    rows = [{'i': i} for i in range(3)]
+    result = await push_data_and_charge(mgr, rows, 'profile', True, push_fn)
+
+    assert len(pushed) == 3
+    assert result.charged_count == 3
+    assert result.event_charge_limit_reached is False
+    assert mgr.get_charged_event_count('profile') == 3
+
+    # Without an explicit event the default event alone is counted once.
+    result2 = await push_data_and_charge(mgr, rows, None, True, push_fn)
+    assert result2.charged_count == 3

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/tests/test_charging_pending.py

@@ -286,7 +286,8 @@ async def test_explicit_and_default_dataset_events_are_each_reserved_once() -> N
     )
 
     assert len(pushed) == 2
-    assert result.charged_count == 4
+    # Rows charged (Apify parity), not rows x events: both events billed 2 each.
+    assert result.charged_count == 2
     assert mgr.get_charged_event_count('page-open') == 2
     assert mgr.get_charged_event_count('apify-default-dataset-item') == 2
     assert mgr.get_total_charged_usd() == Decimal('0.04')

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/tests/test_parity.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any, Dict, List, Optional
 from unittest.mock import MagicMock
 
@@ -287,6 +288,26 @@ async def test_fail_accepts_exit_code_kwarg(_no_real_exit: List[int]) -> None:
         _restore_lifecycle_state(state)
 
 
+async def test_fail_accepts_exception_kwarg(
+    _no_real_exit: List[int], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Regression: Apify-Python style ``Actor.fail(status_message=..., exception=e)`` must not TypeError."""
+    state = _save_lifecycle_state()
+    try:
+        try:
+            raise ValueError('boom')
+        except ValueError as e:
+            with caplog.at_level(logging.ERROR):
+                await Actor.fail(status_message='crashed', exception=e)
+        assert Actor._exit_code == 1
+        assert Actor._status_message == 'crashed'
+        assert _no_real_exit == [1]
+        failed = [r for r in caplog.records if 'Actor failed' in r.getMessage()]
+        assert failed and failed[0].exc_info and failed[0].exc_info[0] is ValueError
+    finally:
+        _restore_lifecycle_state(state)
+
+
 async def test_fail_positional_message_still_works(_no_real_exit: List[int]) -> None:
     """Back-compat: the pre-existing positional form keeps working unchanged."""
     state = _save_lifecycle_state()

{scrapely_python-0.1.7 → scrapely_python-0.1.10}/tests/test_storage.py

@@ -138,6 +138,23 @@ async def test_rq_fetch_uses_head_lock(transport, mock_api):
     assert second.url == 'https://example.com/1'
 
 
+@pytest.mark.asyncio
+async def test_rq_fetch_keeps_user_data(transport):
+    """head/lock returns only id/uniqueKey/url/method, so fetch_next_request must
+    load the full request or user_data is lost (template KeyError: 'depth')."""
+    client = ScrapelyStorageClient(
+        api_url='https://api.test.scrape.ly',
+        token='t',
+        run_id='run-1',
+        transport=transport,
+    )
+    rq = await client.create_rq_client(name='user-data')
+    await rq.add_batch_of_requests([Request.from_url('https://example.com/d', user_data={'depth': 0})])
+    request = await rq.fetch_next_request()
+    assert request is not None
+    assert request.user_data['depth'] == 0
+
+
 @pytest.mark.asyncio
 async def test_rq_fetch_lock_outlasts_handler_timeout(mock_api):
     """The head lock must outlive Crawlee's 60s handler timeout, or an expired