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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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" + '
Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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('^' + ".*" + ' Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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('^' + ".*" + ' Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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" + ' Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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('^' + ".*" + ' Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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('^' + ".*" + ' Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading
, '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); } })(); })(); Add TI deletion endpoint by guan404ming · Pull Request #50165 · apache/airflow · GitHub
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -4573,6 +4573,72 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
delete:
tags:
- Task Instance
summary: Delete Task Instance
description: Delete a task instance.
operationId: delete_task_instance
security:
- OAuth2PasswordBearer: []
parameters:
- name: dag_id
in: path
required: true
schema:
type: string
title: Dag Id
- name: dag_run_id
in: path
required: true
schema:
type: string
title: Dag Run Id
- name: task_id
in: path
required: true
schema:
type: string
title: Task Id
- name: map_index
in: query
required: false
schema:
type: integer
default: -1
title: Map Index
responses:
'200':
description: Successful Response
content:
application/json:
schema:
type: 'null'
title: Response Delete Task Instance
'401':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Unauthorized
'403':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Forbidden
'404':
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPExceptionResponse'
description: Not Found
'422':
description: Validation Error
content:
application/json:
schema:
$ref: '#/components/schemas/HTTPValidationError'
/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped:
get:
tags:
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -240,16 +240,14 @@ def get_task_instance_dependencies(
) -> TaskDependencyCollectionResponse:
"""Get dependencies blocking task from getting scheduled."""
query = select(TI).where(TI.dag_id == dag_id, TI.run_id == dag_run_id, TI.task_id == task_id)

if map_index == -1:
query = query.where(TI.map_index == -1)
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

result = session.execute(query).one_or_none()

if result is None:
error_message = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
error_message = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
raise HTTPException(status.HTTP_404_NOT_FOUND, error_message)

ti = result[0]
Expand DownExpand Up@@ -754,10 +752,7 @@ def _patch_ti_validate_request(
.join(TI.dag_run)
.options(joinedload(TI.rendered_task_instance_fields))
)
if map_index == -1:
query = query.where(or_(TI.map_index == -1, TI.map_index is None))
else:
query = query.where(TI.map_index == map_index)
query = query.where(TI.map_index == map_index)

try:
ti = session.scalar(query)
Expand All@@ -767,7 +762,9 @@ def _patch_ti_validate_request(
"Multiple task instances found. As the TI is mapped, add the map_index value to the URL",
)

err_msg_404 = f"Task Instance not found for dag_id={dag_id}, run_id={dag_run_id}, task_id={task_id}"
err_msg_404 = (
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)
if ti is None:
raise HTTPException(status.HTTP_404_NOT_FOUND, err_msg_404)

Expand DownExpand Up@@ -928,3 +925,33 @@ def patch_task_instance(
session.commit()

return TaskInstanceResponse.model_validate(ti)


@task_instances_router.delete(
task_instances_prefix + "/{task_id}",
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]),
dependencies=[Depends(requires_access_dag(method="DELETE", access_entity=DagAccessEntity.TASK_INSTANCE))],
)
def delete_task_instance(
dag_id: str,
dag_run_id: str,
task_id: str,
session: SessionDep,
map_index: int = -1,
) -> None:
"""Delete a task instance."""
query = select(TI).where(
TI.dag_id == dag_id,
TI.run_id == dag_run_id,
TI.task_id == task_id,
)

query = query.where(TI.map_index == map_index)
task_instance = session.scalar(query)
if task_instance is None:
raise HTTPException(
status.HTTP_404_NOT_FOUND,
f"The Task Instance with dag_id: `{dag_id}`, run_id: `{dag_run_id}`, task_id: `{task_id}` and map_index: `{map_index}` was not found",
)

