polish

Author: vdusek

src/apify/_charging.py

@@ -10,24 +10,12 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 import apify_client._models as _client_models
-from apify_client._models import (
-    ActorChargeEvent as _ClientActorChargeEvent,
-)
-from apify_client._models import (
-    FlatPricePerMonthActorPricingInfo as _ClientFlatPricePerMonth,
-)
-from apify_client._models import (
-    FreeActorPricingInfo as _ClientFree,
-)
-from apify_client._models import (
-    PayPerEventActorPricingInfo as _ClientPayPerEvent,
-)
-from apify_client._models import (
-    PricePerDatasetItemActorPricingInfo as _ClientPricePerDatasetItem,
-)
-from apify_client._models import (
-    PricingPerEvent as _ClientPricingPerEvent,
-)
+from apify_client._models import ActorChargeEvent as ClientActorChargeEvent
+from apify_client._models import FlatPricePerMonthActorPricingInfo as ClientFlatPricePerMonth
+from apify_client._models import FreeActorPricingInfo as ClientFree
+from apify_client._models import PayPerEventActorPricingInfo as ClientPayPerEvent
+from apify_client._models import PricePerDatasetItemActorPricingInfo as ClientPricePerDatasetItem
+from apify_client._models import PricingPerEvent as ClientPricingPerEvent
 
 from apify._utils import ReentrantLock, docs_group, ensure_context
 from apify.log import logger
@@ -74,40 +62,40 @@ class _RelaxedPricingMetadata(BaseModel):
 
 
 @docs_group('Charging')
-class ActorChargeEvent(_ClientActorChargeEvent):
+class ActorChargeEvent(ClientActorChargeEvent):
     # `event_description` is required in apify-client but omitted from the env var.
     event_description: Annotated[str | None, Field(alias='eventDescription')] = None
 
 
 @docs_group('Charging')
-class PricingPerEvent(_ClientPricingPerEvent):
+class PricingPerEvent(ClientPricingPerEvent):
     actor_charge_events: Annotated[dict[str, ActorChargeEvent] | None, Field(alias='actorChargeEvents')] = None
 
 
 @docs_group('Charging')
-class FreeActorPricingInfo(_RelaxedPricingMetadata, _ClientFree):
+class FreeActorPricingInfo(_RelaxedPricingMetadata, ClientFree):
     pass
 
 
 @docs_group('Charging')
-class FlatPricePerMonthActorPricingInfo(_RelaxedPricingMetadata, _ClientFlatPricePerMonth):
+class FlatPricePerMonthActorPricingInfo(_RelaxedPricingMetadata, ClientFlatPricePerMonth):
     trial_minutes: Annotated[int | None, Field(alias='trialMinutes')] = None
     price_per_unit_usd: Annotated[float | None, Field(alias='pricePerUnitUsd')] = None
 
 
 @docs_group('Charging')
-class PricePerDatasetItemActorPricingInfo(_RelaxedPricingMetadata, _ClientPricePerDatasetItem):
+class PricePerDatasetItemActorPricingInfo(_RelaxedPricingMetadata, ClientPricePerDatasetItem):
     unit_name: Annotated[str | None, Field(alias='unitName')] = None
     # `price_per_unit_usd` is already optional in apify-client - inherited.
 
 
 @docs_group('Charging')
-class PayPerEventActorPricingInfo(_RelaxedPricingMetadata, _ClientPayPerEvent):
+class PayPerEventActorPricingInfo(_RelaxedPricingMetadata, ClientPayPerEvent):
     # Re-typed to the relaxed element so an omitted `eventDescription` validates; the field stays required.
     pricing_per_event: Annotated[PricingPerEvent, Field(alias='pricingPerEvent')]
 
 
-ActorPricingInfoModel = _ClientFree | _ClientFlatPricePerMonth | _ClientPricePerDatasetItem | _ClientPayPerEvent
+ActorPricingInfoModel = ClientFree | ClientFlatPricePerMonth | ClientPricePerDatasetItem | ClientPayPerEvent
 """Common supertype of both env-var-parsed SDK subclasses and the API-returned `Run.pricing_info`."""
 
 # apify-client ships these models with deferred forward refs (`__pydantic_complete__` is False), so the
@@ -294,7 +282,7 @@ async def __aenter__(self) -> None:
 
         # Load per-event pricing information. Check against the apify-client base so both env-var-parsed
         # SDK subclasses and the API-returned model match.
-        if isinstance(pricing_info, _ClientPayPerEvent):
+        if isinstance(pricing_info, ClientPayPerEvent):
             actor_charge_events = pricing_info.pricing_per_event.actor_charge_events or {}
             for event_name, event_pricing in actor_charge_events.items():
                 if event_pricing.event_price_usd is None: