Skip to content

[v3-1-test] Add number of queries guard for ui structure (#58051) #58632

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

Merged
pierrejeambrun merged 1 commit into from
Nov 25, 2025
Merged

[v3-1-test] Add number of queries guard for ui structure (#58051) #58632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/api_fastapi/core_api/routes/ui/structure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from fastapi import Depends, HTTPException, status
from sqlalchemy import select
from sqlalchemy.orm import joinedload

from airflow.api_fastapi.auth.managers.models.resource_details import DagAccessEntity
from airflow.api_fastapi.common.db.common import SessionDep
Expand All @@ -31,6 +32,7 @@
get_upstream_assets,
)
from airflow.api_fastapi.core_api.services.ui.task_group import task_group_to_dict
from airflow.models.dag import DagModel
from airflow.models.dag_version import DagVersion
from airflow.models.serialized_dag import SerializedDagModel
from airflow.utils.dag_edges import dag_edges
Expand Down Expand Up @@ -70,6 +72,7 @@ def structure_data(
select(SerializedDagModel)
.join(DagVersion)
.where(SerializedDagModel.dag_id == dag_id, DagVersion.version_number == version_number)
.options(joinedload(SerializedDagModel.dag_model).joinedload(DagModel.task_outlet_asset_references)),
)
if serialized_dag is None:
raise HTTPException(
Expand Down
15 changes: 11 additions & 4 deletions airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_structure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from airflow.sdk import Metadata, task
from airflow.sdk.definitions.asset import Asset, AssetAlias, Dataset

from tests_common.test_utils.asserts import assert_queries_count
from tests_common.test_utils.db import clear_db_assets, clear_db_runs

pytestmark = pytest.mark.db_test
Expand Down Expand Up @@ -207,7 +208,7 @@ def asset3_id(make_dags, asset3, session) -> str:

class TestStructureDataEndpoint:
@pytest.mark.parametrize(
"params, expected",
("params", "expected", "expected_queries_count"),
[
(
{"dag_id": DAG_ID},
Expand Down Expand Up @@ -264,13 +265,15 @@ class TestStructureDataEndpoint:
},
],
},
3,
),
(
{
"dag_id": DAG_ID,
"root": "unknown_task",
},
{"edges": [], "nodes": []},
3,
),
(
{
Expand All @@ -295,6 +298,7 @@ class TestStructureDataEndpoint:
},
],
},
3,
),
(
{"dag_id": DAG_ID_EXTERNAL_TRIGGER, "external_dependencies": True},
Expand Down Expand Up @@ -333,12 +337,14 @@ class TestStructureDataEndpoint:
},
],
},
10,
),
],
)
@pytest.mark.usefixtures("make_dags")
def test_should_return_200(self, test_client, params, expected):
response = test_client.get("/structure/structure_data", params=params)
def test_should_return_200(self, test_client, params, expected, expected_queries_count):
with assert_queries_count(expected_queries_count):
response = test_client.get("/structure/structure_data", params=params)
assert response.status_code == 200
assert response.json() == expected

Expand Down Expand Up @@ -528,7 +534,8 @@ def test_should_return_200_with_asset(self, test_client, asset1_id, asset2_id, a
],
}

response = test_client.get("/structure/structure_data", params=params)
with assert_queries_count(10):
response = test_client.get("/structure/structure_data", params=params)
assert response.status_code == 200
assert response.json() == expected

Expand Down