Skip to content

Commit fa24a21

Browse files
authored
test: replace cast() with isinstance asserts in integration tests (#787)
Sweep integration tests to replace type-only `cast('T', result)` calls with runtime `assert isinstance(result, T)` checks. Where the value is the typed model, the assert both narrows the type for `ty` and verifies the response shape at runtime instead of trusting it blindly.
1 parent 29a9b97 commit fa24a21

15 files changed

Lines changed: 576 additions & 767 deletions

‎tests/integration/test_actor.py‎

Lines changed: 27 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,38 @@
33
from __future__ import annotations
44

55
from datetime import UTC, datetime
6-
from typing import TYPE_CHECKING, cast
6+
from typing import TYPE_CHECKING
77

88
from ._utils import get_random_resource_name, maybe_await
9+
from apify_client._models import Actor, Build, ListOfActors, Run
10+
from apify_client._resource_clients import BuildClient, BuildClientAsync
911

1012
if TYPE_CHECKING:
1113
from apify_client import ApifyClient, ApifyClientAsync
12-
from apify_client._models import Actor, Build, ListOfActors, Run
13-
from apify_client._resource_clients import BuildClient, BuildClientAsync
1414

1515

1616
async def test_get_public_actor(client: ApifyClient | ApifyClientAsync) -> None:
1717
"""Test getting a public Actor by ID."""
1818
# Use a well-known public actor (Apify's web scraper)
19-
result = await maybe_await(client.actor('apify/web-scraper').get())
20-
actor = cast('Actor', result)
21-
22-
assert actor is not None
19+
actor = await maybe_await(client.actor('apify/web-scraper').get())
20+
assert isinstance(actor, Actor)
2321
assert actor.id is not None
2422
assert actor.name == 'web-scraper'
2523
assert actor.username == 'apify'
2624

2725

2826
async def test_get_actor_by_full_name(client: ApifyClient | ApifyClientAsync) -> None:
2927
"""Test getting an Actor using username/actorname format."""
30-
result = await maybe_await(client.actor('apify/hello-world').get())
31-
actor = cast('Actor', result)
32-
33-
assert actor is not None
28+
actor = await maybe_await(client.actor('apify/hello-world').get())
29+
assert isinstance(actor, Actor)
3430
assert actor.name == 'hello-world'
3531
assert actor.username == 'apify'
3632

3733

3834
async def test_list_actors_my(client: ApifyClient | ApifyClientAsync) -> None:
3935
"""Test listing Actors created by the user."""
40-
result = await maybe_await(client.actors().list(my=True, limit=10))
41-
actors_page = cast('ListOfActors', result)
42-
43-
assert actors_page is not None
36+
actors_page = await maybe_await(client.actors().list(my=True, limit=10))
37+
assert isinstance(actors_page, ListOfActors)
4438
assert actors_page.items is not None
4539
# User may have 0 actors
4640
assert isinstance(actors_page.items, list)
@@ -49,10 +43,8 @@ async def test_list_actors_my(client: ApifyClient | ApifyClientAsync) -> None:
4943
async def test_list_actors_pagination(client: ApifyClient | ApifyClientAsync) -> None:
5044
"""Test listing Actors with pagination parameters."""
5145
# List all actors (public + owned), should return some results
52-
result = await maybe_await(client.actors().list(limit=5, offset=0))
53-
actors_page = cast('ListOfActors', result)
54-
55-
assert actors_page is not None
46+
actors_page = await maybe_await(client.actors().list(limit=5, offset=0))
47+
assert isinstance(actors_page, ListOfActors)
5648
assert actors_page.items is not None
5749
assert isinstance(actors_page.items, list)
5850
# Should have at least some actors (public ones exist)
@@ -61,10 +53,8 @@ async def test_list_actors_pagination(client: ApifyClient | ApifyClientAsync) ->
6153

6254
async def test_list_actors_sorting(client: ApifyClient | ApifyClientAsync) -> None:
6355
"""Test listing Actors with sorting."""
64-
result = await maybe_await(client.actors().list(limit=10, desc=True, sort_by='stats.lastRunStartedAt'))
65-
actors_page = cast('ListOfActors', result)
66-
67-
assert actors_page is not None
56+
actors_page = await maybe_await(client.actors().list(limit=10, desc=True, sort_by='stats.lastRunStartedAt'))
57+
assert isinstance(actors_page, ListOfActors)
6858
assert actors_page.items is not None
6959
assert isinstance(actors_page.items, list)
7060

@@ -82,7 +72,7 @@ async def test_actor_create_update_delete(client: ApifyClient | ApifyClientAsync
8272
actor_name = get_random_resource_name('actor')
8373

8474
# Create actor
85-
result = await maybe_await(
75+
created_actor = await maybe_await(
8676
client.actors().create(
8777
name=actor_name,
8878
title='Test Actor',
@@ -103,8 +93,7 @@ async def test_actor_create_update_delete(client: ApifyClient | ApifyClientAsync
10393
],
10494
)
10595
)
106-
created_actor = cast('Actor', result)
107-
assert created_actor is not None
96+
assert isinstance(created_actor, Actor)
10897
assert created_actor.id is not None
10998
assert created_actor.name == actor_name
11099

@@ -114,21 +103,19 @@ async def test_actor_create_update_delete(client: ApifyClient | ApifyClientAsync
114103
# Update actor (only title and description - updating defaultRunOptions requires build to be set)
115104
new_title = 'Updated Test Actor'
116105
new_description = 'Updated description'
117-
result = await maybe_await(
106+
updated_actor = await maybe_await(
118107
actor_client.update(
119108
title=new_title,
120109
description=new_description,
121110
)
122111
)
123-
updated_actor = cast('Actor', result)
124-
assert updated_actor is not None
112+
assert isinstance(updated_actor, Actor)
125113
assert updated_actor.title == new_title
126114
assert updated_actor.description == new_description
127115

128116
# Verify update persisted
129-
result = await maybe_await(actor_client.get())
130-
retrieved_actor = cast('Actor', result)
131-
assert retrieved_actor is not None
117+
retrieved_actor = await maybe_await(actor_client.get())
118+
assert isinstance(retrieved_actor, Actor)
132119
assert retrieved_actor.title == new_title
133120

134121
finally:
@@ -146,14 +133,12 @@ async def test_actor_default_build(client: ApifyClient | ApifyClientAsync) -> No
146133
actor_client = client.actor('apify/hello-world')
147134

148135
# Get default build client
149-
result = await maybe_await(actor_client.default_build())
150-
build_client = cast('BuildClient | BuildClientAsync', result)
151-
assert build_client is not None
136+
build_client = await maybe_await(actor_client.default_build())
137+
assert isinstance(build_client, BuildClient | BuildClientAsync)
152138

153139
# Use the returned client to get the build
154-
result = await maybe_await(build_client.get())
155-
build = cast('Build', result)
156-
assert build is not None
140+
build = await maybe_await(build_client.get())
141+
assert isinstance(build, Build)
157142
assert build.id is not None
158143
assert build.status is not None
159144

@@ -162,19 +147,17 @@ async def test_actor_last_run(client: ApifyClient | ApifyClientAsync) -> None:
162147
"""Test getting an Actor's last run."""
163148
# First run an actor to ensure there is a last run
164149
actor_client = client.actor('apify/hello-world')
165-
result = await maybe_await(actor_client.call())
166-
run = cast('Run', result)
167-
assert run is not None
150+
run = await maybe_await(actor_client.call())
151+
assert isinstance(run, Run)
168152

169153
try:
170154
# Get last run client
171155
last_run_client = actor_client.last_run()
172156
assert last_run_client is not None
173157

174158
# Use the returned client to get the run
175-
result = await maybe_await(last_run_client.get())
176-
last_run = cast('Run', result)
177-
assert last_run is not None
159+
last_run = await maybe_await(last_run_client.get())
160+
assert isinstance(last_run, Run)
178161
assert last_run.id is not None
179162

180163
finally:

‎tests/integration/test_actor_env_var.py‎

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING, cast
5+
from typing import TYPE_CHECKING
6+
7+
from ._utils import get_random_resource_name, maybe_await
8+
from apify_client._models import Actor, EnvVar, ListOfEnvVars
69

710
if TYPE_CHECKING:
811
from apify_client import ApifyClient, ApifyClientAsync
9-
from apify_client._models import Actor, EnvVar, ListOfEnvVars
10-
11-
12-
from ._utils import get_random_resource_name, maybe_await
1312

1413

1514
async def test_actor_env_var_list(client: ApifyClient | ApifyClientAsync) -> None:
1615
"""Test listing Actor version environment variables."""
1716
actor_name = get_random_resource_name('actor')
1817

1918
# Create an actor with a version that has env vars
20-
result = await maybe_await(
19+
actor = await maybe_await(
2120
client.actors().create(
2221
name=actor_name,
2322
versions=[
@@ -43,16 +42,14 @@ async def test_actor_env_var_list(client: ApifyClient | ApifyClientAsync) -> Non
4342
],
4443
)
4544
)
46-
actor = cast('Actor', result)
45+
assert isinstance(actor, Actor)
4746
actor_client = client.actor(actor.id)
4847
version_client = actor_client.version('0.0')
4948

5049
try:
5150
# List env vars
52-
result = await maybe_await(version_client.env_vars().list())
53-
env_vars = cast('ListOfEnvVars', result)
54-
55-
assert env_vars is not None
51+
env_vars = await maybe_await(version_client.env_vars().list())
52+
assert isinstance(env_vars, ListOfEnvVars)
5653
assert env_vars.items is not None
5754
assert len(env_vars.items) >= 1
5855

@@ -70,7 +67,7 @@ async def test_actor_env_var_create_and_get(client: ApifyClient | ApifyClientAsy
7067
actor_name = get_random_resource_name('actor')
7168

7269
# Create an actor with a version
73-
result = await maybe_await(
70+
actor = await maybe_await(
7471
client.actors().create(
7572
name=actor_name,
7673
versions=[
@@ -89,32 +86,28 @@ async def test_actor_env_var_create_and_get(client: ApifyClient | ApifyClientAsy
8986
],
9087
)
9188
)
92-
actor = cast('Actor', result)
89+
assert isinstance(actor, Actor)
9390
actor_client = client.actor(actor.id)
9491
version_client = actor_client.version('1.0')
9592

9693
try:
9794
# Create a new env var
98-
result = await maybe_await(
95+
created_env_var = await maybe_await(
9996
version_client.env_vars().create(
10097
name='MY_VAR',
10198
value='my_value',
10299
is_secret=False,
103100
)
104101
)
105-
created_env_var = cast('EnvVar', result)
106-
107-
assert created_env_var is not None
102+
assert isinstance(created_env_var, EnvVar)
108103
assert created_env_var.name == 'MY_VAR'
109104
assert created_env_var.value == 'my_value'
110105
assert created_env_var.is_secret is False
111106

112107
# Get the same env var
113108
env_var_client = version_client.env_var('MY_VAR')
114-
result = await maybe_await(env_var_client.get())
115-
retrieved_env_var = cast('EnvVar', result)
116-
117-
assert retrieved_env_var is not None
109+
retrieved_env_var = await maybe_await(env_var_client.get())
110+
assert isinstance(retrieved_env_var, EnvVar)
118111
assert retrieved_env_var.name == 'MY_VAR'
119112
assert retrieved_env_var.value == 'my_value'
120113

@@ -127,7 +120,7 @@ async def test_actor_env_var_update(client: ApifyClient | ApifyClientAsync) -> N
127120
actor_name = get_random_resource_name('actor')
128121

129122
# Create an actor with a version and env var
130-
result = await maybe_await(
123+
actor = await maybe_await(
131124
client.actors().create(
132125
name=actor_name,
133126
versions=[
@@ -153,29 +146,26 @@ async def test_actor_env_var_update(client: ApifyClient | ApifyClientAsync) -> N
153146
],
154147
)
155148
)
156-
actor = cast('Actor', result)
149+
assert isinstance(actor, Actor)
157150
actor_client = client.actor(actor.id)
158151
version_client = actor_client.version('0.1')
159152
env_var_client = version_client.env_var('UPDATE_VAR')
160153

161154
try:
162155
# Update the env var
163-
result = await maybe_await(
156+
updated_env_var = await maybe_await(
164157
env_var_client.update(
165158
name='UPDATE_VAR',
166159
value='updated_value',
167160
)
168161
)
169-
updated_env_var = cast('EnvVar', result)
170-
171-
assert updated_env_var is not None
162+
assert isinstance(updated_env_var, EnvVar)
172163
assert updated_env_var.name == 'UPDATE_VAR'
173164
assert updated_env_var.value == 'updated_value'
174165

175166
# Verify the update persisted
176-
result = await maybe_await(env_var_client.get())
177-
retrieved_env_var = cast('EnvVar', result)
178-
assert retrieved_env_var is not None
167+
retrieved_env_var = await maybe_await(env_var_client.get())
168+
assert isinstance(retrieved_env_var, EnvVar)
179169
assert retrieved_env_var.value == 'updated_value'
180170

181171
finally:
@@ -187,7 +177,7 @@ async def test_actor_env_var_delete(client: ApifyClient | ApifyClientAsync) -> N
187177
actor_name = get_random_resource_name('actor')
188178

189179
# Create an actor with a version and two env vars
190-
result = await maybe_await(
180+
actor = await maybe_await(
191181
client.actors().create(
192182
name=actor_name,
193183
versions=[
@@ -218,7 +208,7 @@ async def test_actor_env_var_delete(client: ApifyClient | ApifyClientAsync) -> N
218208
],
219209
)
220210
)
221-
actor = cast('Actor', result)
211+
assert isinstance(actor, Actor)
222212
actor_client = client.actor(actor.id)
223213
version_client = actor_client.version('0.1')
224214

@@ -232,9 +222,8 @@ async def test_actor_env_var_delete(client: ApifyClient | ApifyClientAsync) -> N
232222
assert deleted_env_var is None
233223

234224
# Verify the other env var still exists
235-
result = await maybe_await(version_client.env_var('VAR_TO_KEEP').get())
236-
remaining_env_var = cast('EnvVar', result)
237-
assert remaining_env_var is not None
225+
remaining_env_var = await maybe_await(version_client.env_var('VAR_TO_KEEP').get())
226+
assert isinstance(remaining_env_var, EnvVar)
238227
assert remaining_env_var.name == 'VAR_TO_KEEP'
239228

240229
finally:

0 commit comments

Comments
 (0)