Address feedback (p3)

Author: vdusek

docs/02_concepts/code/05_retries_sync.py

@@ -5,7 +5,7 @@
 TOKEN = 'MY-APIFY-TOKEN'
 
 
-async def main() -> None:
+def main() -> None:
     apify_client = ApifyClient(
         token=TOKEN,
         max_retries=8,

docs/03_examples/code/02_tasks_async.py

@@ -1,22 +1,16 @@
 import asyncio
 
 from apify_client import ApifyClientAsync
-from apify_client._models import Run, Task
-from apify_client._resource_clients import TaskClientAsync
 
 TOKEN = 'MY-APIFY-TOKEN'
 HASHTAGS = ['zebra', 'lion', 'hippo']
 
 
-async def run_apify_task(client: TaskClientAsync) -> Run | None:
-    return await client.call()
-
-
 async def main() -> None:
     apify_client = ApifyClientAsync(token=TOKEN)
 
     # Create Apify tasks
-    apify_tasks = list[Task]()
+    apify_tasks = []
     apify_tasks_client = apify_client.tasks()
 
     for hashtag in HASHTAGS:
@@ -31,20 +25,19 @@ async def main() -> None:
     print('Tasks created:', apify_tasks)
 
     # Create Apify task clients
-    apify_task_clients = list[TaskClientAsync]()
-
-    for apify_task in apify_tasks:
-        task_id = apify_task.id
-        apify_task_client = apify_client.task(task_id)
-        apify_task_clients.append(apify_task_client)
+    apify_task_clients = [apify_client.task(task.id) for task in apify_tasks]
 
     print('Task clients created:', apify_task_clients)
 
     # Execute Apify tasks
-    run_apify_tasks = [run_apify_task(client) for client in apify_task_clients]
-    task_run_results = await asyncio.gather(*run_apify_tasks)
+    task_run_results = await asyncio.gather(
+        *[client.call() for client in apify_task_clients]
+    )
+
+    # Filter out None results (tasks that failed to return a run)
+    successful_runs = [run for run in task_run_results if run is not None]
 
-    print('Task results:', task_run_results)
+    print('Task results:', successful_runs)
 
 
 if __name__ == '__main__':

docs/03_examples/code/02_tasks_sync.py

@@ -1,20 +1,14 @@
 from apify_client import ApifyClient
-from apify_client._models import Run, Task
-from apify_client._resource_clients import TaskClient
 
 TOKEN = 'MY-APIFY-TOKEN'
 HASHTAGS = ['zebra', 'lion', 'hippo']
 
 
-def run_apify_task(client: TaskClient) -> Run | None:
-    return client.call()
-
-
 def main() -> None:
     apify_client = ApifyClient(token=TOKEN)
 
     # Create Apify tasks
-    apify_tasks = list[Task]()
+    apify_tasks = []
     apify_tasks_client = apify_client.tasks()
 
     for hashtag in HASHTAGS:
@@ -29,24 +23,17 @@ def main() -> None:
     print('Tasks created:', apify_tasks)
 
     # Create Apify task clients
-    apify_task_clients = list[TaskClient]()
-
-    for apify_task in apify_tasks:
-        task_id = apify_task.id
-        apify_task_client = apify_client.task(task_id)
-        apify_task_clients.append(apify_task_client)
+    apify_task_clients = [apify_client.task(task.id) for task in apify_tasks]
 
     print('Task clients created:', apify_task_clients)
 
     # Execute Apify tasks
-    task_run_results = list[Run]()
+    task_run_results = [client.call() for client in apify_task_clients]
 
-    for client in apify_task_clients:
-        result = run_apify_task(client)
-        if result is not None:
-            task_run_results.append(result)
+    # Filter out None results (tasks that failed to return a run)
+    successful_runs = [run for run in task_run_results if run is not None]
 
-    print('Task results:', task_run_results)
+    print('Task results:', successful_runs)
 
 
 if __name__ == '__main__':

pyproject.toml

@@ -217,10 +217,10 @@ install-sync = "uv sync --all-extras"
 build = "uv build"
 publish-to-pypi = "uv publish --token ${APIFY_PYPI_TOKEN_CRAWLEE}"
 type-check = "uv run ty check"
-unit-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-16} tests/unit"
-unit-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-16} --cov=src/apify_client --cov-report=xml:coverage-unit.xml tests/unit"
-integration-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-16} tests/integration"
-integration-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-16} --cov=src/apify_client --cov-report=xml:coverage-integration.xml tests/integration"
+unit-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} tests/unit"
+unit-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} --cov=src/apify_client --cov-report=xml:coverage-unit.xml tests/unit"
+integration-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} tests/integration"
+integration-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} --cov=src/apify_client --cov-report=xml:coverage-integration.xml tests/integration"
 check-async-docstrings = "uv run python scripts/check_async_docstrings.py"
 fix-async-docstrings = "uv run python scripts/fix_async_docstrings.py"
 check-code = ["lint", "type-check", "unit-tests", "check-async-docstrings"]