session.delete(task_instance)
3 changes: 3 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1943,6 +1943,9 @@ export type ConnectionServiceDeleteConnectionMutationResult = Awaited<
>;
export type DagRunServiceDeleteDagRunMutationResult = Awaited<ReturnType<typeof DagRunService.deleteDagRun>>;
export type DagServiceDeleteDagMutationResult = Awaited<ReturnType<typeof DagService.deleteDag>>;
export type TaskInstanceServiceDeleteTaskInstanceMutationResult = Awaited<
ReturnType<typeof TaskInstanceService.deleteTaskInstance>
>;
export type PoolServiceDeletePoolMutationResult = Awaited<ReturnType<typeof PoolService.deletePool>>;
export type VariableServiceDeleteVariableMutationResult = Awaited<
ReturnType<typeof VariableService.deleteVariable>
Expand Down
51 changes: 51 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4738,6 +4738,57 @@ export const useDagServiceDeleteDag = <
},
TContext
>({ mutationFn: ({ dagId }) => DagService.deleteDag({ dagId }) as unknown as Promise<TData>, ...options });
/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
export const useTaskInstanceServiceDeleteTaskInstance = <
TData = Common.TaskInstanceServiceDeleteTaskInstanceMutationResult,
TError = unknown,
TContext = unknown,
>(
options?: Omit<
UseMutationOptions<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>,
"mutationFn"
>,
) =>
useMutation<
TData,
TError,
{
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
},
TContext
>({
mutationFn: ({ dagId, dagRunId, mapIndex, taskId }) =>
TaskInstanceService.deleteTaskInstance({
dagId,
dagRunId,
mapIndex,
taskId,
}) as unknown as Promise<TData>,
...options,
});
/**
* Delete Pool
* Delete a pool entry.
Expand Down
36 changes: 36 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,8 @@ import type {
GetTaskInstanceResponse,
PatchTaskInstanceData,
PatchTaskInstanceResponse,
DeleteTaskInstanceData,
DeleteTaskInstanceResponse,
GetMappedTaskInstancesData,
GetMappedTaskInstancesResponse,
GetTaskInstanceDependenciesByMapIndexData,
Expand DownExpand Up@@ -1950,6 +1952,40 @@ export class TaskInstanceService {
});
}

/**
* Delete Task Instance
* Delete a task instance.
* @param data The data for the request.
* @param data.dagId
* @param data.dagRunId
* @param data.taskId
* @param data.mapIndex
* @returns null Successful Response
* @throws ApiError
*/
public static deleteTaskInstance(
data: DeleteTaskInstanceData,
): CancelablePromise<DeleteTaskInstanceResponse> {
return __request(OpenAPI, {
method: "DELETE",
url: "/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}",
path: {
dag_id: data.dagId,
dag_run_id: data.dagRunId,
task_id: data.taskId,
},
query: {
map_index: data.mapIndex,
},
errors: {
401: "Unauthorized",
403: "Forbidden",
404: "Not Found",
422: "Validation Error",
},
});
}

/**
* Get Mapped Task Instances
* Get list of mapped task instances.
Expand Down
34 changes: 34 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2237,6 +2237,15 @@ export type PatchTaskInstanceData = {

export type PatchTaskInstanceResponse = TaskInstanceResponse;

export type DeleteTaskInstanceData = {
dagId: string;
dagRunId: string;
mapIndex?: number;
taskId: string;
};

export type DeleteTaskInstanceResponse = null;

export type GetMappedTaskInstancesData = {
dagId: string;
dagRunId: string;
Expand DownExpand Up@@ -4269,6 +4278,31 @@ export type $OpenApiTs = {
422: HTTPValidationError;
};
};
delete: {
req: DeleteTaskInstanceData;
res: {
/**
* Successful Response
*/
200: null;
/**
* Unauthorized
*/
401: HTTPExceptionResponse;
/**
* Forbidden
*/
403: HTTPExceptionResponse;
/**
* Not Found
*/
404: HTTPExceptionResponse;
/**
* Validation Error
*/
422: HTTPValidationError;
};
};
};
"/api/v2/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances/{task_id}/listMapped": {
get: {
Expand Down
Loading