Skip to content

Commit bb04e9f

Browse files
vdusekvdusek
committed
More tests and updates
1 parent b7a6d8e commit bb04e9f

33 files changed

+1221
-115
lines changed

‎src/apify_client/_resource_clients/actor.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ def start(
334334
params=request_params,
335335
)
336336

337-
data = response_to_dict(response)
338-
return GetRunResponse.model_validate(data).data
337+
response_as_dict = response_to_dict(response)
338+
return GetRunResponse.model_validate(response_as_dict).data
339339

340340
def call(
341341
self,
@@ -484,13 +484,13 @@ async def default_build(
484484
)
485485

486486
response = self.http_client.call(url=self._url('builds/default'), method='GET', params=request_params)
487-
data = response_to_dict(response)
487+
response_as_dict = response_to_dict(response)
488488

489489
return BuildClient(
490490
base_url=self.base_url,
491491
http_client=self.http_client,
492492
root_client=self.root_client,
493-
resource_id=data['id'],
493+
resource_id=response_as_dict['id'],
494494
)
495495

496496
def last_run(
@@ -760,8 +760,8 @@ async def start(
760760
params=request_params,
761761
)
762762

763-
data = response_to_dict(response)
764-
return GetRunResponse.model_validate(data).data
763+
response_as_dict = response_to_dict(response)
764+
return GetRunResponse.model_validate(response_as_dict).data
765765

766766
async def call(
767767
self,
@@ -883,8 +883,8 @@ async def build(
883883
params=request_params,
884884
)
885885

886-
data = response_to_dict(response)
887-
return BuildActorResponse.model_validate(data).data
886+
response_as_dict = response_to_dict(response)
887+
return BuildActorResponse.model_validate(response_as_dict).data
888888

889889
def builds(self) -> BuildCollectionClientAsync:
890890
"""Retrieve a client for the builds of this Actor."""
@@ -919,13 +919,13 @@ async def default_build(
919919
method='GET',
920920
params=request_params,
921921
)
922-
data = response_to_dict(response)
922+
response_as_dict = response_to_dict(response)
923923

924924
return BuildClientAsync(
925925
base_url=self.base_url,
926926
http_client=self.http_client,
927927
root_client=self.root_client,
928-
resource_id=data['id'],
928+
resource_id=response_as_dict['id'],
929929
)
930930

931931
def last_run(

‎src/apify_client/_resource_clients/actor_collection.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def list(
4343
method='GET',
4444
params=self._params(my=my, limit=limit, offset=offset, desc=desc, sortBy=sort_by),
4545
)
46-
data = response_to_dict(response)
47-
return GetListOfActorsResponse.model_validate(data).data
46+
response_as_dict = response_to_dict(response)
47+
return GetListOfActorsResponse.model_validate(response_as_dict).data
4848

4949
def create(
5050
self,
@@ -175,8 +175,8 @@ async def list(
175175
method='GET',
176176
params=self._params(my=my, limit=limit, offset=offset, desc=desc, sortBy=sort_by),
177177
)
178-
data = response_to_dict(response)
179-
return GetListOfActorsResponse.model_validate(data).data
178+
response_as_dict = response_to_dict(response)
179+
return GetListOfActorsResponse.model_validate(response_as_dict).data
180180

181181
async def create(
182182
self,

‎src/apify_client/_resource_clients/actor_env_var.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Any
44

5-
from apify_client._models import EnvVar
5+
from apify_client._models import EnvVar, GetEnvVarResponse
66
from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
77
from apify_client._utils import filter_out_none_values_recursively
88

@@ -37,7 +37,7 @@ def get(self) -> EnvVar | None:
3737
The retrieved Actor environment variable data.
3838
"""
3939
result = self._get()
40-
return EnvVar.model_validate(result) if result is not None else None
40+
return GetEnvVarResponse.model_validate(result).data if result is not None else None
4141

4242
def update(
4343
self,
@@ -65,7 +65,7 @@ def update(
6565
)
6666

6767
result = self._update(filter_out_none_values_recursively(actor_env_var_representation))
68-
return EnvVar.model_validate(result)
68+
return GetEnvVarResponse.model_validate(result).data
6969

7070
def delete(self) -> None:
7171
"""Delete the Actor environment variable.
@@ -91,7 +91,7 @@ async def get(self) -> EnvVar | None:
9191
The retrieved Actor environment variable data.
9292
"""
9393
result = await self._get()
94-
return EnvVar.model_validate(result) if result is not None else None
94+
return GetEnvVarResponse.model_validate(result).data if result is not None else None
9595

9696
async def update(
9797
self,
@@ -119,7 +119,7 @@ async def update(
119119
)
120120

121121
result = await self._update(filter_out_none_values_recursively(actor_env_var_representation))
122-
return EnvVar.model_validate(result)
122+
return GetEnvVarResponse.model_validate(result).data
123123

124124
async def delete(self) -> None:
125125
"""Delete the Actor environment variable.

‎src/apify_client/_resource_clients/actor_env_var_collection.py‎

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

33
from typing import Any
44

5-
from apify_client._models import EnvVar, GetListOfEnvVarsResponse, ListOfEnvVars
5+
from apify_client._models import EnvVar, GetEnvVarResponse, GetListOfEnvVarsResponse, ListOfEnvVars
66
from apify_client._resource_clients.actor_env_var import get_actor_env_var_representation
77
from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
88
from apify_client._utils import filter_out_none_values_recursively, response_to_dict
@@ -28,8 +28,8 @@ def list(self) -> ListOfEnvVars:
2828
method='GET',
2929
params=self._params(),
3030
)
31-
data = response_to_dict(response)
32-
return GetListOfEnvVarsResponse.model_validate(data).data
31+
response_as_dict = response_to_dict(response)
32+
return GetListOfEnvVarsResponse.model_validate(response_as_dict).data
3333

3434
def create(
3535
self,
@@ -57,7 +57,7 @@ def create(
5757
)
5858

5959
result = self._create(filter_out_none_values_recursively(actor_env_var_representation))
60-
return EnvVar.model_validate(result)
60+
return GetEnvVarResponse.model_validate(result).data
6161

6262

6363
class ActorEnvVarCollectionClientAsync(ResourceCollectionClientAsync):
@@ -80,8 +80,8 @@ async def list(self) -> ListOfEnvVars:
8080
method='GET',
8181
params=self._params(),
8282
)
83-
data = response_to_dict(response)
84-
return GetListOfEnvVarsResponse.model_validate(data).data
83+
response_as_dict = response_to_dict(response)
84+
return GetListOfEnvVarsResponse.model_validate(response_as_dict).data
8585

8686
async def create(
8787
self,
@@ -109,4 +109,4 @@ async def create(
109109
)
110110

111111
result = await self._create(filter_out_none_values_recursively(actor_env_var_representation))
112-
return EnvVar.model_validate(result)
112+
return GetEnvVarResponse.model_validate(result).data

‎src/apify_client/_resource_clients/actor_version.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from typing import Any
44

5-
from apify_client._models import Version, VersionSourceType
5+
from apify_client._models import GetVersionResponse, Version, VersionSourceType
66
from apify_client._resource_clients.actor_env_var import ActorEnvVarClient, ActorEnvVarClientAsync
77
from apify_client._resource_clients.actor_env_var_collection import (
88
ActorEnvVarCollectionClient,
@@ -53,7 +53,7 @@ def get(self) -> Version | None:
5353
The retrieved Actor version data.
5454
"""
5555
result = self._get()
56-
return Version.model_validate(result) if result is not None else None
56+
return GetVersionResponse.model_validate(result).data if result is not None else None
5757

5858
def update(
5959
self,
@@ -102,7 +102,7 @@ def update(
102102
)
103103

104104
result = self._update(filter_out_none_values_recursively(actor_version_representation))
105-
return Version.model_validate(result)
105+
return GetVersionResponse.model_validate(result).data
106106

107107
def delete(self) -> None:
108108
"""Delete the Actor version.
@@ -143,7 +143,7 @@ async def get(self) -> Version | None:
143143
The retrieved Actor version data.
144144
"""
145145
result = await self._get()
146-
return Version.model_validate(result) if result is not None else None
146+
return GetVersionResponse.model_validate(result).data if result is not None else None
147147

148148
async def update(
149149
self,
@@ -192,7 +192,7 @@ async def update(
192192
)
193193

194194
result = await self._update(filter_out_none_values_recursively(actor_version_representation))
195-
return Version.model_validate(result)
195+
return GetVersionResponse.model_validate(result).data
196196

197197
async def delete(self) -> None:
198198
"""Delete the Actor version.

‎src/apify_client/_resource_clients/actor_version_collection.py‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
from typing import Any
44

5-
from apify_client._models import GetListOfVersionsResponse, ListOfVersions, Version, VersionSourceType
5+
from apify_client._models import (
6+
GetListOfVersionsResponse,
7+
GetVersionResponse,
8+
ListOfVersions,
9+
Version,
10+
VersionSourceType,
11+
)
612
from apify_client._resource_clients.actor_version import _get_actor_version_representation
713
from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
814
from apify_client._utils import filter_out_none_values_recursively, response_to_dict
@@ -28,8 +34,8 @@ def list(self) -> ListOfVersions:
2834
method='GET',
2935
params=self._params(),
3036
)
31-
data = response_to_dict(response)
32-
return GetListOfVersionsResponse.model_validate(data).data
37+
response_as_dict = response_to_dict(response)
38+
return GetListOfVersionsResponse.model_validate(response_as_dict).data
3339

3440
def create(
3541
self,
@@ -81,7 +87,7 @@ def create(
8187
)
8288

8389
result = self._create(filter_out_none_values_recursively(actor_version_representation))
84-
return Version.model_validate(result)
90+
return GetVersionResponse.model_validate(result).data
8591

8692

8793
class ActorVersionCollectionClientAsync(ResourceCollectionClientAsync):
@@ -104,8 +110,8 @@ async def list(self) -> ListOfVersions:
104110
method='GET',
105111
params=self._params(),
106112
)
107-
data = response_to_dict(response)
108-
return GetListOfVersionsResponse.model_validate(data).data
113+
response_as_dict = response_to_dict(response)
114+
return GetListOfVersionsResponse.model_validate(response_as_dict).data
109115

110116
async def create(
111117
self,
@@ -157,4 +163,4 @@ async def create(
157163
)
158164

159165
result = await self._create(filter_out_none_values_recursively(actor_version_representation))
160-
return Version.model_validate(result)
166+
return GetVersionResponse.model_validate(result).data

‎src/apify_client/_resource_clients/build.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ def get_open_api_definition(self) -> dict | None:
5656
method='GET',
5757
)
5858

59-
response_data: dict = response.json()
59+
response_as_dict: dict = response.json()
6060

61-
return response_data
61+
return response_as_dict
6262

6363
def wait_for_finish(self, *, wait_secs: int | None = None) -> Build | None:
6464
"""Wait synchronously until the build finishes or the server times out.
@@ -135,9 +135,9 @@ async def get_open_api_definition(self) -> dict | None:
135135
method='GET',
136136
)
137137

138-
response_data: dict = response.json()
138+
response_as_dict: dict = response.json()
139139

140-
return response_data
140+
return response_as_dict
141141

142142
async def wait_for_finish(self, *, wait_secs: int | None = None) -> Build | None:
143143
"""Wait synchronously until the build finishes or the server times out.

‎src/apify_client/_resource_clients/build_collection.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ def list(
4242
method='GET',
4343
params=self._params(limit=limit, offset=offset, desc=desc),
4444
)
45-
data = response_to_dict(response)
46-
return GetListOfBuildsResponse.model_validate(data).data
45+
response_as_dict = response_to_dict(response)
46+
return GetListOfBuildsResponse.model_validate(response_as_dict).data
4747

4848

4949
class BuildCollectionClientAsync(ResourceCollectionClientAsync):
@@ -81,5 +81,5 @@ async def list(
8181
method='GET',
8282
params=self._params(limit=limit, offset=offset, desc=desc),
8383
)
84-
data = response_to_dict(response)
85-
return GetListOfBuildsResponse.model_validate(data).data
84+
response_as_dict = response_to_dict(response)
85+
return GetListOfBuildsResponse.model_validate(response_as_dict).data

‎src/apify_client/_resource_clients/dataset_collection.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def list(
4040
method='GET',
4141
params=self._params(unnamed=unnamed, limit=limit, offset=offset, desc=desc),
4242
)
43-
data = response_to_dict(response)
44-
return GetListOfDatasetsResponse.model_validate(data).data
43+
response_as_dict = response_to_dict(response)
44+
return GetListOfDatasetsResponse.model_validate(response_as_dict).data
4545

4646
def get_or_create(self, *, name: str | None = None, schema: dict | None = None) -> Dataset:
4747
"""Retrieve a named dataset, or create a new one when it doesn't exist.
@@ -92,8 +92,8 @@ async def list(
9292
method='GET',
9393
params=self._params(unnamed=unnamed, limit=limit, offset=offset, desc=desc),
9494
)
95-
data = response_to_dict(response)
96-
return GetListOfDatasetsResponse.model_validate(data).data
95+
response_as_dict = response_to_dict(response)
96+
return GetListOfDatasetsResponse.model_validate(response_as_dict).data
9797

9898
async def get_or_create(
9999
self,

‎src/apify_client/_resource_clients/key_value_store_collection.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ def list(
4545
method='GET',
4646
params=self._params(unnamed=unnamed, limit=limit, offset=offset, desc=desc),
4747
)
48-
data = response_to_dict(response)
49-
return GetListOfKeyValueStoresResponse.model_validate(data).data
48+
response_as_dict = response_to_dict(response)
49+
return GetListOfKeyValueStoresResponse.model_validate(response_as_dict).data
5050

5151
def get_or_create(
5252
self,
@@ -102,8 +102,8 @@ async def list(
102102
method='GET',
103103
params=self._params(unnamed=unnamed, limit=limit, offset=offset, desc=desc),
104104
)
105-
data = response_to_dict(response)
106-
return GetListOfKeyValueStoresResponse.model_validate(data).data
105+
response_as_dict = response_to_dict(response)
106+
return GetListOfKeyValueStoresResponse.model_validate(response_as_dict).data
107107

108108
async def get_or_create(
109109
self,

0 commit comments

Comments
 (0)