Merge branch 'main' into 1.9.latest

CHANGELOG.md

@@ -31,6 +31,7 @@
 - Prepare for python typing deprecations ([837](https://github.com/databricks/dbt-databricks/pull/837))
 - Fix behavior flag use in init of DatabricksAdapter (thanks @VersusFacit!) ([836](https://github.com/databricks/dbt-databricks/pull/836))
 - Restrict pydantic to V1 per dbt Labs' request ([843](https://github.com/databricks/dbt-databricks/pull/843))
+- Switching to Ruff for formatting and linting ([847](https://github.com/databricks/dbt-databricks/pull/847))
 
 ## dbt-databricks 1.8.7 (October 10, 2024)
 

dbt/adapters/databricks/__init__.py

@@ -1,9 +1,6 @@
 from dbt.adapters.base import AdapterPlugin
-from dbt.adapters.databricks.column import DatabricksColumn  # noqa
-from dbt.adapters.databricks.connections import DatabricksConnectionManager  # noqa
 from dbt.adapters.databricks.credentials import DatabricksCredentials
 from dbt.adapters.databricks.impl import DatabricksAdapter
-from dbt.adapters.databricks.relation import DatabricksRelation  # noqa
 from dbt.include import databricks
 
 Plugin = AdapterPlugin(

dbt/adapters/databricks/api_client.py

@@ -1,24 +1,21 @@
 import base64
-from collections.abc import Callable
+import re
 import time
-from abc import ABC
-from abc import abstractmethod
+from abc import ABC, abstractmethod
+from collections.abc import Callable
 from dataclasses import dataclass
-import re
-from typing import Any
-from typing import Optional
+from typing import Any, Optional
+
+from dbt_common.exceptions import DbtRuntimeError
+from requests import Response, Session
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 
 from dbt.adapters.databricks import utils
 from dbt.adapters.databricks.__version__ import version
 from dbt.adapters.databricks.auth import BearerAuth
 from dbt.adapters.databricks.credentials import DatabricksCredentials
 from dbt.adapters.databricks.logging import logger
-from dbt_common.exceptions import DbtRuntimeError
-from requests import Response
-from requests import Session
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
-
 
 DEFAULT_POLLING_INTERVAL = 10
 SUBMISSION_LANGUAGE = "python"
@@ -142,7 +139,6 @@ def get_folder(self, _: str, schema: str) -> str:
 
 
 class CurrUserApi(DatabricksApi):
-
     def __init__(self, session: Session, host: str):
         super().__init__(session, host, "/api/2.0/preview/scim/v2")
         self._user = ""
@@ -401,7 +397,6 @@ def get(self, job_id: str) -> dict[str, Any]:
 
 
 class WorkflowJobApi(DatabricksApi):
-
     def __init__(self, session: Session, host: str):
         super().__init__(session, host, "/api/2.1/jobs")
 

dbt/adapters/databricks/auth.py

@@ -1,16 +1,11 @@
-from typing import Any
-from typing import Optional
-
-from databricks.sdk.core import Config
-from databricks.sdk.core import credentials_provider
-from databricks.sdk.core import CredentialsProvider
-from databricks.sdk.core import HeaderFactory
-from databricks.sdk.oauth import ClientCredentials
-from databricks.sdk.oauth import Token
-from databricks.sdk.oauth import TokenSource
+from typing import Any, Optional
+
 from requests import PreparedRequest
 from requests.auth import AuthBase
 
+from databricks.sdk.core import Config, CredentialsProvider, HeaderFactory, credentials_provider
+from databricks.sdk.oauth import ClientCredentials, Token, TokenSource
+
 
 class token_auth(CredentialsProvider):
     _token: str

dbt/adapters/databricks/behaviors/columns.py

@@ -1,9 +1,11 @@
 from abc import ABC, abstractmethod
-from dbt.adapters.sql import SQLAdapter
+
+from dbt_common.utils.dict import AttrDict
+
 from dbt.adapters.databricks.column import DatabricksColumn
 from dbt.adapters.databricks.relation import DatabricksRelation
 from dbt.adapters.databricks.utils import handle_missing_objects
-from dbt_common.utils.dict import AttrDict
+from dbt.adapters.sql import SQLAdapter
 
 GET_COLUMNS_COMMENTS_MACRO_NAME = "get_columns_comments"
 

dbt/adapters/databricks/column.py

@@ -1,6 +1,5 @@
 from dataclasses import dataclass
-from typing import ClassVar
-from typing import Optional
+from typing import ClassVar, Optional
 
 from dbt.adapters.spark.column import SparkColumn
 

dbt/adapters/databricks/connections.py

@@ -1,79 +1,80 @@
-from collections.abc import Callable, Iterator, Sequence
 import decimal
 import os
 import re
 import sys
 import time
 import uuid
 import warnings
+from collections.abc import Callable, Iterator, Sequence
 from contextlib import contextmanager
 from dataclasses import dataclass
 from multiprocessing.context import SpawnContext
 from numbers import Number
 from threading import get_ident
-from typing import Any
-from typing import cast
-from typing import Hashable
-from typing import Optional
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Hashable, Optional, cast
+
+from dbt_common.events.contextvars import get_node_info
+from dbt_common.events.functions import fire_event
+from dbt_common.exceptions import DbtDatabaseError, DbtInternalError, DbtRuntimeError
+from dbt_common.utils import cast_to_str
+from requests import Session
 
 import databricks.sql as dbsql
 from databricks.sql.client import Connection as DatabricksSQLConnection
 from databricks.sql.client import Cursor as DatabricksSQLCursor
 from databricks.sql.exc import Error
 from dbt.adapters.base.query_headers import MacroQueryStringSetter
-from dbt.adapters.contracts.connection import AdapterRequiredConfig
-from dbt.adapters.contracts.connection import AdapterResponse
-from dbt.adapters.contracts.connection import Connection
-from dbt.adapters.contracts.connection import ConnectionState
-from dbt.adapters.contracts.connection import DEFAULT_QUERY_COMMENT
-from dbt.adapters.contracts.connection import Identifier
-from dbt.adapters.contracts.connection import LazyHandle
+from dbt.adapters.contracts.connection import (
+    DEFAULT_QUERY_COMMENT,
+    AdapterRequiredConfig,
+    AdapterResponse,
+    Connection,
+    ConnectionState,
+    Identifier,
+    LazyHandle,
+)
 from dbt.adapters.databricks.__version__ import version as __version__
 from dbt.adapters.databricks.api_client import DatabricksApiClient
 from dbt.adapters.databricks.auth import BearerAuth
-from dbt.adapters.databricks.credentials import DatabricksCredentials
-from dbt.adapters.databricks.credentials import TCredentialProvider
-from dbt.adapters.databricks.events.connection_events import ConnectionAcquire
-from dbt.adapters.databricks.events.connection_events import ConnectionCancel
-from dbt.adapters.databricks.events.connection_events import ConnectionCancelError
-from dbt.adapters.databricks.events.connection_events import ConnectionClose
-from dbt.adapters.databricks.events.connection_events import ConnectionCloseError
-from dbt.adapters.databricks.events.connection_events import ConnectionCreate
-from dbt.adapters.databricks.events.connection_events import ConnectionCreated
-from dbt.adapters.databricks.events.connection_events import ConnectionCreateError
-from dbt.adapters.databricks.events.connection_events import ConnectionIdleCheck
-from dbt.adapters.databricks.events.connection_events import ConnectionIdleClose
-from dbt.adapters.databricks.events.connection_events import ConnectionRelease
-from dbt.adapters.databricks.events.connection_events import ConnectionReset
-from dbt.adapters.databricks.events.connection_events import ConnectionRetrieve
-from dbt.adapters.databricks.events.connection_events import ConnectionReuse
-from dbt.adapters.databricks.events.cursor_events import CursorCancel
-from dbt.adapters.databricks.events.cursor_events import CursorCancelError
-from dbt.adapters.databricks.events.cursor_events import CursorClose
-from dbt.adapters.databricks.events.cursor_events import CursorCloseError
-from dbt.adapters.databricks.events.cursor_events import CursorCreate
+from dbt.adapters.databricks.credentials import DatabricksCredentials, TCredentialProvider
+from dbt.adapters.databricks.events.connection_events import (
+    ConnectionAcquire,
+    ConnectionCancel,
+    ConnectionCancelError,
+    ConnectionClose,
+    ConnectionCloseError,
+    ConnectionCreate,
+    ConnectionCreated,
+    ConnectionCreateError,
+    ConnectionIdleCheck,
+    ConnectionIdleClose,
+    ConnectionRelease,
+    ConnectionReset,
+    ConnectionRetrieve,
+    ConnectionReuse,
+)
+from dbt.adapters.databricks.events.cursor_events import (
+    CursorCancel,
+    CursorCancelError,
+    CursorClose,
+    CursorCloseError,
+    CursorCreate,
+)
 from dbt.adapters.databricks.events.other_events import QueryError
-from dbt.adapters.databricks.events.pipeline_events import PipelineRefresh
-from dbt.adapters.databricks.events.pipeline_events import PipelineRefreshError
+from dbt.adapters.databricks.events.pipeline_events import PipelineRefresh, PipelineRefreshError
 from dbt.adapters.databricks.logging import logger
 from dbt.adapters.databricks.python_models.run_tracking import PythonRunTracker
 from dbt.adapters.databricks.utils import redact_credentials
-from dbt.adapters.events.types import ConnectionClosedInCleanup
-from dbt.adapters.events.types import ConnectionLeftOpenInCleanup
-from dbt.adapters.events.types import ConnectionReused
-from dbt.adapters.events.types import ConnectionUsed
-from dbt.adapters.events.types import NewConnection
-from dbt.adapters.events.types import SQLQuery
-from dbt.adapters.events.types import SQLQueryStatus
+from dbt.adapters.events.types import (
+    ConnectionClosedInCleanup,
+    ConnectionLeftOpenInCleanup,
+    ConnectionReused,
+    ConnectionUsed,
+    NewConnection,
+    SQLQuery,
+    SQLQueryStatus,
+)
 from dbt.adapters.spark.connections import SparkConnectionManager
-from dbt_common.events.contextvars import get_node_info
-from dbt_common.events.functions import fire_event
-from dbt_common.exceptions import DbtDatabaseError
-from dbt_common.exceptions import DbtInternalError
-from dbt_common.exceptions import DbtRuntimeError
-from dbt_common.utils import cast_to_str
-from requests import Session
 
 if TYPE_CHECKING:
     from agate import Table
@@ -868,7 +869,6 @@ def cleanup_all(self) -> None:
     def _update_compute_connection(
         self, conn: DatabricksDBTConnection, new_name: str
     ) -> DatabricksDBTConnection:
-
         if conn.name == new_name and conn.state == ConnectionState.OPEN:
             # Found a connection and nothing to do, so just return it
             return conn

dbt/adapters/databricks/credentials.py

@@ -1,28 +1,25 @@
-from collections.abc import Iterable
 import itertools
 import json
 import os
 import re
 import threading
+from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Any
-from typing import cast
-from typing import Optional
-from typing import Union
+from typing import Any, Optional, Union, cast
 
 import keyring
+from dbt_common.exceptions import DbtConfigError, DbtValidationError
+
 from databricks.sdk.core import CredentialsProvider
-from databricks.sdk.oauth import OAuthClient
-from databricks.sdk.oauth import SessionCredentials
+from databricks.sdk.oauth import OAuthClient, SessionCredentials
 from dbt.adapters.contracts.connection import Credentials
-from dbt.adapters.databricks.auth import m2m_auth
-from dbt.adapters.databricks.auth import token_auth
-from dbt.adapters.databricks.events.credential_events import CredentialLoadError
-from dbt.adapters.databricks.events.credential_events import CredentialSaveError
-from dbt.adapters.databricks.events.credential_events import CredentialShardEvent
+from dbt.adapters.databricks.auth import m2m_auth, token_auth
+from dbt.adapters.databricks.events.credential_events import (
+    CredentialLoadError,
+    CredentialSaveError,
+    CredentialShardEvent,
+)
 from dbt.adapters.databricks.logging import logger
-from dbt_common.exceptions import DbtConfigError
-from dbt_common.exceptions import DbtValidationError
 
 CATALOG_KEY_IN_SESSION_PROPERTIES = "databricks.catalog"
 DBT_DATABRICKS_INVOCATION_ENV = "DBT_DATABRICKS_INVOCATION_ENV"

dbt/adapters/databricks/events/connection_events.py

@@ -1,8 +1,8 @@
 from abc import ABC
-from typing import Any
-from typing import Optional
+from typing import Any, Optional
 
 from databricks.sql.client import Connection
+
 from dbt.adapters.databricks.events.base import SQLErrorEvent
 
 

dbt/adapters/databricks/events/cursor_events.py

@@ -2,6 +2,7 @@
 from uuid import UUID
 
 from databricks.sql.client import Cursor
+
 from dbt.adapters.databricks.events.base import SQLErrorEvent