resolve conflict

Author: Mantisus

src/apify/_charging.py

@@ -242,6 +242,7 @@ async def __aexit__(
         charging_manager_ctx.set(None)
         self.active = False
 
+    @_ensure_context
     @_ensure_context
     async def charge(self, event_name: str, count: int = 1) -> ChargeResult:
         def calculate_chargeable() -> dict[str, int | None]:
@@ -336,13 +337,15 @@ def calculate_chargeable() -> dict[str, int | None]:
             chargeable_within_limit=calculate_chargeable(),
         )
 
+    @_ensure_context
     @_ensure_context
     def calculate_total_charged_amount(self) -> Decimal:
         return sum(
             (item.total_charged_amount for item in self._charging_state.values()),
             start=Decimal(),
         )
 
+    @_ensure_context
     @_ensure_context
     def calculate_max_event_charge_count_within_limit(self, event_name: str) -> int | None:
         price = self._get_event_price(event_name)
@@ -353,6 +356,7 @@ def calculate_max_event_charge_count_within_limit(self, event_name: str) -> int
         result = (self._max_total_charge_usd - self.calculate_total_charged_amount()) / price
         return max(0, math.floor(result)) if result.is_finite() else None
 
+    @_ensure_context
     @_ensure_context
     def get_pricing_info(self) -> ActorPricingInfo:
         return ActorPricingInfo(
@@ -366,11 +370,13 @@ def get_pricing_info(self) -> ActorPricingInfo:
             },
         )
 
+    @_ensure_context
     @_ensure_context
     def get_charged_event_count(self, event_name: str) -> int:
         item = self._charging_state.get(event_name)
         return item.charge_count if item is not None else 0
 
+    @_ensure_context
     @_ensure_context
     def get_max_total_charge_usd(self) -> Decimal:
         return self._max_total_charge_usd