Small adjustments

Author: pierrejeambrun

…airflow/api_fastapi/common/db/cursors.py …rc/airflow/api_fastapi/common/cursors.pyairflow-core/src/airflow/api_fastapi/common/db/cursors.py renamed to airflow-core/src/airflow/api_fastapi/common/cursors.py airflow-core/src/airflow/api_fastapi/common/db/cursors.py renamed to airflow-core/src/airflow/api_fastapi/common/cursors.py

@@ -121,7 +121,7 @@ def to_orm(self, select: Select) -> Select:
     @classmethod
     def depends(
         cls,
-        offset: NonNegativeInt = Query(0),
+        offset: NonNegativeInt = 0,
     ) -> OffsetFilter:
         return cls().set_value(offset)
 

airflow-core/src/airflow/api_fastapi/common/parameters.py

@@ -251,6 +251,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: tags
@@ -624,6 +625,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -777,6 +779,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -918,6 +921,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -1021,6 +1025,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: limit
@@ -1163,6 +1168,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: limit
@@ -1527,6 +1533,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by

airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml

@@ -31,6 +31,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: name_pattern
@@ -147,6 +148,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: name_pattern
@@ -279,6 +281,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -941,6 +944,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -1485,6 +1489,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -2050,6 +2055,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: run_after_gte
@@ -2964,6 +2970,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -3031,6 +3038,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: tags
@@ -3336,6 +3344,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: tags
@@ -3831,6 +3840,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -4178,6 +4188,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -4339,6 +4350,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -4445,6 +4457,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       responses:
@@ -4690,6 +4703,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -4862,6 +4876,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       responses:
@@ -5201,6 +5216,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: xcom_key_pattern
@@ -6035,6 +6051,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -6535,13 +6552,25 @@ paths:
       tags:
       - Task Instance
       summary: Get Task Instances
-      description: "Get list of task instances.\n\nThis endpoint allows specifying\
-        \ `~` as the dag_id, dag_run_id to retrieve Task Instances for all DAGs\n\
-        and DAG runs.\n\nSupports two pagination modes:\n\n- **Offset** (default):\
-        \ Use ``limit`` and ``offset`` query parameters. Returns ``total_entries``.\n\
-        - **Cursor**: Pass ``cursor`` (empty string for the first page, then ``next_cursor``\
-        \ from each\n  response). When ``cursor`` is provided, ``offset`` is ignored\
-        \ and ``total_entries`` is not returned."
+      description: 'Get list of task instances.
+
+
+        This endpoint allows specifying `~` as the dag_id, dag_run_id
+
+        to retrieve task instances for all DAGs and DAG runs.
+
+
+        Supports two pagination modes:
+
+
+        **Offset (default):** use `limit` and `offset` query parameters. Returns `total_entries`.
+
+
+        **Cursor:** pass `cursor` (empty string for the first page, then `next_cursor`
+        from the response).
+
+        When `cursor` is provided, `offset` is ignored and `total_entries` is not
+        returned.'
       operationId: get_task_instances
       security:
       - OAuth2PasswordBearer: []
@@ -6966,6 +6995,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -7868,6 +7898,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -8270,6 +8301,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by
@@ -8413,6 +8445,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: version_number
@@ -8735,6 +8768,7 @@ paths:
         required: false
         schema:
           type: integer
+          minimum: 0
           default: 0
           title: Offset
       - name: order_by

airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml

@@ -27,14 +27,14 @@
 from sqlalchemy.sql.selectable import Select
 
 from airflow.api_fastapi.auth.managers.models.resource_details import DagAccessEntity
+from airflow.api_fastapi.common.cursors import apply_cursor_filter, encode_cursor
 from airflow.api_fastapi.common.dagbag import (
     DagBagDep,
     get_dag_for_run,
     get_dag_for_run_or_latest_version,
     get_latest_version_of_dag,
 )
 from airflow.api_fastapi.common.db.common import SessionDep, apply_filters_to_select, paginated_select
