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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrapely-python
-Version: 0.1.9
+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 AND Apache-2.0

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scrapely-python"
-version = "0.1.9"
+version = "0.1.10"
 description = "Scrapely Python SDK - A toolkit for building Actors on the Scrapely platform"
 readme = "README.md"
 license = "MIT AND Apache-2.0"

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

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

{scrapely_python-0.1.9 → 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.9 → scrapely_python-0.1.10/src/scrapely_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrapely-python
-Version: 0.1.9
+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 AND Apache-2.0

{scrapely_python-0.1.9 → 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.9 → 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')