Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump python sdk version #769

Draft
wants to merge 2 commits into
base: 1.9.latest
Choose a base branch
from
+189 −1,340
Draft

bump python sdk version #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25636de
bump python sdk version
eric-wang-1990 Aug 14, 2024
12c077b
update
eric-wang-1990 Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dbt/adapters/databricks/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

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 BearerAuth
from dbt.adapters.databricks.credentials import DatabricksCredentials
from dbt.adapters.databricks.logging import logger
from dbt_common.exceptions import DbtRuntimeError
Expand Down Expand Up @@ -396,8 +396,8 @@ def create(
http_headers = credentials.get_all_http_headers(
connection_parameters.pop("http_headers", {})
)
credentials_provider = credentials.authenticate(None)
header_factory = credentials_provider(None) # type: ignore
credentials_provider = credentials.authenticate().credentials_provider
header_factory = credentials_provider() # type: ignore
session.auth = BearerAuth(header_factory)

session.headers.update({"User-Agent": user_agent, **http_headers})
Expand Down
106 changes: 0 additions & 106 deletions dbt/adapters/databricks/auth.py
View file
Open in desktop

This file was deleted.

16 changes: 9 additions & 7 deletions dbt/adapters/databricks/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
from dbt.adapters.contracts.connection import 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 BearerAuth
from dbt.adapters.databricks.credentials import DatabricksCredentialManager
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
Expand Down Expand Up @@ -475,7 +475,7 @@ def _reset_handle(self, open: Callable[[Connection], Connection]) -> None:

class DatabricksConnectionManager(SparkConnectionManager):
TYPE: str = "databricks"
credentials_provider: Optional[TCredentialProvider] = None
credentials_manager: Optional[DatabricksCredentialManager] = None
_user_agent = f"dbt-databricks/{__version__}"

def cancel_open(self) -> List[str]:
Expand Down Expand Up @@ -725,7 +725,7 @@ def _open(cls, connection: Connection, query_header_context: Any = None) -> Conn
timeout = creds.connect_timeout

# gotta keep this so we don't prompt users many times
cls.credentials_provider = creds.authenticate(cls.credentials_provider)
cls.credentials_manager = creds.authenticate()

invocation_env = creds.get_invocation_env()
user_agent_entry = cls._user_agent
Expand All @@ -743,12 +743,13 @@ def _open(cls, connection: Connection, query_header_context: Any = None) -> Conn
http_path = _get_http_path(query_header_context, creds)

def connect() -> DatabricksSQLConnectionWrapper:
assert cls.credentials_manager is not None
try:
# TODO: what is the error when a user specifies a catalog they don't have access to
conn: DatabricksSQLConnection = dbsql.connect(
server_hostname=creds.host,
http_path=http_path,
credentials_provider=cls.credentials_provider,
credentials_provider=cls.credentials_manager.credentials_provider,
http_headers=http_headers if http_headers else None,
session_configuration=creds.session_properties,
catalog=creds.database,
Expand Down Expand Up @@ -1018,7 +1019,7 @@ def open(cls, connection: Connection) -> Connection:
timeout = creds.connect_timeout

# gotta keep this so we don't prompt users many times
cls.credentials_provider = creds.authenticate(cls.credentials_provider)
cls.credentials_manager = creds.authenticate()

invocation_env = creds.get_invocation_env()
user_agent_entry = cls._user_agent
Expand All @@ -1036,12 +1037,13 @@ def open(cls, connection: Connection) -> Connection:
http_path = databricks_connection.http_path

def connect() -> DatabricksSQLConnectionWrapper:
assert cls.credentials_manager is not None
try:
# TODO: what is the error when a user specifies a catalog they don't have access to
conn = dbsql.connect(
server_hostname=creds.host,
http_path=http_path,
credentials_provider=cls.credentials_provider,
credentials_provider=cls.credentials_manager.credentials_provider,
http_headers=http_headers if http_headers else None,
session_configuration=creds.session_properties,
catalog=creds.database,
Expand Down
Loading
Loading