better usage of apify config

Author: vdusek

src/apify/storage_clients/_apify/_dataset_client.py

@@ -17,7 +17,8 @@
 
     from apify_client.clients import DatasetClientAsync
     from crawlee._types import JsonSerializable
-    from crawlee.configuration import Configuration
+
+    from apify import Configuration
 
 logger = getLogger(__name__)
 
@@ -89,15 +90,15 @@ async def open(
                 are provided, or if neither `id` nor `name` is provided and no default storage ID is available in
                 the configuration.
         """
-        token = getattr(configuration, 'token', None)
+        token = configuration.token
         if not token:
             raise ValueError(f'Apify storage client requires a valid token in Configuration (token={token}).')
 
-        api_url = getattr(configuration, 'api_base_url', None)
+        api_url = configuration.api_base_url
         if not api_url:
             raise ValueError(f'Apify storage client requires a valid API URL in Configuration (api_url={api_url}).')
 
-        api_public_base_url = getattr(configuration, 'api_public_base_url', None)
+        api_public_base_url = configuration.api_public_base_url
         if not api_public_base_url:
             raise ValueError(
                 'Apify storage client requires a valid API public base URL in Configuration '

src/apify/storage_clients/_apify/_key_value_store_client.py

@@ -18,7 +18,8 @@
     from collections.abc import AsyncIterator
 
     from apify_client.clients import KeyValueStoreClientAsync
-    from crawlee.configuration import Configuration
+
+    from apify import Configuration
 
 logger = getLogger(__name__)
 
@@ -81,15 +82,15 @@ async def open(
                 are provided, or if neither `id` nor `name` is provided and no default storage ID is available
                 in the configuration.
         """
-        token = getattr(configuration, 'token', None)
+        token = configuration.token
         if not token:
             raise ValueError(f'Apify storage client requires a valid token in Configuration (token={token}).')
 
-        api_url = getattr(configuration, 'api_base_url', None)
+        api_url = configuration.api_base_url
         if not api_url:
             raise ValueError(f'Apify storage client requires a valid API URL in Configuration (api_url={api_url}).')
 
-        api_public_base_url = getattr(configuration, 'api_public_base_url', None)
+        api_public_base_url = configuration.api_public_base_url
         if not api_public_base_url:
             raise ValueError(
                 'Apify storage client requires a valid API public base URL in Configuration '

src/apify/storage_clients/_apify/_request_queue_client.py

@@ -21,7 +21,8 @@
     from collections.abc import Sequence
 
     from apify_client.clients import RequestQueueClientAsync
-    from crawlee.configuration import Configuration
+
+    from apify import Configuration
 
 logger = getLogger(__name__)
 
@@ -106,15 +107,15 @@ async def open(
                 are provided, or if neither `id` nor `name` is provided and no default storage ID is available
                 in the configuration.
         """
-        token = getattr(configuration, 'token', None)
+        token = configuration.token
         if not token:
             raise ValueError(f'Apify storage client requires a valid token in Configuration (token={token}).')
 
-        api_url = getattr(configuration, 'api_base_url', None)
+        api_url = configuration.api_base_url
         if not api_url:
             raise ValueError(f'Apify storage client requires a valid API URL in Configuration (api_url={api_url}).')
 
-        api_public_base_url = getattr(configuration, 'api_public_base_url', None)
+        api_public_base_url = configuration.api_public_base_url
         if not api_public_base_url:
             raise ValueError(
                 'Apify storage client requires a valid API public base URL in Configuration '

src/apify/storage_clients/_apify/_storage_client.py

@@ -1,14 +1,18 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from typing_extensions import override
 
-from crawlee.configuration import Configuration
 from crawlee.storage_clients._base import StorageClient
 
 from ._dataset_client import ApifyDatasetClient
 from ._key_value_store_client import ApifyKeyValueStoreClient
 from ._request_queue_client import ApifyRequestQueueClient
 
+if TYPE_CHECKING:
+    from crawlee.configuration import Configuration
+
 
 class ApifyStorageClient(StorageClient):
     """Apify storage client."""
@@ -21,8 +25,16 @@ async def create_dataset_client(
         name: str | None = None,
         configuration: Configuration | None = None,
     ) -> ApifyDatasetClient:
-        configuration = configuration or Configuration.get_global_configuration()
-        return await ApifyDatasetClient.open(id=id, name=name, configuration=configuration)
+        from apify import Configuration as ApifyConfiguration
+
+        configuration = configuration or ApifyConfiguration.get_global_configuration()
+        if isinstance(configuration, ApifyConfiguration):
+            return await ApifyDatasetClient.open(id=id, name=name, configuration=configuration)
+
+        raise TypeError(
+            f'Expected "configuration" to be an instance of "apify.Configuration", '
+            f'but got {type(configuration).__name__} instead.'
+        )
 
     @override
     async def create_kvs_client(
@@ -32,8 +44,16 @@ async def create_kvs_client(
         name: str | None = None,
         configuration: Configuration | None = None,
     ) -> ApifyKeyValueStoreClient:
-        configuration = configuration or Configuration.get_global_configuration()
-        return await ApifyKeyValueStoreClient.open(id=id, name=name, configuration=configuration)
+        from apify import Configuration as ApifyConfiguration
+
+        configuration = configuration or ApifyConfiguration.get_global_configuration()
+        if isinstance(configuration, ApifyConfiguration):
+            return await ApifyKeyValueStoreClient.open(id=id, name=name, configuration=configuration)
+
+        raise TypeError(
+            f'Expected "configuration" to be an instance of "apify.Configuration", '
+            f'but got {type(configuration).__name__} instead.'
+        )
 
     @override
     async def create_rq_client(
@@ -43,5 +63,13 @@ async def create_rq_client(
         name: str | None = None,
         configuration: Configuration | None = None,
     ) -> ApifyRequestQueueClient:
-        configuration = configuration or Configuration.get_global_configuration()
-        return await ApifyRequestQueueClient.open(id=id, name=name, configuration=configuration)
+        from apify import Configuration as ApifyConfiguration
+
+        configuration = configuration or ApifyConfiguration.get_global_configuration()
+        if isinstance(configuration, ApifyConfiguration):
+            return await ApifyRequestQueueClient.open(id=id, name=name, configuration=configuration)
+
+        raise TypeError(
+            f'Expected "configuration" to be an instance of "apify.Configuration", '
+            f'but got {type(configuration).__name__} instead.'
+        )