Re-order methods

Author: Pijukatel

src/apify/storage_clients/_apify/_dataset_client.py

@@ -263,9 +263,6 @@ class DatasetApiClientFactory(ApiClientFactory[DatasetClientAsync, DatasetMetada
     def _collection_client(self) -> DatasetCollectionClientAsync:
         return self._api_client.datasets()
 
-    def _get_resource_client(self, id: str) -> DatasetClientAsync:
-        return self._api_client.dataset(dataset_id=id)
-
     @property
     def _default_id(self) -> str | None:
         return self._configuration.default_dataset_id
@@ -277,3 +274,6 @@ def _storage_type(self) -> type[Dataset]:
     @staticmethod
     def _get_metadata(raw_metadata: dict | None) -> DatasetMetadata:
         return DatasetMetadata.model_validate(raw_metadata)
+
+    def _get_resource_client(self, id: str) -> DatasetClientAsync:
+        return self._api_client.dataset(dataset_id=id)

src/apify/storage_clients/_apify/_key_value_store_client.py

@@ -189,9 +189,6 @@ class KvsApiClientFactory(ApiClientFactory[KeyValueStoreClientAsync, ApifyKeyVal
     def _collection_client(self) -> KeyValueStoreCollectionClientAsync:
         return self._api_client.key_value_stores()
 
-    def _get_resource_client(self, id: str) -> KeyValueStoreClientAsync:
-        return self._api_client.key_value_store(key_value_store_id=id)
-
     @property
     def _default_id(self) -> str | None:
         return self._configuration.default_key_value_store_id
@@ -203,3 +200,6 @@ def _storage_type(self) -> type[KeyValueStore]:
     @staticmethod
     def _get_metadata(raw_metadata: dict | None) -> ApifyKeyValueStoreMetadata:
         return ApifyKeyValueStoreMetadata.model_validate(raw_metadata)
+
+    def _get_resource_client(self, id: str) -> KeyValueStoreClientAsync:
+        return self._api_client.key_value_store(key_value_store_id=id)

src/apify/storage_clients/_apify/_request_queue_client.py

@@ -250,9 +250,6 @@ class RqApiClientFactory(ApiClientFactory[RequestQueueClientAsync, ApifyRequestQ
     def _collection_client(self) -> RequestQueueCollectionClientAsync:
         return self._api_client.request_queues()
 
-    def _get_resource_client(self, id: str) -> RequestQueueClientAsync:
-        return self._api_client.request_queue(request_queue_id=id)
-
     @property
     def _default_id(self) -> str | None:
         return self._configuration.default_request_queue_id
@@ -264,3 +261,6 @@ def _storage_type(self) -> type[RequestQueue]:
     @staticmethod
     def _get_metadata(raw_metadata: dict | None) -> ApifyRequestQueueMetadata:
         return ApifyRequestQueueMetadata.model_validate(raw_metadata)
+
+    def _get_resource_client(self, id: str) -> RequestQueueClientAsync:
+        return self._api_client.request_queue(request_queue_id=id)

src/apify/storage_clients/_apify/_utils.py

@@ -303,10 +303,6 @@ def _default_id(self) -> str | None:
     def _storage_type(self) -> type[Storage]:
         """Get a metadata model class."""
 
-    @abstractmethod
-    def _get_resource_client(self, id: str) -> TResourceClient:
-        """Get a resource API client."""
-
     @staticmethod
     @abstractmethod
     def _get_metadata(raw_metadata: dict | None) -> TStorageMetadata:
@@ -338,3 +334,7 @@ async def _open_by_alias(self, alias: str) -> tuple[TResourceClient, TStorageMet
             # Return the client for the newly created storage directly.
             # It was just created, no need to refetch it.
             return self._get_resource_client(id=metadata.id), self._get_metadata(raw_metadata)
+
+    @abstractmethod
+    def _get_resource_client(self, id: str) -> TResourceClient:
+        """Get a resource API client."""