update

Author: parthban-db

databricks/sdk/__init__.py

@@ -10,7 +10,7 @@
 import requests
 import requests.adapters
 
-from .databricks import useragent
+from . import useragent
 from .casing import Casing
 from .clock import Clock, RealClock
 from .errors import DatabricksError, _ErrorCustomizer, _Parser

databricks/sdk/databricks/__init__.py

@@ -1,6 +1,6 @@
 from typing import Dict
 
-from ..oauth import TokenSource
+from .oauth import TokenSource
 from ..service.provisioning import Workspace
 
 

databricks/sdk/databricks/_base_client.py

@@ -20,7 +20,7 @@
 from google.auth.transport.requests import Request  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-from .databricks.azure import add_sp_management_token, add_workspace_id_header
+from .azure import add_sp_management_token, add_workspace_id_header
 from .oauth import (ClientCredentials, OAuthClient, Refreshable, Token,
                     TokenCache, TokenSource)
 
@@ -155,7 +155,7 @@ def runtime_native_auth(cfg: "Config") -> Optional[CredentialsProvider]:
     # This import MUST be after the "DATABRICKS_RUNTIME_VERSION" check
     # above, so that we are not throwing import errors when not in
     # runtime and no config variables are set.
-    from databricks.sdk.runtime import (init_runtime_legacy_auth,
+    from databricks.sdk.databricks.runtime import (init_runtime_legacy_auth,
                                         init_runtime_native_auth,
                                         init_runtime_repl_auth)
 

databricks/sdk/databricks/azure.py

@@ -5,8 +5,8 @@
 from typing import Callable, Optional
 from urllib import parse
 
-from databricks.sdk import oauth
-from databricks.sdk.oauth import Token
+from databricks.sdk.databricks import oauth
+from databricks.sdk.databricks.oauth import Token
 
 URL_ENCODED_CONTENT_TYPE = "application/x-www-form-urlencoded"
 JWT_BEARER_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer"

databricks/sdk/databricks/credentials_provider.py

@@ -8,9 +8,9 @@
 from typing import Any, Callable, Dict, List, Optional
 
 from .core import ApiClient, Config, DatabricksError
-from .mixins import compute as compute_ext
-from .mixins import files as dbfs_ext
-from .service import compute, workspace
+from ..mixins import compute as compute_ext
+from ..mixins import files as dbfs_ext
+from ..service import compute, workspace
 
 _LOG = logging.getLogger("databricks.sdk")
 
@@ -229,7 +229,7 @@ def __init__(self, config: "Config" = None):
     @property
     def widgets(self):
         if self._widgets is None:
-            from ._widgets import widget_impl
+            from .._widgets import widget_impl
 
             self._widgets = widget_impl()
 

databricks/sdk/databricks/data_plane.py

@@ -1,7 +1,7 @@
 import requests
 
-from databricks.sdk.errors import platform
-from databricks.sdk.errors.base import DatabricksError
+from databricks.sdk.databricks.errors import platform
+from databricks.sdk.databricks.errors.base import DatabricksError
 
 from .overrides import _ALL_OVERRIDES
 

databricks/sdk/databricks/dbutils.py

@@ -180,7 +180,7 @@ def displayHTML(html) -> None:  # type: ignore
 
     # We want to propagate the error in initialising dbutils because this is a core
     # functionality of the sdk
-    from databricks.sdk.dbutils import RemoteDbUtils
+    from databricks.sdk.databricks.dbutils import RemoteDbUtils
 
     from . import dbutils_stub
 

databricks/sdk/databricks/errors/mapper.py

@@ -5,7 +5,7 @@
 import re
 from typing import List, Optional, Tuple
 
-from .version import __version__
+from ..version import __version__
 
 # Constants
 RUNTIME_KEY = "runtime"