update

Author: parthban-db

databricks/sdk/databricks/core.py

@@ -3,7 +3,7 @@
 from urllib.parse import urlencode
 
 from ._base_client import _BaseClient
-from .databricks.config import *
+from .config import *
 # To preserve backwards compatibility (as these definitions were previously in this module)
 from .credentials_provider import *
 from .errors import DatabricksError, _ErrorCustomizer

databricks/sdk/mixins/compute.py

@@ -5,8 +5,8 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from databricks.sdk.core import DatabricksError
-from databricks.sdk.errors import OperationFailed
+from databricks.sdk.databricks.core import DatabricksError
+from databricks.sdk.databricks.errors import OperationFailed
 from databricks.sdk.service import compute
 
 _LOG = logging.getLogger("databricks.sdk")

databricks/sdk/mixins/workspace.py

@@ -1,6 +1,6 @@
 from typing import Any, BinaryIO, Iterator, Optional, Union
 
-from ..core import DatabricksError
+from ..databricks.core import DatabricksError
 from ..service.workspace import (ExportFormat, ImportFormat, Language,
                                  ObjectInfo, ObjectType, WorkspaceAPI)
 

tests/conftest.py

@@ -5,8 +5,8 @@
 import pytest as pytest
 from pyfakefs.fake_filesystem_unittest import Patcher
 
-from databricks.sdk.core import Config
-from databricks.sdk.credentials_provider import credentials_strategy
+from databricks.sdk.databricks.core import Config
+from databricks.sdk.databricks.credentials_provider import credentials_strategy
 
 from .integration.conftest import restorable_env  # type: ignore
 

tests/integration/test_clusters.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from databricks.sdk.core import DatabricksError
+from databricks.sdk.databricks.core import DatabricksError
 from databricks.sdk.service.compute import EventType
 
 

tests/integration/test_commands.py

@@ -1,6 +1,6 @@
 import pytest
 
-from databricks.sdk.core import DatabricksError
+from databricks.sdk.databricks.core import DatabricksError
 
 
 def test_error_unmarshall(w, random):

tests/integration/test_data_plane.py

@@ -1,4 +1,4 @@
-from databricks.sdk.data_plane import DataPlaneTokenSource
+from databricks.sdk.databricks.data_plane import DataPlaneTokenSource
 
 
 def test_data_plane_token_source(ucws, env_or_skip):

tests/integration/test_dbutils.py

@@ -4,12 +4,12 @@
 
 import pytest
 
-from databricks.sdk.core import DatabricksError
-from databricks.sdk.errors import NotFound
+from databricks.sdk.databricks.core import DatabricksError
+from databricks.sdk.databricks.errors import NotFound
 
 
 def test_rest_dbfs_ls(w, env_or_skip):
-    from databricks.sdk.runtime import dbutils
+    from databricks.sdk.databricks.runtime import dbutils
 
     x = dbutils.fs.ls("/")
 
@@ -192,7 +192,7 @@ def test_secrets(w, random):
         bytes_value=base64.b64encode(random_value.encode()).decode(),
     )
 
-    from databricks.sdk.runtime import dbutils
+    from databricks.sdk.databricks.runtime import dbutils
 
     all_scopes = dbutils.secrets.listScopes()
     assert random_scope in [scope.getName() for scope in all_scopes]

tests/integration/test_files.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from databricks.sdk.core import DatabricksError
+from databricks.sdk.databricks.core import DatabricksError
 from databricks.sdk.service.catalog import VolumeType
 
 

tests/integration/test_iam.py

@@ -1,7 +1,7 @@
 import pytest
 
-from databricks.sdk import errors
-from databricks.sdk.core import DatabricksError
+from databricks.sdk.databricks import errors
+from databricks.sdk.databricks.core import DatabricksError
 
 
 def test_filtering_groups(w, random):