Skip to content

Commit b7a6d8e

Browse files
committed
More fixes
1 parent 0f64ed8 commit b7a6d8e

28 files changed

+329
-276
lines changed

src/apify_client/_models.py

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# generated by datamodel-codegen:
22
# filename: openapi.json
3-
# timestamp: 2026-01-23T12:31:59+00:00
3+
# timestamp: 2026-01-23T13:59:39+00:00
44

55
from __future__ import annotations
66

@@ -37,12 +37,12 @@ class PaginationResponse(BaseModel):
3737

3838

3939
class ActorStats(BaseModel):
40-
total_builds: Annotated[int, Field(alias='totalBuilds', examples=[9])]
41-
total_runs: Annotated[int, Field(alias='totalRuns', examples=[16])]
42-
total_users: Annotated[int, Field(alias='totalUsers', examples=[6])]
43-
total_users7_days: Annotated[int, Field(alias='totalUsers7Days', examples=[2])]
44-
total_users30_days: Annotated[int, Field(alias='totalUsers30Days', examples=[6])]
45-
total_users90_days: Annotated[int, Field(alias='totalUsers90Days', examples=[6])]
40+
total_builds: Annotated[int | None, Field(alias='totalBuilds', examples=[9])] = None
41+
total_runs: Annotated[int | None, Field(alias='totalRuns', examples=[16])] = None
42+
total_users: Annotated[int | None, Field(alias='totalUsers', examples=[6])] = None
43+
total_users7_days: Annotated[int | None, Field(alias='totalUsers7Days', examples=[2])] = None
44+
total_users30_days: Annotated[int | None, Field(alias='totalUsers30Days', examples=[6])] = None
45+
total_users90_days: Annotated[int | None, Field(alias='totalUsers90Days', examples=[6])] = None
4646
total_metamorphs: Annotated[int | None, Field(alias='totalMetamorphs', examples=[2])] = None
4747
last_run_started_at: Annotated[
4848
AwareDatetime | None, Field(alias='lastRunStartedAt', examples=['2019-07-08T14:01:05.546Z'])
@@ -367,26 +367,26 @@ class UpdateActorResponse(BaseModel):
367367
data: Actor
368368

369369

370-
class VersionList(BaseModel):
370+
class ListOfVersions(BaseModel):
371371
total: Annotated[int, Field(examples=[5])]
372372
items: list[Version]
373373

374374

375-
class GetVersionListResponse(BaseModel):
376-
data: VersionList
375+
class GetListOfVersionsResponse(BaseModel):
376+
data: ListOfVersions
377377

378378

379379
class GetVersionResponse(BaseModel):
380380
data: Version
381381

382382

383-
class EnvVarList(BaseModel):
383+
class ListOfEnvVars(BaseModel):
384384
total: Annotated[int, Field(examples=[5])]
385385
items: list[EnvVar]
386386

387387

388-
class GetEnvVarListResponse(BaseModel):
389-
data: EnvVarList
388+
class GetListOfEnvVarsResponse(BaseModel):
389+
data: ListOfEnvVars
390390

391391

392392
class CreateOrUpdateEnvVarRequest(BaseModel):
@@ -483,12 +483,12 @@ class BuildShort(BaseModel):
483483
meta: BuildsMeta | None = None
484484

485485

486-
class BuildList(PaginationResponse):
486+
class ListOfBuilds(PaginationResponse):
487487
items: list[BuildShort]
488488

489489

490-
class GetBuildListResponse(BaseModel):
491-
data: BuildList
490+
class GetListOfBuildsResponse(BaseModel):
491+
data: ListOfBuilds
492492

493493

494494
class BuildStats(BaseModel):
@@ -948,12 +948,12 @@ class RunShort(BaseModel):
948948
default_request_queue_id: Annotated[str, Field(alias='defaultRequestQueueId', examples=['so93g2shcDzK3pA85'])]
949949

950950

951-
class RunList(PaginationResponse):
951+
class ListOfRuns(PaginationResponse):
952952
items: list[RunShort]
953953

954954

955-
class GetUserRunsListResponse(BaseModel):
956-
data: RunList
955+
class GetListOfRunsResponse(BaseModel):
956+
data: ListOfRuns
957957

958958

959959
class RunStats(BaseModel):
@@ -1164,7 +1164,7 @@ class Run(BaseModel):
11641164
"""
11651165

11661166

1167-
class RunResponse(BaseModel):
1167+
class GetRunResponse(BaseModel):
11681168
data: Run
11691169

11701170

@@ -1176,15 +1176,23 @@ class TaskShort(BaseModel):
11761176
id: Annotated[str, Field(examples=['zdc3Pyhyz3m8vjDeM'])]
11771177
user_id: Annotated[str, Field(alias='userId', examples=['wRsJZtadYvn4mBZmm'])]
11781178
act_id: Annotated[str, Field(alias='actId', examples=['asADASadYvn4mBZmm'])]
1179-
act_name: Annotated[str, Field(alias='actName', examples=['my-actor'])]
1179+
act_name: Annotated[str | None, Field(alias='actName', examples=['my-actor'])] = None
11801180
name: Annotated[str, Field(examples=['my-task'])]
11811181
username: Annotated[str | None, Field(examples=['janedoe'])] = None
1182-
act_username: Annotated[str, Field(alias='actUsername', examples=['janedoe'])]
1182+
act_username: Annotated[str | None, Field(alias='actUsername', examples=['janedoe'])] = None
11831183
created_at: Annotated[AwareDatetime, Field(alias='createdAt', examples=['2018-10-26T07:23:14.855Z'])]
11841184
modified_at: Annotated[AwareDatetime, Field(alias='modifiedAt', examples=['2018-10-26T13:30:49.578Z'])]
11851185
stats: TaskStats | None = None
11861186

11871187

1188+
class ListOfTasks(PaginationResponse):
1189+
items: list[TaskShort]
1190+
1191+
1192+
class GetListOfTasksResponse(BaseModel):
1193+
data: ListOfTasks
1194+
1195+
11881196
class TaskOptions(BaseModel):
11891197
build: Annotated[str | None, Field(examples=['latest'])] = None
11901198
timeout_secs: Annotated[int | None, Field(alias='timeoutSecs', examples=[300])] = None
@@ -1323,7 +1331,7 @@ class CreateKeyValueStoreResponse(BaseModel):
13231331
data: KeyValueStore
13241332

13251333

1326-
class GetStoreResponse(BaseModel):
1334+
class GetKeyValueStoreResponse(BaseModel):
13271335
data: KeyValueStore
13281336

13291337

@@ -1332,7 +1340,7 @@ class UpdateStoreRequest(BaseModel):
13321340
general_access: Annotated[GeneralAccessEnum | None, Field(alias='generalAccess')] = None
13331341

13341342

1335-
class UpdateStoreResponse(BaseModel):
1343+
class UpdateKeyValueStoreResponse(BaseModel):
13361344
data: KeyValueStore
13371345

13381346

@@ -1457,7 +1465,7 @@ class Dataset(BaseModel):
14571465
stats: DatasetStats | None = None
14581466

14591467

1460-
class DatasetResponse(BaseModel):
1468+
class CreateDatasetResponse(BaseModel):
14611469
data: Dataset
14621470

14631471

@@ -2201,38 +2209,38 @@ class GetWebhookDispatchResponse(BaseModel):
22012209
data: WebhookDispatch
22022210

22032211

2204-
class GetListOfSchedulesResponseDataItemsActions(BaseModel):
2212+
class ScheduleAction(BaseModel):
22052213
id: Annotated[str, Field(examples=['ZReCs7hkdieq8ZUki'])]
22062214
type: Annotated[str, Field(examples=['RUN_ACTOR'])]
22072215
actor_id: Annotated[str, Field(alias='actorId', examples=['HKhKmiCMrDgu9eXeE'])]
22082216

22092217

2210-
class GetListOfSchedulesResponseDataItems(BaseModel):
2218+
class ScheduleShort(BaseModel):
22112219
id: Annotated[str, Field(examples=['asdLZtadYvn4mBZmm'])]
22122220
user_id: Annotated[str, Field(alias='userId', examples=['wRsJZtadYvn4mBZmm'])]
22132221
name: Annotated[str, Field(examples=['my-schedule'])]
22142222
created_at: Annotated[AwareDatetime, Field(alias='createdAt', examples=['2019-12-12T07:34:14.202Z'])]
22152223
modified_at: Annotated[AwareDatetime, Field(alias='modifiedAt', examples=['2019-12-20T06:33:11.202Z'])]
2216-
last_run_at: Annotated[AwareDatetime, Field(alias='lastRunAt', examples=['2019-04-12T07:33:10.202Z'])]
2217-
next_run_at: Annotated[AwareDatetime, Field(alias='nextRunAt', examples=['2019-04-12T07:34:10.202Z'])]
2224+
last_run_at: Annotated[AwareDatetime | None, Field(alias='lastRunAt', examples=['2019-04-12T07:33:10.202Z'])] = None
2225+
next_run_at: Annotated[AwareDatetime | None, Field(alias='nextRunAt', examples=['2019-04-12T07:34:10.202Z'])] = None
22182226
is_enabled: Annotated[bool, Field(alias='isEnabled', examples=[True])]
22192227
is_exclusive: Annotated[bool, Field(alias='isExclusive', examples=[True])]
22202228
cron_expression: Annotated[str, Field(alias='cronExpression', examples=['* * * * *'])]
22212229
timezone: Annotated[str, Field(examples=['UTC'])]
2222-
actions: list[GetListOfSchedulesResponseDataItemsActions]
2230+
actions: list[ScheduleAction]
22232231

22242232

2225-
class GetListOfSchedulesResponseData(BaseModel):
2233+
class ListOfSchedules(BaseModel):
22262234
total: Annotated[int, Field(examples=[2])]
22272235
offset: Annotated[int, Field(examples=[0])]
22282236
limit: Annotated[int, Field(examples=[1000])]
22292237
desc: Annotated[bool, Field(examples=[False])]
22302238
count: Annotated[int, Field(examples=[2])]
2231-
items: list[GetListOfSchedulesResponseDataItems]
2239+
items: list[ScheduleShort]
22322240

22332241

22342242
class GetListOfSchedulesResponse(BaseModel):
2235-
data: GetListOfSchedulesResponseData
2243+
data: ListOfSchedules
22362244

22372245

22382246
class ScheduleActionsRunInput(BaseModel):
@@ -2264,15 +2272,15 @@ class ScheduleCreate(BaseModel):
22642272
actions: list[ScheduleCreateActions] | None = None
22652273

22662274

2267-
class ScheduleResponseDataActions(BaseModel):
2275+
class ScheduleActions(BaseModel):
22682276
id: Annotated[str, Field(examples=['c6KfSgoQzFhMk3etc'])]
22692277
type: Annotated[str, Field(examples=['RUN_ACTOR'])]
22702278
actor_id: Annotated[str, Field(alias='actorId', examples=['jF8GGEvbEg4Au3NLA'])]
22712279
run_input: Annotated[ScheduleActionsRunInput | None, Field(alias='runInput')] = None
22722280
run_options: Annotated[ScheduleActionsRunOptions | None, Field(alias='runOptions')] = None
22732281

22742282

2275-
class ScheduleResponseData(BaseModel):
2283+
class Schedule(BaseModel):
22762284
id: Annotated[str, Field(examples=['asdLZtadYvn4mBZmm'])]
22772285
user_id: Annotated[str, Field(alias='userId', examples=['wRsJZtadYvn4mBZmm'])]
22782286
name: Annotated[str, Field(examples=['my-schedule'])]
@@ -2285,11 +2293,11 @@ class ScheduleResponseData(BaseModel):
22852293
modified_at: Annotated[AwareDatetime, Field(alias='modifiedAt', examples=['2019-12-20T06:33:11.202Z'])]
22862294
next_run_at: Annotated[AwareDatetime | None, Field(alias='nextRunAt', examples=['2019-04-12T07:34:10.202Z'])] = None
22872295
last_run_at: Annotated[AwareDatetime | None, Field(alias='lastRunAt', examples=['2019-04-12T07:33:10.202Z'])] = None
2288-
actions: list[ScheduleResponseDataActions]
2296+
actions: list[ScheduleActions]
22892297

22902298

2291-
class ScheduleResponse(BaseModel):
2292-
data: ScheduleResponseData
2299+
class GetScheduleResponse(BaseModel):
2300+
data: Schedule
22932301

22942302

22952303
class ScheduleInvoked(BaseModel):
@@ -2322,7 +2330,7 @@ class StoreListActor(BaseModel):
23222330
current_pricing_info: Annotated[CurrentPricingInfo, Field(alias='currentPricingInfo')]
23232331

23242332

2325-
class StoreData(BaseModel):
2333+
class ListOfStoreActors(BaseModel):
23262334
total: Annotated[int, Field(examples=[100])]
23272335
offset: Annotated[int, Field(examples=[0])]
23282336
limit: Annotated[int, Field(examples=[1000])]
@@ -2332,7 +2340,7 @@ class StoreData(BaseModel):
23322340

23332341

23342342
class GetListOfActorsInStoreResponse(BaseModel):
2335-
data: StoreData
2343+
data: ListOfStoreActors
23362344

23372345

23382346
class Profile(BaseModel):

src/apify_client/_resource_clients/actor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Build,
99
BuildActorResponse,
1010
GetActorResponse,
11+
GetRunResponse,
1112
Run,
1213
RunOrigin,
13-
RunResponse,
1414
UpdateActorResponse,
1515
)
1616
from apify_client._resource_clients.actor_version import ActorVersionClient, ActorVersionClientAsync
@@ -335,7 +335,7 @@ def start(
335335
)
336336

337337
data = response_to_dict(response)
338-
return RunResponse.model_validate(data).data
338+
return GetRunResponse.model_validate(data).data
339339

340340
def call(
341341
self,
@@ -761,7 +761,7 @@ async def start(
761761
)
762762

763763
data = response_to_dict(response)
764-
return RunResponse.model_validate(data).data
764+
return GetRunResponse.model_validate(data).data
765765

766766
async def call(
767767
self,

src/apify_client/_resource_clients/actor_collection.py

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
from __future__ import annotations
22

3-
from typing import TYPE_CHECKING, Any, Literal
3+
from typing import Any, Literal
44

5-
from apify_client._models import Actor, ActorShort, CreateActorResponse
5+
from apify_client._models import Actor, CreateActorResponse, GetListOfActorsResponse, ListOfActors
66
from apify_client._resource_clients.actor import get_actor_representation
77
from apify_client._resource_clients.base import ResourceCollectionClient, ResourceCollectionClientAsync
8-
from apify_client._utils import filter_out_none_values_recursively
9-
10-
if TYPE_CHECKING:
11-
from apify_client._types import ListPage
8+
from apify_client._utils import filter_out_none_values_recursively, response_to_dict
129

1310

1411
class ActorCollectionClient(ResourceCollectionClient):
@@ -26,7 +23,7 @@ def list(
2623
offset: int | None = None,
2724
desc: bool | None = None,
2825
sort_by: Literal['createdAt', 'stats.lastRunStartedAt'] | None = 'createdAt',
29-
) -> ListPage[ActorShort]:
26+
) -> ListOfActors:
3027
"""List the Actors the user has created or used.
3128
3229
https://docs.apify.com/api/v2#/reference/actors/actor-collection/get-list-of-actors
@@ -41,7 +38,13 @@ def list(
4138
Returns:
4239
The list of available Actors matching the specified filters.
4340
"""
44-
return self._list(my=my, limit=limit, offset=offset, desc=desc, sortBy=sort_by)
41+
response = self.http_client.call(
42+
url=self._url(),
43+
method='GET',
44+
params=self._params(my=my, limit=limit, offset=offset, desc=desc, sortBy=sort_by),
45+
)
46+
data = response_to_dict(response)
47+
return GetListOfActorsResponse.model_validate(data).data
4548

4649
def create(
4750
self,
@@ -152,7 +155,7 @@ async def list(
152155
offset: int | None = None,
153156
desc: bool | None = None,
154157
sort_by: Literal['createdAt', 'stats.lastRunStartedAt'] | None = 'createdAt',
155-
) -> ListPage[ActorShort]:
158+
) -> ListOfActors:
156159
"""List the Actors the user has created or used.
157160
158161
https://docs.apify.com/api/v2#/reference/actors/actor-collection/get-list-of-actors
@@ -167,7 +170,13 @@ async def list(
167170
Returns:
168171
The list of available Actors matching the specified filters.
169172
"""
170-
return await self._list(my=my, limit=limit, offset=offset, desc=desc, sortBy=sort_by)
173+
response = await self.http_client.call(
174+
url=self._url(),
175+
method='GET',
176+
params=self._params(my=my, limit=limit, offset=offset, desc=desc, sortBy=sort_by),
177+
)
178+
data = response_to_dict(response)
179+
return GetListOfActorsResponse.model_validate(data).data
171180

172181
async def create(
173182
self,

0 commit comments

Comments
 (0)