Merge pull request #33 from upstash/base-url-fix

Add Optional base_url Parameter to Clients
upstash · Dec 24, 2024 · 9efb145 · 9efb145
1 parent cabb431
commit 9efb145
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/qstash/asyncio/client.py b/qstash/asyncio/client.py
@@ -18,12 +18,17 @@ def __init__(
         token: str,
         *,
         retry: Optional[Union[Literal[False], RetryConfig]] = None,
+        base_url: Optional[str] = None,
     ) -> None:
         """
         :param token: The authorization token from the Upstash console.
         :param retry: Configures how the client should retry requests.
         """
-        http = AsyncHttpClient(token, retry)
+        http = AsyncHttpClient(
+            token,
+            retry,
+            base_url,
+        )
         self.message = AsyncMessageApi(http)
         """Message api."""
 

diff --git a/qstash/asyncio/http.py b/qstash/asyncio/http.py
@@ -19,6 +19,7 @@ def __init__(
         self,
         token: str,
         retry: Optional[Union[Literal[False], RetryConfig]],
+        base_url: Optional[str] = None,
     ) -> None:
         self._token = f"Bearer {token}"
 
@@ -33,6 +34,8 @@ def __init__(
             timeout=DEFAULT_TIMEOUT,
         )
 
+        self._base_url = base_url.rstrip("/") if base_url else BASE_URL
+
     async def request(
         self,
         *,
@@ -45,7 +48,7 @@ async def request(
         base_url: Optional[str] = None,
         token: Optional[str] = None,
     ) -> Any:
-        base_url = base_url or BASE_URL
+        base_url = base_url or self._base_url
         token = token or self._token
 
         url = base_url + path
@@ -91,7 +94,7 @@ async def stream(
         base_url: Optional[str] = None,
         token: Optional[str] = None,
     ) -> httpx.Response:
-        base_url = base_url or BASE_URL
+        base_url = base_url or self._base_url
         token = token or self._token
 
         url = base_url + path

diff --git a/qstash/client.py b/qstash/client.py
@@ -19,12 +19,17 @@ def __init__(
         token: str,
         *,
         retry: Optional[Union[Literal[False], RetryConfig]] = None,
+        base_url: Optional[str] = None,
     ) -> None:
         """
         :param token: The authorization token from the Upstash console.
         :param retry: Configures how the client should retry requests.
         """
-        http = HttpClient(token, retry)
+        http = HttpClient(
+            token,
+            retry,
+            base_url,
+        )
         self.message = MessageApi(http)
         """Message api."""
 

diff --git a/qstash/http.py b/qstash/http.py
@@ -102,6 +102,7 @@ def __init__(
         self,
         token: str,
         retry: Optional[Union[Literal[False], RetryConfig]],
+        base_url: Optional[str] = None,
     ) -> None:
         self._token = f"Bearer {token}"
 
@@ -116,6 +117,8 @@ def __init__(
             timeout=DEFAULT_TIMEOUT,
         )
 
+        self._base_url = base_url.rstrip("/") if base_url else BASE_URL
+
     def request(
         self,
         *,
@@ -128,7 +131,7 @@ def request(
         base_url: Optional[str] = None,
         token: Optional[str] = None,
     ) -> Any:
-        base_url = base_url or BASE_URL
+        base_url = base_url or self._base_url
         token = token or self._token
 
         url = base_url + path
@@ -174,7 +177,7 @@ def stream(
         base_url: Optional[str] = None,
         token: Optional[str] = None,
     ) -> httpx.Response:
-        base_url = base_url or BASE_URL
+        base_url = base_url or self._base_url
         token = token or self._token
 
         url = base_url + path