fix: use create_storage_content_signature from shared package

Author: danpoletaev

src/apify_client/_utils.py

@@ -2,11 +2,8 @@
 
 import asyncio
 import base64
-import hashlib
-import hmac
 import json
 import random
-import string
 import time
 from collections.abc import Callable
 from http import HTTPStatus
@@ -152,59 +149,3 @@ def encode_key_value_store_record_value(value: Any, content_type: str | None = N
         value = json.dumps(value, ensure_ascii=False, indent=2, allow_nan=False, default=str).encode('utf-8')
 
     return (value, content_type)
-
-
-# TODO: will be removed once create_hmac_signature is moved to apify_shared.utils
-# https://github.com/apify/apify-shared-python/pull/44
-CHARSET = string.digits + string.ascii_letters
-
-
-def encode_base62(num: int) -> str:
-    """Encode the given number to base62."""
-    if num == 0:
-        return CHARSET[0]
-
-    res = ''
-    while num > 0:
-        num, remainder = divmod(num, 62)
-        res = CHARSET[remainder] + res
-    return res
-
-
-def create_hmac_signature(secret_key: str, message: str) -> str:
-    """Generate an HMAC signature and encodes it using Base62. Base62 encoding reduces the signature length.
-
-    HMAC signature is truncated to 30 characters to make it shorter.
-
-    Args:
-        secret_key (str): Secret key used for signing signatures
-        message (str): Message to be signed
-
-    Returns:
-        str: Base62 encoded signature
-    """
-    signature = hmac.new(secret_key.encode('utf-8'), message.encode('utf-8'), hashlib.sha256).hexdigest()[:30]
-
-    decimal_signature = int(signature, 16)
-
-    return encode_base62(decimal_signature)
-
-
-def create_storage_signature(
-    resource_id: str, url_signing_secret_key: str, expires_in_millis: int | None, version: int = 0
-) -> str:
-    """Create a storage signature for a resource, which can be used to generate signed URLs for accessing the resource.
-
-    The signature is created using HMAC with the provided secret key and includes
-    the resource ID, expiration time, and version.
-
-    Note: expires_in_millis is optional. If not provided, the signature will not expire.
-
-    """
-    expires_at = int(time.time() * 1000) + expires_in_millis if expires_in_millis else 0
-
-    message_to_sign = f'{version}.{expires_at}.{resource_id}'
-    hmac = create_hmac_signature(url_signing_secret_key, message_to_sign)
-
-    base64url_encoded_payload = base64.urlsafe_b64encode(f'{version}.{expires_at}.{hmac}'.encode())
-    return base64url_encoded_payload.decode('utf-8')

src/apify_client/clients/resource_clients/dataset.py

@@ -6,10 +6,10 @@
 from urllib.parse import urlencode, urlparse, urlunparse
 
 from apify_shared.models import ListPage
-from apify_shared.utils import filter_out_none_values_recursively, ignore_docs
+from apify_shared.utils import create_storage_content_signature, filter_out_none_values_recursively, ignore_docs
 
 from apify_client._errors import ApifyApiError
-from apify_client._utils import catch_not_found_or_throw, create_storage_signature, pluck_data
+from apify_client._utils import catch_not_found_or_throw, pluck_data
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
 
 if TYPE_CHECKING:
@@ -619,7 +619,7 @@ def create_items_public_url(
         )
 
         if dataset and 'urlSigningSecretKey' in dataset:
-            signature = create_storage_signature(
+            signature = create_storage_content_signature(
                 resource_id=dataset['id'],
                 url_signing_secret_key=dataset['urlSigningSecretKey'],
                 expires_in_millis=expires_in_millis,
@@ -1137,7 +1137,7 @@ async def create_items_public_url(
         )
 
         if dataset and 'urlSigningSecretKey' in dataset:
-            signature = create_storage_signature(
+            signature = create_storage_content_signature(
                 resource_id=dataset['id'],
                 url_signing_secret_key=dataset['urlSigningSecretKey'],
                 expires_in_millis=expires_in_millis,

src/apify_client/clients/resource_clients/key_value_store.py

@@ -6,12 +6,16 @@
 from typing import TYPE_CHECKING, Any
 from urllib.parse import urlencode, urlparse, urlunparse
 
-from apify_shared.utils import filter_out_none_values_recursively, ignore_docs, parse_date_fields
+from apify_shared.utils import (
+    create_storage_content_signature,
+    filter_out_none_values_recursively,
+    ignore_docs,
+    parse_date_fields,
+)
 
 from apify_client._errors import ApifyApiError
 from apify_client._utils import (
     catch_not_found_or_throw,
-    create_storage_signature,
     encode_key_value_store_record_value,
     pluck_data,
 )
@@ -326,7 +330,7 @@ def create_keys_public_url(
         )
 
         if store and 'urlSigningSecretKey' in store:
-            signature = create_storage_signature(
+            signature = create_storage_content_signature(
                 resource_id=store['id'],
                 url_signing_secret_key=store['urlSigningSecretKey'],
                 expires_in_millis=expires_in_millis,
@@ -623,7 +627,7 @@ async def create_keys_public_url(
         )
 
         if store and 'urlSigningSecretKey' in store:
-            signature = create_storage_signature(
+            signature = create_storage_content_signature(
                 resource_id=store['id'],
                 url_signing_secret_key=store['urlSigningSecretKey'],
                 expires_in_millis=expires_in_millis,