From 47ceaab68c8d1477050657ce94b244cf8fb4dea5 Mon Sep 17 00:00:00 2001 From: Pedro Rodrigues Date: Thu, 7 Aug 2025 19:30:36 +0100 Subject: [PATCH 1/2] fix request params replacement --- singlestoredb/management/manager.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/singlestoredb/management/manager.py b/singlestoredb/management/manager.py index 9474360a8..397d5d57c 100644 --- a/singlestoredb/management/manager.py +++ b/singlestoredb/management/manager.py @@ -148,7 +148,7 @@ def _get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs['params'] = self._params + kwargs.setdefault('params', {}).update(self._params) set_organization(kwargs) return self._check(self._doit('get', path, *args, **kwargs), path, kwargs) @@ -171,7 +171,7 @@ def _post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs['params'] = self._params + kwargs.setdefault('params', {}).update(self._params) set_organization(kwargs) return self._check(self._doit('post', path, *args, **kwargs), path, kwargs) @@ -194,7 +194,7 @@ def _put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs['params'] = self._params + kwargs.setdefault('params', {}).update(self._params) set_organization(kwargs) return self._check(self._doit('put', path, *args, **kwargs), path, kwargs) @@ -217,7 +217,7 @@ def _delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs['params'] = self._params + kwargs.setdefault('params', {}).update(self._params) set_organization(kwargs) return self._check(self._doit('delete', path, *args, **kwargs), path, kwargs) @@ -240,7 +240,7 @@ def _patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs['params'] = self._params + kwargs.setdefault('params', {}).update(self._params) set_organization(kwargs) return self._check(self._doit('patch', path, *args, **kwargs), path, kwargs) From 8ca9d6587731e18337fd87f5ffc868f626267750 Mon Sep 17 00:00:00 2001 From: Pedro Rodrigues Date: Thu, 7 Aug 2025 20:01:43 +0100 Subject: [PATCH 2/2] fix kwargs --- singlestoredb/management/manager.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/singlestoredb/management/manager.py b/singlestoredb/management/manager.py index 397d5d57c..3d974950c 100644 --- a/singlestoredb/management/manager.py +++ b/singlestoredb/management/manager.py @@ -148,7 +148,9 @@ def _get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs.setdefault('params', {}).update(self._params) + params = dict(self._params) + params.update(kwargs.get('params', {})) + kwargs['params'] = params set_organization(kwargs) return self._check(self._doit('get', path, *args, **kwargs), path, kwargs) @@ -171,7 +173,9 @@ def _post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs.setdefault('params', {}).update(self._params) + params = dict(self._params) + params.update(kwargs.get('params', {})) + kwargs['params'] = params set_organization(kwargs) return self._check(self._doit('post', path, *args, **kwargs), path, kwargs) @@ -194,7 +198,9 @@ def _put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs.setdefault('params', {}).update(self._params) + params = dict(self._params) + params.update(kwargs.get('params', {})) + kwargs['params'] = params set_organization(kwargs) return self._check(self._doit('put', path, *args, **kwargs), path, kwargs) @@ -217,7 +223,9 @@ def _delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs.setdefault('params', {}).update(self._params) + params = dict(self._params) + params.update(kwargs.get('params', {})) + kwargs['params'] = params set_organization(kwargs) return self._check(self._doit('delete', path, *args, **kwargs), path, kwargs) @@ -240,7 +248,9 @@ def _patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response: """ if self._params: - kwargs.setdefault('params', {}).update(self._params) + params = dict(self._params) + params.update(kwargs.get('params', {})) + kwargs['params'] = params set_organization(kwargs) return self._check(self._doit('patch', path, *args, **kwargs), path, kwargs)