Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 37 additions & 8 deletions providers/dbt/cloud/src/airflow/providers/dbt/cloud/hooks/dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
if TYPE_CHECKING:
from requests.models import PreparedRequest, Response

from airflow.models import Connection
from airflow.providers.common.compat.sdk import Connection

DBT_CAUSE_MAX_LENGTH = 255

Expand DownExpand Up@@ -254,12 +254,13 @@ def get_request_url_params(

async def get_headers_tenants_from_connection(self) -> tuple[dict[str, Any], str]:
"""Get Headers, tenants from the connection details."""
conn = await self._resolve_connection_async()
headers: dict[str, Any] = {}
tenant = self._get_tenant_domain(self.connection)
tenant = self._get_tenant_domain(conn)
package_name, provider_version = _get_provider_info()
headers["User-Agent"] = f"{package_name}-v{provider_version}"
headers["Content-Type"] = "application/json"
headers["Authorization"] = f"Token {self.connection.password}"
headers["Authorization"] = f"Token {conn.password}"
return headers, tenant

def _log_request_error(self, attempt_num: int, error: str) -> None:
Expand DownExpand Up@@ -307,7 +308,8 @@ async def get_job_details(
endpoint = f"{account_id}/runs/{run_id}/"
headers, tenant = await self.get_headers_tenants_from_connection()
url, params = self.get_request_url_params(tenant, endpoint, include_related)
proxies = self._get_proxies(self.connection) or {}
conn = await self._resolve_connection_async()
proxies = self._get_proxies(conn) or {}
proxy = proxies.get("https") if proxies and url.startswith("https") else proxies.get("http")
extra_request_args = {}

Expand DownExpand Up@@ -341,13 +343,40 @@ async def get_job_status(
job_run_status: int = response["data"]["status"]
return job_run_status

@staticmethod
def _require_password(conn: Connection) -> Connection:
if not conn.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
return conn

@cached_property
def connection(self) -> Connection:
Comment thread
amoghrajesh marked this conversation as resolved.
_connection = self.get_connection(self.dbt_cloud_conn_id)
if not _connection.password:
raise AirflowException("An API token is required to connect to dbt Cloud.")
"""
Resolve and cache the dbt Cloud connection (sync).

return _connection # type: ignore[return-value]
Do not read this property from async code running inside the triggerer's
event loop — it calls the synchronous ``get_connection()``, whose secret-masking
step raises ``RuntimeError`` when invoked from a thread that's already running an
event loop. Use ``_resolve_connection_async()`` instead; it shares this property's
cache slot so the connection is still only looked up once per hook instance
regardless of which path is used first.
"""
return self._require_password(self.get_connection(self.dbt_cloud_conn_id))

async def _resolve_connection_async(self) -> Connection:
"""
Resolve and cache the dbt Cloud connection (async).

Shares the ``connection`` cached_property's cache slot so a connection
fetched from either the sync or async path is not looked up twice on
the same hook instance, and so the async path never touches the sync
``get_connection()``/``mask_secret()`` path from inside a running
event loop (which raises in the triggerer).
"""
if "connection" not in self.__dict__:
conn = await get_async_connection(self.dbt_cloud_conn_id)
self.__dict__["connection"] = self._require_password(conn)
return self.__dict__["connection"]

def get_conn(self, *args, **kwargs) -> Session:
tenant = self._get_tenant_domain(self.connection)
Expand Down
101 changes: 101 additions & 0 deletions providers/dbt/cloud/tests/unit/dbt/cloud/hooks/test_dbt.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,6 +356,107 @@ async def test_account_id_cache_shared_between_sync_and_async(self):
assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_get_headers_tenants_from_connection_does_not_use_sync_get_connection(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(DbtCloudHook, "get_connection") as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
host=SINGLE_TENANT_DOMAIN,
)
),
) as mock_get_async_connection,
):
headers, tenant = await hook.get_headers_tenants_from_connection()

assert tenant == SINGLE_TENANT_DOMAIN
assert headers["Authorization"] == f"Token {TOKEN}"
mock_get_connection.assert_not_called()
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_resolve_connection_cached_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection:
first_call = await hook._resolve_connection_async()
second_call = await hook._resolve_connection_async()

assert first_call.password == TOKEN
assert second_call.password == TOKEN
assert mock_get_async_connection.call_count == 1

@pytest.mark.asyncio
async def test_connection_cache_shared_between_sync_and_async(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with (
patch.object(
DbtCloudHook,
"get_connection",
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
),
) as mock_get_connection,
patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
password=TOKEN,
)
),
) as mock_get_async_connection,
):
sync_conn = hook.connection
async_conn = await hook._resolve_connection_async()

assert sync_conn.password == TOKEN
assert async_conn.password == TOKEN

assert mock_get_connection.call_count == 1
assert mock_get_async_connection.call_count == 0

@pytest.mark.asyncio
async def test_resolve_connection_async_requires_password(self):
hook = DbtCloudHook(ACCOUNT_ID_CONN)

with patch(
"airflow.providers.dbt.cloud.hooks.dbt.get_async_connection",
new=AsyncMock(
return_value=Connection(
conn_id=ACCOUNT_ID_CONN,
conn_type=DbtCloudHook.conn_type,
login=str(DEFAULT_ACCOUNT_ID),
)
),
):
with pytest.raises(AirflowException, match="An API token is required"):
await hook._resolve_connection_async()

@pytest.mark.parametrize(
argnames=("conn_id", "account_id"),
argvalues=[(ACCOUNT_ID_CONN, None), (NO_ACCOUNT_ID_CONN, ACCOUNT_ID)],
Expand Down