Skip to content

[v3-1-test] Add number of queries guard for public hitls (#57549) #57738

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 4, 2025
Merged

[v3-1-test] Add number of queries guard for public hitls (#57549) #57738

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
7 changes: 5 additions & 2 deletions airflow-core/src/airflow/api_fastapi/core_api/routes/public/hitl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
from airflow.api_fastapi.core_api.openapi.exceptions import create_openapi_http_exception_doc
from airflow.api_fastapi.core_api.security import GetUserDep, ReadableTIFilterDep, requires_access_dag
from airflow.api_fastapi.logging.decorators import action_logging
from airflow.models.dag_version import DagVersion
from airflow.models.dagrun import DagRun
from airflow.models.hitl import HITLDetail as HITLDetailModel, HITLUser
from airflow.models.taskinstance import TaskInstance as TI
Expand Down Expand Up @@ -252,8 +253,10 @@ def get_hitl_details(
.join(TI.dag_run)
.options(
joinedload(HITLDetailModel.task_instance).options(
joinedload(TI.dag_run),
)
joinedload(TI.dag_run).joinedload(DagRun.dag_model),
joinedload(TI.task_instance_note),
joinedload(TI.dag_version).joinedload(DagVersion.bundle),
),
)
)
if dag_id != "~":
Expand Down
7 changes: 5 additions & 2 deletions airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_hitl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
from airflow.sdk.execution_time.hitl import HITLUser
from airflow.utils.state import TaskInstanceState

from tests_common.test_utils.asserts import assert_queries_count
from tests_common.test_utils.format_datetime import from_datetime_to_zulu_without_ms

if TYPE_CHECKING:
Expand Down Expand Up @@ -526,7 +527,8 @@ def test_should_respond_200_with_existing_response(
test_client: TestClient,
expected_sample_hitl_detail_dict: dict[str, Any],
) -> None:
response = test_client.get("/dags/~/dagRuns/~/hitlDetails")
with assert_queries_count(3):
response = test_client.get("/dags/~/dagRuns/~/hitlDetails")
assert response.status_code == 200
assert response.json() == {
"hitl_details": [expected_sample_hitl_detail_dict],
Expand Down Expand Up @@ -595,7 +597,8 @@ def test_should_respond_200_with_existing_response_and_query(
params: dict[str, Any],
expected_ti_count: int,
) -> None:
response = test_client.get("/dags/~/dagRuns/~/hitlDetails", params=params)
with assert_queries_count(3):
response = test_client.get("/dags/~/dagRuns/~/hitlDetails", params=params)
assert response.status_code == 200
assert response.json()["total_entries"] == expected_ti_count
assert len(response.json()["hitl_details"]) == expected_ti_count
Expand Down