Skip to content

Commit cb79707

Browse files
authored
fix(requests): fix request params replacement (#85)
1 parent 61c22a0 commit cb79707

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

singlestoredb/management/manager.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ def _get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
148148
149149
"""
150150
if self._params:
151-
kwargs['params'] = self._params
151+
params = dict(self._params)
152+
params.update(kwargs.get('params', {}))
153+
kwargs['params'] = params
152154
set_organization(kwargs)
153155
return self._check(self._doit('get', path, *args, **kwargs), path, kwargs)
154156

@@ -171,7 +173,9 @@ def _post(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
171173
172174
"""
173175
if self._params:
174-
kwargs['params'] = self._params
176+
params = dict(self._params)
177+
params.update(kwargs.get('params', {}))
178+
kwargs['params'] = params
175179
set_organization(kwargs)
176180
return self._check(self._doit('post', path, *args, **kwargs), path, kwargs)
177181

@@ -194,7 +198,9 @@ def _put(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
194198
195199
"""
196200
if self._params:
197-
kwargs['params'] = self._params
201+
params = dict(self._params)
202+
params.update(kwargs.get('params', {}))
203+
kwargs['params'] = params
198204
set_organization(kwargs)
199205
return self._check(self._doit('put', path, *args, **kwargs), path, kwargs)
200206

@@ -217,7 +223,9 @@ def _delete(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
217223
218224
"""
219225
if self._params:
220-
kwargs['params'] = self._params
226+
params = dict(self._params)
227+
params.update(kwargs.get('params', {}))
228+
kwargs['params'] = params
221229
set_organization(kwargs)
222230
return self._check(self._doit('delete', path, *args, **kwargs), path, kwargs)
223231

@@ -240,7 +248,9 @@ def _patch(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
240248
241249
"""
242250
if self._params:
243-
kwargs['params'] = self._params
251+
params = dict(self._params)
252+
params.update(kwargs.get('params', {}))
253+
kwargs['params'] = params
244254
set_organization(kwargs)
245255
return self._check(self._doit('patch', path, *args, **kwargs), path, kwargs)
246256

0 commit comments

Comments
 (0)