From 20a199e5c696a61ff5ac911d8d7995f58fb839a7 Mon Sep 17 00:00:00 2001 From: Eric Wang Date: Fri, 31 Jan 2025 08:47:51 -0800 Subject: [PATCH] ruff fix --- dbt/adapters/databricks/api_client.py | 3 +-- dbt/adapters/databricks/connections.py | 3 +-- dbt/adapters/databricks/credentials.py | 23 ++++++++--------------- tests/unit/test_idle_config.py | 1 + 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dbt/adapters/databricks/api_client.py b/dbt/adapters/databricks/api_client.py index f636970e..235e5f52 100644 --- a/dbt/adapters/databricks/api_client.py +++ b/dbt/adapters/databricks/api_client.py @@ -13,8 +13,7 @@ from dbt.adapters.databricks import utils from dbt.adapters.databricks.__version__ import version -from dbt.adapters.databricks.credentials import BearerAuth -from dbt.adapters.databricks.credentials import DatabricksCredentials +from dbt.adapters.databricks.credentials import BearerAuth, DatabricksCredentials from dbt.adapters.databricks.logging import logger DEFAULT_POLLING_INTERVAL = 10 diff --git a/dbt/adapters/databricks/connections.py b/dbt/adapters/databricks/connections.py index f118b8eb..f38b7e4a 100644 --- a/dbt/adapters/databricks/connections.py +++ b/dbt/adapters/databricks/connections.py @@ -33,9 +33,8 @@ from dbt.adapters.databricks.__version__ import version as __version__ from dbt.adapters.databricks.api_client import DatabricksApiClient from dbt.adapters.databricks.credentials import ( - BearerAuth, - DatabricksCredentials, DatabricksCredentialManager, + DatabricksCredentials, ) from dbt.adapters.databricks.events.connection_events import ( ConnectionAcquire, diff --git a/dbt/adapters/databricks/credentials.py b/dbt/adapters/databricks/credentials.py index 1c897df1..b4244d88 100644 --- a/dbt/adapters/databricks/credentials.py +++ b/dbt/adapters/databricks/credentials.py @@ -1,27 +1,22 @@ import itertools import json -import os import re import threading from collections.abc import Iterable -from dataclasses import dataclass -from dataclasses import field -from typing import Any, Optional, Callable, Dict, List, cast +from dataclasses import dataclass, field +from typing import Any, Callable, Dict, List, Optional, cast from dbt_common.exceptions import DbtConfigError, DbtValidationError +from mashumaro import DataClassDictMixin +from requests import PreparedRequest +from requests.auth import AuthBase from databricks.sdk import WorkspaceClient -from databricks.sdk.core import Config -from databricks.sdk.core import CredentialsProvider +from databricks.sdk.core import Config, CredentialsProvider from dbt.adapters.contracts.connection import Credentials from dbt.adapters.databricks.global_state import GlobalState from dbt.adapters.databricks.logging import logger -from mashumaro import DataClassDictMixin -from requests import PreparedRequest -from requests.auth import AuthBase -from dbt.adapters.databricks.logging import logger - CATALOG_KEY_IN_SESSION_PROPERTIES = "databricks.catalog" DBT_DATABRICKS_INVOCATION_ENV_REGEX = re.compile("^[A-z0-9\\-]+$") EXTRACT_CLUSTER_ID_FROM_HTTP_PATH_REGEX = re.compile(r"/?sql/protocolv1/o/\d+/(.*)") @@ -154,10 +149,8 @@ def validate_creds(self) -> None: self.azure_client_id and not self.azure_client_secret ): raise DbtConfigError( - ( - "The config 'azure_client_id' and 'azure_client_secret' " - "must be both present or both absent" - ) + "The config 'azure_client_id' and 'azure_client_secret' " + "must be both present or both absent" ) @classmethod diff --git a/tests/unit/test_idle_config.py b/tests/unit/test_idle_config.py index 22b9072d..a733c07d 100644 --- a/tests/unit/test_idle_config.py +++ b/tests/unit/test_idle_config.py @@ -1,4 +1,5 @@ from unittest.mock import patch + import pytest from dbt_common.exceptions import DbtRuntimeError