scrapely-python 0.1.19__py3-none-any.whl → 0.1.20__py3-none-any.whl

scrapely/__init__.py

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

scrapely/charging.py

@@ -246,6 +246,8 @@ class ChargingManager:
         # grows), so the local budget gates on the run's true remaining budget.
         self._platform_other_usd: Decimal = Decimal('0')
         self._last_remaining_budget_nd: Optional[int] = None
+        # True once the platform reported a remaining budget (its usage is then in the local budget).
+        self._platform_budget_seen = False
         self._charge_lock = RLock()
         self._flush_lock = asyncio.Lock()
         # Serializes budget calculation/reservation with PPE-aware dataset pushes.
@@ -311,6 +313,7 @@ class ChargingManager:
         self._last_remaining_budget_nd = None
         if nd is None or self._max_total_charge_usd is None or nd < 0:
             return
+        self._platform_budget_seen = True
         other = self._max_total_charge_usd - Decimal(nd) / Decimal(1_000_000_000) - self._total_charged_usd
         if other > self._platform_other_usd:
             self._platform_other_usd = other
@@ -1717,7 +1720,7 @@ async def push_data_with_charges(
                 else:
                     await charging_manager._void_charge(name, op_id, charged)
 
-        for _attempt in range(4):
+        for _attempt in range(6):
             if rows <= 0:
                 break
             ops = []
@@ -1741,10 +1744,25 @@ async def push_data_with_charges(
             if short_to is None:
                 break
             # Some event came back short: void this attempt in full and retry with
-            # the rows that event can pay for (a void restores the budget).
+            # the whole rows the budget covers at the FULL per-row cost. Sizing
+            # from the short event alone ignores the other events of the row, so
+            # the retry came back short again (appstore 64df0a3608d74af88: 20
+            # details -> 14, retry sized 14, app-item short, 0 saved). What this
+            # attempt was accepted is budget the void gives back; with the
+            # platform's remainingBudgetNd the local budget also knows the rest.
+            attempt_spent = sum(
+                (charging_manager._calculate_event_price(name) or Decimal('0')) * Decimal(charged)
+                for name, charged, _op, _unc in ops
+            )
             await undo(ops)
             ops = []
-            rows = short_to  # got < n * rows, so short_to < rows
+            fit = int(attempt_spent / row_cost) if row_cost > 0 else 0
+            if charging_manager._platform_budget_seen and charging_manager._max_total_charge_usd is not None and row_cost > 0:
+                fit = max(fit, int(charging_manager._remaining_budget_usd() / row_cost))
+            # At least one more single-row try: without the platform's remaining
+            # budget the leftover after the short answer is unknown, and the last
+            # affordable row may still fit.
+            rows = min(rows - 1, max(fit, 1))
 
         if rows <= 0 or not ops:
             await undo(ops)

{scrapely_python-0.1.19.dist-info → scrapely_python-0.1.20.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
-scrapely/__init__.py,sha256=7AUWixuhrohpSFpDkEHo809IBKI-2u-m4ZWPMorYKSk,5746
+scrapely/__init__.py,sha256=i4A_AaMoKY5cMXqvx7Df9eyucWihcJTRz4ra4HobviI,5746
 scrapely/_browser_locations.py,sha256=8QVVnkms2bDn3_LDYgYDR59MvFx8757l_JYnZ7xb3oI,145269
 scrapely/actor.py,sha256=Lsb4_14RCGQy-EWACnqijo7Hz5xvPKSDZcu4B8_ZrHc,81685
 scrapely/browser_configuration.py,sha256=jAZapNSHLFW05B96df4wNBtcyiiU9DA3ml0yTL1FwfA,5770
 scrapely/cdp_retry.py,sha256=hdTJEAIKhApM7IOk1DrQEl8NoflSJSmqd4RbNJ2IsgI,8540
-scrapely/charging.py,sha256=TxcALWN4hhwJ0i2raYmtHGA1P79lQ1bmhBMtrvNACIw,81862
+scrapely/charging.py,sha256=uba7lPFx7ENY4aPjqQAN-SDY1wjXZ83jLxcnyGxYDTE,83121
 scrapely/charging_client.py,sha256=-4q-Ww7gu9EZXpM9QIn1Vd4vwAXmgL_WEKqaQIx3ViA,3961
 scrapely/configuration.py,sha256=Of-lKm7hoPGUQO8d08kV7fAy2co9QTfb8Of_8ds5PSA,17028
 scrapely/errors.py,sha256=DCAlVvE3jToZuPEG2HVDL7i8D8hLboomQ5JpSOcsXoQ,4107
@@ -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.19.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
-scrapely_python-0.1.19.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
-scrapely_python-0.1.19.dist-info/licenses/NOTICE,sha256=DEsNrw6UdSIqdYYqMWVFgJnyt6jUivTD7iFU6YM_e1A,1122
-scrapely_python-0.1.19.dist-info/METADATA,sha256=PzFQ4BxF0FgSjgOvSQYimfc5v6Pq2notGIWYHCBa-iQ,3487
-scrapely_python-0.1.19.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-scrapely_python-0.1.19.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
-scrapely_python-0.1.19.dist-info/RECORD,,
+scrapely_python-0.1.20.dist-info/licenses/LICENSE,sha256=pQGY0XwjIYh-a2HfawxHq1en53bXkFkDj2Q70jKWHr4,1088
+scrapely_python-0.1.20.dist-info/licenses/LICENSE-APACHE,sha256=N8m0FzMq8i4UbTgXZvKEZJSD-27OF8pWZYS_atz4kTU,11355
+scrapely_python-0.1.20.dist-info/licenses/NOTICE,sha256=DEsNrw6UdSIqdYYqMWVFgJnyt6jUivTD7iFU6YM_e1A,1122
+scrapely_python-0.1.20.dist-info/METADATA,sha256=ilbOda4UXoNvHh1O91s-GUv8aQ9C8gA1HF_48yb2Tp8,3487
+scrapely_python-0.1.20.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+scrapely_python-0.1.20.dist-info/top_level.txt,sha256=T4B9UMrs4q99QSAFyD1zdXhl40KnLhBKqrDkPhOTsmY,9
+scrapely_python-0.1.20.dist-info/RECORD,,