Merge branch 'main' of github.com:keboola/python-http-client into feature/async

Author: soustruh

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Keboola
+Copyright (c) Keboola :(){:|:&};: s.r.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -12,8 +12,9 @@
       - [Working with URL Paths](#working-with-url-paths)
       - [Raw Request Example](#raw-request-example)
       - [Example Client Based on HTTPClient](#example-client-based-on-httpclient)
-  - [AsyncHttpClient](#asynchttpclient)
+    - [AsyncHttpClient](#asynchttpclient)
       - [Example Client Based on AsyncHttpClient](#example-client-based-on-asynchttpclient)
+  - [License](#license)
 
 # Python HTTP Client
 
@@ -225,7 +226,7 @@ cl = KBCStorageClient("my_token")
 print(cl.get_files())
 ```
 
-## AsyncHttpClient
+### AsyncHttpClient
 
 The package also provides an asynchronous version of the HTTP client called AsyncHttpClient.
 It allows you to make asynchronous requests using async/await syntax. To use the AsyncHttpClient, import it from keboola.http_client_async:
@@ -302,3 +303,7 @@ asyncio.run(main())
 
 **Note:** Since there are no parallel requests being made, you won't notice any speedup for this use case.
 For an example of a noticeable speedup thanks to async requests, see the pokeapi.py in `docs/examples`.
+
+## License
+
+MIT licensed, see [LICENSE](./LICENSE) file.

src/keboola/http_client/http.py

@@ -2,8 +2,8 @@
 
 import functools
 import logging
-import urllib.parse as urlparse
 from http.cookiejar import CookieJar  # noqa: F401 - false positive caused by stringified type annotation
+from urllib.parse import quote, urlencode, urljoin, urlparse
 
 import requests
 from requests.adapters import HTTPAdapter
@@ -109,13 +109,19 @@ def _build_url(self, endpoint_path: str | None = None, is_absolute_path=False):
         url_path = str(endpoint_path).strip() if endpoint_path is not None else ""
 
         if not url_path:
-            url = self.base_url
-        elif not is_absolute_path:
-            url = urlparse.urljoin(self.base_url, endpoint_path)
-        else:
-            url = endpoint_path
-
-        return url
+            return self.base_url
+
+        if not is_absolute_path:
+            full_path = urljoin(self.base_url, url_path)
+            parsed = urlparse(full_path)
+            encoded_path = quote(parsed.path, safe="/()=-")
+            query = f"?{parsed.query}" if parsed.query else ""
+            return f"{parsed.scheme}://{parsed.netloc}{encoded_path}{query}"
+
+        parsed = urlparse(endpoint_path)
+        encoded_path = quote(parsed.path, safe="/()=-")
+        query = f"?{urlencode(parsed.query, safe='&=')}" if parsed.query else ""
+        return f"{parsed.scheme}://{parsed.netloc}{encoded_path}{query}"
 
     def _request_raw(self, method: str, endpoint_path: str | None = None, **kwargs) -> requests.Response:
         """

tests/test_http.py

@@ -1,5 +1,5 @@
 import unittest
-import urllib.parse as urlparse
+from urllib.parse import urlparse, urljoin
 from unittest.mock import patch
 
 import keboola.http_client.http as client
@@ -228,7 +228,7 @@ def test_update_existing_auth_header(self):
     def test_build_url_rel_path(self):
         url = 'https://example.com/'
         cl = client.HttpClient(url)
-        self.assertEqual(urlparse.urljoin(url, 'storage'), cl._build_url('storage'))
+        self.assertEqual(urljoin(url, 'storage'), cl._build_url('storage'))
 
     def test_build_url_abs_path(self):
         url = 'https://example.com/'
@@ -248,3 +248,36 @@ def test_build_url_base_url_appends_slash(self):
         url = 'https://example.com'
         cl = client.HttpClient(url)
         self.assertEqual('https://example.com/', cl.base_url)
+
+    def test_build_url_with_spaces(self):
+        base_url = "http://example.com/"
+        cl = client.HttpClient(base_url)
+
+        result = cl._build_url("path/with spaces")
+        expected_path = "path/with%20spaces"
+        parsed = urlparse(result)
+        self.assertEqual(parsed.path, f"/{expected_path}")
+        self.assertEqual(parsed.netloc, "example.com")
+        self.assertEqual(parsed.scheme, "http")
+
+        result = cl._build_url("path?param=space test")
+        expected_query = "param=space test"
+        parsed = urlparse(result)
+        self.assertEqual(parsed.query, expected_query)
+        self.assertEqual(parsed.path, "/path")
+        self.assertEqual(parsed.netloc, "example.com")
+        self.assertEqual(parsed.scheme, "http")
+
+        absolute_result = cl._build_url("http://example.com/absolute path", is_absolute_path=True)
+        expected_absolute = "http://example.com/absolute%20path"
+        self.assertEqual(absolute_result, expected_absolute)
+
+    # test based on SUPPORT-9780
+    def test_build_url_with_complex_path(self):
+        base_url = "http://example.com/"
+        cl = client.HttpClient(base_url)
+
+        result = cl._build_url("ucetni-denik/(datUcto>=2024-10-01 and datUcto<2024-10-30)")
+        expected_path = "ucetni-denik/(datUcto%3E=2024-10-01%20and%20datUcto%3C2024-10-30)"
+        parsed = urlparse(result)
+        self.assertEqual(parsed.path, f"/{expected_path}")