From 4adeec79c84d79abcf861966289503332c05a30f Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Fri, 17 Apr 2026 10:45:39 +0200 Subject: [PATCH] refactor: consolidate StorageOwnership to the generated StrEnum Drop the duplicate StorageOwnership Literal from _types.py and reuse the auto-generated StrEnum from _models.py in dataset, key-value store, and request queue collection clients. --- .../_resource_clients/dataset_collection.py | 4 ++-- .../_resource_clients/key_value_store_collection.py | 3 ++- .../_resource_clients/request_queue_collection.py | 3 ++- src/apify_client/_types.py | 3 --- tests/unit/test_storage_collection_listing.py | 13 +++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/apify_client/_resource_clients/dataset_collection.py b/src/apify_client/_resource_clients/dataset_collection.py index 31c9c687..698fa31e 100644 --- a/src/apify_client/_resource_clients/dataset_collection.py +++ b/src/apify_client/_resource_clients/dataset_collection.py @@ -3,11 +3,11 @@ from typing import TYPE_CHECKING, Any from apify_client._docs import docs_group -from apify_client._models import Dataset, DatasetResponse, ListOfDatasets, ListOfDatasetsResponse +from apify_client._models import Dataset, DatasetResponse, ListOfDatasets, ListOfDatasetsResponse, StorageOwnership from apify_client._resource_clients._resource_client import ResourceClient, ResourceClientAsync if TYPE_CHECKING: - from apify_client._types import StorageOwnership, Timeout + from apify_client._types import Timeout @docs_group('Resource clients') diff --git a/src/apify_client/_resource_clients/key_value_store_collection.py b/src/apify_client/_resource_clients/key_value_store_collection.py index 0f0e7e81..0b792360 100644 --- a/src/apify_client/_resource_clients/key_value_store_collection.py +++ b/src/apify_client/_resource_clients/key_value_store_collection.py @@ -8,11 +8,12 @@ KeyValueStoreResponse, ListOfKeyValueStores, ListOfKeyValueStoresResponse, + StorageOwnership, ) from apify_client._resource_clients._resource_client import ResourceClient, ResourceClientAsync if TYPE_CHECKING: - from apify_client._types import StorageOwnership, Timeout + from apify_client._types import Timeout @docs_group('Resource clients') diff --git a/src/apify_client/_resource_clients/request_queue_collection.py b/src/apify_client/_resource_clients/request_queue_collection.py index c0ab28d0..c328303a 100644 --- a/src/apify_client/_resource_clients/request_queue_collection.py +++ b/src/apify_client/_resource_clients/request_queue_collection.py @@ -8,11 +8,12 @@ ListOfRequestQueuesResponse, RequestQueue, RequestQueueResponse, + StorageOwnership, ) from apify_client._resource_clients._resource_client import ResourceClient, ResourceClientAsync if TYPE_CHECKING: - from apify_client._types import StorageOwnership, Timeout + from apify_client._types import Timeout @docs_group('Resource clients') diff --git a/src/apify_client/_types.py b/src/apify_client/_types.py index 18cd8595..d3af93d0 100644 --- a/src/apify_client/_types.py +++ b/src/apify_client/_types.py @@ -9,9 +9,6 @@ from apify_client._models import ActorJobStatus, WebhookCreate # noqa: TC001 -StorageOwnership = Literal['ownedByMe', 'sharedWithMe'] -"""Filter for storage listing methods to return only storages owned by the user or shared with the user.""" - Timeout = timedelta | Literal['no_timeout', 'short', 'medium', 'long'] """Type for the `timeout` parameter on resource client methods. diff --git a/tests/unit/test_storage_collection_listing.py b/tests/unit/test_storage_collection_listing.py index feaf483f..5f19978a 100644 --- a/tests/unit/test_storage_collection_listing.py +++ b/tests/unit/test_storage_collection_listing.py @@ -7,6 +7,7 @@ from werkzeug.wrappers import Response from apify_client import ApifyClient, ApifyClientAsync +from apify_client._models import StorageOwnership if TYPE_CHECKING: from collections.abc import Callable @@ -47,7 +48,7 @@ def test_dataset_collection_list_ownership_sync(httpserver: HTTPServer, client_u httpserver.expect_oneshot_request('/v2/datasets', method='GET').respond_with_handler(_make_handler(captured)) client = ApifyClient(token='placeholder_token', **client_urls) - result = client.datasets().list(ownership='ownedByMe') + result = client.datasets().list(ownership=StorageOwnership.OWNED_BY_ME) assert result.total == 0 assert captured['args']['ownership'] == 'ownedByMe' @@ -58,7 +59,7 @@ async def test_dataset_collection_list_ownership_async(httpserver: HTTPServer, c httpserver.expect_oneshot_request('/v2/datasets', method='GET').respond_with_handler(_make_handler(captured)) client = ApifyClientAsync(token='placeholder_token', **client_urls) - result = await client.datasets().list(ownership='sharedWithMe') + result = await client.datasets().list(ownership=StorageOwnership.SHARED_WITH_ME) assert result.total == 0 assert captured['args']['ownership'] == 'sharedWithMe' @@ -71,7 +72,7 @@ def test_key_value_store_collection_list_ownership_sync(httpserver: HTTPServer, ) client = ApifyClient(token='placeholder_token', **client_urls) - result = client.key_value_stores().list(ownership='ownedByMe') + result = client.key_value_stores().list(ownership=StorageOwnership.OWNED_BY_ME) assert result.total == 0 assert captured['args']['ownership'] == 'ownedByMe' @@ -84,7 +85,7 @@ async def test_key_value_store_collection_list_ownership_async(httpserver: HTTPS ) client = ApifyClientAsync(token='placeholder_token', **client_urls) - result = await client.key_value_stores().list(ownership='sharedWithMe') + result = await client.key_value_stores().list(ownership=StorageOwnership.SHARED_WITH_ME) assert result.total == 0 assert captured['args']['ownership'] == 'sharedWithMe' @@ -95,7 +96,7 @@ def test_request_queue_collection_list_ownership_sync(httpserver: HTTPServer, cl httpserver.expect_oneshot_request('/v2/request-queues', method='GET').respond_with_handler(_make_handler(captured)) client = ApifyClient(token='placeholder_token', **client_urls) - result = client.request_queues().list(ownership='ownedByMe') + result = client.request_queues().list(ownership=StorageOwnership.OWNED_BY_ME) assert result.total == 0 assert captured['args']['ownership'] == 'ownedByMe' @@ -106,7 +107,7 @@ async def test_request_queue_collection_list_ownership_async(httpserver: HTTPSer httpserver.expect_oneshot_request('/v2/request-queues', method='GET').respond_with_handler(_make_handler(captured)) client = ApifyClientAsync(token='placeholder_token', **client_urls) - result = await client.request_queues().list(ownership='sharedWithMe') + result = await client.request_queues().list(ownership=StorageOwnership.SHARED_WITH_ME) assert result.total == 0 assert captured['args']['ownership'] == 'sharedWithMe'