Merge branch 'master' into update-models-docs-pr-2412

Author: vdusek

pyproject.toml

@@ -226,6 +226,8 @@ extra_fields = "allow"
 allow_population_by_field_name = true
 aliases = "datamodel_codegen_aliases.json"
 formatters = ["ruff-check", "ruff-format"]
+custom_file_header = "# generated by datamodel-codegen"
+disable_timestamp = true
 
 [tool.uv]
 # Minimal defense against supply-chain atatcks.

src/apify_client/_models.py

@@ -1,6 +1,4 @@
-# generated by datamodel-codegen:
-#   filename:  openapi.json
-#   timestamp: 2026-04-09T11:54:55+00:00
+# generated by datamodel-codegen
 
 from __future__ import annotations
 
@@ -152,8 +150,8 @@ class SourceCodeFile(BaseModel):
         extra='allow',
         populate_by_name=True,
     )
-    format: SourceCodeFileFormat
-    content: Annotated[str, Field(examples=["console.log('This is the main.js file');"])]
+    format: SourceCodeFileFormat | None = None
+    content: Annotated[str | None, Field(examples=["console.log('This is the main.js file');"])] = None
     name: Annotated[str, Field(examples=['src/main.js'])]
 
 
@@ -229,14 +227,6 @@ class CommonActorPricingInfo(BaseModel):
     reason_for_change: Annotated[str | None, Field(alias='reasonForChange')] = None
 
 
