refactor: clean up

Author: danpoletaev

src/apify/apify_storage_client/_key_value_store_client.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Any
 
 from typing_extensions import override
+from yarl import URL
 
 from crawlee.storage_clients._base import KeyValueStoreClient as BaseKeyValueStoreClient
 from crawlee.storage_clients.models import KeyValueStoreListKeysPage, KeyValueStoreMetadata, KeyValueStoreRecord
@@ -91,11 +92,18 @@ async def get_public_url(self, key: str) -> str:
         Args:
             key: The key for which the URL should be generated.
         """
-        public_api_url = self._api_public_base_url
-        public_url = f'{public_api_url}/v2/key-value-stores/{self._client.resource_id}/records/{key}'
+        if self._client.resource_id is None:
+            raise ValueError('resource_id cannot be None when generating a public URL')
 
-        url_signing_secret_key = getattr(self.storage_object, 'url_signing_secret_key', None)
-        if url_signing_secret_key:
-            public_url += f'?signature={create_hmac_signature(url_signing_secret_key, key)}'
+        public_url = (
+            URL(self._api_public_base_url) / 'v2' / 'key-value-stores' / self._client.resource_id / 'records' / key
+        )
+
+        key_value_store = await self.get()
+
+        if key_value_store is not None and isinstance(key_value_store.model_extra, dict):
+            url_signing_secret_key = key_value_store.model_extra.get('urlSigningSecretKey')
+            if url_signing_secret_key:
+                public_url = public_url.with_query(signature=create_hmac_signature(url_signing_secret_key, key))
 
-        return public_url
+        return str(public_url)

tests/integration/test_actor_key_value_store.py

@@ -6,7 +6,6 @@
 
 from ._utils import generate_unique_resource_name
 from apify import Actor
-from apify._crypto import create_hmac_signature
 
 if TYPE_CHECKING:
     import pytest
@@ -202,21 +201,24 @@ async def test_generate_public_url_for_kvs_record(
     run_actor: RunActorFunction,
 ) -> None:
     async def main() -> None:
-        from typing import cast
-
-        from apify.apify_storage_client._key_value_store_client import KeyValueStoreClient
+        from apify._crypto import create_hmac_signature
 
         async with Actor:
             public_api_url = Actor.config.api_public_base_url
             default_store_id = Actor.config.default_key_value_store_id
+            record_key = 'public-record-key'
 
             store = await Actor.open_key_value_store()
-            record_key = 'dummy'
-            record_url = await cast(KeyValueStoreClient, store._resource_client).get_public_url(record_key)
-            url_signing_secret_key = cast(str, getattr(store.storage_object, 'url_signing_secret_key', None))
-            signature = create_hmac_signature(url_signing_secret_key, record_key)
 
+            assert isinstance(store.storage_object.model_extra, dict)
+            url_signing_secret_key = store.storage_object.model_extra.get('urlSigningSecretKey')
             assert url_signing_secret_key is not None
+
+            await store.set_value(record_key, {'exposedData': 'test'}, 'application/json')
+
+            record_url = await store.get_public_url(record_key)
+
+            signature = create_hmac_signature(url_signing_secret_key, record_key)
             assert (
                 record_url
                 == f'{public_api_url}/v2/key-value-stores/{default_store_id}/records/{record_key}?signature={signature}'