Skip to content

Commit 83099fb

Browse files
committed
Fix double nesting in get keys of KVS
1 parent 27d8cb3 commit 83099fb

4 files changed

Lines changed: 49 additions & 53 deletions

File tree

‎src/apify_client/_models.py‎

Lines changed: 23 additions & 27 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-13T19:37:26+00:00
3+
# timestamp: 2026-01-14T09:15:42+00:00
44

55
from __future__ import annotations
66

@@ -1317,7 +1317,7 @@ class Item(BaseModel):
13171317
"""
13181318

13191319

1320-
class Data8(BaseModel):
1320+
class ListOfKeys(BaseModel):
13211321
items: list[Item]
13221322
count: Annotated[float, Field(examples=[2])]
13231323
limit: Annotated[float, Field(examples=[2])]
@@ -1326,12 +1326,8 @@ class Data8(BaseModel):
13261326
next_exclusive_start_key: Annotated[str | None, Field(alias='nextExclusiveStartKey', examples=['third-key'])] = None
13271327

13281328

1329-
class ListOfKeysResponse(BaseModel):
1330-
data: Data8
1331-
1332-
13331329
class GetListOfKeysResponse(BaseModel):
1334-
data: ListOfKeysResponse
1330+
data: ListOfKeys
13351331

13361332

13371333
class GetRecordResponse(BaseModel):
@@ -1355,12 +1351,12 @@ class DatasetListItem(BaseModel):
13551351
act_run_id: Annotated[str | None, Field(alias='actRunId')] = None
13561352

13571353

1358-
class Data9(PaginationResponse):
1354+
class Data8(PaginationResponse):
13591355
items: list[DatasetListItem]
13601356

13611357

13621358
class GetListOfDatasetsResponse(BaseModel):
1363-
data: Data9
1359+
data: Data8
13641360

13651361

13661362
class DatasetStats(BaseModel):
@@ -1474,7 +1470,7 @@ class InvalidItem(BaseModel):
14741470
"""
14751471

14761472

1477-
class Data10(BaseModel):
1473+
class Data9(BaseModel):
14781474
invalid_items: Annotated[list[InvalidItem], Field(alias='invalidItems')]
14791475
"""
14801476
A list of invalid items in the received array of items.
@@ -1490,7 +1486,7 @@ class Error1(BaseModel):
14901486
"""
14911487
A human-readable message describing the error.
14921488
"""
1493-
data: Data10
1489+
data: Data9
14941490

14951491

14961492
class DatasetSchemaValidationError(BaseModel):
@@ -1520,15 +1516,15 @@ class DatasetFieldStatistics(BaseModel):
15201516
"""
15211517

15221518

1523-
class Data11(BaseModel):
1519+
class Data10(BaseModel):
15241520
field_statistics: Annotated[dict[str, DatasetFieldStatistics] | None, Field(alias='fieldStatistics')] = None
15251521
"""
15261522
When you configure the dataset [fields schema](https://docs.apify.com/platform/actors/development/actor-definition/dataset-schema/validation), we measure the statistics such as `min`, `max`, `nullCount` and `emptyCount` for each field. This property provides statistics for each field from dataset fields schema. <br/></br>See dataset field statistics [documentation](https://docs.apify.com/platform/actors/development/actor-definition/dataset-schema/validation#dataset-field-statistics) for more information.
15271523
"""
15281524

15291525

15301526
class GetDatasetStatisticsResponse(BaseModel):
1531-
data: Data11
1527+
data: Data10
15321528

15331529

15341530
class RequestQueueShort(BaseModel):
@@ -1548,7 +1544,7 @@ class RequestQueueShort(BaseModel):
15481544
had_multiple_clients: Annotated[bool, Field(alias='hadMultipleClients', examples=[True])]
15491545

15501546

1551-
class Data12(BaseModel):
1547+
class Data11(BaseModel):
15521548
total: Annotated[float, Field(examples=[2])]
15531549
offset: Annotated[float, Field(examples=[0])]
15541550
limit: Annotated[float, Field(examples=[1000])]
@@ -1558,7 +1554,7 @@ class Data12(BaseModel):
15581554

15591555

15601556
class GetListOfRequestQueuesResponse(BaseModel):
1561-
data: Data12
1557+
data: Data11
15621558

15631559

15641560
class Stats6(BaseModel):
@@ -1626,13 +1622,13 @@ class UnprocessedRequest(BaseModel):
16261622
method: Annotated[str, Field(examples=['GET'])]
16271623

16281624

1629-
class Data13(BaseModel):
1625+
class Data12(BaseModel):
16301626
processed_requests: Annotated[list[ProcessedRequest], Field(alias='processedRequests')]
16311627
unprocessed_requests: Annotated[list[UnprocessedRequest], Field(alias='unprocessedRequests')]
16321628

16331629

16341630
class BatchOperationResponse(BaseModel):
1635-
data: Data13
1631+
data: Data12
16361632

16371633

16381634
class UserData(BaseModel):
@@ -1658,15 +1654,15 @@ class RequestQueueItems(BaseModel):
16581654
handled_at: Annotated[str | None, Field(alias='handledAt', examples=['2019-06-16T10:23:31.607Z'])] = None
16591655

16601656

1661-
class Data14(BaseModel):
1657+
class Data13(BaseModel):
16621658
items: list[RequestQueueItems]
16631659
count: Annotated[float | None, Field(examples=[2])] = None
16641660
limit: Annotated[float, Field(examples=[2])]
16651661
exclusive_start_id: Annotated[str | None, Field(alias='exclusiveStartId', examples=['Ihnsp8YrvJ8102Kj'])] = None
16661662

16671663

16681664
class ListRequestsResponse(BaseModel):
1669-
data: Data14
1665+
data: Data13
16701666

16711667

16721668
class RequestOperationInfo(BaseModel):
@@ -1695,15 +1691,15 @@ class Item1(BaseModel):
16951691
method: Annotated[str | None, Field(examples=['GET'])] = None
16961692

16971693

1698-
class Data15(BaseModel):
1694+
class Data14(BaseModel):
16991695
limit: Annotated[float, Field(examples=[1000])]
17001696
queue_modified_at: Annotated[str, Field(alias='queueModifiedAt', examples=['2018-03-14T23:00:00.000Z'])]
17011697
had_multiple_clients: Annotated[bool, Field(alias='hadMultipleClients', examples=[False])]
17021698
items: list[Item1]
17031699

17041700

17051701
class GetHeadResponse(BaseModel):
1706-
data: Data15
1702+
data: Data14
17071703

17081704

17091705
class Item2(BaseModel):
@@ -1715,7 +1711,7 @@ class Item2(BaseModel):
17151711
lock_expires_at: Annotated[str, Field(alias='lockExpiresAt', examples=['2022-06-14T23:00:00.000Z'])]
17161712

17171713

