|
4 | 4 | from contextlib import asynccontextmanager, contextmanager |
5 | 5 | from http import HTTPStatus |
6 | 6 | from typing import TYPE_CHECKING, Any |
7 | | -from urllib.parse import urlencode, urlparse, urlunparse |
8 | 7 |
|
9 | 8 | from apify_client._docs import docs_group |
10 | 9 | from apify_client._models import ( |
@@ -425,13 +424,7 @@ def get_record_public_url(self, key: str, *, timeout: Timeout = 'long') -> str: |
425 | 424 | if metadata and metadata.url_signing_secret_key: |
426 | 425 | request_params['signature'] = create_hmac_signature(metadata.url_signing_secret_key, key) |
427 | 426 |
|
428 | | - key_public_url = urlparse(self._build_url(f'records/{key}', public=True)) |
429 | | - filtered_params = {k: v for k, v in request_params.items() if v is not None} |
430 | | - |
431 | | - if filtered_params: |
432 | | - key_public_url = key_public_url._replace(query=urlencode(filtered_params)) |
433 | | - |
434 | | - return urlunparse(key_public_url) |
| 427 | + return self._build_public_url(f'records/{key}', request_params) |
435 | 428 |
|
436 | 429 | def create_keys_public_url( |
437 | 430 | self, |
@@ -482,13 +475,7 @@ def create_keys_public_url( |
482 | 475 | ) |
483 | 476 | request_params['signature'] = signature |
484 | 477 |
|
485 | | - keys_public_url = urlparse(self._build_url('keys', public=True)) |
486 | | - |
487 | | - filtered_params = {k: v for k, v in request_params.items() if v is not None} |
488 | | - if filtered_params: |
489 | | - keys_public_url = keys_public_url._replace(query=urlencode(filtered_params)) |
490 | | - |
491 | | - return urlunparse(keys_public_url) |
| 478 | + return self._build_public_url('keys', request_params) |
492 | 479 |
|
493 | 480 |
|
494 | 481 | @docs_group('Resource clients') |
@@ -853,13 +840,7 @@ async def get_record_public_url(self, key: str, *, timeout: Timeout = 'long') -> |
853 | 840 | if metadata and metadata.url_signing_secret_key: |
854 | 841 | request_params['signature'] = create_hmac_signature(metadata.url_signing_secret_key, key) |
855 | 842 |
|
856 | | - key_public_url = urlparse(self._build_url(f'records/{key}', public=True)) |
857 | | - filtered_params = {k: v for k, v in request_params.items() if v is not None} |
858 | | - |
859 | | - if filtered_params: |
860 | | - key_public_url = key_public_url._replace(query=urlencode(filtered_params)) |
861 | | - |
862 | | - return urlunparse(key_public_url) |
| 843 | + return self._build_public_url(f'records/{key}', request_params) |
863 | 844 |
|
864 | 845 | async def create_keys_public_url( |
865 | 846 | self, |
@@ -910,10 +891,4 @@ async def create_keys_public_url( |
910 | 891 | ) |
911 | 892 | request_params['signature'] = signature |
912 | 893 |
|
913 | | - keys_public_url = urlparse(self._build_url('keys', public=True)) |
914 | | - |
915 | | - filtered_params = {k: v for k, v in request_params.items() if v is not None} |
916 | | - if filtered_params: |
917 | | - keys_public_url = keys_public_url._replace(query=urlencode(filtered_params)) |
918 | | - |
919 | | - return urlunparse(keys_public_url) |
| 894 | + return self._build_public_url('keys', request_params) |
0 commit comments