Treat url and public url the same way with respect to the v2 part of the path

Author: Pijukatel

src/apify_client/client.py

@@ -85,7 +85,8 @@ 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 DEFAULT_API_URL).rstrip('/')
+        api_public_url = (api_public_url or DEFAULT_API_URL).rstrip('/')
+        self.public_base_url = f'{api_public_url}/{API_VERSION}'
         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,6 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
-from urllib.parse import urljoin, urlparse
 
 from apify_client._logging import WithLogDetailsClient
 from apify_client._utils import to_safe_id
@@ -23,7 +22,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:
-            return urljoin(self.root_client.public_base_url + '/', urlparse(url).path.strip('/'))
+            return url.replace(self.root_client.base_url, self.root_client.public_base_url)
         return url
 
     def _params(self, **kwargs: Any) -> dict: