Merge branch 'main' of https://github.com/apache/airflow into kalyan/…

…provider_moving/google
apache · Feb 2, 2025 · 9cf5f28 · 9cf5f28
2 parents 3b6347a + c5c6276
commit 9cf5f28
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 19 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -135,6 +135,7 @@ github:
     - cmarteepants
     - bugraoz93
     - briana-okyere
+    - gyli
 
 notifications:
   jobs: [email protected]

diff --git a/.github/actions/install-pre-commit/action.yml b/.github/actions/install-pre-commit/action.yml
@@ -24,7 +24,7 @@ inputs:
     default: "3.9"
   uv-version:
     description: 'uv version to use'
-    default: "0.5.24"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.5.26"  # Keep this comment to allow automatic replacement of uv version
   pre-commit-version:
     description: 'pre-commit version to use'
     default: "4.1.0"  # Keep this comment to allow automatic replacement of pre-commit version

diff --git a/Dockerfile b/Dockerfile
@@ -55,7 +55,7 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm"
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=25.0
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.5.24
+ARG AIRFLOW_UV_VERSION=0.5.26
 ARG AIRFLOW_USE_UV="false"
 ARG UV_HTTP_TIMEOUT="300"
 ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1254,7 +1254,7 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=25.0
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.5.24
+ARG AIRFLOW_UV_VERSION=0.5.26
 # TODO(potiuk): automate with upgrade check (possibly)
 ARG AIRFLOW_PRE_COMMIT_VERSION="4.1.0"
 ARG AIRFLOW_PRE_COMMIT_UV_VERSION="4.1.4"

diff --git a/airflow/api_fastapi/core_api/datamodels/ui/grid.py b/airflow/api_fastapi/core_api/datamodels/ui/grid.py
@@ -18,7 +18,6 @@
 from __future__ import annotations
 
 from datetime import datetime
-from uuid import UUID
 
 from pydantic import BaseModel, Field
 
@@ -51,7 +50,7 @@ class GridDAGRunwithTIs(BaseModel):
     run_type: DagRunType
     data_interval_start: datetime | None
     data_interval_end: datetime | None
-    version_number: UUID | None
+    version_number: int | None
     note: str | None
     task_instances: list[GridTaskInstanceSummary]
 

diff --git a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
@@ -8786,8 +8786,7 @@ components:
           title: Data Interval End
         version_number:
           anyOf:
-          - type: string
-            format: uuid
+          - type: integer
           - type: 'null'
           title: Version Number
         note:

diff --git a/airflow/api_fastapi/core_api/routes/ui/grid.py b/airflow/api_fastapi/core_api/routes/ui/grid.py
@@ -23,6 +23,7 @@
 
 from fastapi import Depends, HTTPException, Request, status
 from sqlalchemy import select
+from sqlalchemy.orm import joinedload
 
 from airflow import DAG
 from airflow.api_fastapi.common.db.common import SessionDep, paginated_select
@@ -93,7 +94,9 @@ def grid_data(
     base_query = (
         select(DagRun)
         .join(DagRun.dag_run_note, isouter=True)
+        .join(DagRun.dag_version, isouter=True)
         .select_from(DagRun)
+        .options(joinedload(DagRun.dag_version))
         .where(DagRun.dag_id == dag.dag_id)
     )
 
@@ -212,11 +215,11 @@ def grid_data(
             run_type=dag_run.run_type,
             data_interval_start=dag_run.data_interval_start,
             data_interval_end=dag_run.data_interval_end,
-            version_number=dag_run.dag_version_id,
+            version_number=dag_run.dag_version.version_number if dag_run.dag_version else None,
             note=dag_run.note,
-            task_instances=task_instance_summaries[dag_run.run_id]
-            if dag_run.run_id in task_instance_summaries
-            else [],
+            task_instances=(
+                task_instance_summaries[dag_run.run_id] if dag_run.run_id in task_instance_summaries else []
+            ),
         )
         for dag_run in dag_runs
     ]

diff --git a/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow/ui/openapi-gen/requests/schemas.gen.ts
@@ -3401,8 +3401,7 @@ export const $GridDAGRunwithTIs = {
     version_number: {
       anyOf: [
         {
-          type: "string",
-          format: "uuid",
+          type: "integer",
         },
         {
           type: "null",

diff --git a/airflow/ui/openapi-gen/requests/types.gen.ts b/airflow/ui/openapi-gen/requests/types.gen.ts
@@ -889,7 +889,7 @@ export type GridDAGRunwithTIs = {
   run_type: DagRunType;
   data_interval_start: string | null;
   data_interval_end: string | null;
-  version_number: string | null;
+  version_number: number | null;
   note: string | null;
   task_instances: Array<GridTaskInstanceSummary>;
 };

diff --git a/dev/breeze/doc/ci/02_images.md b/dev/breeze/doc/ci/02_images.md
@@ -443,7 +443,7 @@ can be used for CI images:
 | `ADDITIONAL_DEV_APT_DEPS`       |                            | Additional apt dev dependencies installed in the first part of the image                                          |
 | `ADDITIONAL_DEV_APT_ENV`        |                            | Additional env variables defined when installing dev deps                                                         |
 | `AIRFLOW_PIP_VERSION`           | `25.0`                     | `pip` version used.                                                                                               |
-| `AIRFLOW_UV_VERSION`            | `0.5.24`                   | `uv` version used.                                                                                                |
+| `AIRFLOW_UV_VERSION`            | `0.5.26`                   | `uv` version used.                                                                                                |
 | `AIRFLOW_PRE_COMMIT_VERSION`    | `4.1.0`                    | `pre-commit` version used.                                                                                        |
 | `AIRFLOW_PRE_COMMIT_UV_VERSION` | `4.1.4`                    | `pre-commit-uv` version used.                                                                                     |
 | `AIRFLOW_USE_UV`                | `true`                     | Whether to use UV for installation.                                                                               |

diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
@@ -237,7 +237,7 @@ class VersionedFile(NamedTuple):
 
 
 AIRFLOW_PIP_VERSION = "25.0"
-AIRFLOW_UV_VERSION = "0.5.24"
+AIRFLOW_UV_VERSION = "0.5.26"
 AIRFLOW_USE_UV = False
 # TODO: automate these as well
 WHEEL_VERSION = "0.44.0"

diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -189,7 +189,7 @@
 ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]
 
 PIP_VERSION = "25.0"
-UV_VERSION = "0.5.24"
+UV_VERSION = "0.5.26"
 
 DEFAULT_UV_HTTP_TIMEOUT = 300
 DEFAULT_WSL2_HTTP_TIMEOUT = 900

diff --git a/scripts/ci/install_breeze.sh b/scripts/ci/install_breeze.sh
@@ -22,7 +22,7 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../../"
 PYTHON_ARG=""
 
 PIP_VERSION="25.0"
-UV_VERSION="0.5.24"
+UV_VERSION="0.5.26"
 if [[ ${PYTHON_VERSION=} != "" ]]; then
     PYTHON_ARG="--python=$(which python"${PYTHON_VERSION}") "
 fi

diff --git a/scripts/tools/setup_breeze b/scripts/tools/setup_breeze
@@ -27,7 +27,7 @@ COLOR_YELLOW=$'\e[33m'
 COLOR_BLUE=$'\e[34m'
 COLOR_RESET=$'\e[0m'
 
-UV_VERSION="0.5.24"
+UV_VERSION="0.5.26"
 
 function manual_instructions() {
     echo