Merge branch 'api-client-refactor' into deco-23621

Author: mgyucht

databricks/sdk/_base_client.py

@@ -3,7 +3,6 @@
 from types import TracebackType
 from typing import (Any, BinaryIO, Callable, Dict, Iterable, Iterator, List,
                     Optional, Type, Union)
-import urllib.parse
 
 import requests
 import requests.adapters

databricks/sdk/core.py

@@ -18,7 +18,6 @@
 OIDC_TOKEN_PATH = "/oidc/v1/token"
 
 
-
 class ApiClient:
 
     def __init__(self, cfg: Config):

tests/fixture_server.py

@@ -29,5 +29,3 @@ def __getattr__(self, item):
         yield 'http://{0}:{1}'.format(*srv.server_address)
     finally:
         srv.shutdown()
-
-

tests/test_base_client.py

@@ -1,11 +1,11 @@
 from http.server import BaseHTTPRequestHandler
-from typing import List, Iterator
+from typing import Iterator, List
 
 import pytest
 import requests
 
-from databricks.sdk._base_client import _BaseClient, _StreamingResponse
 from databricks.sdk import errors, useragent
+from databricks.sdk._base_client import _BaseClient, _StreamingResponse
 from databricks.sdk.core import DatabricksError
 
 from .clock import FakeClock
@@ -59,7 +59,7 @@ def test_streaming_response_read_closes(config):
 @pytest.mark.parametrize('status_code,headers,body,expected_error', [
     (400, {}, {
         "message":
-            "errorMessage",
+        "errorMessage",
         "details": [{
             "type": DatabricksError._error_info_type,
             "reason": "error reason",
@@ -88,23 +88,21 @@ def test_streaming_response_read_closes(config):
     (401, {}, {
         'error_code': 'UNAUTHORIZED',
         'message': 'errorMessage',
-    },
-     errors.Unauthenticated('errorMessage', error_code='UNAUTHORIZED')),
+    }, errors.Unauthenticated('errorMessage', error_code='UNAUTHORIZED')),
     (403, {}, {
         'error_code': 'FORBIDDEN',
         'message': 'errorMessage',
-    },
-     errors.PermissionDenied('errorMessage', error_code='FORBIDDEN')),
+    }, errors.PermissionDenied('errorMessage', error_code='FORBIDDEN')),
     (429, {}, {
         'error_code': 'TOO_MANY_REQUESTS',
         'message': 'errorMessage',
     }, errors.TooManyRequests('errorMessage', error_code='TOO_MANY_REQUESTS', retry_after_secs=1)),
     (429, {
         'Retry-After': '100'
     }, {
-         'error_code': 'TOO_MANY_REQUESTS',
-         'message': 'errorMessage',
-     }, errors.TooManyRequests('errorMessage', error_code='TOO_MANY_REQUESTS', retry_after_secs=100)),
+        'error_code': 'TOO_MANY_REQUESTS',
+        'message': 'errorMessage',
+    }, errors.TooManyRequests('errorMessage', error_code='TOO_MANY_REQUESTS', retry_after_secs=100)),
     (503, {}, {
         'error_code': 'TEMPORARILY_UNAVAILABLE',
         'message': 'errorMessage',
@@ -113,9 +111,9 @@ def test_streaming_response_read_closes(config):
     (503, {
         'Retry-After': '100'
     }, {
-         'error_code': 'TEMPORARILY_UNAVAILABLE',
-         'message': 'errorMessage',
-     },
+        'error_code': 'TEMPORARILY_UNAVAILABLE',
+        'message': 'errorMessage',
+    },
      errors.TemporarilyUnavailable('errorMessage', error_code='TEMPORARILY_UNAVAILABLE',
                                    retry_after_secs=100)),
     (404, {}, {
@@ -217,7 +215,7 @@ def inner(h: BaseHTTPRequestHandler):
     with http_fixture_server(inner) as host:
         api_client = _BaseClient(retry_timeout_seconds=1, clock=FakeClock())
         with pytest.raises(TimeoutError):
-            res = api_client.do('GET', f'{host}/foo')
+            api_client.do('GET', f'{host}/foo')
 
     assert len(requests) == 1
 
@@ -278,5 +276,3 @@ def inner(h: BaseHTTPRequestHandler):
         assert 'foo' in res
 
     assert len(requests) == 2
-
-

tests/test_core.py

@@ -1,11 +1,8 @@
-import contextlib
-import functools
 import os
 import pathlib
 import platform
 import random
 import string
-import typing
 from datetime import datetime
 from http.server import BaseHTTPRequestHandler
 
@@ -25,8 +22,8 @@
 from databricks.sdk.service.iam import AccessControlRequest
 from databricks.sdk.version import __version__
 
-from .fixture_server import http_fixture_server
 from .conftest import noop_credentials
+from .fixture_server import http_fixture_server
 
 
 def test_parse_dsn():
@@ -300,18 +297,20 @@ def test_deletes(config, requests_mock):
     assert res is None
 
 
-@pytest.mark.parametrize('status_code,headers,body,expected_error', [
-    (401, {}, {
+@pytest.mark.parametrize(
+    'status_code,headers,body,expected_error',
+    [(401, {}, {
         'error_code': 'UNAUTHORIZED',
         'message': 'errorMessage',
     },
-     errors.Unauthenticated('errorMessage. Config: host=http://localhost, auth_type=noop', error_code='UNAUTHORIZED')),
-    (403, {}, {
-        'error_code': 'FORBIDDEN',
-        'message': 'errorMessage',
-    },
-     errors.PermissionDenied('errorMessage. Config: host=http://localhost, auth_type=noop', error_code='FORBIDDEN')),
-])
+      errors.Unauthenticated('errorMessage. Config: host=http://localhost, auth_type=noop',
+                             error_code='UNAUTHORIZED')),
+     (403, {}, {
+         'error_code': 'FORBIDDEN',
+         'message': 'errorMessage',
+     },
+      errors.PermissionDenied('errorMessage. Config: host=http://localhost, auth_type=noop',
+                              error_code='FORBIDDEN')), ])
 def test_error(config, requests_mock, status_code, headers, body, expected_error):
     client = ApiClient(config)
     requests_mock.get("/test", json=body, status_code=status_code, headers=headers)