Add option to define custom public url

Author: Pijukatel

src/apify_client/client.py

@@ -85,7 +85,7 @@ def __init__(
         self.token = token
         api_url = (api_url or DEFAULT_API_URL).rstrip('/')
         self.base_url = f'{api_url}/{API_VERSION}'
-        self.public_base_url = (api_public_url or self.base_url).rstrip('/')
+        self.public_base_url = (api_public_url or DEFAULT_API_URL).rstrip('/')
         self.max_retries = max_retries or 8
         self.min_delay_between_retries_millis = min_delay_between_retries_millis or 500
         self.timeout_secs = timeout_secs or DEFAULT_TIMEOUT

src/apify_client/clients/base/base_client.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
-from urllib.parse import urlparse
+from urllib.parse import urljoin, urlparse
 
 from apify_client._logging import WithLogDetailsClient
 from apify_client._utils import to_safe_id
@@ -23,8 +23,7 @@ def _url(self, path: str | None = None, *, public: bool = False) -> str:
         url = f'{self.url}/{path}' if path is not None else self.url
 
         if public:
-            url_path = urlparse(url).path
-            return urlparse(self.root_client.public_base_url)._replace(path=url_path).geturl()
+            return urljoin(self.root_client.public_base_url + '/', urlparse(url).path.strip('/'))
         return url
 
     def _params(self, **kwargs: Any) -> dict:

tests/integration/conftest.py

@@ -13,6 +13,8 @@
         ('https://api.apify.com', 'https://api.apify.com'),
         ('https://api.apify.com', None),
         ('https://api.apify.com', 'https://custom-public-url.com'),
+        ('https://api.apify.com', 'https://custom-public-url.com/with/custom/path'),
+        ('https://api.apify.com', 'https://custom-public-url.com/with/custom/path/'),
     ],
 )
 

tests/integration/test_dataset.py

@@ -6,6 +6,7 @@
 from integration.integration_test_utils import random_resource_name
 
 from apify_client import ApifyClient, ApifyClientAsync
+from apify_client.client import DEFAULT_API_URL
 
 
 class TestDatasetSync:
@@ -53,7 +54,7 @@ def test_public_url(self, api_token: str, api_url: str, api_public_url: str) ->
         try:
             public_url = dataset.create_items_public_url()
             assert public_url == (
-                f'{api_public_url or api_url}/v2/datasets/'
+                f'{(api_public_url or DEFAULT_API_URL).strip("/")}/v2/datasets/'
                 f'{created_store["id"]}/items?signature={public_url.split("signature=")[1]}'
             )
         finally:
@@ -109,7 +110,7 @@ async def test_public_url(self, api_token: str, api_url: str, api_public_url: st
         try:
             public_url = await dataset.create_items_public_url()
             assert public_url == (
-                f'{api_public_url or api_url}/v2/datasets/'
+                f'{(api_public_url or DEFAULT_API_URL).strip("/")}/v2/datasets/'
                 f'{created_store["id"]}/items?signature={public_url.split("signature=")[1]}'
             )
         finally:

tests/integration/test_key_value_store.py

@@ -6,6 +6,7 @@
 from integration.integration_test_utils import random_resource_name
 
 from apify_client import ApifyClient, ApifyClientAsync
+from apify_client.client import DEFAULT_API_URL
 
 
 class TestKeyValueStoreSync:
@@ -53,7 +54,7 @@ def test_public_url(self, api_token: str, api_url: str, api_public_url: str) ->
         try:
             public_url = kvs.create_keys_public_url()
             assert public_url == (
-                f'{api_public_url or api_url}/v2/key-value-stores/'
+                f'{(api_public_url or DEFAULT_API_URL).strip("/")}/v2/key-value-stores/'
                 f'{created_store["id"]}/keys?signature={public_url.split("signature=")[1]}'
             )
         finally:
@@ -113,7 +114,7 @@ async def test_public_url(self, api_token: str, api_url: str, api_public_url: st
         try:
             public_url = await kvs.create_keys_public_url()
             assert public_url == (
-                f'{api_public_url or api_url}/v2/key-value-stores/'
+                f'{(api_public_url or DEFAULT_API_URL).strip("/")}/v2/key-value-stores/'
                 f'{created_store["id"]}/keys?signature={public_url.split("signature=")[1]}'
             )
         finally: