-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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.
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
AIP-84: Migrate get_log endpoint #44238
base: main
Are you sure you want to change the base?
Changes from all commits
8fb5f5b
6996c71
e74af39
7dcc42f
fdbc27d
c158b20
d0813ca
2732061
c3d4a22
613db85
2a1715a
b0b2dc9
c374d76
b65270d
320b022
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
from __future__ import annotations | ||
|
||
from pydantic import BaseModel | ||
|
||
|
||
class TaskInstancesLogResponse(BaseModel): | ||
"""Log serializer for responses.""" | ||
|
||
content: str | ||
continuation_token: str | None |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,128 @@ | ||||||
# Licensed to the Apache Software Foundation (ASF) under one | ||||||
# or more contributor license agreements. See the NOTICE file | ||||||
# distributed with this work for additional information | ||||||
# regarding copyright ownership. The ASF licenses this file | ||||||
# to you under the Apache License, Version 2.0 (the | ||||||
# "License"); you may not use this file except in compliance | ||||||
# with the License. You may obtain a copy of the License at | ||||||
# | ||||||
# http://www.apache.org/licenses/LICENSE-2.0 | ||||||
# | ||||||
# Unless required by applicable law or agreed to in writing, | ||||||
# software distributed under the License is distributed on an | ||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||||||
# KIND, either express or implied. See the License for the | ||||||
# specific language governing permissions and limitations | ||||||
# under the License. | ||||||
|
||||||
from __future__ import annotations | ||||||
|
||||||
from typing import Annotated, Any | ||||||
|
||||||
from fastapi import Depends, HTTPException, Request, Response, status | ||||||
from itsdangerous import BadSignature, URLSafeSerializer | ||||||
from sqlalchemy.orm import Session, joinedload | ||||||
from sqlalchemy.sql import select | ||||||
|
||||||
from airflow.api_fastapi.common.db.common import get_session | ||||||
from airflow.api_fastapi.common.headers import HeaderAcceptJsonOrText | ||||||
from airflow.api_fastapi.common.router import AirflowRouter | ||||||
from airflow.api_fastapi.common.types import Mimetype | ||||||
from airflow.api_fastapi.core_api.datamodels.log import TaskInstancesLogResponse | ||||||
from airflow.api_fastapi.core_api.openapi.exceptions import create_openapi_http_exception_doc | ||||||
from airflow.exceptions import TaskNotFound | ||||||
from airflow.models import TaskInstance, Trigger | ||||||
from airflow.models.taskinstancehistory import TaskInstanceHistory | ||||||
from airflow.utils.log.log_reader import TaskLogReader | ||||||
|
||||||
task_instances_log_router = AirflowRouter( | ||||||
tags=["Task Instance"], prefix="/dags/{dag_id}/dagRuns/{dag_run_id}/taskInstances" | ||||||
) | ||||||
|
||||||
|
||||||
@task_instances_log_router.get( | ||||||
"/{task_id}/logs/{task_try_number}", | ||||||
responses=create_openapi_http_exception_doc([status.HTTP_404_NOT_FOUND]), | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we are missing the documentation for |
||||||
response_model=TaskInstancesLogResponse, | ||||||
) | ||||||
def get_log( | ||||||
dag_id: str, | ||||||
dag_run_id: str, | ||||||
task_id: str, | ||||||
task_try_number: int, | ||||||
utkarsharma2 marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we can import this from pydantic There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will automatically raise 422. We don't need to separately check if its less than 0 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Let's add a default try number value. and just There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I forgot that try_number can be >0. In that case, we should use |
||||||
accept: HeaderAcceptJsonOrText, | ||||||
request: Request, | ||||||
session: Annotated[Session, Depends(get_session)], | ||||||
full_content: bool = False, | ||||||
map_index: int = -1, | ||||||
token: str | None = None, | ||||||
): | ||||||
"""Get logs for a specific task instance.""" | ||||||
if not token: | ||||||
metadata = {} | ||||||
else: | ||||||
try: | ||||||
metadata = URLSafeSerializer(request.app.state.secret_key).loads(token) | ||||||
except BadSignature: | ||||||
raise HTTPException( | ||||||
status.HTTP_400_BAD_REQUEST, "Bad Signature. Please use only the tokens provided by the API." | ||||||
pierrejeambrun marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
) | ||||||
|
||||||
if task_try_number <= 0: | ||||||
raise HTTPException(status.HTTP_400_BAD_REQUEST, "task_try_number must be a positive integer") | ||||||
Comment on lines
+71
to
+72
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
if metadata.get("download_logs") and metadata["download_logs"]: | ||||||
full_content = True | ||||||
|
||||||
if full_content: | ||||||
metadata["download_logs"] = True | ||||||
else: | ||||||
metadata["download_logs"] = False | ||||||
pierrejeambrun marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
task_log_reader = TaskLogReader() | ||||||
|
||||||
if not task_log_reader.supports_read: | ||||||
raise HTTPException(status.HTTP_400_BAD_REQUEST, "Task log handler does not support read logs.") | ||||||
|
||||||
query = ( | ||||||
select(TaskInstance) | ||||||
.where( | ||||||
TaskInstance.task_id == task_id, | ||||||
TaskInstance.dag_id == dag_id, | ||||||
TaskInstance.run_id == dag_run_id, | ||||||
TaskInstance.map_index == map_index, | ||||||
) | ||||||
.join(TaskInstance.dag_run) | ||||||
.options(joinedload(TaskInstance.trigger).joinedload(Trigger.triggerer_job)) | ||||||
) | ||||||
ti = session.scalar(query) | ||||||
if ti is None: | ||||||
query = select(TaskInstanceHistory).where( | ||||||
TaskInstanceHistory.task_id == task_id, | ||||||
TaskInstanceHistory.dag_id == dag_id, | ||||||
TaskInstanceHistory.run_id == dag_run_id, | ||||||
TaskInstanceHistory.map_index == map_index, | ||||||
TaskInstanceHistory.try_number == task_try_number, | ||||||
) | ||||||
ti = session.scalar(query) | ||||||
|
||||||
if ti is None: | ||||||
metadata["end_of_log"] = True | ||||||
raise HTTPException(status.HTTP_404_NOT_FOUND, "TaskInstance not found") | ||||||
|
||||||
dag = request.app.state.dag_bag.get_dag(dag_id) | ||||||
if dag: | ||||||
try: | ||||||
ti.task = dag.get_task(ti.task_id) | ||||||
except TaskNotFound: | ||||||
pass | ||||||
|
||||||
logs: Any | ||||||
if accept == Mimetype.JSON or accept == Mimetype.ANY: # default | ||||||
logs, metadata = task_log_reader.read_log_chunks(ti, task_try_number, metadata) | ||||||
# we must have token here, so we can safely ignore it | ||||||
token = URLSafeSerializer(request.app.state.secret_key).dumps(metadata) # type: ignore[assignment] | ||||||
return TaskInstancesLogResponse(continuation_token=token, content=str(logs[0])).model_dump() | ||||||
# text/plain. Stream | ||||||
logs = task_log_reader.read_log_stream(ti, task_try_number, metadata) | ||||||
return Response(media_type=accept, content="".join(list(logs))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.