-@docs_group('Models')
-class PricingModel(StrEnum):
-    PAY_PER_EVENT = 'PAY_PER_EVENT'
-    PRICE_PER_DATASET_ITEM = 'PRICE_PER_DATASET_ITEM'
-    FLAT_PRICE_PER_MONTH = 'FLAT_PRICE_PER_MONTH'
-    FREE = 'FREE'
-
-
 @docs_group('Models')
 class ActorChargeEvent(BaseModel):
     model_config = ConfigDict(
@@ -679,6 +669,27 @@ class ActorNotFoundError(BaseModel):
     error: ActorNotFoundErrorDetail | None = None
 
 
+@docs_group('Models')
+class RecordOrTokenNotFoundErrorDetail(ErrorDetail):
+    model_config = ConfigDict(
+        extra='allow',
+        populate_by_name=True,
+    )
+    type: Annotated[Literal['record-or-token-not-found'], Field(title='ErrorType')] = 'record-or-token-not-found'
+    """
+    Machine-processable error type identifier.
+    """
+
+
+@docs_group('Models')
+class RecordOrTokenNotFoundError(BaseModel):
+    model_config = ConfigDict(
+        extra='allow',
+        populate_by_name=True,
+    )
+    error: RecordOrTokenNotFoundErrorDetail | None = None
+
+
 @docs_group('Models')
 class RecordNotFoundErrorDetail(ErrorDetail):
     model_config = ConfigDict(
@@ -1632,7 +1643,7 @@ class CreateTaskRequest(BaseModel):
         populate_by_name=True,
     )
     act_id: Annotated[str, Field(alias='actId', examples=['asADASadYvn4mBZmm'])]
-    name: Annotated[str, Field(examples=['my-task'])]
+    name: Annotated[str | None, Field(examples=['my-task'])] = None
     options: TaskOptions | None = None
     input: TaskInput | None = None
     title: str | None = None
@@ -1735,27 +1746,6 @@ class ChargeRunRequest(BaseModel):
     count: Annotated[int, Field(examples=[1])]
 
 
-@docs_group('Models')
-class RecordOrTokenNotFoundErrorDetail(ErrorDetail):
-    model_config = ConfigDict(
-        extra='allow',
-        populate_by_name=True,
-    )
-    type: Annotated[Literal['record-or-token-not-found'], Field(title='ErrorType')] = 'record-or-token-not-found'
-    """
-    Machine-processable error type identifier.
-    """
-
-
-@docs_group('Models')
-class RecordOrTokenNotFoundError(BaseModel):
-    model_config = ConfigDict(
-        extra='allow',
-        populate_by_name=True,
-    )
-    error: RecordOrTokenNotFoundErrorDetail | None = None
-
-
 @docs_group('Models')
 class StorageOwnership(StrEnum):
     OWNED_BY_ME = 'ownedByMe'
@@ -2475,7 +2465,7 @@ class RequestBase(BaseModel):
     """
     A unique key used for request de-duplication. Requests with the same unique key are considered identical.
     """
-    url: Annotated[AnyUrl | None, Field(examples=['https://apify.com'])] = None
+    url: Annotated[str | None, Field(examples=['https://apify.com'])] = None
     """
     The URL of the request.
     """
@@ -2488,7 +2478,7 @@ class RequestBase(BaseModel):
     """
     The final URL that was loaded, after redirects (if any).
     """
-    payload: Annotated[dict[str, Any] | None, Field(examples=[None])] = None
+    payload: Annotated[str | dict[str, Any] | None, Field(examples=[None])] = None
     """
     The request payload, typically used with POST or PUT requests.
     """
@@ -2553,7 +2543,7 @@ class RequestDraft(BaseModel):
     """
     A unique key used for request de-duplication. Requests with the same unique key are considered identical.
     """
-    url: Annotated[AnyUrl, Field(examples=['https://apify.com'])]
+    url: Annotated[str, Field(examples=['https://apify.com'])]
     """
     The URL of the request.
     """
@@ -2872,7 +2862,7 @@ class HeadRequest(BaseModel):
     """
     A unique key used for request de-duplication. Requests with the same unique key are considered identical.
     """
-    url: Annotated[AnyUrl, Field(examples=['https://apify.com'])]
+    url: Annotated[str, Field(examples=['https://apify.com'])]
     """
     The URL of the request.
     """
@@ -2936,7 +2926,7 @@ class LockedHeadRequest(BaseModel):
     """
     A unique key used for request de-duplication. Requests with the same unique key are considered identical.
     """
-    url: Annotated[AnyUrl, Field(examples=['https://apify.com'])]
+    url: Annotated[str, Field(examples=['https://apify.com'])]
     """
     The URL of the request.
     """
@@ -3037,7 +3027,7 @@ class WebhookCreate(BaseModel):
     idempotency_key: Annotated[str | None, Field(alias='idempotencyKey', examples=['fdSJmdP3nfs7sfk3y'])] = None
     ignore_ssl_errors: Annotated[bool | None, Field(alias='ignoreSslErrors', examples=[False])] = None
     do_not_retry: Annotated[bool | None, Field(alias='doNotRetry', examples=[False])] = None
-    request_url: Annotated[AnyUrl, Field(alias='requestUrl', examples=['http://example.com/'])]
+    request_url: Annotated[str, Field(alias='requestUrl', examples=['http://example.com/'])]
     payload_template: Annotated[
         str | None, Field(alias='payloadTemplate', examples=['{\\n "userId": {{userId}}...'])
     ] = None

src/apify_client/_resource_clients/webhook_collection.py

@@ -2,8 +2,6 @@
 
 from typing import TYPE_CHECKING, Any
 
-from pydantic import AnyUrl
-
 from apify_client._docs import docs_group
 from apify_client._models import (
     ListOfWebhooks,
@@ -105,7 +103,7 @@ def create(
         """
         webhook_create = WebhookCreate(
             event_types=list(event_types),
-            request_url=AnyUrl(request_url),
+            request_url=request_url,
             payload_template=payload_template,
             headers_template=headers_template,
             ignore_ssl_errors=ignore_ssl_errors,
@@ -208,7 +206,7 @@ async def create(
         """
         webhook_create = WebhookCreate(
             event_types=list(event_types),
-            request_url=AnyUrl(request_url),
+            request_url=request_url,
             payload_template=payload_template,
             headers_template=headers_template,
             ignore_ssl_errors=ignore_ssl_errors,

tests/unit/test_utils.py

@@ -5,7 +5,6 @@
 
 import impit
 import pytest
-from pydantic import AnyUrl
 
 from apify_client._models import WebhookCondition, WebhookCreate, WebhookEventType
 from apify_client._resource_clients._resource_client import ResourceClientBase
@@ -39,12 +38,12 @@ def test_webhook_representation_list_to_base64() -> None:
                 WebhookCreate(
                     event_types=[WebhookEventType.ACTOR_RUN_CREATED],
                     condition=WebhookCondition(),
-                    request_url=AnyUrl('https://example.com/run-created'),
+                    request_url='https://example.com/run-created',
                 ),
                 WebhookCreate(
                     event_types=[WebhookEventType.ACTOR_RUN_SUCCEEDED],
                     condition=WebhookCondition(),
-                    request_url=AnyUrl('https://example.com/run-succeeded'),
+                    request_url='https://example.com/run-succeeded',
                     payload_template='{"hello": "world", "resource":{{resource}}}',
                 ),
             ]
@@ -77,12 +76,12 @@ def test_webhook_representation_list_from_dicts() -> None:
             WebhookCreate(
                 event_types=[WebhookEventType.ACTOR_RUN_CREATED],
                 condition=WebhookCondition(),
-                request_url=AnyUrl('https://example.com/run-created'),
+                request_url='https://example.com/run-created',
             ),
             WebhookCreate(
                 event_types=[WebhookEventType.ACTOR_RUN_SUCCEEDED],
                 condition=WebhookCondition(),
-                request_url=AnyUrl('https://example.com/run-succeeded'),
+                request_url='https://example.com/run-succeeded',
                 payload_template='{"hello": "world"}',
             ),
         ]

website/yarn.lock

@@ -7070,13 +7070,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.7.9":
-  version: 1.13.6
-  resolution: "axios@npm:1.13.6"
+  version: 1.15.0
+  resolution: "axios@npm:1.15.0"
   dependencies:
     follow-redirects: "npm:^1.15.11"
     form-data: "npm:^4.0.5"
-    proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/51fb5af055c3b85662fa97df17d986ae2c37d13bf86d50b6bb36b6b3a2dec6966a1d3a14ab3774b71707b155ae3597ed9b7babdf1a1a863d1a31840cb8e7ec71
+    proxy-from-env: "npm:^2.1.0"
+  checksum: 10c0/47e0f860e98d4d7aa145e89ce0cae00e1fb0f1d2485f065c21fce955ddb1dba4103a46bd0e47acd18a27208a7f62c96249e620db575521b92a968619ab133409
   languageName: node
   linkType: hard
 
@@ -15361,10 +15361,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "proxy-from-env@npm:1.1.0"
-  checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
+"proxy-from-env@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "proxy-from-env@npm:2.1.0"
+  checksum: 10c0/ed01729fd4d094eab619cd7e17ce3698b3413b31eb102c4904f9875e677cd207392795d5b4adee9cec359dfd31c44d5ad7595a3a3ad51c40250e141512281c58
   languageName: node
   linkType: hard