Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/apify_client/_resource_clients/actor.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __init__(
self,
*,
resource_id: str,
resource_path: str = 'acts',
resource_path: str = 'actors',
**kwargs: Any,
) -> None:
super().__init__(
Expand Down Expand Up @@ -571,7 +571,7 @@ def __init__(
self,
*,
resource_id: str,
resource_path: str = 'acts',
resource_path: str = 'actors',
**kwargs: Any,
) -> None:
super().__init__(
Expand Down
4 changes: 2 additions & 2 deletions src/apify_client/_resource_clients/actor_collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ActorCollectionClient(ResourceClient):
def __init__(
self,
*,
resource_path: str = 'acts',
resource_path: str = 'actors',
**kwargs: Any,
) -> None:
super().__init__(
Expand Down Expand Up @@ -215,7 +215,7 @@ class ActorCollectionClientAsync(ResourceClientAsync):
def __init__(
self,
*,
resource_path: str = 'acts',
resource_path: str = 'actors',
**kwargs: Any,
) -> None:
super().__init__(
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/test_actor_start_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def capture_request(request: Request) -> Response:
)

httpserver.expect_request(
f'/v2/acts/{_MOCKED_ACTOR_ID}/runs',
f'/v2/actors/{_MOCKED_ACTOR_ID}/runs',
method='POST',
).respond_with_handler(capture_request)

Expand Down Expand Up @@ -97,7 +97,7 @@ def capture_request(request: Request) -> Response:
)

httpserver.expect_request(
f'/v2/acts/{_MOCKED_ACTOR_ID}/runs',
f'/v2/actors/{_MOCKED_ACTOR_ID}/runs',
method='POST',
).respond_with_handler(capture_request)

Expand Down Expand Up @@ -130,7 +130,7 @@ def capture_request(request: Request) -> Response:
)

httpserver.expect_request(
f'/v2/acts/{_MOCKED_ACTOR_ID}/runs',
f'/v2/actors/{_MOCKED_ACTOR_ID}/runs',
method='POST',
).respond_with_handler(capture_request)

Expand Down Expand Up @@ -160,7 +160,7 @@ def capture_request(request: Request) -> Response:
)

httpserver.expect_request(
f'/v2/acts/{_MOCKED_ACTOR_ID}/runs',
f'/v2/actors/{_MOCKED_ACTOR_ID}/runs',
method='POST',
).respond_with_handler(capture_request)

Expand Down Expand Up @@ -191,7 +191,7 @@ def capture_request(request: Request) -> Response:
)

httpserver.expect_request(
f'/v2/acts/{_MOCKED_ACTOR_ID}/runs',
f'/v2/actors/{_MOCKED_ACTOR_ID}/runs',
method='POST',
).respond_with_handler(capture_request)

Expand All @@ -218,7 +218,7 @@ def capture_request(request: Request) -> Response:
)

httpserver.expect_request(
f'/v2/acts/{_MOCKED_ACTOR_ID}/runs',
f'/v2/actors/{_MOCKED_ACTOR_ID}/runs',
method='POST',
).respond_with_handler(capture_request)

Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_client_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,21 +281,21 @@ def test_actor_last_run_dataset_get_raises_on_404(httpserver: HTTPServer, sync_c
"""404 covers missing actor, missing last_run, or missing dataset — all three are indistinguishable from the single
HTTP response (the client only hits the final URL), so `NotFoundError` propagates uniformly.
"""
httpserver.expect_request('/v2/acts/actor-id/runs/last/dataset').respond_with_json(_not_found_body(), status=404)
httpserver.expect_request('/v2/actors/actor-id/runs/last/dataset').respond_with_json(_not_found_body(), status=404)
with pytest.raises(NotFoundError):
sync_client.actor('actor-id').last_run().dataset().get()


async def test_actor_last_run_dataset_get_raises_on_404_async(
httpserver: HTTPServer, async_client: ApifyClientAsync
) -> None:
httpserver.expect_request('/v2/acts/actor-id/runs/last/dataset').respond_with_json(_not_found_body(), status=404)
httpserver.expect_request('/v2/actors/actor-id/runs/last/dataset').respond_with_json(_not_found_body(), status=404)
with pytest.raises(NotFoundError):
await async_client.actor('actor-id').last_run().dataset().get()


def test_actor_last_run_dataset_get_returns_dataset(httpserver: HTTPServer, sync_client: ApifyClient) -> None:
httpserver.expect_request('/v2/acts/actor-id/runs/last/dataset').respond_with_json({'data': _DATASET_FIXTURE})
httpserver.expect_request('/v2/actors/actor-id/runs/last/dataset').respond_with_json({'data': _DATASET_FIXTURE})
dataset = sync_client.actor('actor-id').last_run().dataset().get()
assert dataset is not None
assert dataset.id == 'ds-1'
Expand All @@ -304,7 +304,7 @@ def test_actor_last_run_dataset_get_returns_dataset(httpserver: HTTPServer, sync
async def test_actor_last_run_dataset_get_returns_dataset_async(
httpserver: HTTPServer, async_client: ApifyClientAsync
) -> None:
httpserver.expect_request('/v2/acts/actor-id/runs/last/dataset').respond_with_json({'data': _DATASET_FIXTURE})
httpserver.expect_request('/v2/actors/actor-id/runs/last/dataset').respond_with_json({'data': _DATASET_FIXTURE})
dataset = await async_client.actor('actor-id').last_run().dataset().get()
assert dataset is not None
assert dataset.id == 'ds-1'
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/test_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def mock_api(httpserver: HTTPServer) -> None:
)

# Add actor info endpoint
httpserver.expect_request(f'/v2/acts/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
httpserver.expect_request(f'/v2/actors/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
{
'data': {
'id': _MOCKED_ACTOR_ID,
Expand Down Expand Up @@ -203,7 +203,7 @@ def mock_api(httpserver: HTTPServer) -> None:
)

# Add actor run creation endpoint
httpserver.expect_request(f'/v2/acts/{_MOCKED_ACTOR_ID}/runs', method='POST').respond_with_json(
httpserver.expect_request(f'/v2/actors/{_MOCKED_ACTOR_ID}/runs', method='POST').respond_with_json(
{
'data': status_generator._create_minimal_run_data('Initial message', 'RUNNING', is_terminal=False),
}
Expand Down Expand Up @@ -520,7 +520,7 @@ async def test_streamed_log_async_restart_after_normal_completion(httpserver: HT
)

# Set up actor info endpoint
httpserver.expect_request(f'/v2/acts/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
httpserver.expect_request(f'/v2/actors/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
{
'data': {
'id': _MOCKED_ACTOR_ID,
Expand Down Expand Up @@ -608,7 +608,7 @@ async def test_status_message_watcher_async_restart_after_normal_completion(http
)

# Set up actor info endpoint (needed for get_status_message_watcher)
httpserver.expect_request(f'/v2/acts/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
httpserver.expect_request(f'/v2/actors/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
{
'data': {
'id': _MOCKED_ACTOR_ID,
Expand Down Expand Up @@ -749,7 +749,7 @@ def _register_run_and_actor_endpoints(httpserver: HTTPServer) -> None:
}
}
)
httpserver.expect_request(f'/v2/acts/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
httpserver.expect_request(f'/v2/actors/{_MOCKED_ACTOR_ID}', method='GET').respond_with_json(
{
'data': {
'id': _MOCKED_ACTOR_ID,
Expand Down
Loading