address feedback

Author: vdusek

src/apify_client/_resource_clients/actor.py

@@ -168,7 +168,7 @@ def update(
         Returns:
             The updated Actor.
         """
-        request = UpdateActorRequest(
+        actor_fields = UpdateActorRequest(
             name=name,
             title=title,
             description=description,
@@ -201,7 +201,7 @@ def update(
             ),
             tagged_builds=tagged_builds,
         )
-        result = self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._update(**actor_fields.model_dump(by_alias=True, exclude_none=True))
         return ActorResponse.model_validate(result).data
 
     def delete(self) -> None:
@@ -633,7 +633,7 @@ async def update(
         Returns:
             The updated Actor.
         """
-        request = UpdateActorRequest(
+        actor_fields = UpdateActorRequest(
             name=name,
             title=title,
             description=description,
@@ -666,7 +666,7 @@ async def update(
             ),
             tagged_builds=tagged_builds,
         )
-        result = await self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._update(**actor_fields.model_dump(by_alias=True, exclude_none=True))
         return ActorResponse.model_validate(result).data
 
     async def delete(self) -> None:

src/apify_client/_resource_clients/actor_collection.py

@@ -120,7 +120,7 @@ def create(
         Returns:
             The created Actor.
         """
-        request = CreateActorRequest(
+        actor_fields = CreateActorRequest(
             name=name,
             title=title,
             description=description,
@@ -150,7 +150,7 @@ def create(
                 content_type=example_run_input_content_type,
             ),
         )
-        result = self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._create(**actor_fields.model_dump(by_alias=True, exclude_none=True))
         return ActorResponse.model_validate(result).data
 
 
@@ -254,7 +254,7 @@ async def create(
         Returns:
             The created Actor.
         """
-        request = CreateActorRequest(
+        actor_fields = CreateActorRequest(
             name=name,
             title=title,
             description=description,
@@ -284,5 +284,5 @@ async def create(
                 content_type=example_run_input_content_type,
             ),
         )
-        result = await self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._create(**actor_fields.model_dump(by_alias=True, exclude_none=True))
         return ActorResponse.model_validate(result).data

src/apify_client/_resource_clients/actor_version.py

@@ -96,7 +96,7 @@ def update(
         Returns:
             The updated Actor version.
         """
-        request = CreateOrUpdateVersionRequest(
+        version_fields = CreateOrUpdateVersionRequest(
             build_tag=build_tag,
             env_vars=[EnvVar.model_validate(v) for v in env_vars] if env_vars else None,
             apply_env_vars_to_build=apply_env_vars_to_build,
@@ -106,7 +106,7 @@ def update(
             tarball_url=tarball_url,
             github_gist_url=github_gist_url,
         )
-        result = self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._update(**version_fields.model_dump(by_alias=True, exclude_none=True))
         return VersionResponse.model_validate(result).data
 
     def delete(self) -> None:
@@ -204,7 +204,7 @@ async def update(
         Returns:
             The updated Actor version.
         """
-        request = CreateOrUpdateVersionRequest(
+        version_fields = CreateOrUpdateVersionRequest(
             build_tag=build_tag,
             env_vars=[EnvVar.model_validate(v) for v in env_vars] if env_vars else None,
             apply_env_vars_to_build=apply_env_vars_to_build,
@@ -214,7 +214,7 @@ async def update(
             tarball_url=tarball_url,
             github_gist_url=github_gist_url,
         )
-        result = await self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._update(**version_fields.model_dump(by_alias=True, exclude_none=True))
         return VersionResponse.model_validate(result).data
 
     async def delete(self) -> None:

src/apify_client/_resource_clients/actor_version_collection.py

@@ -81,7 +81,7 @@ def create(
         Returns:
             The created Actor version.
         """
-        request = CreateOrUpdateVersionRequest(
+        version_fields = CreateOrUpdateVersionRequest(
             version_number=version_number,
             build_tag=build_tag,
             env_vars=[EnvVar.model_validate(v) for v in env_vars] if env_vars else None,
@@ -92,7 +92,7 @@ def create(
             tarball_url=tarball_url,
             github_gist_url=github_gist_url,
         )
-        result = self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._create(**version_fields.model_dump(by_alias=True, exclude_none=True))
         return VersionResponse.model_validate(result).data
 
 
@@ -156,7 +156,7 @@ async def create(
         Returns:
             The created Actor version.
         """
-        request = CreateOrUpdateVersionRequest(
+        version_fields = CreateOrUpdateVersionRequest(
             version_number=version_number,
             build_tag=build_tag,
             env_vars=[EnvVar.model_validate(v) for v in env_vars] if env_vars else None,
@@ -167,5 +167,5 @@ async def create(
             tarball_url=tarball_url,
             github_gist_url=github_gist_url,
         )
-        result = await self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._create(**version_fields.model_dump(by_alias=True, exclude_none=True))
         return VersionResponse.model_validate(result).data

src/apify_client/_resource_clients/schedule.py

@@ -72,7 +72,7 @@ def update(
         Returns:
             The updated schedule.
         """
-        request = ScheduleCreate(
+        schedule_fields = ScheduleCreate(
             cron_expression=cron_expression,
             is_enabled=is_enabled,
             is_exclusive=is_exclusive,
@@ -82,7 +82,7 @@ def update(
             timezone=timezone,
             title=title,
         )
-        result = self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._update(**schedule_fields.model_dump(by_alias=True, exclude_none=True))
         return ScheduleResponse.model_validate(result).data
 
     def delete(self) -> None:
@@ -170,7 +170,7 @@ async def update(
         Returns:
             The updated schedule.
         """
-        request = ScheduleCreate(
+        schedule_fields = ScheduleCreate(
             cron_expression=cron_expression,
             is_enabled=is_enabled,
             is_exclusive=is_exclusive,
@@ -180,7 +180,7 @@ async def update(
             timezone=timezone,
             title=title,
         )
-        result = await self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._update(**schedule_fields.model_dump(by_alias=True, exclude_none=True))
         return ScheduleResponse.model_validate(result).data
 
     async def delete(self) -> None:

src/apify_client/_resource_clients/schedule_collection.py

@@ -82,7 +82,7 @@ def create(
         if not actions:
             actions = []
 
-        request = ScheduleCreate(
+        schedule_fields = ScheduleCreate(
             cron_expression=cron_expression,
             is_enabled=is_enabled,
             is_exclusive=is_exclusive,
@@ -92,7 +92,7 @@ def create(
             timezone=timezone,
             title=title,
         )
-        result = self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._create(**schedule_fields.model_dump(by_alias=True, exclude_none=True))
         return ScheduleResponse.model_validate(result).data
 
 
@@ -164,7 +164,7 @@ async def create(
         if not actions:
             actions = []
 
-        request = ScheduleCreate(
+        schedule_fields = ScheduleCreate(
             cron_expression=cron_expression,
             is_enabled=is_enabled,
             is_exclusive=is_exclusive,
@@ -174,5 +174,5 @@ async def create(
             timezone=timezone,
             title=title,
         )
-        result = await self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._create(**schedule_fields.model_dump(by_alias=True, exclude_none=True))
         return ScheduleResponse.model_validate(result).data

src/apify_client/_resource_clients/task.py

@@ -114,7 +114,7 @@ def update(
         Returns:
             The updated task.
         """
-        request = UpdateTaskRequest(
+        task_fields = UpdateTaskRequest(
             name=name,
             title=title,
             input=TaskInput.model_validate(task_input) if task_input else None,
@@ -133,7 +133,7 @@ def update(
                 memory_mbytes=actor_standby_memory_mbytes,
             ),
         )
-        result = self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._update(**task_fields.model_dump(by_alias=True, exclude_none=True))
         return TaskResponse.model_validate(result).data
 
     def delete(self) -> None:
@@ -409,7 +409,7 @@ async def update(
         Returns:
             The updated task.
         """
-        request = UpdateTaskRequest(
+        task_fields = UpdateTaskRequest(
             name=name,
             title=title,
             input=TaskInput.model_validate(task_input) if task_input else None,
@@ -428,7 +428,7 @@ async def update(
                 memory_mbytes=actor_standby_memory_mbytes,
             ),
         )
-        result = await self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._update(**task_fields.model_dump(by_alias=True, exclude_none=True))
         return TaskResponse.model_validate(result).data
 
     async def delete(self) -> None:

src/apify_client/_resource_clients/task_collection.py

@@ -103,7 +103,7 @@ def create(
         Returns:
             The created task.
         """
-        request = CreateTaskRequest(
+        task_fields = CreateTaskRequest(
             act_id=actor_id,
             name=name,
             title=title,
@@ -123,7 +123,7 @@ def create(
                 memory_mbytes=actor_standby_memory_mbytes,
             ),
         )
-        result = self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._create(**task_fields.model_dump(by_alias=True, exclude_none=True))
         return TaskResponse.model_validate(result).data
 
 
@@ -210,7 +210,7 @@ async def create(
         Returns:
             The created task.
         """
-        request = CreateTaskRequest(
+        task_fields = CreateTaskRequest(
             act_id=actor_id,
             name=name,
             title=title,
@@ -230,5 +230,5 @@ async def create(
                 memory_mbytes=actor_standby_memory_mbytes,
             ),
         )
-        result = await self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._create(**task_fields.model_dump(by_alias=True, exclude_none=True))
         return TaskResponse.model_validate(result).data

src/apify_client/_resource_clients/webhook.py

@@ -81,24 +81,21 @@ def update(
         Returns:
             The updated webhook.
         """
-        if actor_run_id is not None and is_ad_hoc is None:
-            is_ad_hoc = True
-
-        request = WebhookUpdate(
+        webhook_update = WebhookUpdate(
             event_types=list(event_types) if event_types is not None else None,
             request_url=AnyUrl(request_url) if request_url is not None else None,
             payload_template=payload_template,
             headers_template=headers_template,
             ignore_ssl_errors=ignore_ssl_errors,
             do_not_retry=do_not_retry,
-            is_ad_hoc=is_ad_hoc,
+            is_ad_hoc=is_ad_hoc if actor_run_id else None,
             condition=WebhookCondition(
                 actor_run_id=actor_run_id,
                 actor_task_id=actor_task_id,
                 actor_id=actor_id,
             ),
         )
-        result = self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._update(**webhook_update.model_dump(by_alias=True, exclude_none=True))
         return WebhookResponse.model_validate(result).data
 
     def delete(self) -> None:
@@ -206,24 +203,21 @@ async def update(
         Returns:
             The updated webhook.
         """
-        if actor_run_id is not None and is_ad_hoc is None:
-            is_ad_hoc = True
-
-        request = WebhookUpdate(
+        webhook_update = WebhookUpdate(
             event_types=list(event_types) if event_types is not None else None,
             request_url=AnyUrl(request_url) if request_url is not None else None,
             payload_template=payload_template,
             headers_template=headers_template,
             ignore_ssl_errors=ignore_ssl_errors,
             do_not_retry=do_not_retry,
-            is_ad_hoc=is_ad_hoc,
+            is_ad_hoc=is_ad_hoc if actor_run_id else None,
             condition=WebhookCondition(
                 actor_run_id=actor_run_id,
                 actor_task_id=actor_task_id,
                 actor_id=actor_id,
             ),
         )
-        result = await self._update(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._update(**webhook_update.model_dump(by_alias=True, exclude_none=True))
         return WebhookResponse.model_validate(result).data
 
     async def delete(self) -> None:

src/apify_client/_resource_clients/webhook_collection.py

@@ -91,25 +91,22 @@ def create(
         Returns:
            The created webhook.
         """
-        if actor_run_id is not None and is_ad_hoc is None:
-            is_ad_hoc = True
-
-        request = WebhookCreate(
+        webhook_create = WebhookCreate(
             event_types=list(event_types),
             request_url=AnyUrl(request_url),
             payload_template=payload_template,
             headers_template=headers_template,
             ignore_ssl_errors=ignore_ssl_errors,
             do_not_retry=do_not_retry,
             idempotency_key=idempotency_key,
-            is_ad_hoc=is_ad_hoc,
+            is_ad_hoc=is_ad_hoc if actor_run_id else None,
             condition=WebhookCondition(
                 actor_run_id=actor_run_id,
                 actor_task_id=actor_task_id,
                 actor_id=actor_id,
             ),
         )
-        result = self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = self._create(**webhook_create.model_dump(by_alias=True, exclude_none=True))
         return WebhookResponse.model_validate(result).data
 
 
@@ -186,23 +183,20 @@ async def create(
         Returns:
            The created webhook.
         """
-        if actor_run_id is not None and is_ad_hoc is None:
-            is_ad_hoc = True
-
-        request = WebhookCreate(
+        webhook_create = WebhookCreate(
             event_types=list(event_types),
             request_url=AnyUrl(request_url),
             payload_template=payload_template,
             headers_template=headers_template,
             ignore_ssl_errors=ignore_ssl_errors,
             do_not_retry=do_not_retry,
             idempotency_key=idempotency_key,
-            is_ad_hoc=is_ad_hoc,
+            is_ad_hoc=is_ad_hoc if actor_run_id else None,
             condition=WebhookCondition(
                 actor_run_id=actor_run_id,
                 actor_task_id=actor_task_id,
                 actor_id=actor_id,
             ),
         )
-        result = await self._create(**request.model_dump(by_alias=True, exclude_none=True))
+        result = await self._create(**webhook_create.model_dump(by_alias=True, exclude_none=True))
         return WebhookResponse.model_validate(result).data