src/apify_client/_apify_client.py

@@ -129,10 +129,10 @@ def __init__(
         """Collector for client request statistics."""
 
         self._http_client = HttpClient(
-            token=token,
-            timeout=timeout or DEFAULT_TIMEOUT,
-            max_retries=max_retries or DEFAULT_MAX_RETRIES,
-            min_delay_between_retries=min_delay_between_retries or DEFAULT_MIN_DELAY_BETWEEN_RETRIES,
+            token=self._token,
+            timeout=timeout,
+            max_retries=max_retries,
+            min_delay_between_retries=min_delay_between_retries,
             statistics=self._statistics,
             headers=headers,
         )
@@ -390,10 +390,10 @@ def __init__(
         """Collector for client request statistics."""
 
         self._http_client = HttpClientAsync(
-            token=token,
-            timeout=timeout or DEFAULT_TIMEOUT,
-            max_retries=max_retries or DEFAULT_MAX_RETRIES,
-            min_delay_between_retries=min_delay_between_retries or DEFAULT_MIN_DELAY_BETWEEN_RETRIES,
+            token=self._token,
+            timeout=timeout,
+            max_retries=max_retries,
+            min_delay_between_retries=min_delay_between_retries,
             statistics=self._statistics,
             headers=headers,
         )

src/apify_client/_logging.py

@@ -67,8 +67,8 @@ def format(self, record: logging.LogRecord) -> str:
             Formatted log message with colored logger name prefix.
         """
         formatted_logger_name = f'{Fore.CYAN}[{record.name}]{Style.RESET_ALL}'
-        message = record.getMessage()
-        return f'{formatted_logger_name} -> {message}'
+        formatted_message = super().format(record)
+        return f'{formatted_logger_name} -> {formatted_message}'
 
 
 def create_redirect_logger(name: str) -> logging.Logger:

src/apify_client/_representations.py

@@ -174,6 +174,7 @@ def get_actor_repr(
 
 
 def get_task_repr(
+    *,
     actor_id: str | None = None,
     name: str | None = None,
     task_input: dict | None = None,
@@ -187,7 +188,6 @@ def get_task_repr(
     actor_standby_idle_timeout: timedelta | None = None,
     actor_standby_build: str | None = None,
     actor_standby_memory_mbytes: int | None = None,
-    *,
     restart_on_error: bool | None = None,
 ) -> dict:
     """Get the dictionary representation of a task."""
@@ -240,13 +240,13 @@ def get_actor_version_repr(
 
 
 def get_schedule_repr(
+    *,
     cron_expression: str | None = None,
     name: str | None = None,
     actions: list[dict] | None = None,
     description: str | None = None,
     timezone: str | None = None,
     title: str | None = None,
-    *,
     is_enabled: bool | None = None,
     is_exclusive: bool | None = None,
 ) -> dict:
@@ -293,7 +293,7 @@ def get_webhook_repr(
         ),
     }
 
-    if actor_run_id is not None:
+    if actor_run_id is not None and is_ad_hoc is None:
         webhook['isAdHoc'] = True
 
     if event_types is not None:

src/apify_client/_resource_clients/__init__.py

@@ -10,23 +10,16 @@
 from .dataset_collection import DatasetCollectionClient, DatasetCollectionClientAsync
 from .key_value_store import KeyValueStoreClient, KeyValueStoreClientAsync
 from .key_value_store_collection import KeyValueStoreCollectionClient, KeyValueStoreCollectionClientAsync
-from .log import (
-    LogClient,
-    LogClientAsync,
-    StatusMessageWatcher,
-    StatusMessageWatcherAsync,
-    StatusMessageWatcherSync,
-    StreamedLog,
-    StreamedLogAsync,
-    StreamedLogSync,
-)
+from .log import LogClient, LogClientAsync
 from .request_queue import RequestQueueClient, RequestQueueClientAsync
 from .request_queue_collection import RequestQueueCollectionClient, RequestQueueCollectionClientAsync
 from .run import RunClient, RunClientAsync
 from .run_collection import RunCollectionClient, RunCollectionClientAsync
 from .schedule import ScheduleClient, ScheduleClientAsync
 from .schedule_collection import ScheduleCollectionClient, ScheduleCollectionClientAsync
+from .status_message_watcher import StatusMessageWatcher, StatusMessageWatcherAsync, StatusMessageWatcherSync
 from .store_collection import StoreCollectionClient, StoreCollectionClientAsync
+from .streamed_log import StreamedLog, StreamedLogAsync, StreamedLogSync
 from .task import TaskClient, TaskClientAsync
 from .task_collection import TaskCollectionClient, TaskCollectionClientAsync
 from .user import UserClient, UserClientAsync

src/apify_client/_resource_clients/_resource_client.py

@@ -98,7 +98,7 @@ def _build_url(
         Returns:
             Complete URL with optional path and query string.
         """
-        url = f'{self._resource_url}/{path}' if path else self._resource_url
+        url = f'{self._resource_url}/{path}' if path is not None else self._resource_url
 
         if public:
             if not url.startswith(self._base_url):
@@ -254,16 +254,16 @@ def _wait_for_finish(
                 remaining_secs = max(0, int(to_seconds(deadline - datetime.now(timezone.utc))))
                 wait_for_finish = remaining_secs
             else:
-                wait_for_finish = to_seconds(DEFAULT_WAIT_FOR_FINISH)
+                wait_for_finish = to_seconds(DEFAULT_WAIT_FOR_FINISH, as_int=True)
 
             try:
                 response = self._http_client.call(
                     url=url,
                     method='GET',
                     params={**params, 'waitForFinish': wait_for_finish},
                 )
-                response_as_dict = response_to_dict(response)
-                actor_job_response = ActorJobResponse.model_validate(response_as_dict)
+                result = response_to_dict(response)
+                actor_job_response = ActorJobResponse.model_validate(result)
                 actor_job = actor_job_response.data.model_dump()
 
                 is_terminal = actor_job_response.data.status in TERMINAL_STATUSES
@@ -420,16 +420,16 @@ async def _wait_for_finish(
                 remaining_secs = max(0, int(to_seconds(deadline - datetime.now(timezone.utc))))
                 wait_for_finish = remaining_secs
             else:
-                wait_for_finish = to_seconds(DEFAULT_WAIT_FOR_FINISH)
+                wait_for_finish = to_seconds(DEFAULT_WAIT_FOR_FINISH, as_int=True)
 
             try:
                 response = await self._http_client.call(
                     url=url,
                     method='GET',
                     params={**params, 'waitForFinish': wait_for_finish},
                 )
-                response_as_dict = response_to_dict(response)
-                actor_job_response = ActorJobResponse.model_validate(response_as_dict)
+                result = response_to_dict(response)
+                actor_job_response = ActorJobResponse.model_validate(result)
                 actor_job = actor_job_response.data.model_dump()
 
                 is_terminal = actor_job_response.data.status in TERMINAL_STATUSES

src/apify_client/_resource_clients/actor.py

@@ -258,8 +258,8 @@ def start(
             params=request_params,
         )
 
-        response_as_dict = response_to_dict(response)
-        return RunResponse.model_validate(response_as_dict).data
+        result = response_to_dict(response)
+        return RunResponse.model_validate(result).data
 
     def call(
         self,
@@ -383,7 +383,8 @@ def build(
             params=request_params,
         )
 
-        return BuildResponse.model_validate(response_to_dict(response)).data
+        result = response_to_dict(response)
+        return BuildResponse.model_validate(result).data
 
     def builds(self) -> BuildCollectionClient:
         """Retrieve a client for the builds of this Actor."""
@@ -420,10 +421,10 @@ def default_build(
         )
 
         response = self._http_client.call(url=self._build_url('builds/default'), method='GET', params=request_params)
-        response_as_dict = response_to_dict(response)
+        result = response_to_dict(response)
 
         return self._client_registry.build_client(
-            resource_id=response_as_dict['data']['id'],
+            resource_id=result['data']['id'],
             base_url=self._base_url,
             public_base_url=self._public_base_url,
             http_client=self._http_client,
@@ -716,8 +717,8 @@ async def start(
             params=request_params,
         )
 
-        response_as_dict = response_to_dict(response)
-        return RunResponse.model_validate(response_as_dict).data
+        result = response_to_dict(response)
+        return RunResponse.model_validate(result).data
 
     async def call(
         self,
@@ -845,8 +846,8 @@ async def build(
             params=request_params,
         )
 
-        response_as_dict = response_to_dict(response)
-        return BuildResponse.model_validate(response_as_dict).data
+        result = response_to_dict(response)
+        return BuildResponse.model_validate(result).data
 
     def builds(self) -> BuildCollectionClientAsync:
         """Retrieve a client for the builds of this Actor."""
@@ -887,10 +888,10 @@ async def default_build(
             method='GET',
             params=request_params,
         )
-        response_as_dict = response_to_dict(response)
+        result = response_to_dict(response)
 
         return self._client_registry.build_client(
-            resource_id=response_as_dict['data']['id'],
+            resource_id=result['data']['id'],
             base_url=self._base_url,
             public_base_url=self._public_base_url,
             http_client=self._http_client,