-from airflow.api_fastapi.common.db.cursors import apply_cursor_filter, encode_cursor
 from airflow.api_fastapi.common.db.task_instances import eager_load_TI_and_TIH_for_validation
 from airflow.api_fastapi.common.parameters import (
     FilterOptionEnum,
@@ -483,14 +483,15 @@ def get_task_instances(
     """
     Get list of task instances.
 
-    This endpoint allows specifying `~` as the dag_id, dag_run_id to retrieve Task Instances for all DAGs
-    and DAG runs.
+    This endpoint allows specifying `~` as the dag_id, dag_run_id
+    to retrieve task instances for all DAGs and DAG runs.
 
     Supports two pagination modes:
 
-    - **Offset** (default): Use ``limit`` and ``offset`` query parameters. Returns ``total_entries``.
-    - **Cursor**: Pass ``cursor`` (empty string for the first page, then ``next_cursor`` from each
-      response). When ``cursor`` is provided, ``offset`` is ignored and ``total_entries`` is not returned.
+    **Offset (default):** use `limit` and `offset` query parameters. Returns `total_entries`.
+
+    **Cursor:** pass `cursor` (empty string for the first page, then `next_cursor` from the response).
+    When `cursor` is provided, `offset` is ignored and `total_entries` is not returned.
     """
     use_cursor = cursor is not None
     dag_run = None
@@ -541,10 +542,7 @@ def get_task_instances(
     ]
 
     if use_cursor:
-        task_instance_select = apply_filters_to_select(statement=query, filters=filters)
-        task_instance_select = apply_filters_to_select(
-            statement=task_instance_select, filters=[order_by, limit]
-        )
+        task_instance_select = apply_filters_to_select(statement=query, filters=[*filters, order_by, limit])
         if cursor:
             task_instance_select = apply_cursor_filter(task_instance_select, cursor, order_by)
 

airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py

@@ -902,14 +902,15 @@ export const ensureUseTaskInstanceServiceGetMappedTaskInstanceData = (queryClien
 * Get Task Instances
 * Get list of task instances.
 *
-* This endpoint allows specifying `~` as the dag_id, dag_run_id to retrieve Task Instances for all DAGs
-* and DAG runs.
+* This endpoint allows specifying `~` as the dag_id, dag_run_id
+* to retrieve task instances for all DAGs and DAG runs.
 *
 * Supports two pagination modes:
 *
-* - **Offset** (default): Use ``limit`` and ``offset`` query parameters. Returns ``total_entries``.
-* - **Cursor**: Pass ``cursor`` (empty string for the first page, then ``next_cursor`` from each
-* response). When ``cursor`` is provided, ``offset`` is ignored and ``total_entries`` is not returned.
+* **Offset (default):** use `limit` and `offset` query parameters. Returns `total_entries`.
+*
+* **Cursor:** pass `cursor` (empty string for the first page, then `next_cursor` from the response).
+* When `cursor` is provided, `offset` is ignored and `total_entries` is not returned.
 * @param data The data for the request.
 * @param data.dagId
 * @param data.dagRunId

airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts

@@ -902,14 +902,15 @@ export const prefetchUseTaskInstanceServiceGetMappedTaskInstance = (queryClient:
 * Get Task Instances
 * Get list of task instances.
 *
-* This endpoint allows specifying `~` as the dag_id, dag_run_id to retrieve Task Instances for all DAGs
-* and DAG runs.
+* This endpoint allows specifying `~` as the dag_id, dag_run_id
+* to retrieve task instances for all DAGs and DAG runs.
 *
 * Supports two pagination modes:
 *
-* - **Offset** (default): Use ``limit`` and ``offset`` query parameters. Returns ``total_entries``.
-* - **Cursor**: Pass ``cursor`` (empty string for the first page, then ``next_cursor`` from each
-* response). When ``cursor`` is provided, ``offset`` is ignored and ``total_entries`` is not returned.
+* **Offset (default):** use `limit` and `offset` query parameters. Returns `total_entries`.
+*
+* **Cursor:** pass `cursor` (empty string for the first page, then `next_cursor` from the response).
+* When `cursor` is provided, `offset` is ignored and `total_entries` is not returned.
 * @param data The data for the request.
 * @param data.dagId
 * @param data.dagRunId

airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts

@@ -902,14 +902,15 @@ export const useTaskInstanceServiceGetMappedTaskInstance = <TData = Common.TaskI
 * Get Task Instances
 * Get list of task instances.
 *
-* This endpoint allows specifying `~` as the dag_id, dag_run_id to retrieve Task Instances for all DAGs
-* and DAG runs.
+* This endpoint allows specifying `~` as the dag_id, dag_run_id
+* to retrieve task instances for all DAGs and DAG runs.
 *
 * Supports two pagination modes:
 *
-* - **Offset** (default): Use ``limit`` and ``offset`` query parameters. Returns ``total_entries``.
-* - **Cursor**: Pass ``cursor`` (empty string for the first page, then ``next_cursor`` from each
-* response). When ``cursor`` is provided, ``offset`` is ignored and ``total_entries`` is not returned.
+* **Offset (default):** use `limit` and `offset` query parameters. Returns `total_entries`.
+*
+* **Cursor:** pass `cursor` (empty string for the first page, then `next_cursor` from the response).
+* When `cursor` is provided, `offset` is ignored and `total_entries` is not returned.
 * @param data The data for the request.
 * @param data.dagId
 * @param data.dagRunId