vincbeck commented on code in PR #75381:
URL: https://github.com/apache/airflow/pull/75381#discussion_r4633918351
##########
airflow-core/src/airflow/api_fastapi/execution_api/routes/task_state_store.py:
##########
@@ -47,34 +48,41 @@
)
-def _get_task_scope_for_ti(task_instance_id: UUID, session: Session) ->
TaskScope:
- ti = session.get(TI, task_instance_id)
- if ti is None or ti.working_set is not True:
+async def _get_task_scope_for_ti(task_instance_id: UUID, session:
AsyncSession) -> TaskScope:
+ row = (
+ await session.execute(
+ select(TI.dag_id, TI.run_id, TI.task_id, TI.region_index,
TI.region_id).where(
+ TI.id == task_instance_id, TI.working_set.is_(True)
+ )
+ )
+ ).one_or_none()
+ if row is None:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail={
"reason": "not_found",
"message": f"Task instance {task_instance_id} not found",
},
)
+ dag_id, run_id, task_id, region_index, region_id = row
return TaskScope(
- dag_id=ti.dag_id,
- run_id=ti.run_id,
- task_id=ti.task_id,
- map_index=ti.region_index,
- region_id=ti.region_id,
+ dag_id=dag_id,
+ run_id=run_id,
+ task_id=task_id,
+ map_index=region_index,
Review Comment:
nit: `map_index` is only a compatibility name on `TaskScope`, you can pass
`region_index` directly
```suggestion
region_index=region_index,
```
##########
airflow-core/src/airflow/api_fastapi/execution_api/routes/task_state_store.py:
##########
@@ -47,34 +48,41 @@
)
-def _get_task_scope_for_ti(task_instance_id: UUID, session: Session) ->
TaskScope:
- ti = session.get(TI, task_instance_id)
- if ti is None or ti.working_set is not True:
+async def _get_task_scope_for_ti(task_instance_id: UUID, session:
AsyncSession) -> TaskScope:
+ row = (
+ await session.execute(
+ select(TI.dag_id, TI.run_id, TI.task_id, TI.region_index,
TI.region_id).where(
+ TI.id == task_instance_id, TI.working_set.is_(True)
+ )
+ )
+ ).one_or_none()
+ if row is None:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail={
"reason": "not_found",
"message": f"Task instance {task_instance_id} not found",
},
)
+ dag_id, run_id, task_id, region_index, region_id = row
return TaskScope(
- dag_id=ti.dag_id,
- run_id=ti.run_id,
- task_id=ti.task_id,
- map_index=ti.region_index,
- region_id=ti.region_id,
+ dag_id=dag_id,
+ run_id=run_id,
+ task_id=task_id,
+ map_index=region_index,
+ region_id=region_id,
)
@router.get("/{task_instance_id}/{key:path}")
-def get_task_state_store(
+async def get_task_state_store(
task_instance_id: UUID,
key: Annotated[str, Path(min_length=1)],
- session: SessionDep,
+ session: AsyncSessionDep,
) -> TaskStateStoreResponse:
"""Get value for a task state store key."""
- scope = _get_task_scope_for_ti(task_instance_id, session)
- if (value := get_state_backend().get_value(scope, key, session=session))
is None:
+ scope = await _get_task_scope_for_ti(task_instance_id, session)
+ if (value := await get_state_backend().aget_value(scope, key,
session=session)) is None:
Review Comment:
About the TODO in the description, I would fix it in this PR rather than
merge a GET that blocks the event loop longer than today. Maybe offload the
`json.loads` in `BaseStoreBackend.aget_value`? A backend that overrides it to
skip decoding would not pay for it.
--
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]