1718-
class Data16(BaseModel):
1714+
class Data15(BaseModel):
17191715
limit: Annotated[float, Field(examples=[1000])]
17201716
queue_modified_at: Annotated[str, Field(alias='queueModifiedAt', examples=['2018-03-14T23:00:00.000Z'])]
17211717
"""
@@ -1732,18 +1728,18 @@ class Data16(BaseModel):
17321728

17331729

17341730
class GetHeadAndLockResponse(BaseModel):
1735-
data: Data16
1731+
data: Data15
17361732

17371733

1738-
class Data17(BaseModel):
1734+
class Data16(BaseModel):
17391735
lock_expires_at: Annotated[str, Field(alias='lockExpiresAt', examples=['2022-01-01T00:00:00.000Z'])]
17401736
"""
17411737
Date when lock expires.
17421738
"""
17431739

17441740

17451741
class ProlongRequestLockResponse(BaseModel):
1746-
data: Data17 | None = None
1742+
data: Data16 | None = None
17471743

17481744

17491745
class WebhookCreate(BaseModel):
@@ -1821,12 +1817,12 @@ class TestWebhookResponse(BaseModel):
18211817
data: WebhookDispatch
18221818

18231819

1824-
class Data18(PaginationResponse):
1820+
class Data17(PaginationResponse):
18251821
items: list[WebhookDispatch]
18261822

18271823

18281824
class WebhookDispatchList(BaseModel):
1829-
data: Data18 | None = None
1825+
data: Data17 | None = None
18301826

18311827

18321828
class GetWebhookDispatchResponse(BaseModel):

‎src/apify_client/_resource_clients/dataset.py‎

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

88
from apify_shared.utils import create_storage_content_signature
99

10-
from apify_client._models import Data11, Dataset, DatasetResponse, GetDatasetStatisticsResponse
10+
from apify_client._models import Data10, Dataset, DatasetResponse, GetDatasetStatisticsResponse
1111
from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
1212
from apify_client._types import ListPage
1313
from apify_client._utils import (
@@ -566,7 +566,7 @@ def push_items(self, items: JsonSerializable) -> None:
566566
timeout_secs=_MEDIUM_TIMEOUT,
567567
)
568568

569-
def get_statistics(self) -> Data11 | None:
569+
def get_statistics(self) -> Data10 | None:
570570
"""Get the dataset statistics.
571571
572572
https://docs.apify.com/api/v2#tag/DatasetsStatistics/operation/dataset_statistics_get
@@ -1092,7 +1092,7 @@ async def push_items(self, items: JsonSerializable) -> None:
10921092
timeout_secs=_MEDIUM_TIMEOUT,
10931093
)
10941094

1095-
async def get_statistics(self) -> Data11 | None:
1095+
async def get_statistics(self) -> Data10 | None:
10961096
"""Get the dataset statistics.
10971097
10981098
https://docs.apify.com/api/v2#tag/DatasetsStatistics/operation/dataset_statistics_get

‎src/apify_client/_resource_clients/key_value_store.py‎

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

88
from apify_shared.utils import create_hmac_signature, create_storage_content_signature
99

10-
from apify_client._models import Data8, GetStoreResponse, KeyValueStore, ListOfKeysResponse
10+
from apify_client._models import GetListOfKeysResponse, GetStoreResponse, KeyValueStore, ListOfKeys
1111
from apify_client._resource_clients.base import ResourceClient, ResourceClientAsync
1212
from apify_client._utils import (
1313
catch_not_found_or_throw,
@@ -79,7 +79,7 @@ def list_keys(
7979
collection: str | None = None,
8080
prefix: str | None = None,
8181
signature: str | None = None,
82-
) -> Data8:
82+
) -> ListOfKeys:
8383
"""List the keys in the key-value store.
8484
8585
https://docs.apify.com/api/v2#/reference/key-value-stores/key-collection/get-list-of-keys
@@ -110,7 +110,7 @@ def list_keys(
110110
)
111111

112112
result = response.json()
113-
return ListOfKeysResponse.model_validate(result).data
113+
return GetListOfKeysResponse.model_validate(result).data
114114

115115
def get_record(self, key: str, signature: str | None = None) -> dict | None:
116116
"""Retrieve the given record from the key-value store.
@@ -411,7 +411,7 @@ async def list_keys(
411411
collection: str | None = None,
412412
prefix: str | None = None,
413413
signature: str | None = None,
414-
) -> Data8:
414+
) -> ListOfKeys:
415415
"""List the keys in the key-value store.
416416
417417
https://docs.apify.com/api/v2#/reference/key-value-stores/key-collection/get-list-of-keys
@@ -442,7 +442,7 @@ async def list_keys(
442442
)
443443

444444
result = response.json()
445-
return ListOfKeysResponse.model_validate(result).data
445+
return GetListOfKeysResponse.model_validate(result).data
446446

447447
async def get_record(self, key: str, signature: str | None = None) -> dict | None:
448448
"""Retrieve the given record from the key-value store.

0 commit comments

Comments
 (0)