Lee-W commented on code in PR #53376:
URL: https://github.com/apache/airflow/pull/53376#discussion_r2224559957
##########
airflow-core/src/airflow/api_fastapi/core_api/routes/public/hitl.py:
##########
@@ -262,17 +276,68 @@ def get_mapped_ti_hitl_detail(
dependencies=[Depends(requires_access_dag(method="GET",
access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def get_hitl_details(
- readable_ti_filter: ReadableTIFilterDep,
+ limit: QueryLimit,
+ offset: QueryOffset,
+ order_by: Annotated[
+ SortParam,
+ Depends(
+ SortParam(
+ [
+ "ti_id",
+ "subject",
+ "response_at",
+ "task_instance.dag_id",
+ "task_instance.run_id",
+ ],
+ HITLDetailModel,
+ to_replace={
+ "dag_id": TI.dag_id,
+ "run_id": TI.run_id,
+ },
+ ).dynamic_depends(),
+ ),
+ ],
session: SessionDep,
+ # ti related filter
+ readable_ti_filter: ReadableTIFilterDep,
+ dag_id_pattern: QueryHITLDetailDagIdPatternSearch,
+ dag_run_id: QueryHITLDetailDagRunIdFilter,
+ ti_state: QueryTIStateFilter,
+ # hitl detail related filter
+ response_received: QueryHITLDetailResponseReceivedFilter,
+ user_id: QueryHITLDetailUserIdFilter,
+ subject_patten: QueryHITLDetailSubjectSearch,
+ body_patten: QueryHITLDetailBodySearch,
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
- query = select(HITLDetailModel).join(TI, HITLDetailModel.ti_id == TI.id)
+ query = (
+ select(HITLDetailModel)
+ .join(TI, HITLDetailModel.ti_id == TI.id)
+ .options(joinedload(HITLDetailModel.task_instance))
+ )
hitl_detail_select, total_entries = paginated_select(
statement=query,
- filters=[readable_ti_filter],
+ filters=[
+ # ti related filter
+ readable_ti_filter,
+ dag_id_pattern,
+ dag_run_id,
+ ti_state,
+ # hitl detail related filter
+ response_received,
+ user_id,
+ subject_patten,
+ body_patten,
+ ],
+ offset=offset,
+ limit=limit,
+ order_by=order_by,
session=session,
)
+
hitl_details = session.scalars(hitl_detail_select)
+ # raise Exception(f"{hitl_detail_select}")
Review Comment:
fixed
##########
airflow-core/src/airflow/api_fastapi/core_api/routes/public/hitl.py:
##########
@@ -262,17 +276,68 @@ def get_mapped_ti_hitl_detail(
dependencies=[Depends(requires_access_dag(method="GET",
access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def get_hitl_details(
- readable_ti_filter: ReadableTIFilterDep,
+ limit: QueryLimit,
+ offset: QueryOffset,
+ order_by: Annotated[
+ SortParam,
+ Depends(
+ SortParam(
+ [
+ "ti_id",
+ "subject",
+ "response_at",
+ "task_instance.dag_id",
+ "task_instance.run_id",
+ ],
+ HITLDetailModel,
+ to_replace={
+ "dag_id": TI.dag_id,
+ "run_id": TI.run_id,
+ },
+ ).dynamic_depends(),
+ ),
+ ],
session: SessionDep,
+ # ti related filter
+ readable_ti_filter: ReadableTIFilterDep,
+ dag_id_pattern: QueryHITLDetailDagIdPatternSearch,
+ dag_run_id: QueryHITLDetailDagRunIdFilter,
+ ti_state: QueryTIStateFilter,
+ # hitl detail related filter
+ response_received: QueryHITLDetailResponseReceivedFilter,
+ user_id: QueryHITLDetailUserIdFilter,
+ subject_patten: QueryHITLDetailSubjectSearch,
+ body_patten: QueryHITLDetailBodySearch,
) -> HITLDetailCollection:
"""Get Human-in-the-loop details."""
- query = select(HITLDetailModel).join(TI, HITLDetailModel.ti_id == TI.id)
+ query = (
+ select(HITLDetailModel)
+ .join(TI, HITLDetailModel.ti_id == TI.id)
+ .options(joinedload(HITLDetailModel.task_instance))
+ )
hitl_detail_select, total_entries = paginated_select(
statement=query,
- filters=[readable_ti_filter],
+ filters=[
+ # ti related filter
+ readable_ti_filter,
+ dag_id_pattern,
+ dag_run_id,
+ ti_state,
+ # hitl detail related filter
+ response_received,
+ user_id,
+ subject_patten,
+ body_patten,
+ ],
+ offset=offset,
+ limit=limit,
+ order_by=order_by,
session=session,
)
+
hitl_details = session.scalars(hitl_detail_select)
+ # raise Exception(f"{hitl_detail_select}")
Review Comment:
fixed. Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
