Concatenate paths in _get_base_url_with_base_path rather than use urljoin

The current implementation treats the base_path as a relative URL reference and resolves it against the base URL, so it ignores any path segments already set in base_url. We have customers which use a gateway in front of our API and have a setup where the base url contains a path segment

Author: erlendvollset

cognite/client/_api_client.py

@@ -19,7 +19,6 @@
     cast,
     overload,
 )
-from urllib.parse import urljoin
 
 import requests.utils
 from requests import Response
@@ -301,7 +300,7 @@ def _get_base_url_with_base_path(self) -> str:
         base_path = ""
         if self._api_version:
             base_path = f"/api/{self._api_version}/projects/{self._config.project}"
-        return urljoin(self._config.base_url, base_path)
+        return f"{self._config.base_url.rstrip('/')}/{base_path.lstrip('/')}"
 
     def _is_retryable(self, method: str, path: str) -> bool:
         valid_methods = ["GET", "POST", "PUT", "DELETE", "PATCH"]

tests/tests_unit/test_api_client.py

@@ -199,6 +199,21 @@ def test__do_request_raises_unmodified_exception(self, api_client_with_token):
         exc_msg = exc_info.value.args[0]
         assert "contain NaN(s) or +/- Inf!" not in exc_msg
 
+    def test_client_with_base_url_including_path_segments(self, cognite_client):
+        client = APIClient(
+            ClientConfig(
+                client_name="any",
+                project="test-project",
+                base_url="https://bla.bla.com/extra",
+                max_workers=1,
+                headers={"x-cdp-app": "python-sdk-integration-tests"},
+                credentials=Token(lambda: "abc"),
+            ),
+            api_version="v1",
+            cognite_client=cognite_client,
+        )
+        assert client._get_base_url_with_base_path() == "https://bla.bla.com/extra/api/v1/projects/test-project"
+
 
 class SomeUpdate(CogniteUpdate):
     @property