|
1 | 1 | #!/usr/bin/env python
|
2 | 2 | """SingleStoreDB Base Manager."""
|
3 |
| -import logging |
4 | 3 | import os
|
5 | 4 | import sys
|
6 | 5 | import time
|
@@ -58,13 +57,11 @@ def __init__(
|
58 | 57 | base_url: Optional[str] = None, *, organization_id: Optional[str] = None,
|
59 | 58 | ):
|
60 | 59 | from .. import __version__ as client_version
|
61 |
| - refresh_token = not bool(access_token) |
62 | 60 | access_token = (
|
63 | 61 | access_token or get_token()
|
64 | 62 | )
|
65 | 63 | if not access_token:
|
66 | 64 | raise ManagementError(msg='No management token was configured.')
|
67 |
| - self._auth_is_jwt = refresh_token and is_jwt(access_token) |
68 | 65 | self._sess = requests.Session()
|
69 | 66 | self._sess.headers.update({
|
70 | 67 | 'Authorization': f'Bearer {access_token}',
|
@@ -118,35 +115,10 @@ def _doit(
|
118 | 115 | *args: Any,
|
119 | 116 | **kwargs: Any,
|
120 | 117 | ) -> requests.Response:
|
121 |
| - """Perform HTTP request and retry as needed.""" |
122 |
| - retries = 5 |
123 |
| - while retries > 0: |
124 |
| - if self._auth_is_jwt: |
125 |
| - logging.debug('making request with JWT') |
126 |
| - else: |
127 |
| - logging.debug('making request without JWT') |
128 |
| - res = getattr(self._sess, method.lower())( |
129 |
| - urljoin(self._base_url, path), *args, **kwargs, |
130 |
| - ) |
131 |
| - # Retry for authentication errors because the JWT in the |
132 |
| - # notebook env might need to be refreshed. |
133 |
| - if self._auth_is_jwt and res.status_code == 401: |
134 |
| - logging.debug('authorization error with JWT; retrying') |
135 |
| - access_token: Optional[str] = str(self._sess.headers['Authorization']) |
136 |
| - logging.debug(f'old JWT: {access_token}') |
137 |
| - time.sleep(5) |
138 |
| - access_token = get_token() |
139 |
| - logging.debug(f'new JWT: {access_token}') |
140 |
| - if access_token is not None: |
141 |
| - self._sess.headers.update({ |
142 |
| - 'Authorization': f'Bearer {access_token}', |
143 |
| - }) |
144 |
| - retries -= 1 |
145 |
| - continue |
146 |
| - elif res.status_code == 401: |
147 |
| - logging.debug('authorization error; no retries') |
148 |
| - break |
149 |
| - return res |
| 118 | + """Perform HTTP request.""" |
| 119 | + return getattr(self._sess, method.lower())( |
| 120 | + urljoin(self._base_url, path), *args, **kwargs, |
| 121 | + ) |
150 | 122 |
|
151 | 123 | def _get(self, path: str, *args: Any, **kwargs: Any) -> requests.Response:
|
152 | 124 | """
|
|
0 commit comments