Merge remote-tracking branch 'origin/master' into alias-storage-configuration-mapping

Author: Pijukatel

.github/workflows/_tests.yaml

@@ -85,15 +85,7 @@ jobs:
         (github.event_name == 'push' && github.ref == 'refs/heads/master')
       }}
 
-    # E2E tests build and run Actors on the platform. The combination of max-parallel 2 with 16 pytest
-    # workers and a global concurrency group is a compromise between stability and performance - it keeps
-    # the platform's resource usage in check while still allowing reasonable test throughput.
-    concurrency:
-      group: e2e-tests
-      cancel-in-progress: false
-
     strategy:
-      max-parallel: 2
       matrix:
         os: ["ubuntu-latest"]
         python-version: ["3.10", "3.14"]

.github/workflows/on_master.yaml

@@ -17,8 +17,8 @@ jobs:
     uses: ./.github/workflows/_check_docs.yaml
 
   doc_release:
-    # Skip this for non-docs commits and forks.
-    if: "startsWith(github.event.head_commit.message, 'docs') && startsWith(github.repository, 'apify/')"
+    # Skip this for non-"docs" commits.
+    if: startsWith(github.event.head_commit.message, 'docs')
     name: Doc release
     needs: [doc_checks]
     uses: ./.github/workflows/_release_docs.yaml
@@ -32,15 +32,20 @@ jobs:
     uses: ./.github/workflows/_check_code.yaml
 
   tests:
-    # Skip this for "ci" and "docs" commits.
-    if: "!startsWith(github.event.head_commit.message, 'ci') && !startsWith(github.event.head_commit.message, 'docs')"
+    # Skip this for "docs" commits.
+    if: "!startsWith(github.event.head_commit.message, 'docs')"
     name: Tests
     uses: ./.github/workflows/_tests.yaml
     secrets: inherit
 
   release_prepare:
-    # Skip this for "ci", "docs" and "test" commits and for forks.
-    if: "!startsWith(github.event.head_commit.message, 'ci') && !startsWith(github.event.head_commit.message, 'docs') && !startsWith(github.event.head_commit.message, 'test') && startsWith(github.repository, 'apify/')"
+    # Run this only for "feat", "fix", "perf", "refactor" and "style" commits.
+    if: >-
+      startsWith(github.event.head_commit.message, 'feat') ||
+      startsWith(github.event.head_commit.message, 'fix') ||
+      startsWith(github.event.head_commit.message, 'perf') ||
+      startsWith(github.event.head_commit.message, 'refactor') ||
+      startsWith(github.event.head_commit.message, 'style')
     name: Release prepare
     needs: [code_checks, tests]
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 ### 🐛 Bug Fixes
 
 - Resolve LogRecord attribute conflict in event manager logging ([#802](https://github.com/apify/apify-sdk-python/pull/802)) ([e1bdbc9](https://github.com/apify/apify-sdk-python/commit/e1bdbc9e303c24571b9511f43ec0815e7e9f4b55)) by [@vdusek](https://github.com/vdusek)
+- Update models.py to align with the current API behavior ([#782](https://github.com/apify/apify-sdk-python/pull/782)) ([b06355d](https://github.com/apify/apify-sdk-python/commit/b06355dbc1c8276e9930ecbde72795b6570dde33)) by [@vdusek](https://github.com/vdusek), closes [#778](https://github.com/apify/apify-sdk-python/issues/778)
 
 
 <!-- git-cliff-unreleased-end -->

src/apify/_charging.py

@@ -156,15 +156,16 @@ async def __aenter__(self) -> None:
 
         # Set pricing model
         if self._configuration.test_pay_per_event:
-            self._pricing_model = 'PAY_PER_EVENT'
+            self._pricing_model: PricingModel = 'PAY_PER_EVENT'
         else:
-            self._pricing_model = pricing_info.pricing_model if pricing_info is not None else None
+            self._pricing_model = pricing_info.pricing_model if pricing_info else None
 
         # Load per-event pricing information
         if pricing_info is not None and isinstance(pricing_info, PayPerEventActorPricingInfo):
-            for event_name, event_pricing in pricing_info.pricing_per_event.actor_charge_events.items():
+            actor_charge_events = pricing_info.pricing_per_event.actor_charge_events or {}
+            for event_name, event_pricing in actor_charge_events.items():
                 self._pricing_info[event_name] = PricingInfoItem(
-                    price=event_pricing.event_price_usd,
+                    price=Decimal(str(event_pricing.event_price_usd)),
                     title=event_pricing.event_title,
                 )
 
@@ -355,10 +356,11 @@ async def _fetch_pricing_info(self) -> _FetchedPricingInfoDict:
             if run is None:
                 raise RuntimeError('Actor run not found')
 
+            max_charge = run.options.max_total_charge_usd
             return _FetchedPricingInfoDict(
                 pricing_info=run.pricing_info,
                 charged_event_counts=run.charged_event_counts or {},
-                max_total_charge_usd=run.options.max_total_charge_usd or Decimal('inf'),
+                max_total_charge_usd=Decimal(str(max_charge)) if max_charge is not None else Decimal('inf'),
             )
 
         # Local development without environment variables

src/apify/_models.py

@@ -1,52 +1,103 @@
 from __future__ import annotations
 
-from datetime import datetime, timedelta
-from decimal import Decimal
-from typing import TYPE_CHECKING, Annotated, Literal
+from datetime import datetime
+from typing import Annotated, Literal
 
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
 from apify_shared.consts import ActorJobStatus, MetaOrigin, WebhookEventType
-from crawlee._utils.models import timedelta_ms
 from crawlee._utils.urls import validate_http_url
 
 from apify._utils import docs_group
 
-if TYPE_CHECKING:
-    from typing import TypeAlias
+PricingModel = Literal['PAY_PER_EVENT', 'PRICE_PER_DATASET_ITEM', 'FLAT_PRICE_PER_MONTH', 'FREE']
+"""Pricing model for an Actor."""
+
+GeneralAccess = Literal['ANYONE_WITH_ID_CAN_READ', 'ANYONE_WITH_NAME_CAN_READ', 'FOLLOW_USER_SETTING', 'RESTRICTED']
+"""Defines the general access level for the resource."""
+
+
+class WebhookCondition(BaseModel):
+    """Condition for triggering a webhook."""
+
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    actor_id: Annotated[str | None, Field(alias='actorId')] = None
+    actor_task_id: Annotated[str | None, Field(alias='actorTaskId')] = None
+    actor_run_id: Annotated[str | None, Field(alias='actorRunId')] = None
+
+
+WebhookDispatchStatus = Literal['ACTIVE', 'SUCCEEDED', 'FAILED']
+"""Status of a webhook dispatch."""
+
+
+class ExampleWebhookDispatch(BaseModel):
+    """Information about a webhook dispatch."""
+
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    status: WebhookDispatchStatus
+    finished_at: Annotated[datetime, Field(alias='finishedAt')]
+
+
+class WebhookStats(BaseModel):
+    """Statistics about webhook dispatches."""
+
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    total_dispatches: Annotated[int, Field(alias='totalDispatches')]
 
 
 @docs_group('Actor')
 class Webhook(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
     event_types: Annotated[
         list[WebhookEventType],
-        Field(description='Event types that should trigger the webhook'),
+        Field(alias='eventTypes', description='Event types that should trigger the webhook'),
     ]
     request_url: Annotated[
         str,
-        Field(description='URL that the webhook should call'),
+        Field(alias='requestUrl', description='URL that the webhook should call'),
         BeforeValidator(validate_http_url),
     ]
+    id: Annotated[str | None, Field(alias='id')] = None
+    created_at: Annotated[datetime | None, Field(alias='createdAt')] = None
+    modified_at: Annotated[datetime | None, Field(alias='modifiedAt')] = None
+    user_id: Annotated[str | None, Field(alias='userId')] = None
+    is_ad_hoc: Annotated[bool | None, Field(alias='isAdHoc')] = None
+    should_interpolate_strings: Annotated[bool | None, Field(alias='shouldInterpolateStrings')] = None
+    condition: Annotated[WebhookCondition | None, Field(alias='condition')] = None
+    ignore_ssl_errors: Annotated[bool | None, Field(alias='ignoreSslErrors')] = None
+    do_not_retry: Annotated[bool | None, Field(alias='doNotRetry')] = None
     payload_template: Annotated[
         str | None,
-        Field(description='Template for the payload sent by the webook'),
+        Field(alias='payloadTemplate', description='Template for the payload sent by the webhook'),
     ] = None
+    headers_template: Annotated[str | None, Field(alias='headersTemplate')] = None
+    description: Annotated[str | None, Field(alias='description')] = None
+    last_dispatch: Annotated[ExampleWebhookDispatch | None, Field(alias='lastDispatch')] = None
+    stats: Annotated[WebhookStats | None, Field(alias='stats')] = None
 
 
 @docs_group('Actor')
 class ActorRunMeta(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
     origin: Annotated[MetaOrigin, Field()]
+    client_ip: Annotated[str | None, Field(alias='clientIp')] = None
+    user_agent: Annotated[str | None, Field(alias='userAgent')] = None
+    schedule_id: Annotated[str | None, Field(alias='scheduleId')] = None
+    scheduled_at: Annotated[datetime | None, Field(alias='scheduledAt')] = None
 
 
 @docs_group('Actor')
 class ActorRunStats(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
     input_body_len: Annotated[int | None, Field(alias='inputBodyLen')] = None
+    migration_count: Annotated[int | None, Field(alias='migrationCount')] = None
+    reboot_count: Annotated[int | None, Field(alias='rebootCount')] = None
     restart_count: Annotated[int, Field(alias='restartCount')]
     resurrect_count: Annotated[int, Field(alias='resurrectCount')]
     mem_avg_bytes: Annotated[float | None, Field(alias='memAvgBytes')] = None
@@ -57,26 +108,47 @@ class ActorRunStats(BaseModel):
     cpu_current_usage: Annotated[float | None, Field(alias='cpuCurrentUsage')] = None
     net_rx_bytes: Annotated[int | None, Field(alias='netRxBytes')] = None
     net_tx_bytes: Annotated[int | None, Field(alias='netTxBytes')] = None
-    duration: Annotated[timedelta_ms | None, Field(alias='durationMillis')] = None
-    run_time: Annotated[timedelta | None, Field(alias='runTimeSecs')] = None
+    duration_millis: Annotated[int | None, Field(alias='durationMillis')] = None
+    run_time_secs: Annotated[float | None, Field(alias='runTimeSecs')] = None
     metamorph: Annotated[int | None, Field(alias='metamorph')] = None
     compute_units: Annotated[float, Field(alias='computeUnits')]
 
 
 @docs_group('Actor')
 class ActorRunOptions(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
     build: str
-    timeout: Annotated[timedelta, Field(alias='timeoutSecs')]
+    timeout_secs: Annotated[int, Field(alias='timeoutSecs')]
     memory_mbytes: Annotated[int, Field(alias='memoryMbytes')]
     disk_mbytes: Annotated[int, Field(alias='diskMbytes')]
-    max_total_charge_usd: Annotated[Decimal | None, Field(alias='maxTotalChargeUsd')] = None
+    max_items: Annotated[int | None, Field(alias='maxItems')] = None
+    max_total_charge_usd: Annotated[float | None, Field(alias='maxTotalChargeUsd')] = None
 
 
 @docs_group('Actor')
 class ActorRunUsage(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    actor_compute_units: Annotated[float | None, Field(alias='ACTOR_COMPUTE_UNITS')] = None
+    dataset_reads: Annotated[int | None, Field(alias='DATASET_READS')] = None
+    dataset_writes: Annotated[int | None, Field(alias='DATASET_WRITES')] = None
+    key_value_store_reads: Annotated[int | None, Field(alias='KEY_VALUE_STORE_READS')] = None
+    key_value_store_writes: Annotated[int | None, Field(alias='KEY_VALUE_STORE_WRITES')] = None
+    key_value_store_lists: Annotated[int | None, Field(alias='KEY_VALUE_STORE_LISTS')] = None
+    request_queue_reads: Annotated[int | None, Field(alias='REQUEST_QUEUE_READS')] = None
+    request_queue_writes: Annotated[int | None, Field(alias='REQUEST_QUEUE_WRITES')] = None
+    data_transfer_internal_gbytes: Annotated[float | None, Field(alias='DATA_TRANSFER_INTERNAL_GBYTES')] = None
+    data_transfer_external_gbytes: Annotated[float | None, Field(alias='DATA_TRANSFER_EXTERNAL_GBYTES')] = None
+    proxy_residential_transfer_gbytes: Annotated[float | None, Field(alias='PROXY_RESIDENTIAL_TRANSFER_GBYTES')] = None
+    proxy_serps: Annotated[int | None, Field(alias='PROXY_SERPS')] = None
+
+
+@docs_group('Actor')
+class ActorRunUsageUsd(BaseModel):
+    """Resource usage costs in USD."""
+
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
     actor_compute_units: Annotated[float | None, Field(alias='ACTOR_COMPUTE_UNITS')] = None
     dataset_reads: Annotated[float | None, Field(alias='DATASET_READS')] = None
@@ -92,9 +164,67 @@ class ActorRunUsage(BaseModel):
     proxy_serps: Annotated[float | None, Field(alias='PROXY_SERPS')] = None
 
 
+class Metamorph(BaseModel):
+    """Information about a metamorph event that occurred during the run."""
+
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    created_at: Annotated[datetime, Field(alias='createdAt')]
+    actor_id: Annotated[str, Field(alias='actorId')]
+    build_id: Annotated[str, Field(alias='buildId')]
+    input_key: Annotated[str | None, Field(alias='inputKey')] = None
+
+
+class CommonActorPricingInfo(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    apify_margin_percentage: Annotated[float | None, Field(alias='apifyMarginPercentage')] = None
+    created_at: Annotated[datetime | None, Field(alias='createdAt')] = None
+    started_at: Annotated[datetime | None, Field(alias='startedAt')] = None
+    notified_about_future_change_at: Annotated[datetime | None, Field(alias='notifiedAboutFutureChangeAt')] = None
+    notified_about_change_at: Annotated[datetime | None, Field(alias='notifiedAboutChangeAt')] = None
+    reason_for_change: Annotated[str | None, Field(alias='reasonForChange')] = None
+
+
+class FreeActorPricingInfo(CommonActorPricingInfo):
+    pricing_model: Annotated[Literal['FREE'], Field(alias='pricingModel')]
+
+
+class FlatPricePerMonthActorPricingInfo(CommonActorPricingInfo):
+    pricing_model: Annotated[Literal['FLAT_PRICE_PER_MONTH'], Field(alias='pricingModel')]
+    trial_minutes: Annotated[int, Field(alias='trialMinutes')]
+    price_per_unit_usd: Annotated[float, Field(alias='pricePerUnitUsd')]
+
+
+class PricePerDatasetItemActorPricingInfo(CommonActorPricingInfo):
+    pricing_model: Annotated[Literal['PRICE_PER_DATASET_ITEM'], Field(alias='pricingModel')]
+    unit_name: Annotated[str, Field(alias='unitName')]
+    price_per_unit_usd: Annotated[float, Field(alias='pricePerUnitUsd')]
+
+
+class ActorChargeEvent(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    event_price_usd: Annotated[float, Field(alias='eventPriceUsd')]
+    event_title: Annotated[str, Field(alias='eventTitle')]
+    event_description: Annotated[str | None, Field(alias='eventDescription')] = None
+
+
+class PricingPerEvent(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
+
+    actor_charge_events: Annotated[dict[str, ActorChargeEvent] | None, Field(alias='actorChargeEvents')] = None
+
+
+class PayPerEventActorPricingInfo(CommonActorPricingInfo):
+    pricing_model: Annotated[Literal['PAY_PER_EVENT'], Field(alias='pricingModel')]
+    pricing_per_event: Annotated[PricingPerEvent, Field(alias='pricingPerEvent')]
+    minimal_max_total_charge_usd: Annotated[float | None, Field(alias='minimalMaxTotalChargeUsd')] = None
+
+
 @docs_group('Actor')
 class ActorRun(BaseModel):
-    __model_config__ = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
     id: Annotated[str, Field(alias='id')]
     act_id: Annotated[str, Field(alias='actId')]
@@ -110,16 +240,17 @@ class ActorRun(BaseModel):
     options: Annotated[ActorRunOptions, Field(alias='options')]
     build_id: Annotated[str, Field(alias='buildId')]
     exit_code: Annotated[int | None, Field(alias='exitCode')] = None
+    general_access: Annotated[str | None, Field(alias='generalAccess')] = None
     default_key_value_store_id: Annotated[str, Field(alias='defaultKeyValueStoreId')]
     default_dataset_id: Annotated[str, Field(alias='defaultDatasetId')]
     default_request_queue_id: Annotated[str, Field(alias='defaultRequestQueueId')]
     build_number: Annotated[str | None, Field(alias='buildNumber')] = None
-    container_url: Annotated[str, Field(alias='containerUrl')]
+    container_url: Annotated[str | None, Field(alias='containerUrl')] = None
     is_container_server_ready: Annotated[bool | None, Field(alias='isContainerServerReady')] = None
     git_branch_name: Annotated[str | None, Field(alias='gitBranchName')] = None
     usage: Annotated[ActorRunUsage | None, Field(alias='usage')] = None
     usage_total_usd: Annotated[float | None, Field(alias='usageTotalUsd')] = None
-    usage_usd: Annotated[ActorRunUsage | None, Field(alias='usageUsd')] = None
+    usage_usd: Annotated[ActorRunUsageUsd | None, Field(alias='usageUsd')] = None
     pricing_info: Annotated[
         FreeActorPricingInfo
         | FlatPricePerMonthActorPricingInfo
@@ -132,43 +263,4 @@ class ActorRun(BaseModel):
         dict[str, int] | None,
         Field(alias='chargedEventCounts'),
     ] = None
-
-
-class FreeActorPricingInfo(BaseModel):
-    pricing_model: Annotated[Literal['FREE'], Field(alias='pricingModel')]
-
-
-class FlatPricePerMonthActorPricingInfo(BaseModel):
-    pricing_model: Annotated[Literal['FLAT_PRICE_PER_MONTH'], Field(alias='pricingModel')]
-    trial_minutes: Annotated[int | None, Field(alias='trialMinutes')] = None
-    price_per_unit_usd: Annotated[Decimal, Field(alias='pricePerUnitUsd')]
-
-
-class PricePerDatasetItemActorPricingInfo(BaseModel):
-    pricing_model: Annotated[Literal['PRICE_PER_DATASET_ITEM'], Field(alias='pricingModel')]
-    unit_name: Annotated[str | None, Field(alias='unitName')] = None
-    price_per_unit_usd: Annotated[Decimal, Field(alias='pricePerUnitUsd')]
-
-
-class ActorChargeEvent(BaseModel):
-    event_price_usd: Annotated[Decimal, Field(alias='eventPriceUsd')]
-    event_title: Annotated[str, Field(alias='eventTitle')]
-    event_description: Annotated[str | None, Field(alias='eventDescription')] = None
-
-
-class PricingPerEvent(BaseModel):
-    actor_charge_events: Annotated[dict[str, ActorChargeEvent], Field(alias='actorChargeEvents')]
-
-
-class PayPerEventActorPricingInfo(BaseModel):
-    pricing_model: Annotated[Literal['PAY_PER_EVENT'], Field(alias='pricingModel')]
-    pricing_per_event: Annotated[PricingPerEvent, Field(alias='pricingPerEvent')]
-    minimal_max_total_charge_usd: Annotated[Decimal | None, Field(alias='minimalMaxTotalChargeUsd')] = None
-
-
-PricingModel: TypeAlias = Literal[
-    'FREE',
-    'FLAT_PRICE_PER_MONTH',
-    'PRICE_PER_DATASET_ITEM',
-    'PAY_PER_EVENT',
-]
+    metamorphs: Annotated[list[Metamorph] | None, Field(alias='metamorphs')] = None