diff --git a/airflow-core/src/airflow/api_fastapi/common/parameters.py b/airflow-core/src/airflow/api_fastapi/common/parameters.py index 4ee000a2173d7..902a5da445926 100644 --- a/airflow-core/src/airflow/api_fastapi/common/parameters.py +++ b/airflow-core/src/airflow/api_fastapi/common/parameters.py @@ -511,8 +511,10 @@ def to_orm(self, select: Select) -> Select: class Range(BaseModel, Generic[T]): """Range with a lower and upper bound.""" - lower_bound: T | None - upper_bound: T | None + lower_bound_gte: T | None + lower_bound_gt: T | None + upper_bound_lte: T | None + upper_bound_lt: T | None class RangeFilter(BaseParam[Range]): @@ -526,10 +528,18 @@ def to_orm(self, select: Select) -> Select: if self.skip_none is False: raise ValueError(f"Cannot set 'skip_none' to False on a {type(self)}") - if self.value and self.value.lower_bound: - select = select.where(self.attribute >= self.value.lower_bound) - if self.value and self.value.upper_bound: - select = select.where(self.attribute <= self.value.upper_bound) + if self.value is None: + return select + + if self.value.lower_bound_gte: + select = select.where(self.attribute >= self.value.lower_bound_gte) + if self.value.lower_bound_gt: + select = select.where(self.attribute > self.value.lower_bound_gt) + if self.value.upper_bound_lte: + select = select.where(self.attribute <= self.value.upper_bound_lte) + if self.value.upper_bound_lt: + select = select.where(self.attribute < self.value.upper_bound_lt) + return select @classmethod @@ -539,7 +549,10 @@ def depends(cls, *args: Any, **kwargs: Any) -> Self: def is_active(self) -> bool: """Check if the range filter has any active bounds.""" return self.value is not None and ( - self.value.lower_bound is not None or self.value.upper_bound is not None + self.value.lower_bound_gte is not None + or self.value.lower_bound_gt is not None + or self.value.upper_bound_lte is not None + or self.value.upper_bound_lt is not None ) @@ -547,14 +560,21 @@ def datetime_range_filter_factory( filter_name: str, model: Base, attribute_name: str | None = None ) -> Callable[[datetime | None, datetime | None], RangeFilter]: def depends_datetime( - lower_bound: datetime | None = Query(alias=f"{filter_name}_gte", default=None), - upper_bound: datetime | None = Query(alias=f"{filter_name}_lte", default=None), + lower_bound_gte: datetime | None = Query(alias=f"{filter_name}_gte", default=None), + lower_bound_gt: datetime | None = Query(alias=f"{filter_name}_gt", default=None), + upper_bound_lte: datetime | None = Query(alias=f"{filter_name}_lte", default=None), + upper_bound_lt: datetime | None = Query(alias=f"{filter_name}_lt", default=None), ) -> RangeFilter: attr = getattr(model, attribute_name or filter_name) if filter_name in ("start_date", "end_date"): attr = func.coalesce(attr, func.now()) return RangeFilter( - Range(lower_bound=lower_bound, upper_bound=upper_bound), + Range( + lower_bound_gte=lower_bound_gte, + lower_bound_gt=lower_bound_gt, + upper_bound_lte=upper_bound_lte, + upper_bound_lt=upper_bound_lt, + ), attr, ) @@ -565,11 +585,19 @@ def float_range_filter_factory( filter_name: str, model: Base ) -> Callable[[float | None, float | None], RangeFilter]: def depends_float( - lower_bound: float | None = Query(alias=f"{filter_name}_gte", default=None), - upper_bound: float | None = Query(alias=f"{filter_name}_lte", default=None), + lower_bound_gte: float | None = Query(alias=f"{filter_name}_gte", default=None), + lower_bound_gt: float | None = Query(alias=f"{filter_name}_gt", default=None), + upper_bound_lte: float | None = Query(alias=f"{filter_name}_lte", default=None), + upper_bound_lt: float | None = Query(alias=f"{filter_name}_lt", default=None), ) -> RangeFilter: return RangeFilter( - Range(lower_bound=lower_bound, upper_bound=upper_bound), getattr(model, filter_name) + Range( + lower_bound_gte=lower_bound_gte, + lower_bound_gt=lower_bound_gt, + upper_bound_lte=upper_bound_lte, + upper_bound_lt=upper_bound_lt, + ), + getattr(model, filter_name), ) return depends_float diff --git a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py index cc128809d4355..9a0bb16b91884 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py @@ -160,11 +160,23 @@ class DAGRunsBatchBody(StrictBaseModel): page_limit: NonNegativeInt = 100 dag_ids: list[str] | None = None states: list[DagRunState | None] | None = None + run_after_gte: AwareDatetime | None = None + run_after_gt: AwareDatetime | None = None run_after_lte: AwareDatetime | None = None + run_after_lt: AwareDatetime | None = None + logical_date_gte: AwareDatetime | None = None + logical_date_gt: AwareDatetime | None = None logical_date_lte: AwareDatetime | None = None + logical_date_lt: AwareDatetime | None = None + start_date_gte: AwareDatetime | None = None + start_date_gt: AwareDatetime | None = None start_date_lte: AwareDatetime | None = None + start_date_lt: AwareDatetime | None = None + end_date_gte: AwareDatetime | None = None + end_date_gt: AwareDatetime | None = None end_date_lte: AwareDatetime | None = None + end_date_lt: AwareDatetime | None = None diff --git a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/task_instances.py b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/task_instances.py index fb87fb66c0aad..52c948a11373c 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/task_instances.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/task_instances.py @@ -106,16 +106,32 @@ class TaskInstancesBatchBody(StrictBaseModel): dag_run_ids: list[str] | None = None task_ids: list[str] | None = None state: list[TaskInstanceState | None] | None = None + run_after_gte: AwareDatetime | None = None + run_after_gt: AwareDatetime | None = None run_after_lte: AwareDatetime | None = None + run_after_lt: AwareDatetime | None = None + logical_date_gte: AwareDatetime | None = None + logical_date_gt: AwareDatetime | None = None logical_date_lte: AwareDatetime | None = None + logical_date_lt: AwareDatetime | None = None + start_date_gte: AwareDatetime | None = None + start_date_gt: AwareDatetime | None = None start_date_lte: AwareDatetime | None = None + start_date_lt: AwareDatetime | None = None + end_date_gte: AwareDatetime | None = None + end_date_gt: AwareDatetime | None = None end_date_lte: AwareDatetime | None = None + end_date_lt: AwareDatetime | None = None + duration_gte: float | None = None + duration_gt: float | None = None duration_lte: float | None = None + duration_lt: float | None = None + pool: list[str] | None = None queue: list[str] | None = None executor: list[str] | None = None diff --git a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml index 88c840e3f0aaf..b93c687165963 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml +++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml @@ -597,6 +597,15 @@ paths: format: date-time - type: 'null' title: Run After Gte + - name: run_after_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt - name: run_after_lte in: query required: false @@ -606,6 +615,15 @@ paths: format: date-time - type: 'null' title: Run After Lte + - name: run_after_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt responses: '200': description: Successful Response @@ -686,6 +704,15 @@ paths: format: date-time - type: 'null' title: Run After Gte + - name: run_after_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt - name: run_after_lte in: query required: false @@ -695,6 +722,15 @@ paths: format: date-time - type: 'null' title: Run After Lte + - name: run_after_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt responses: '200': description: Successful Response @@ -830,6 +866,15 @@ paths: format: date-time - type: 'null' title: Logical Date Gte + - name: logical_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt - name: logical_date_lte in: query required: false @@ -839,6 +884,15 @@ paths: format: date-time - type: 'null' title: Logical Date Lte + - name: logical_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt responses: '200': description: Successful Response diff --git a/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml b/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml index 8797232263e38..9408052d37f48 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml +++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml @@ -327,6 +327,15 @@ paths: format: date-time - type: 'null' title: Timestamp Gte + - name: timestamp_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Timestamp Gt - name: timestamp_lte in: query required: false @@ -336,6 +345,15 @@ paths: format: date-time - type: 'null' title: Timestamp Lte + - name: timestamp_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Timestamp Lt responses: '200': description: Successful Response @@ -1986,6 +2004,15 @@ paths: format: date-time - type: 'null' title: Run After Gte + - name: run_after_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt - name: run_after_lte in: query required: false @@ -1995,6 +2022,15 @@ paths: format: date-time - type: 'null' title: Run After Lte + - name: run_after_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt - name: logical_date_gte in: query required: false @@ -2004,6 +2040,15 @@ paths: format: date-time - type: 'null' title: Logical Date Gte + - name: logical_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt - name: logical_date_lte in: query required: false @@ -2013,6 +2058,15 @@ paths: format: date-time - type: 'null' title: Logical Date Lte + - name: logical_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt - name: start_date_gte in: query required: false @@ -2022,6 +2076,15 @@ paths: format: date-time - type: 'null' title: Start Date Gte + - name: start_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Gt - name: start_date_lte in: query required: false @@ -2031,6 +2094,15 @@ paths: format: date-time - type: 'null' title: Start Date Lte + - name: start_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Lt - name: end_date_gte in: query required: false @@ -2040,6 +2112,15 @@ paths: format: date-time - type: 'null' title: End Date Gte + - name: end_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Gt - name: end_date_lte in: query required: false @@ -2049,6 +2130,15 @@ paths: format: date-time - type: 'null' title: End Date Lte + - name: end_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Lt - name: updated_at_gte in: query required: false @@ -2058,6 +2148,15 @@ paths: format: date-time - type: 'null' title: Updated At Gte + - name: updated_at_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Updated At Gt - name: updated_at_lte in: query required: false @@ -2067,6 +2166,15 @@ paths: format: date-time - type: 'null' title: Updated At Lte + - name: updated_at_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Updated At Lt - name: run_type in: query required: false @@ -2905,6 +3013,15 @@ paths: format: date-time - type: 'null' title: Dag Run Start Date Gte + - name: dag_run_start_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Dag Run Start Date Gt - name: dag_run_start_date_lte in: query required: false @@ -2914,6 +3031,15 @@ paths: format: date-time - type: 'null' title: Dag Run Start Date Lte + - name: dag_run_start_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Dag Run Start Date Lt - name: dag_run_end_date_gte in: query required: false @@ -2923,6 +3049,15 @@ paths: format: date-time - type: 'null' title: Dag Run End Date Gte + - name: dag_run_end_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Dag Run End Date Gt - name: dag_run_end_date_lte in: query required: false @@ -2932,6 +3067,15 @@ paths: format: date-time - type: 'null' title: Dag Run End Date Lte + - name: dag_run_end_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Dag Run End Date Lt - name: dag_run_state in: query required: false @@ -3848,6 +3992,15 @@ paths: format: date-time - type: 'null' title: Start Date Gte + - name: start_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Gt - name: start_date_lte in: query required: false @@ -3857,6 +4010,15 @@ paths: format: date-time - type: 'null' title: Start Date Lte + - name: start_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Lt - name: end_date_gte in: query required: false @@ -3866,6 +4028,15 @@ paths: format: date-time - type: 'null' title: End Date Gte + - name: end_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Gt - name: end_date_lte in: query required: false @@ -3875,6 +4046,15 @@ paths: format: date-time - type: 'null' title: End Date Lte + - name: end_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Lt - name: limit in: query required: false @@ -4732,6 +4912,15 @@ paths: format: date-time - type: 'null' title: Logical Date Gte + - name: logical_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt - name: logical_date_lte in: query required: false @@ -4741,6 +4930,15 @@ paths: format: date-time - type: 'null' title: Logical Date Lte + - name: logical_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt - name: run_after_gte in: query required: false @@ -4750,6 +4948,15 @@ paths: format: date-time - type: 'null' title: Run After Gte + - name: run_after_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt - name: run_after_lte in: query required: false @@ -4759,6 +4966,15 @@ paths: format: date-time - type: 'null' title: Run After Lte + - name: run_after_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt responses: '200': description: Successful Response @@ -5127,6 +5343,15 @@ paths: format: date-time - type: 'null' title: Run After Gte + - name: run_after_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt - name: run_after_lte in: query required: false @@ -5136,6 +5361,15 @@ paths: format: date-time - type: 'null' title: Run After Lte + - name: run_after_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt - name: logical_date_gte in: query required: false @@ -5145,6 +5379,15 @@ paths: format: date-time - type: 'null' title: Logical Date Gte + - name: logical_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt - name: logical_date_lte in: query required: false @@ -5154,6 +5397,15 @@ paths: format: date-time - type: 'null' title: Logical Date Lte + - name: logical_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt - name: start_date_gte in: query required: false @@ -5163,6 +5415,15 @@ paths: format: date-time - type: 'null' title: Start Date Gte + - name: start_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Gt - name: start_date_lte in: query required: false @@ -5172,6 +5433,15 @@ paths: format: date-time - type: 'null' title: Start Date Lte + - name: start_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Lt - name: end_date_gte in: query required: false @@ -5181,6 +5451,15 @@ paths: format: date-time - type: 'null' title: End Date Gte + - name: end_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Gt - name: end_date_lte in: query required: false @@ -5190,6 +5469,15 @@ paths: format: date-time - type: 'null' title: End Date Lte + - name: end_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Lt - name: updated_at_gte in: query required: false @@ -5199,6 +5487,15 @@ paths: format: date-time - type: 'null' title: Updated At Gte + - name: updated_at_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Updated At Gt - name: updated_at_lte in: query required: false @@ -5208,6 +5505,15 @@ paths: format: date-time - type: 'null' title: Updated At Lte + - name: updated_at_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Updated At Lt - name: duration_gte in: query required: false @@ -5216,6 +5522,14 @@ paths: - type: number - type: 'null' title: Duration Gte + - name: duration_gt + in: query + required: false + schema: + anyOf: + - type: number + - type: 'null' + title: Duration Gt - name: duration_lte in: query required: false @@ -5224,6 +5538,14 @@ paths: - type: number - type: 'null' title: Duration Lte + - name: duration_lt + in: query + required: false + schema: + anyOf: + - type: number + - type: 'null' + title: Duration Lt - name: state in: query required: false @@ -5801,6 +6123,15 @@ paths: format: date-time - type: 'null' title: Run After Gte + - name: run_after_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt - name: run_after_lte in: query required: false @@ -5810,6 +6141,15 @@ paths: format: date-time - type: 'null' title: Run After Lte + - name: run_after_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt - name: logical_date_gte in: query required: false @@ -5819,6 +6159,15 @@ paths: format: date-time - type: 'null' title: Logical Date Gte + - name: logical_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt - name: logical_date_lte in: query required: false @@ -5828,6 +6177,15 @@ paths: format: date-time - type: 'null' title: Logical Date Lte + - name: logical_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt - name: start_date_gte in: query required: false @@ -5837,6 +6195,15 @@ paths: format: date-time - type: 'null' title: Start Date Gte + - name: start_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Gt - name: start_date_lte in: query required: false @@ -5846,6 +6213,15 @@ paths: format: date-time - type: 'null' title: Start Date Lte + - name: start_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Lt - name: end_date_gte in: query required: false @@ -5855,6 +6231,15 @@ paths: format: date-time - type: 'null' title: End Date Gte + - name: end_date_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Gt - name: end_date_lte in: query required: false @@ -5864,6 +6249,15 @@ paths: format: date-time - type: 'null' title: End Date Lte + - name: end_date_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Lt - name: updated_at_gte in: query required: false @@ -5873,6 +6267,15 @@ paths: format: date-time - type: 'null' title: Updated At Gte + - name: updated_at_gt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Updated At Gt - name: updated_at_lte in: query required: false @@ -5882,6 +6285,15 @@ paths: format: date-time - type: 'null' title: Updated At Lte + - name: updated_at_lt + in: query + required: false + schema: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Updated At Lt - name: duration_gte in: query required: false @@ -5890,6 +6302,14 @@ paths: - type: number - type: 'null' title: Duration Gte + - name: duration_gt + in: query + required: false + schema: + anyOf: + - type: number + - type: 'null' + title: Duration Gt - name: duration_lte in: query required: false @@ -5898,6 +6318,14 @@ paths: - type: number - type: 'null' title: Duration Lte + - name: duration_lt + in: query + required: false + schema: + anyOf: + - type: number + - type: 'null' + title: Duration Lt - name: task_display_name_pattern in: query required: false @@ -9582,48 +10010,96 @@ components: format: date-time - type: 'null' title: Run After Gte + run_after_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt run_after_lte: anyOf: - type: string format: date-time - type: 'null' title: Run After Lte + run_after_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt logical_date_gte: anyOf: - type: string format: date-time - type: 'null' title: Logical Date Gte + logical_date_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt logical_date_lte: anyOf: - type: string format: date-time - type: 'null' title: Logical Date Lte + logical_date_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt start_date_gte: anyOf: - type: string format: date-time - type: 'null' title: Start Date Gte + start_date_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Gt start_date_lte: anyOf: - type: string format: date-time - type: 'null' title: Start Date Lte + start_date_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Lt end_date_gte: anyOf: - type: string format: date-time - type: 'null' title: End Date Gte + end_date_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Gt end_date_lte: anyOf: - type: string format: date-time - type: 'null' title: End Date Lte + end_date_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Lt additionalProperties: false type: object title: DAGRunsBatchBody @@ -11425,58 +11901,116 @@ components: format: date-time - type: 'null' title: Run After Gte + run_after_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Gt run_after_lte: anyOf: - type: string format: date-time - type: 'null' title: Run After Lte + run_after_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Run After Lt logical_date_gte: anyOf: - type: string format: date-time - type: 'null' title: Logical Date Gte + logical_date_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Gt logical_date_lte: anyOf: - type: string format: date-time - type: 'null' title: Logical Date Lte + logical_date_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Logical Date Lt start_date_gte: anyOf: - type: string format: date-time - type: 'null' title: Start Date Gte + start_date_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Gt start_date_lte: anyOf: - type: string format: date-time - type: 'null' title: Start Date Lte + start_date_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: Start Date Lt end_date_gte: anyOf: - type: string format: date-time - type: 'null' title: End Date Gte + end_date_gt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Gt end_date_lte: anyOf: - type: string format: date-time - type: 'null' title: End Date Lte + end_date_lt: + anyOf: + - type: string + format: date-time + - type: 'null' + title: End Date Lt duration_gte: anyOf: - type: number - type: 'null' title: Duration Gte + duration_gt: + anyOf: + - type: number + - type: 'null' + title: Duration Gt duration_lte: anyOf: - type: number - type: 'null' title: Duration Lte + duration_lt: + anyOf: + - type: number + - type: 'null' + title: Duration Lt pool: anyOf: - items: diff --git a/airflow-core/src/airflow/api_fastapi/core_api/routes/public/dag_run.py b/airflow-core/src/airflow/api_fastapi/core_api/routes/public/dag_run.py index 37641c28ec819..833b927df1389 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/routes/public/dag_run.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/routes/public/dag_run.py @@ -512,19 +512,39 @@ def get_list_dag_runs_batch( """Get a list of DAG Runs.""" dag_ids = FilterParam(DagRun.dag_id, body.dag_ids, FilterOptionEnum.IN) logical_date = RangeFilter( - Range(lower_bound=body.logical_date_gte, upper_bound=body.logical_date_lte), + Range( + lower_bound_gte=body.logical_date_gte, + lower_bound_gt=body.logical_date_gt, + upper_bound_lte=body.logical_date_lte, + upper_bound_lt=body.logical_date_lt, + ), attribute=DagRun.logical_date, ) run_after = RangeFilter( - Range(lower_bound=body.run_after_gte, upper_bound=body.run_after_lte), + Range( + lower_bound_gte=body.run_after_gte, + lower_bound_gt=body.run_after_gt, + upper_bound_lte=body.run_after_lte, + upper_bound_lt=body.run_after_lt, + ), attribute=DagRun.run_after, ) start_date = RangeFilter( - Range(lower_bound=body.start_date_gte, upper_bound=body.start_date_lte), + Range( + lower_bound_gte=body.start_date_gte, + lower_bound_gt=body.start_date_gt, + upper_bound_lte=body.start_date_lte, + upper_bound_lt=body.start_date_lt, + ), attribute=DagRun.start_date, ) end_date = RangeFilter( - Range(lower_bound=body.end_date_gte, upper_bound=body.end_date_lte), + Range( + lower_bound_gte=body.end_date_gte, + lower_bound_gt=body.end_date_gt, + upper_bound_lte=body.end_date_lte, + upper_bound_lt=body.end_date_lt, + ), attribute=DagRun.end_date, ) state = FilterParam(DagRun.state, body.states, FilterOptionEnum.ANY_EQUAL) diff --git a/airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py b/airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py index 32887038ae5eb..c1927a8c36ba0 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/routes/public/task_instances.py @@ -519,23 +519,48 @@ def get_task_instances_batch( dag_run_ids = FilterParam(TI.run_id, body.dag_run_ids, FilterOptionEnum.IN) task_ids = FilterParam(TI.task_id, body.task_ids, FilterOptionEnum.IN) run_after = RangeFilter( - Range(lower_bound=body.run_after_gte, upper_bound=body.run_after_lte), + Range( + lower_bound_gte=body.run_after_gte, + lower_bound_gt=body.run_after_gt, + upper_bound_lte=body.run_after_lte, + upper_bound_lt=body.run_after_lt, + ), attribute=TI.run_after, ) logical_date = RangeFilter( - Range(lower_bound=body.logical_date_gte, upper_bound=body.logical_date_lte), + Range( + lower_bound_gte=body.logical_date_gte, + lower_bound_gt=body.logical_date_gt, + upper_bound_lte=body.logical_date_lte, + upper_bound_lt=body.logical_date_lt, + ), attribute=TI.logical_date, ) start_date = RangeFilter( - Range(lower_bound=body.start_date_gte, upper_bound=body.start_date_lte), + Range( + lower_bound_gte=body.start_date_gte, + lower_bound_gt=body.start_date_gt, + upper_bound_lte=body.start_date_lte, + upper_bound_lt=body.start_date_lt, + ), attribute=TI.start_date, ) end_date = RangeFilter( - Range(lower_bound=body.end_date_gte, upper_bound=body.end_date_lte), + Range( + lower_bound_gte=body.end_date_gte, + lower_bound_gt=body.end_date_gt, + upper_bound_lte=body.end_date_lte, + upper_bound_lt=body.end_date_lt, + ), attribute=TI.end_date, ) duration = RangeFilter( - Range(lower_bound=body.duration_gte, upper_bound=body.duration_lte), + Range( + lower_bound_gte=body.duration_gte, + lower_bound_gt=body.duration_gt, + upper_bound_lte=body.duration_lte, + upper_bound_lt=body.duration_lt, + ), attribute=TI.duration, ) state = FilterParam(TI.state, body.state, FilterOptionEnum.ANY_EQUAL) diff --git a/airflow-core/src/airflow/api_fastapi/core_api/services/ui/calendar.py b/airflow-core/src/airflow/api_fastapi/core_api/services/ui/calendar.py index 28b7f32ead918..8562d305406ac 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/services/ui/calendar.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/services/ui/calendar.py @@ -317,9 +317,13 @@ def _is_date_in_range(self, dt: datetime.datetime, logical_date: RangeFilter) -> if not logical_date.value: return True - if logical_date.value.lower_bound and dt < logical_date.value.lower_bound: + if logical_date.value.lower_bound_gte and dt < logical_date.value.lower_bound_gte: return False - if logical_date.value.upper_bound and dt > logical_date.value.upper_bound: + if logical_date.value.lower_bound_gt and dt <= logical_date.value.lower_bound_gt: + return False + if logical_date.value.upper_bound_lte and dt > logical_date.value.upper_bound_lte: + return False + if logical_date.value.upper_bound_lt and dt >= logical_date.value.upper_bound_lt: return False return True diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts index 3e16c25e85cd1..1f7330904c967 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts @@ -33,7 +33,7 @@ export const UseAssetServiceGetAssetAliasKeyFn = ({ assetAliasId }: { export type AssetServiceGetAssetEventsDefaultResponse = Awaited>; export type AssetServiceGetAssetEventsQueryResult = UseQueryResult; export const useAssetServiceGetAssetEventsKey = "AssetServiceGetAssetEvents"; -export const UseAssetServiceGetAssetEventsKeyFn = ({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }: { +export const UseAssetServiceGetAssetEventsKeyFn = ({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }: { assetId?: number; limit?: number; offset?: number; @@ -42,9 +42,11 @@ export const UseAssetServiceGetAssetEventsKeyFn = ({ assetId, limit, offset, ord sourceMapIndex?: number; sourceRunId?: string; sourceTaskId?: string; + timestampGt?: string; timestampGte?: string; + timestampLt?: string; timestampLte?: string; -} = {}, queryKey?: Array) => [useAssetServiceGetAssetEventsKey, ...(queryKey ?? [{ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }])]; +} = {}, queryKey?: Array) => [useAssetServiceGetAssetEventsKey, ...(queryKey ?? [{ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }])]; export type AssetServiceGetAssetQueuedEventsDefaultResponse = Awaited>; export type AssetServiceGetAssetQueuedEventsQueryResult = UseQueryResult; export const useAssetServiceGetAssetQueuedEventsKey = "AssetServiceGetAssetQueuedEvents"; @@ -140,26 +142,36 @@ export const UseDagRunServiceGetUpstreamAssetEventsKeyFn = ({ dagId, dagRunId }: export type DagRunServiceGetDagRunsDefaultResponse = Awaited>; export type DagRunServiceGetDagRunsQueryResult = UseQueryResult; export const useDagRunServiceGetDagRunsKey = "DagRunServiceGetDagRuns"; -export const UseDagRunServiceGetDagRunsKeyFn = ({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }: { +export const UseDagRunServiceGetDagRunsKeyFn = ({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }: { dagId: string; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; runType?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; triggeringUserNamePattern?: string; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; -}, queryKey?: Array) => [useDagRunServiceGetDagRunsKey, ...(queryKey ?? [{ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }])]; +}, queryKey?: Array) => [useDagRunServiceGetDagRunsKey, ...(queryKey ?? [{ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }])]; export type DagRunServiceWaitDagRunUntilFinishedDefaultResponse = Awaited>; export type DagRunServiceWaitDagRunUntilFinishedQueryResult = UseQueryResult; export const useDagRunServiceWaitDagRunUntilFinishedKey = "DagRunServiceWaitDagRunUntilFinished"; @@ -230,14 +242,18 @@ export const UseDagWarningServiceListDagWarningsKeyFn = ({ dagId, limit, offset, export type DagServiceGetDagsDefaultResponse = Awaited>; export type DagServiceGetDagsQueryResult = UseQueryResult; export const useDagServiceGetDagsKey = "DagServiceGetDags"; -export const UseDagServiceGetDagsKeyFn = ({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { +export const UseDagServiceGetDagsKeyFn = ({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { bundleName?: string; bundleVersion?: string; dagDisplayNamePattern?: string; dagIdPattern?: string; + dagRunEndDateGt?: string; dagRunEndDateGte?: string; + dagRunEndDateLt?: string; dagRunEndDateLte?: string; + dagRunStartDateGt?: string; dagRunStartDateGte?: string; + dagRunStartDateLt?: string; dagRunStartDateLte?: string; dagRunState?: string[]; excludeStale?: boolean; @@ -250,7 +266,7 @@ export const UseDagServiceGetDagsKeyFn = ({ bundleName, bundleVersion, dagDispla paused?: boolean; tags?: string[]; tagsMatchMode?: "any" | "all"; -} = {}, queryKey?: Array) => [useDagServiceGetDagsKey, ...(queryKey ?? [{ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }])]; +} = {}, queryKey?: Array) => [useDagServiceGetDagsKey, ...(queryKey ?? [{ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }])]; export type DagServiceGetDagDefaultResponse = Awaited>; export type DagServiceGetDagQueryResult = UseQueryResult; export const useDagServiceGetDagKey = "DagServiceGetDag"; @@ -353,32 +369,44 @@ export const UseTaskInstanceServiceGetTaskInstanceKeyFn = ({ dagId, dagRunId, ta export type TaskInstanceServiceGetMappedTaskInstancesDefaultResponse = Awaited>; export type TaskInstanceServiceGetMappedTaskInstancesQueryResult = UseQueryResult; export const useTaskInstanceServiceGetMappedTaskInstancesKey = "TaskInstanceServiceGetMappedTaskInstances"; -export const UseTaskInstanceServiceGetMappedTaskInstancesKeyFn = ({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const UseTaskInstanceServiceGetMappedTaskInstancesKeyFn = ({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskId: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}, queryKey?: Array) => [useTaskInstanceServiceGetMappedTaskInstancesKey, ...(queryKey ?? [{ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }])]; +}, queryKey?: Array) => [useTaskInstanceServiceGetMappedTaskInstancesKey, ...(queryKey ?? [{ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }])]; export type TaskInstanceServiceGetTaskInstanceDependenciesByMapIndexDefaultResponse = Awaited>; export type TaskInstanceServiceGetTaskInstanceDependenciesByMapIndexQueryResult = UseQueryResult; export const useTaskInstanceServiceGetTaskInstanceDependenciesByMapIndexKey = "TaskInstanceServiceGetTaskInstanceDependenciesByMapIndex"; @@ -427,33 +455,45 @@ export const UseTaskInstanceServiceGetMappedTaskInstanceKeyFn = ({ dagId, dagRun export type TaskInstanceServiceGetTaskInstancesDefaultResponse = Awaited>; export type TaskInstanceServiceGetTaskInstancesQueryResult = UseQueryResult; export const useTaskInstanceServiceGetTaskInstancesKey = "TaskInstanceServiceGetTaskInstances"; -export const UseTaskInstanceServiceGetTaskInstancesKeyFn = ({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const UseTaskInstanceServiceGetTaskInstancesKeyFn = ({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskDisplayNamePattern?: string; taskId?: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}, queryKey?: Array) => [useTaskInstanceServiceGetTaskInstancesKey, ...(queryKey ?? [{ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }])]; +}, queryKey?: Array) => [useTaskInstanceServiceGetTaskInstancesKey, ...(queryKey ?? [{ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }])]; export type TaskInstanceServiceGetTaskInstanceTryDetailsDefaultResponse = Awaited>; export type TaskInstanceServiceGetTaskInstanceTryDetailsQueryResult = UseQueryResult; export const useTaskInstanceServiceGetTaskInstanceTryDetailsKey = "TaskInstanceServiceGetTaskInstanceTryDetails"; @@ -514,8 +554,10 @@ export const UseImportErrorServiceGetImportErrorsKeyFn = ({ limit, offset, order export type JobServiceGetJobsDefaultResponse = Awaited>; export type JobServiceGetJobsQueryResult = UseQueryResult; export const useJobServiceGetJobsKey = "JobServiceGetJobs"; -export const UseJobServiceGetJobsKeyFn = ({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }: { +export const UseJobServiceGetJobsKeyFn = ({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }: { + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executorClass?: string; hostname?: string; @@ -525,9 +567,11 @@ export const UseJobServiceGetJobsKeyFn = ({ endDateGte, endDateLte, executorClas limit?: number; offset?: number; orderBy?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; -} = {}, queryKey?: Array) => [useJobServiceGetJobsKey, ...(queryKey ?? [{ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }])]; +} = {}, queryKey?: Array) => [useJobServiceGetJobsKey, ...(queryKey ?? [{ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }])]; export type PluginServiceGetPluginsDefaultResponse = Awaited>; export type PluginServiceGetPluginsQueryResult = UseQueryResult; export const usePluginServiceGetPluginsKey = "PluginServiceGetPlugins"; @@ -576,24 +620,28 @@ export const UseXcomServiceGetXcomEntryKeyFn = ({ dagId, dagRunId, deserialize, export type XcomServiceGetXcomEntriesDefaultResponse = Awaited>; export type XcomServiceGetXcomEntriesQueryResult = UseQueryResult; export const useXcomServiceGetXcomEntriesKey = "XcomServiceGetXcomEntries"; -export const UseXcomServiceGetXcomEntriesKeyFn = ({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { +export const UseXcomServiceGetXcomEntriesKeyFn = ({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { dagDisplayNamePattern?: string; dagId: string; dagRunId: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; mapIndex?: number; mapIndexFilter?: number; offset?: number; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; taskId: string; taskIdPattern?: string; xcomKey?: string; xcomKeyPattern?: string; -}, queryKey?: Array) => [useXcomServiceGetXcomEntriesKey, ...(queryKey ?? [{ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }])]; +}, queryKey?: Array) => [useXcomServiceGetXcomEntriesKey, ...(queryKey ?? [{ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }])]; export type TaskServiceGetTasksDefaultResponse = Awaited>; export type TaskServiceGetTasksQueryResult = UseQueryResult; export const useTaskServiceGetTasksKey = "TaskServiceGetTasks"; @@ -730,25 +778,29 @@ export const UseStructureServiceStructureDataKeyFn = ({ dagId, externalDependenc export type GridServiceGetDagStructureDefaultResponse = Awaited>; export type GridServiceGetDagStructureQueryResult = UseQueryResult; export const useGridServiceGetDagStructureKey = "GridServiceGetDagStructure"; -export const UseGridServiceGetDagStructureKeyFn = ({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const UseGridServiceGetDagStructureKeyFn = ({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}, queryKey?: Array) => [useGridServiceGetDagStructureKey, ...(queryKey ?? [{ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }])]; +}, queryKey?: Array) => [useGridServiceGetDagStructureKey, ...(queryKey ?? [{ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }])]; export type GridServiceGetGridRunsDefaultResponse = Awaited>; export type GridServiceGetGridRunsQueryResult = UseQueryResult; export const useGridServiceGetGridRunsKey = "GridServiceGetGridRuns"; -export const UseGridServiceGetGridRunsKeyFn = ({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const UseGridServiceGetGridRunsKeyFn = ({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}, queryKey?: Array) => [useGridServiceGetGridRunsKey, ...(queryKey ?? [{ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }])]; +}, queryKey?: Array) => [useGridServiceGetGridRunsKey, ...(queryKey ?? [{ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }])]; export type GridServiceGetGridTiSummariesDefaultResponse = Awaited>; export type GridServiceGetGridTiSummariesQueryResult = UseQueryResult; export const useGridServiceGetGridTiSummariesKey = "GridServiceGetGridTiSummaries"; @@ -759,12 +811,14 @@ export const UseGridServiceGetGridTiSummariesKeyFn = ({ dagId, runId }: { export type CalendarServiceGetCalendarDefaultResponse = Awaited>; export type CalendarServiceGetCalendarQueryResult = UseQueryResult; export const useCalendarServiceGetCalendarKey = "CalendarServiceGetCalendar"; -export const UseCalendarServiceGetCalendarKeyFn = ({ dagId, granularity, logicalDateGte, logicalDateLte }: { +export const UseCalendarServiceGetCalendarKeyFn = ({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }: { dagId: string; granularity?: "hourly" | "daily"; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; -}, queryKey?: Array) => [useCalendarServiceGetCalendarKey, ...(queryKey ?? [{ dagId, granularity, logicalDateGte, logicalDateLte }])]; +}, queryKey?: Array) => [useCalendarServiceGetCalendarKey, ...(queryKey ?? [{ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }])]; export type AssetServiceCreateAssetEventMutationResult = Awaited>; export type AssetServiceMaterializeAssetMutationResult = Awaited>; export type BackfillServiceCreateBackfillMutationResult = Awaited>; diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts index 1f9f575e4d890..0165979a81fc1 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts @@ -68,11 +68,13 @@ export const ensureUseAssetServiceGetAssetAliasData = (queryClient: QueryClient, * @param data.sourceRunId * @param data.sourceMapIndex * @param data.timestampGte +* @param data.timestampGt * @param data.timestampLte +* @param data.timestampLt * @returns AssetEventCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseAssetServiceGetAssetEventsData = (queryClient: QueryClient, { assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }: { +export const ensureUseAssetServiceGetAssetEventsData = (queryClient: QueryClient, { assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }: { assetId?: number; limit?: number; offset?: number; @@ -81,9 +83,11 @@ export const ensureUseAssetServiceGetAssetEventsData = (queryClient: QueryClient sourceMapIndex?: number; sourceRunId?: string; sourceTaskId?: string; + timestampGt?: string; timestampGte?: string; + timestampLt?: string; timestampLte?: string; -} = {}) => queryClient.ensureQueryData({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }) }); +} = {}) => queryClient.ensureQueryData({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }) }); /** * Get Asset Queued Events * Get queued asset events for an asset. @@ -260,15 +264,25 @@ export const ensureUseDagRunServiceGetUpstreamAssetEventsData = (queryClient: Qu * @param data.limit * @param data.offset * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.updatedAtGte +* @param data.updatedAtGt * @param data.updatedAtLte +* @param data.updatedAtLt * @param data.runType * @param data.state * @param data.orderBy @@ -277,26 +291,36 @@ export const ensureUseDagRunServiceGetUpstreamAssetEventsData = (queryClient: Qu * @returns DAGRunCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseDagRunServiceGetDagRunsData = (queryClient: QueryClient, { dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }: { +export const ensureUseDagRunServiceGetDagRunsData = (queryClient: QueryClient, { dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }: { dagId: string; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; runType?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; triggeringUserNamePattern?: string; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; -}) => queryClient.ensureQueryData({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }) }); /** * Experimental: Wait for a dag run to complete, and return task results if requested. * 🚧 This is an experimental endpoint and may change or be removed without notice. @@ -437,23 +461,31 @@ export const ensureUseDagWarningServiceListDagWarningsData = (queryClient: Query * @param data.bundleName * @param data.bundleVersion * @param data.dagRunStartDateGte +* @param data.dagRunStartDateGt * @param data.dagRunStartDateLte +* @param data.dagRunStartDateLt * @param data.dagRunEndDateGte +* @param data.dagRunEndDateGt * @param data.dagRunEndDateLte +* @param data.dagRunEndDateLt * @param data.dagRunState * @param data.orderBy * @param data.isFavorite * @returns DAGCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseDagServiceGetDagsData = (queryClient: QueryClient, { bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { +export const ensureUseDagServiceGetDagsData = (queryClient: QueryClient, { bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { bundleName?: string; bundleVersion?: string; dagDisplayNamePattern?: string; dagIdPattern?: string; + dagRunEndDateGt?: string; dagRunEndDateGte?: string; + dagRunEndDateLt?: string; dagRunEndDateLte?: string; + dagRunStartDateGt?: string; dagRunStartDateGte?: string; + dagRunStartDateLt?: string; dagRunStartDateLte?: string; dagRunState?: string[]; excludeStale?: boolean; @@ -466,7 +498,7 @@ export const ensureUseDagServiceGetDagsData = (queryClient: QueryClient, { bundl paused?: boolean; tags?: string[]; tagsMatchMode?: "any" | "all"; -} = {}) => queryClient.ensureQueryData({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) }); +} = {}) => queryClient.ensureQueryData({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) }); /** * Get Dag * Get basic information about a DAG. @@ -662,17 +694,29 @@ export const ensureUseTaskInstanceServiceGetTaskInstanceData = (queryClient: Que * @param data.dagRunId * @param data.taskId * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.updatedAtGte +* @param data.updatedAtGt * @param data.updatedAtLte +* @param data.updatedAtLt * @param data.durationGte +* @param data.durationGt * @param data.durationLte +* @param data.durationLt * @param data.state * @param data.pool * @param data.queue @@ -685,32 +729,44 @@ export const ensureUseTaskInstanceServiceGetTaskInstanceData = (queryClient: Que * @returns TaskInstanceCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseTaskInstanceServiceGetMappedTaskInstancesData = (queryClient: QueryClient, { dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const ensureUseTaskInstanceServiceGetMappedTaskInstancesData = (queryClient: QueryClient, { dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskId: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}) => queryClient.ensureQueryData({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) }); /** * Get Task Instance Dependencies * Get dependencies blocking task from getting scheduled. @@ -806,17 +862,29 @@ export const ensureUseTaskInstanceServiceGetMappedTaskInstanceData = (queryClien * @param data.dagRunId * @param data.taskId * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.updatedAtGte +* @param data.updatedAtGt * @param data.updatedAtLte +* @param data.updatedAtLt * @param data.durationGte +* @param data.durationGt * @param data.durationLte +* @param data.durationLt * @param data.taskDisplayNamePattern SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. * @param data.state * @param data.pool @@ -830,33 +898,45 @@ export const ensureUseTaskInstanceServiceGetMappedTaskInstanceData = (queryClien * @returns TaskInstanceCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseTaskInstanceServiceGetTaskInstancesData = (queryClient: QueryClient, { dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const ensureUseTaskInstanceServiceGetTaskInstancesData = (queryClient: QueryClient, { dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskDisplayNamePattern?: string; taskId?: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}) => queryClient.ensureQueryData({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) }); /** * Get Task Instance Try Details * Get task instance details by try number. @@ -970,9 +1050,13 @@ export const ensureUseImportErrorServiceGetImportErrorsData = (queryClient: Quer * @param data The data for the request. * @param data.isAlive * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.limit * @param data.offset * @param data.orderBy @@ -983,8 +1067,10 @@ export const ensureUseImportErrorServiceGetImportErrorsData = (queryClient: Quer * @returns JobCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseJobServiceGetJobsData = (queryClient: QueryClient, { endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }: { +export const ensureUseJobServiceGetJobsData = (queryClient: QueryClient, { endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }: { + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executorClass?: string; hostname?: string; @@ -994,9 +1080,11 @@ export const ensureUseJobServiceGetJobsData = (queryClient: QueryClient, { endDa limit?: number; offset?: number; orderBy?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; -} = {}) => queryClient.ensureQueryData({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }), queryFn: () => JobService.getJobs({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }) }); +} = {}) => queryClient.ensureQueryData({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }), queryFn: () => JobService.getJobs({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }) }); /** * Get Plugins * @param data The data for the request. @@ -1098,30 +1186,38 @@ export const ensureUseXcomServiceGetXcomEntryData = (queryClient: QueryClient, { * @param data.taskIdPattern SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. * @param data.mapIndexFilter * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @returns XComCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseXcomServiceGetXcomEntriesData = (queryClient: QueryClient, { dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { +export const ensureUseXcomServiceGetXcomEntriesData = (queryClient: QueryClient, { dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { dagDisplayNamePattern?: string; dagId: string; dagRunId: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; mapIndex?: number; mapIndexFilter?: number; offset?: number; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; taskId: string; taskIdPattern?: string; xcomKey?: string; xcomKeyPattern?: string; -}) => queryClient.ensureQueryData({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) }); /** * Get Tasks * Get tasks for DAG. @@ -1379,18 +1475,22 @@ export const ensureUseStructureServiceStructureDataData = (queryClient: QueryCli * @param data.limit * @param data.orderBy * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @returns GridNodeResponse Successful Response * @throws ApiError */ -export const ensureUseGridServiceGetDagStructureData = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const ensureUseGridServiceGetDagStructureData = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}) => queryClient.ensureQueryData({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) }); /** * Get Grid Runs * Get info about a run for the grid. @@ -1400,18 +1500,22 @@ export const ensureUseGridServiceGetDagStructureData = (queryClient: QueryClient * @param data.limit * @param data.orderBy * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @returns GridRunsResponse Successful Response * @throws ApiError */ -export const ensureUseGridServiceGetGridRunsData = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const ensureUseGridServiceGetGridRunsData = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}) => queryClient.ensureQueryData({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) }); /** * Get Grid Ti Summaries * Get states for TIs / "groups" of TIs. @@ -1443,13 +1547,17 @@ export const ensureUseGridServiceGetGridTiSummariesData = (queryClient: QueryCli * @param data.dagId * @param data.granularity * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @returns CalendarTimeRangeCollectionResponse Successful Response * @throws ApiError */ -export const ensureUseCalendarServiceGetCalendarData = (queryClient: QueryClient, { dagId, granularity, logicalDateGte, logicalDateLte }: { +export const ensureUseCalendarServiceGetCalendarData = (queryClient: QueryClient, { dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }: { dagId: string; granularity?: "hourly" | "daily"; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; -}) => queryClient.ensureQueryData({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGte, logicalDateLte }), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGte, logicalDateLte }) }); +}) => queryClient.ensureQueryData({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }) }); diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts index 83b2327c84f60..147ee1207dafd 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts @@ -68,11 +68,13 @@ export const prefetchUseAssetServiceGetAssetAlias = (queryClient: QueryClient, { * @param data.sourceRunId * @param data.sourceMapIndex * @param data.timestampGte +* @param data.timestampGt * @param data.timestampLte +* @param data.timestampLt * @returns AssetEventCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseAssetServiceGetAssetEvents = (queryClient: QueryClient, { assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }: { +export const prefetchUseAssetServiceGetAssetEvents = (queryClient: QueryClient, { assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }: { assetId?: number; limit?: number; offset?: number; @@ -81,9 +83,11 @@ export const prefetchUseAssetServiceGetAssetEvents = (queryClient: QueryClient, sourceMapIndex?: number; sourceRunId?: string; sourceTaskId?: string; + timestampGt?: string; timestampGte?: string; + timestampLt?: string; timestampLte?: string; -} = {}) => queryClient.prefetchQuery({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }) }); +} = {}) => queryClient.prefetchQuery({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }) }); /** * Get Asset Queued Events * Get queued asset events for an asset. @@ -260,15 +264,25 @@ export const prefetchUseDagRunServiceGetUpstreamAssetEvents = (queryClient: Quer * @param data.limit * @param data.offset * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.updatedAtGte +* @param data.updatedAtGt * @param data.updatedAtLte +* @param data.updatedAtLt * @param data.runType * @param data.state * @param data.orderBy @@ -277,26 +291,36 @@ export const prefetchUseDagRunServiceGetUpstreamAssetEvents = (queryClient: Quer * @returns DAGRunCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseDagRunServiceGetDagRuns = (queryClient: QueryClient, { dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }: { +export const prefetchUseDagRunServiceGetDagRuns = (queryClient: QueryClient, { dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }: { dagId: string; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; runType?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; triggeringUserNamePattern?: string; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; -}) => queryClient.prefetchQuery({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }) }); /** * Experimental: Wait for a dag run to complete, and return task results if requested. * 🚧 This is an experimental endpoint and may change or be removed without notice. @@ -437,23 +461,31 @@ export const prefetchUseDagWarningServiceListDagWarnings = (queryClient: QueryCl * @param data.bundleName * @param data.bundleVersion * @param data.dagRunStartDateGte +* @param data.dagRunStartDateGt * @param data.dagRunStartDateLte +* @param data.dagRunStartDateLt * @param data.dagRunEndDateGte +* @param data.dagRunEndDateGt * @param data.dagRunEndDateLte +* @param data.dagRunEndDateLt * @param data.dagRunState * @param data.orderBy * @param data.isFavorite * @returns DAGCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseDagServiceGetDags = (queryClient: QueryClient, { bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { +export const prefetchUseDagServiceGetDags = (queryClient: QueryClient, { bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { bundleName?: string; bundleVersion?: string; dagDisplayNamePattern?: string; dagIdPattern?: string; + dagRunEndDateGt?: string; dagRunEndDateGte?: string; + dagRunEndDateLt?: string; dagRunEndDateLte?: string; + dagRunStartDateGt?: string; dagRunStartDateGte?: string; + dagRunStartDateLt?: string; dagRunStartDateLte?: string; dagRunState?: string[]; excludeStale?: boolean; @@ -466,7 +498,7 @@ export const prefetchUseDagServiceGetDags = (queryClient: QueryClient, { bundleN paused?: boolean; tags?: string[]; tagsMatchMode?: "any" | "all"; -} = {}) => queryClient.prefetchQuery({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) }); +} = {}) => queryClient.prefetchQuery({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) }); /** * Get Dag * Get basic information about a DAG. @@ -662,17 +694,29 @@ export const prefetchUseTaskInstanceServiceGetTaskInstance = (queryClient: Query * @param data.dagRunId * @param data.taskId * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.updatedAtGte +* @param data.updatedAtGt * @param data.updatedAtLte +* @param data.updatedAtLt * @param data.durationGte +* @param data.durationGt * @param data.durationLte +* @param data.durationLt * @param data.state * @param data.pool * @param data.queue @@ -685,32 +729,44 @@ export const prefetchUseTaskInstanceServiceGetTaskInstance = (queryClient: Query * @returns TaskInstanceCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseTaskInstanceServiceGetMappedTaskInstances = (queryClient: QueryClient, { dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const prefetchUseTaskInstanceServiceGetMappedTaskInstances = (queryClient: QueryClient, { dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskId: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}) => queryClient.prefetchQuery({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) }); /** * Get Task Instance Dependencies * Get dependencies blocking task from getting scheduled. @@ -806,17 +862,29 @@ export const prefetchUseTaskInstanceServiceGetMappedTaskInstance = (queryClient: * @param data.dagRunId * @param data.taskId * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.updatedAtGte +* @param data.updatedAtGt * @param data.updatedAtLte +* @param data.updatedAtLt * @param data.durationGte +* @param data.durationGt * @param data.durationLte +* @param data.durationLt * @param data.taskDisplayNamePattern SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. * @param data.state * @param data.pool @@ -830,33 +898,45 @@ export const prefetchUseTaskInstanceServiceGetMappedTaskInstance = (queryClient: * @returns TaskInstanceCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseTaskInstanceServiceGetTaskInstances = (queryClient: QueryClient, { dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const prefetchUseTaskInstanceServiceGetTaskInstances = (queryClient: QueryClient, { dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskDisplayNamePattern?: string; taskId?: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}) => queryClient.prefetchQuery({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) }); /** * Get Task Instance Try Details * Get task instance details by try number. @@ -970,9 +1050,13 @@ export const prefetchUseImportErrorServiceGetImportErrors = (queryClient: QueryC * @param data The data for the request. * @param data.isAlive * @param data.startDateGte +* @param data.startDateGt * @param data.startDateLte +* @param data.startDateLt * @param data.endDateGte +* @param data.endDateGt * @param data.endDateLte +* @param data.endDateLt * @param data.limit * @param data.offset * @param data.orderBy @@ -983,8 +1067,10 @@ export const prefetchUseImportErrorServiceGetImportErrors = (queryClient: QueryC * @returns JobCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseJobServiceGetJobs = (queryClient: QueryClient, { endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }: { +export const prefetchUseJobServiceGetJobs = (queryClient: QueryClient, { endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }: { + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executorClass?: string; hostname?: string; @@ -994,9 +1080,11 @@ export const prefetchUseJobServiceGetJobs = (queryClient: QueryClient, { endDate limit?: number; offset?: number; orderBy?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; -} = {}) => queryClient.prefetchQuery({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }), queryFn: () => JobService.getJobs({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }) }); +} = {}) => queryClient.prefetchQuery({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }), queryFn: () => JobService.getJobs({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }) }); /** * Get Plugins * @param data The data for the request. @@ -1098,30 +1186,38 @@ export const prefetchUseXcomServiceGetXcomEntry = (queryClient: QueryClient, { d * @param data.taskIdPattern SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. * @param data.mapIndexFilter * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @returns XComCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseXcomServiceGetXcomEntries = (queryClient: QueryClient, { dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { +export const prefetchUseXcomServiceGetXcomEntries = (queryClient: QueryClient, { dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { dagDisplayNamePattern?: string; dagId: string; dagRunId: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; mapIndex?: number; mapIndexFilter?: number; offset?: number; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; taskId: string; taskIdPattern?: string; xcomKey?: string; xcomKeyPattern?: string; -}) => queryClient.prefetchQuery({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) }); /** * Get Tasks * Get tasks for DAG. @@ -1379,18 +1475,22 @@ export const prefetchUseStructureServiceStructureData = (queryClient: QueryClien * @param data.limit * @param data.orderBy * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @returns GridNodeResponse Successful Response * @throws ApiError */ -export const prefetchUseGridServiceGetDagStructure = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const prefetchUseGridServiceGetDagStructure = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}) => queryClient.prefetchQuery({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) }); /** * Get Grid Runs * Get info about a run for the grid. @@ -1400,18 +1500,22 @@ export const prefetchUseGridServiceGetDagStructure = (queryClient: QueryClient, * @param data.limit * @param data.orderBy * @param data.runAfterGte +* @param data.runAfterGt * @param data.runAfterLte +* @param data.runAfterLt * @returns GridRunsResponse Successful Response * @throws ApiError */ -export const prefetchUseGridServiceGetGridRuns = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const prefetchUseGridServiceGetGridRuns = (queryClient: QueryClient, { dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}) => queryClient.prefetchQuery({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) }); /** * Get Grid Ti Summaries * Get states for TIs / "groups" of TIs. @@ -1443,13 +1547,17 @@ export const prefetchUseGridServiceGetGridTiSummaries = (queryClient: QueryClien * @param data.dagId * @param data.granularity * @param data.logicalDateGte +* @param data.logicalDateGt * @param data.logicalDateLte +* @param data.logicalDateLt * @returns CalendarTimeRangeCollectionResponse Successful Response * @throws ApiError */ -export const prefetchUseCalendarServiceGetCalendar = (queryClient: QueryClient, { dagId, granularity, logicalDateGte, logicalDateLte }: { +export const prefetchUseCalendarServiceGetCalendar = (queryClient: QueryClient, { dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }: { dagId: string; granularity?: "hourly" | "daily"; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; -}) => queryClient.prefetchQuery({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGte, logicalDateLte }), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGte, logicalDateLte }) }); +}) => queryClient.prefetchQuery({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }) }); diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts index 324f01c4e7e07..3b550048e98f0 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts @@ -68,11 +68,13 @@ export const useAssetServiceGetAssetAlias = = unknown[]>({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }: { +export const useAssetServiceGetAssetEvents = = unknown[]>({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }: { assetId?: number; limit?: number; offset?: number; @@ -81,9 +83,11 @@ export const useAssetServiceGetAssetEvents = , "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }, queryKey), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }) as TData, ...options }); +} = {}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }, queryKey), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }) as TData, ...options }); /** * Get Asset Queued Events * Get queued asset events for an asset. @@ -260,15 +264,25 @@ export const useDagRunServiceGetUpstreamAssetEvents = = unknown[]>({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }: { +export const useDagRunServiceGetDagRuns = = unknown[]>({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }: { dagId: string; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; runType?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; triggeringUserNamePattern?: string; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }, queryKey), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }, queryKey), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }) as TData, ...options }); /** * Experimental: Wait for a dag run to complete, and return task results if requested. * 🚧 This is an experimental endpoint and may change or be removed without notice. @@ -437,23 +461,31 @@ export const useDagWarningServiceListDagWarnings = = unknown[]>({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { +export const useDagServiceGetDags = = unknown[]>({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { bundleName?: string; bundleVersion?: string; dagDisplayNamePattern?: string; dagIdPattern?: string; + dagRunEndDateGt?: string; dagRunEndDateGte?: string; + dagRunEndDateLt?: string; dagRunEndDateLte?: string; + dagRunStartDateGt?: string; dagRunStartDateGte?: string; + dagRunStartDateLt?: string; dagRunStartDateLte?: string; dagRunState?: string[]; excludeStale?: boolean; @@ -466,7 +498,7 @@ export const useDagServiceGetDags = , "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }, queryKey), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) as TData, ...options }); +} = {}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }, queryKey), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) as TData, ...options }); /** * Get Dag * Get basic information about a DAG. @@ -662,17 +694,29 @@ export const useTaskInstanceServiceGetTaskInstance = = unknown[]>({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const useTaskInstanceServiceGetMappedTaskInstances = = unknown[]>({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskId: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) as TData, ...options }); /** * Get Task Instance Dependencies * Get dependencies blocking task from getting scheduled. @@ -806,17 +862,29 @@ export const useTaskInstanceServiceGetMappedTaskInstance = = unknown[]>({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const useTaskInstanceServiceGetTaskInstances = = unknown[]>({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskDisplayNamePattern?: string; taskId?: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) as TData, ...options }); /** * Get Task Instance Try Details * Get task instance details by try number. @@ -970,9 +1050,13 @@ export const useImportErrorServiceGetImportErrors = = unknown[]>({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }: { +export const useJobServiceGetJobs = = unknown[]>({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }: { + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executorClass?: string; hostname?: string; @@ -994,9 +1080,11 @@ export const useJobServiceGetJobs = , "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }, queryKey), queryFn: () => JobService.getJobs({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }) as TData, ...options }); +} = {}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }, queryKey), queryFn: () => JobService.getJobs({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }) as TData, ...options }); /** * Get Plugins * @param data The data for the request. @@ -1098,30 +1186,38 @@ export const useXcomServiceGetXcomEntry = = unknown[]>({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { +export const useXcomServiceGetXcomEntries = = unknown[]>({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { dagDisplayNamePattern?: string; dagId: string; dagRunId: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; mapIndex?: number; mapIndexFilter?: number; offset?: number; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; taskId: string; taskIdPattern?: string; xcomKey?: string; xcomKeyPattern?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }, queryKey), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }, queryKey), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) as TData, ...options }); /** * Get Tasks * Get tasks for DAG. @@ -1379,18 +1475,22 @@ export const useStructureServiceStructureData = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const useGridServiceGetDagStructure = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }, queryKey), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }, queryKey), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) as TData, ...options }); /** * Get Grid Runs * Get info about a run for the grid. @@ -1400,18 +1500,22 @@ export const useGridServiceGetDagStructure = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const useGridServiceGetGridRuns = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }, queryKey), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }, queryKey), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) as TData, ...options }); /** * Get Grid Ti Summaries * Get states for TIs / "groups" of TIs. @@ -1443,16 +1547,20 @@ export const useGridServiceGetGridTiSummaries = = unknown[]>({ dagId, granularity, logicalDateGte, logicalDateLte }: { +export const useCalendarServiceGetCalendar = = unknown[]>({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }: { dagId: string; granularity?: "hourly" | "daily"; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGte, logicalDateLte }, queryKey), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGte, logicalDateLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useQuery({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }, queryKey), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }) as TData, ...options }); /** * Create Asset Event * Create asset events. diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts b/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts index 8613bd6e9d491..19e39a9ce7897 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts @@ -68,11 +68,13 @@ export const useAssetServiceGetAssetAliasSuspense = = unknown[]>({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }: { +export const useAssetServiceGetAssetEventsSuspense = = unknown[]>({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }: { assetId?: number; limit?: number; offset?: number; @@ -81,9 +83,11 @@ export const useAssetServiceGetAssetEventsSuspense = , "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }, queryKey), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGte, timestampLte }) as TData, ...options }); +} = {}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseAssetServiceGetAssetEventsKeyFn({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }, queryKey), queryFn: () => AssetService.getAssetEvents({ assetId, limit, offset, orderBy, sourceDagId, sourceMapIndex, sourceRunId, sourceTaskId, timestampGt, timestampGte, timestampLt, timestampLte }) as TData, ...options }); /** * Get Asset Queued Events * Get queued asset events for an asset. @@ -260,15 +264,25 @@ export const useDagRunServiceGetUpstreamAssetEventsSuspense = = unknown[]>({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }: { +export const useDagRunServiceGetDagRunsSuspense = = unknown[]>({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }: { dagId: string; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; runType?: string[]; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; triggeringUserNamePattern?: string; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }, queryKey), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGte, endDateLte, limit, logicalDateGte, logicalDateLte, offset, orderBy, runAfterGte, runAfterLte, runIdPattern, runType, startDateGte, startDateLte, state, triggeringUserNamePattern, updatedAtGte, updatedAtLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseDagRunServiceGetDagRunsKeyFn({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }, queryKey), queryFn: () => DagRunService.getDagRuns({ dagId, endDateGt, endDateGte, endDateLt, endDateLte, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, runType, startDateGt, startDateGte, startDateLt, startDateLte, state, triggeringUserNamePattern, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte }) as TData, ...options }); /** * Experimental: Wait for a dag run to complete, and return task results if requested. * 🚧 This is an experimental endpoint and may change or be removed without notice. @@ -437,23 +461,31 @@ export const useDagWarningServiceListDagWarningsSuspense = = unknown[]>({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { +export const useDagServiceGetDagsSuspense = = unknown[]>({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }: { bundleName?: string; bundleVersion?: string; dagDisplayNamePattern?: string; dagIdPattern?: string; + dagRunEndDateGt?: string; dagRunEndDateGte?: string; + dagRunEndDateLt?: string; dagRunEndDateLte?: string; + dagRunStartDateGt?: string; dagRunStartDateGte?: string; + dagRunStartDateLt?: string; dagRunStartDateLte?: string; dagRunState?: string[]; excludeStale?: boolean; @@ -466,7 +498,7 @@ export const useDagServiceGetDagsSuspense = , "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }, queryKey), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGte, dagRunEndDateLte, dagRunStartDateGte, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) as TData, ...options }); +} = {}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseDagServiceGetDagsKeyFn({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }, queryKey), queryFn: () => DagService.getDags({ bundleName, bundleVersion, dagDisplayNamePattern, dagIdPattern, dagRunEndDateGt, dagRunEndDateGte, dagRunEndDateLt, dagRunEndDateLte, dagRunStartDateGt, dagRunStartDateGte, dagRunStartDateLt, dagRunStartDateLte, dagRunState, excludeStale, isFavorite, lastDagRunState, limit, offset, orderBy, owners, paused, tags, tagsMatchMode }) as TData, ...options }); /** * Get Dag * Get basic information about a DAG. @@ -662,17 +694,29 @@ export const useTaskInstanceServiceGetTaskInstanceSuspense = = unknown[]>({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const useTaskInstanceServiceGetMappedTaskInstancesSuspense = = unknown[]>({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskId: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseTaskInstanceServiceGetMappedTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getMappedTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) as TData, ...options }); /** * Get Task Instance Dependencies * Get dependencies blocking task from getting scheduled. @@ -806,17 +862,29 @@ export const useTaskInstanceServiceGetMappedTaskInstanceSuspense = = unknown[]>({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }: { +export const useTaskInstanceServiceGetTaskInstancesSuspense = = unknown[]>({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }: { dagId: string; dagRunId: string; + durationGt?: number; durationGte?: number; + durationLt?: number; durationLte?: number; + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executor?: string[]; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; offset?: number; orderBy?: string[]; pool?: string[]; queue?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; + startDateGt?: string; startDateGte?: string; + startDateLt?: string; startDateLte?: string; state?: string[]; taskDisplayNamePattern?: string; taskId?: string; tryNumber?: number[]; + updatedAtGt?: string; updatedAtGte?: string; + updatedAtLt?: string; updatedAtLte?: string; versionNumber?: number[]; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGte, durationLte, endDateGte, endDateLte, executor, limit, logicalDateGte, logicalDateLte, offset, orderBy, pool, queue, runAfterGte, runAfterLte, startDateGte, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGte, updatedAtLte, versionNumber }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }, queryKey), queryFn: () => TaskInstanceService.getTaskInstances({ dagId, dagRunId, durationGt, durationGte, durationLt, durationLte, endDateGt, endDateGte, endDateLt, endDateLte, executor, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, offset, orderBy, pool, queue, runAfterGt, runAfterGte, runAfterLt, runAfterLte, startDateGt, startDateGte, startDateLt, startDateLte, state, taskDisplayNamePattern, taskId, tryNumber, updatedAtGt, updatedAtGte, updatedAtLt, updatedAtLte, versionNumber }) as TData, ...options }); /** * Get Task Instance Try Details * Get task instance details by try number. @@ -970,9 +1050,13 @@ export const useImportErrorServiceGetImportErrorsSuspense = = unknown[]>({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }: { +export const useJobServiceGetJobsSuspense = = unknown[]>({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }: { + endDateGt?: string; endDateGte?: string; + endDateLt?: string; endDateLte?: string; executorClass?: string; hostname?: string; @@ -994,9 +1080,11 @@ export const useJobServiceGetJobsSuspense = , "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }, queryKey), queryFn: () => JobService.getJobs({ endDateGte, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGte, startDateLte }) as TData, ...options }); +} = {}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseJobServiceGetJobsKeyFn({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }, queryKey), queryFn: () => JobService.getJobs({ endDateGt, endDateGte, endDateLt, endDateLte, executorClass, hostname, isAlive, jobState, jobType, limit, offset, orderBy, startDateGt, startDateGte, startDateLt, startDateLte }) as TData, ...options }); /** * Get Plugins * @param data The data for the request. @@ -1098,30 +1186,38 @@ export const useXcomServiceGetXcomEntrySuspense = = unknown[]>({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { +export const useXcomServiceGetXcomEntriesSuspense = = unknown[]>({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }: { dagDisplayNamePattern?: string; dagId: string; dagRunId: string; limit?: number; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; mapIndex?: number; mapIndexFilter?: number; offset?: number; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; runIdPattern?: string; taskId: string; taskIdPattern?: string; xcomKey?: string; xcomKeyPattern?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }, queryKey), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGte, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGte, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseXcomServiceGetXcomEntriesKeyFn({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }, queryKey), queryFn: () => XcomService.getXcomEntries({ dagDisplayNamePattern, dagId, dagRunId, limit, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte, mapIndex, mapIndexFilter, offset, runAfterGt, runAfterGte, runAfterLt, runAfterLte, runIdPattern, taskId, taskIdPattern, xcomKey, xcomKeyPattern }) as TData, ...options }); /** * Get Tasks * Get tasks for DAG. @@ -1379,18 +1475,22 @@ export const useStructureServiceStructureDataSuspense = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const useGridServiceGetDagStructureSuspense = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }, queryKey), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseGridServiceGetDagStructureKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }, queryKey), queryFn: () => GridService.getDagStructure({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) as TData, ...options }); /** * Get Grid Runs * Get info about a run for the grid. @@ -1400,18 +1500,22 @@ export const useGridServiceGetDagStructureSuspense = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }: { +export const useGridServiceGetGridRunsSuspense = = unknown[]>({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }: { dagId: string; limit?: number; offset?: number; orderBy?: string[]; + runAfterGt?: string; runAfterGte?: string; + runAfterLt?: string; runAfterLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }, queryKey), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGte, runAfterLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseGridServiceGetGridRunsKeyFn({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }, queryKey), queryFn: () => GridService.getGridRuns({ dagId, limit, offset, orderBy, runAfterGt, runAfterGte, runAfterLt, runAfterLte }) as TData, ...options }); /** * Get Grid Ti Summaries * Get states for TIs / "groups" of TIs. @@ -1443,13 +1547,17 @@ export const useGridServiceGetGridTiSummariesSuspense = = unknown[]>({ dagId, granularity, logicalDateGte, logicalDateLte }: { +export const useCalendarServiceGetCalendarSuspense = = unknown[]>({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }: { dagId: string; granularity?: "hourly" | "daily"; + logicalDateGt?: string; logicalDateGte?: string; + logicalDateLt?: string; logicalDateLte?: string; -}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGte, logicalDateLte }, queryKey), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGte, logicalDateLte }) as TData, ...options }); +}, queryKey?: TQueryKey, options?: Omit, "queryKey" | "queryFn">) => useSuspenseQuery({ queryKey: Common.UseCalendarServiceGetCalendarKeyFn({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }, queryKey), queryFn: () => CalendarService.getCalendar({ dagId, granularity, logicalDateGt, logicalDateGte, logicalDateLt, logicalDateLte }) as TData, ...options }); diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts index 204d2439c29fb..dd0b89ebf72e5 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts @@ -2544,6 +2544,18 @@ export const $DAGRunsBatchBody = { ], title: 'Run After Gte' }, + run_after_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Run After Gt' + }, run_after_lte: { anyOf: [ { @@ -2556,6 +2568,18 @@ export const $DAGRunsBatchBody = { ], title: 'Run After Lte' }, + run_after_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Run After Lt' + }, logical_date_gte: { anyOf: [ { @@ -2568,6 +2592,18 @@ export const $DAGRunsBatchBody = { ], title: 'Logical Date Gte' }, + logical_date_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Logical Date Gt' + }, logical_date_lte: { anyOf: [ { @@ -2580,6 +2616,18 @@ export const $DAGRunsBatchBody = { ], title: 'Logical Date Lte' }, + logical_date_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Logical Date Lt' + }, start_date_gte: { anyOf: [ { @@ -2592,6 +2640,18 @@ export const $DAGRunsBatchBody = { ], title: 'Start Date Gte' }, + start_date_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Start Date Gt' + }, start_date_lte: { anyOf: [ { @@ -2604,6 +2664,18 @@ export const $DAGRunsBatchBody = { ], title: 'Start Date Lte' }, + start_date_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Start Date Lt' + }, end_date_gte: { anyOf: [ { @@ -2616,6 +2688,18 @@ export const $DAGRunsBatchBody = { ], title: 'End Date Gte' }, + end_date_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'End Date Gt' + }, end_date_lte: { anyOf: [ { @@ -2627,6 +2711,18 @@ export const $DAGRunsBatchBody = { } ], title: 'End Date Lte' + }, + end_date_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'End Date Lt' } }, additionalProperties: false, @@ -5147,6 +5243,18 @@ export const $TaskInstancesBatchBody = { ], title: 'Run After Gte' }, + run_after_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Run After Gt' + }, run_after_lte: { anyOf: [ { @@ -5159,6 +5267,18 @@ export const $TaskInstancesBatchBody = { ], title: 'Run After Lte' }, + run_after_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Run After Lt' + }, logical_date_gte: { anyOf: [ { @@ -5171,6 +5291,18 @@ export const $TaskInstancesBatchBody = { ], title: 'Logical Date Gte' }, + logical_date_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Logical Date Gt' + }, logical_date_lte: { anyOf: [ { @@ -5183,6 +5315,18 @@ export const $TaskInstancesBatchBody = { ], title: 'Logical Date Lte' }, + logical_date_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Logical Date Lt' + }, start_date_gte: { anyOf: [ { @@ -5195,6 +5339,18 @@ export const $TaskInstancesBatchBody = { ], title: 'Start Date Gte' }, + start_date_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Start Date Gt' + }, start_date_lte: { anyOf: [ { @@ -5207,6 +5363,18 @@ export const $TaskInstancesBatchBody = { ], title: 'Start Date Lte' }, + start_date_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'Start Date Lt' + }, end_date_gte: { anyOf: [ { @@ -5219,6 +5387,18 @@ export const $TaskInstancesBatchBody = { ], title: 'End Date Gte' }, + end_date_gt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'End Date Gt' + }, end_date_lte: { anyOf: [ { @@ -5231,6 +5411,18 @@ export const $TaskInstancesBatchBody = { ], title: 'End Date Lte' }, + end_date_lt: { + anyOf: [ + { + type: 'string', + format: 'date-time' + }, + { + type: 'null' + } + ], + title: 'End Date Lt' + }, duration_gte: { anyOf: [ { @@ -5242,6 +5434,17 @@ export const $TaskInstancesBatchBody = { ], title: 'Duration Gte' }, + duration_gt: { + anyOf: [ + { + type: 'number' + }, + { + type: 'null' + } + ], + title: 'Duration Gt' + }, duration_lte: { anyOf: [ { @@ -5253,6 +5456,17 @@ export const $TaskInstancesBatchBody = { ], title: 'Duration Lte' }, + duration_lt: { + anyOf: [ + { + type: 'number' + }, + { + type: 'null' + } + ], + title: 'Duration Lt' + }, pool: { anyOf: [ { diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts index a94f7397619c6..279f223a48fef 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts @@ -109,7 +109,9 @@ export class AssetService { * @param data.sourceRunId * @param data.sourceMapIndex * @param data.timestampGte + * @param data.timestampGt * @param data.timestampLte + * @param data.timestampLt * @returns AssetEventCollectionResponse Successful Response * @throws ApiError */ @@ -127,7 +129,9 @@ export class AssetService { source_run_id: data.sourceRunId, source_map_index: data.sourceMapIndex, timestamp_gte: data.timestampGte, - timestamp_lte: data.timestampLte + timestamp_gt: data.timestampGt, + timestamp_lte: data.timestampLte, + timestamp_lt: data.timestampLt }, errors: { 401: 'Unauthorized', @@ -971,15 +975,25 @@ export class DagRunService { * @param data.limit * @param data.offset * @param data.runAfterGte + * @param data.runAfterGt * @param data.runAfterLte + * @param data.runAfterLt * @param data.logicalDateGte + * @param data.logicalDateGt * @param data.logicalDateLte + * @param data.logicalDateLt * @param data.startDateGte + * @param data.startDateGt * @param data.startDateLte + * @param data.startDateLt * @param data.endDateGte + * @param data.endDateGt * @param data.endDateLte + * @param data.endDateLt * @param data.updatedAtGte + * @param data.updatedAtGt * @param data.updatedAtLte + * @param data.updatedAtLt * @param data.runType * @param data.state * @param data.orderBy @@ -999,15 +1013,25 @@ export class DagRunService { limit: data.limit, offset: data.offset, run_after_gte: data.runAfterGte, + run_after_gt: data.runAfterGt, run_after_lte: data.runAfterLte, + run_after_lt: data.runAfterLt, logical_date_gte: data.logicalDateGte, + logical_date_gt: data.logicalDateGt, logical_date_lte: data.logicalDateLte, + logical_date_lt: data.logicalDateLt, start_date_gte: data.startDateGte, + start_date_gt: data.startDateGt, start_date_lte: data.startDateLte, + start_date_lt: data.startDateLt, end_date_gte: data.endDateGte, + end_date_gt: data.endDateGt, end_date_lte: data.endDateLte, + end_date_lt: data.endDateLt, updated_at_gte: data.updatedAtGte, + updated_at_gt: data.updatedAtGt, updated_at_lte: data.updatedAtLte, + updated_at_lt: data.updatedAtLt, run_type: data.runType, state: data.state, order_by: data.orderBy, @@ -1369,9 +1393,13 @@ export class DagService { * @param data.bundleName * @param data.bundleVersion * @param data.dagRunStartDateGte + * @param data.dagRunStartDateGt * @param data.dagRunStartDateLte + * @param data.dagRunStartDateLt * @param data.dagRunEndDateGte + * @param data.dagRunEndDateGt * @param data.dagRunEndDateLte + * @param data.dagRunEndDateLt * @param data.dagRunState * @param data.orderBy * @param data.isFavorite @@ -1396,9 +1424,13 @@ export class DagService { bundle_name: data.bundleName, bundle_version: data.bundleVersion, dag_run_start_date_gte: data.dagRunStartDateGte, + dag_run_start_date_gt: data.dagRunStartDateGt, dag_run_start_date_lte: data.dagRunStartDateLte, + dag_run_start_date_lt: data.dagRunStartDateLt, dag_run_end_date_gte: data.dagRunEndDateGte, + dag_run_end_date_gt: data.dagRunEndDateGt, dag_run_end_date_lte: data.dagRunEndDateLte, + dag_run_end_date_lt: data.dagRunEndDateLt, dag_run_state: data.dagRunState, order_by: data.orderBy, is_favorite: data.isFavorite @@ -1965,17 +1997,29 @@ export class TaskInstanceService { * @param data.dagRunId * @param data.taskId * @param data.runAfterGte + * @param data.runAfterGt * @param data.runAfterLte + * @param data.runAfterLt * @param data.logicalDateGte + * @param data.logicalDateGt * @param data.logicalDateLte + * @param data.logicalDateLt * @param data.startDateGte + * @param data.startDateGt * @param data.startDateLte + * @param data.startDateLt * @param data.endDateGte + * @param data.endDateGt * @param data.endDateLte + * @param data.endDateLt * @param data.updatedAtGte + * @param data.updatedAtGt * @param data.updatedAtLte + * @param data.updatedAtLt * @param data.durationGte + * @param data.durationGt * @param data.durationLte + * @param data.durationLt * @param data.state * @param data.pool * @param data.queue @@ -1999,17 +2043,29 @@ export class TaskInstanceService { }, query: { run_after_gte: data.runAfterGte, + run_after_gt: data.runAfterGt, run_after_lte: data.runAfterLte, + run_after_lt: data.runAfterLt, logical_date_gte: data.logicalDateGte, + logical_date_gt: data.logicalDateGt, logical_date_lte: data.logicalDateLte, + logical_date_lt: data.logicalDateLt, start_date_gte: data.startDateGte, + start_date_gt: data.startDateGt, start_date_lte: data.startDateLte, + start_date_lt: data.startDateLt, end_date_gte: data.endDateGte, + end_date_gt: data.endDateGt, end_date_lte: data.endDateLte, + end_date_lt: data.endDateLt, updated_at_gte: data.updatedAtGte, + updated_at_gt: data.updatedAtGt, updated_at_lte: data.updatedAtLte, + updated_at_lt: data.updatedAtLt, duration_gte: data.durationGte, + duration_gt: data.durationGt, duration_lte: data.durationLte, + duration_lt: data.durationLt, state: data.state, pool: data.pool, queue: data.queue, @@ -2232,17 +2288,29 @@ export class TaskInstanceService { * @param data.dagRunId * @param data.taskId * @param data.runAfterGte + * @param data.runAfterGt * @param data.runAfterLte + * @param data.runAfterLt * @param data.logicalDateGte + * @param data.logicalDateGt * @param data.logicalDateLte + * @param data.logicalDateLt * @param data.startDateGte + * @param data.startDateGt * @param data.startDateLte + * @param data.startDateLt * @param data.endDateGte + * @param data.endDateGt * @param data.endDateLte + * @param data.endDateLt * @param data.updatedAtGte + * @param data.updatedAtGt * @param data.updatedAtLte + * @param data.updatedAtLt * @param data.durationGte + * @param data.durationGt * @param data.durationLte + * @param data.durationLt * @param data.taskDisplayNamePattern SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. * @param data.state * @param data.pool @@ -2267,17 +2335,29 @@ export class TaskInstanceService { query: { task_id: data.taskId, run_after_gte: data.runAfterGte, + run_after_gt: data.runAfterGt, run_after_lte: data.runAfterLte, + run_after_lt: data.runAfterLt, logical_date_gte: data.logicalDateGte, + logical_date_gt: data.logicalDateGt, logical_date_lte: data.logicalDateLte, + logical_date_lt: data.logicalDateLt, start_date_gte: data.startDateGte, + start_date_gt: data.startDateGt, start_date_lte: data.startDateLte, + start_date_lt: data.startDateLt, end_date_gte: data.endDateGte, + end_date_gt: data.endDateGt, end_date_lte: data.endDateLte, + end_date_lt: data.endDateLt, updated_at_gte: data.updatedAtGte, + updated_at_gt: data.updatedAtGt, updated_at_lte: data.updatedAtLte, + updated_at_lt: data.updatedAtLt, duration_gte: data.durationGte, + duration_gt: data.durationGt, duration_lte: data.durationLte, + duration_lt: data.durationLt, task_display_name_pattern: data.taskDisplayNamePattern, state: data.state, pool: data.pool, @@ -2663,9 +2743,13 @@ export class JobService { * @param data The data for the request. * @param data.isAlive * @param data.startDateGte + * @param data.startDateGt * @param data.startDateLte + * @param data.startDateLt * @param data.endDateGte + * @param data.endDateGt * @param data.endDateLte + * @param data.endDateLt * @param data.limit * @param data.offset * @param data.orderBy @@ -2683,9 +2767,13 @@ export class JobService { query: { is_alive: data.isAlive, start_date_gte: data.startDateGte, + start_date_gt: data.startDateGt, start_date_lte: data.startDateLte, + start_date_lt: data.startDateLt, end_date_gte: data.endDateGte, + end_date_gt: data.endDateGt, end_date_lte: data.endDateLte, + end_date_lt: data.endDateLt, limit: data.limit, offset: data.offset, order_by: data.orderBy, @@ -3028,9 +3116,13 @@ export class XcomService { * @param data.taskIdPattern SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. * @param data.mapIndexFilter * @param data.logicalDateGte + * @param data.logicalDateGt * @param data.logicalDateLte + * @param data.logicalDateLt * @param data.runAfterGte + * @param data.runAfterGt * @param data.runAfterLte + * @param data.runAfterLt * @returns XComCollectionResponse Successful Response * @throws ApiError */ @@ -3054,9 +3146,13 @@ export class XcomService { task_id_pattern: data.taskIdPattern, map_index_filter: data.mapIndexFilter, logical_date_gte: data.logicalDateGte, + logical_date_gt: data.logicalDateGt, logical_date_lte: data.logicalDateLte, + logical_date_lt: data.logicalDateLt, run_after_gte: data.runAfterGte, - run_after_lte: data.runAfterLte + run_after_gt: data.runAfterGt, + run_after_lte: data.runAfterLte, + run_after_lt: data.runAfterLt }, errors: { 400: 'Bad Request', @@ -3757,7 +3853,9 @@ export class GridService { * @param data.limit * @param data.orderBy * @param data.runAfterGte + * @param data.runAfterGt * @param data.runAfterLte + * @param data.runAfterLt * @returns GridNodeResponse Successful Response * @throws ApiError */ @@ -3773,7 +3871,9 @@ export class GridService { limit: data.limit, order_by: data.orderBy, run_after_gte: data.runAfterGte, - run_after_lte: data.runAfterLte + run_after_gt: data.runAfterGt, + run_after_lte: data.runAfterLte, + run_after_lt: data.runAfterLt }, errors: { 400: 'Bad Request', @@ -3792,7 +3892,9 @@ export class GridService { * @param data.limit * @param data.orderBy * @param data.runAfterGte + * @param data.runAfterGt * @param data.runAfterLte + * @param data.runAfterLt * @returns GridRunsResponse Successful Response * @throws ApiError */ @@ -3808,7 +3910,9 @@ export class GridService { limit: data.limit, order_by: data.orderBy, run_after_gte: data.runAfterGte, - run_after_lte: data.runAfterLte + run_after_gt: data.runAfterGt, + run_after_lte: data.runAfterLte, + run_after_lt: data.runAfterLt }, errors: { 400: 'Bad Request', @@ -3864,7 +3968,9 @@ export class CalendarService { * @param data.dagId * @param data.granularity * @param data.logicalDateGte + * @param data.logicalDateGt * @param data.logicalDateLte + * @param data.logicalDateLt * @returns CalendarTimeRangeCollectionResponse Successful Response * @throws ApiError */ @@ -3878,7 +3984,9 @@ export class CalendarService { query: { granularity: data.granularity, logical_date_gte: data.logicalDateGte, - logical_date_lte: data.logicalDateLte + logical_date_gt: data.logicalDateGt, + logical_date_lte: data.logicalDateLte, + logical_date_lt: data.logicalDateLt }, errors: { 422: 'Validation Error' diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts index c425e586bb97e..a00e4cf5fcdc6 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts @@ -661,13 +661,21 @@ export type DAGRunsBatchBody = { dag_ids?: Array<(string)> | null; states?: Array<(DagRunState | null)> | null; run_after_gte?: string | null; + run_after_gt?: string | null; run_after_lte?: string | null; + run_after_lt?: string | null; logical_date_gte?: string | null; + logical_date_gt?: string | null; logical_date_lte?: string | null; + logical_date_lt?: string | null; start_date_gte?: string | null; + start_date_gt?: string | null; start_date_lte?: string | null; + start_date_lt?: string | null; end_date_gte?: string | null; + end_date_gt?: string | null; end_date_lte?: string | null; + end_date_lt?: string | null; }; /** @@ -1351,15 +1359,25 @@ export type TaskInstancesBatchBody = { task_ids?: Array<(string)> | null; state?: Array<(TaskInstanceState | null)> | null; run_after_gte?: string | null; + run_after_gt?: string | null; run_after_lte?: string | null; + run_after_lt?: string | null; logical_date_gte?: string | null; + logical_date_gt?: string | null; logical_date_lte?: string | null; + logical_date_lt?: string | null; start_date_gte?: string | null; + start_date_gt?: string | null; start_date_lte?: string | null; + start_date_lt?: string | null; end_date_gte?: string | null; + end_date_gt?: string | null; end_date_lte?: string | null; + end_date_lt?: string | null; duration_gte?: number | null; + duration_gt?: number | null; duration_lte?: number | null; + duration_lt?: number | null; pool?: Array<(string)> | null; queue?: Array<(string)> | null; executor?: Array<(string)> | null; @@ -1973,7 +1991,9 @@ export type GetAssetEventsData = { sourceMapIndex?: number | null; sourceRunId?: string | null; sourceTaskId?: string | null; + timestampGt?: string | null; timestampGte?: string | null; + timestampLt?: string | null; timestampLte?: string | null; }; @@ -2198,28 +2218,38 @@ export type ClearDagRunResponse = TaskInstanceCollectionResponse | DAGRunRespons export type GetDagRunsData = { dagId: string; + endDateGt?: string | null; endDateGte?: string | null; + endDateLt?: string | null; endDateLte?: string | null; limit?: number; + logicalDateGt?: string | null; logicalDateGte?: string | null; + logicalDateLt?: string | null; logicalDateLte?: string | null; offset?: number; orderBy?: Array<(string)>; + runAfterGt?: string | null; runAfterGte?: string | null; + runAfterLt?: string | null; runAfterLte?: string | null; /** * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. */ runIdPattern?: string | null; runType?: Array<(string)>; + startDateGt?: string | null; startDateGte?: string | null; + startDateLt?: string | null; startDateLte?: string | null; state?: Array<(string)>; /** * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. */ triggeringUserNamePattern?: string | null; + updatedAtGt?: string | null; updatedAtGte?: string | null; + updatedAtLt?: string | null; updatedAtLte?: string | null; }; @@ -2312,9 +2342,13 @@ export type GetDagsData = { * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. */ dagIdPattern?: string | null; + dagRunEndDateGt?: string | null; dagRunEndDateGte?: string | null; + dagRunEndDateLt?: string | null; dagRunEndDateLte?: string | null; + dagRunStartDateGt?: string | null; dagRunStartDateGte?: string | null; + dagRunStartDateLt?: string | null; dagRunStartDateLte?: string | null; dagRunState?: Array<(string)>; excludeStale?: boolean; @@ -2497,26 +2531,38 @@ export type DeleteTaskInstanceResponse = null; export type GetMappedTaskInstancesData = { dagId: string; dagRunId: string; + durationGt?: number | null; durationGte?: number | null; + durationLt?: number | null; durationLte?: number | null; + endDateGt?: string | null; endDateGte?: string | null; + endDateLt?: string | null; endDateLte?: string | null; executor?: Array<(string)>; limit?: number; + logicalDateGt?: string | null; logicalDateGte?: string | null; + logicalDateLt?: string | null; logicalDateLte?: string | null; offset?: number; orderBy?: Array<(string)>; pool?: Array<(string)>; queue?: Array<(string)>; + runAfterGt?: string | null; runAfterGte?: string | null; + runAfterLt?: string | null; runAfterLte?: string | null; + startDateGt?: string | null; startDateGte?: string | null; + startDateLt?: string | null; startDateLte?: string | null; state?: Array<(string)>; taskId: string; tryNumber?: Array<(number)>; + updatedAtGt?: string | null; updatedAtGte?: string | null; + updatedAtLt?: string | null; updatedAtLte?: string | null; versionNumber?: Array<(number)>; }; @@ -2582,21 +2628,31 @@ export type PatchTaskInstanceByMapIndexResponse = TaskInstanceCollectionResponse export type GetTaskInstancesData = { dagId: string; dagRunId: string; + durationGt?: number | null; durationGte?: number | null; + durationLt?: number | null; durationLte?: number | null; + endDateGt?: string | null; endDateGte?: string | null; + endDateLt?: string | null; endDateLte?: string | null; executor?: Array<(string)>; limit?: number; + logicalDateGt?: string | null; logicalDateGte?: string | null; + logicalDateLt?: string | null; logicalDateLte?: string | null; offset?: number; orderBy?: Array<(string)>; pool?: Array<(string)>; queue?: Array<(string)>; + runAfterGt?: string | null; runAfterGte?: string | null; + runAfterLt?: string | null; runAfterLte?: string | null; + startDateGt?: string | null; startDateGte?: string | null; + startDateLt?: string | null; startDateLte?: string | null; state?: Array<(string)>; /** @@ -2605,7 +2661,9 @@ export type GetTaskInstancesData = { taskDisplayNamePattern?: string | null; taskId?: string | null; tryNumber?: Array<(number)>; + updatedAtGt?: string | null; updatedAtGte?: string | null; + updatedAtLt?: string | null; updatedAtLte?: string | null; versionNumber?: Array<(number)>; }; @@ -2715,7 +2773,9 @@ export type GetImportErrorsData = { export type GetImportErrorsResponse = ImportErrorCollectionResponse; export type GetJobsData = { + endDateGt?: string | null; endDateGte?: string | null; + endDateLt?: string | null; endDateLte?: string | null; executorClass?: string | null; hostname?: string | null; @@ -2725,7 +2785,9 @@ export type GetJobsData = { limit?: number; offset?: number; orderBy?: Array<(string)>; + startDateGt?: string | null; startDateGte?: string | null; + startDateLt?: string | null; startDateLte?: string | null; }; @@ -2821,12 +2883,16 @@ export type GetXcomEntriesData = { dagId: string; dagRunId: string; limit?: number; + logicalDateGt?: string | null; logicalDateGte?: string | null; + logicalDateLt?: string | null; logicalDateLte?: string | null; mapIndex?: number | null; mapIndexFilter?: number | null; offset?: number; + runAfterGt?: string | null; runAfterGte?: string | null; + runAfterLt?: string | null; runAfterLte?: string | null; /** * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`). Regular expressions are **not** supported. @@ -3042,7 +3108,9 @@ export type GetDagStructureData = { limit?: number; offset?: number; orderBy?: Array<(string)>; + runAfterGt?: string | null; runAfterGte?: string | null; + runAfterLt?: string | null; runAfterLte?: string | null; }; @@ -3053,7 +3121,9 @@ export type GetGridRunsData = { limit?: number; offset?: number; orderBy?: Array<(string)>; + runAfterGt?: string | null; runAfterGte?: string | null; + runAfterLt?: string | null; runAfterLte?: string | null; }; @@ -3069,7 +3139,9 @@ export type GetGridTiSummariesResponse = GridTISummaries; export type GetCalendarData = { dagId: string; granularity?: 'hourly' | 'daily'; + logicalDateGt?: string | null; logicalDateGte?: string | null; + logicalDateLt?: string | null; logicalDateLte?: string | null; }; diff --git a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_run.py b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_run.py index 5463bff536e3c..e14879119a63e 100644 --- a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_run.py +++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_run.py @@ -431,6 +431,22 @@ def test_bad_limit_and_offset(self, test_client, query_params, expected_detail): }, [DAG1_RUN1_ID, DAG1_RUN2_ID], ), + ( + "~", + { + "start_date_gt": START_DATE1.isoformat(), + "start_date_lt": (START_DATE2 - timedelta(days=1)).isoformat(), + }, + [], + ), + ( + "~", + { + "start_date_gt": (START_DATE1 - timedelta(hours=1)).isoformat(), + "start_date_lt": (START_DATE2 - timedelta(days=1)).isoformat(), + }, + [DAG1_RUN1_ID, DAG1_RUN2_ID], + ), ( DAG1_ID, { @@ -439,6 +455,22 @@ def test_bad_limit_and_offset(self, test_client, query_params, expected_detail): }, [DAG1_RUN1_ID, DAG1_RUN2_ID], ), + ( + DAG1_ID, + { + "end_date_gt": START_DATE2.isoformat(), + "end_date_lt": (datetime.now(tz=timezone.utc) + timedelta(days=1)).isoformat(), + }, + [DAG1_RUN1_ID, DAG1_RUN2_ID], + ), + ( + DAG1_ID, + { + "end_date_gt": (START_DATE2 - timedelta(days=1)).isoformat(), + "end_date_lt": (datetime.now(tz=timezone.utc) + timedelta(days=1)).isoformat(), + }, + [DAG1_RUN1_ID, DAG1_RUN2_ID], + ), ( DAG1_ID, { @@ -447,6 +479,22 @@ def test_bad_limit_and_offset(self, test_client, query_params, expected_detail): }, [DAG1_RUN1_ID, DAG1_RUN2_ID], ), + ( + DAG1_ID, + { + "logical_date_gt": LOGICAL_DATE1.isoformat(), + "logical_date_lt": LOGICAL_DATE2.isoformat(), + }, + [], + ), + ( + DAG1_ID, + { + "logical_date_gt": (LOGICAL_DATE1 - timedelta(hours=1)).isoformat(), + "logical_date_lt": LOGICAL_DATE2.isoformat(), + }, + [DAG1_RUN1_ID], + ), ( DAG1_ID, { @@ -455,6 +503,22 @@ def test_bad_limit_and_offset(self, test_client, query_params, expected_detail): }, [DAG1_RUN1_ID, DAG1_RUN2_ID], ), + ( + DAG1_ID, + { + "run_after_gt": RUN_AFTER1.isoformat(), + "run_after_lt": RUN_AFTER2.isoformat(), + }, + [], + ), + ( + DAG1_ID, + { + "run_after_gt": (RUN_AFTER1 - timedelta(hours=1)).isoformat(), + "run_after_lt": (RUN_AFTER2 + timedelta(hours=1)).isoformat(), + }, + [DAG1_RUN1_ID, DAG1_RUN2_ID], + ), ( DAG2_ID, { @@ -463,6 +527,22 @@ def test_bad_limit_and_offset(self, test_client, query_params, expected_detail): }, [DAG2_RUN1_ID, DAG2_RUN2_ID], ), + ( + DAG2_ID, + { + "start_date_gt": START_DATE2.isoformat(), + "end_date_lt": (datetime.now(tz=timezone.utc) + timedelta(days=1)).isoformat(), + }, + [], + ), + ( + DAG2_ID, + { + "start_date_gt": (START_DATE2 - timedelta(hours=1)).isoformat(), + "end_date_lt": (datetime.now(tz=timezone.utc) + timedelta(days=1)).isoformat(), + }, + [DAG2_RUN1_ID, DAG2_RUN2_ID], + ), (DAG1_ID, {"state": DagRunState.SUCCESS.value}, [DAG1_RUN1_ID]), (DAG2_ID, {"state": DagRunState.FAILED.value}, []), ( diff --git a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dags.py b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dags.py index fbb72e02ecca9..de792c615492a 100644 --- a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dags.py +++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dags.py @@ -186,6 +186,11 @@ class TestGetDags(TestDagEndpoint): 1, [DAG3_ID], ), + ( + {"dag_run_start_date_gt": DAG3_START_DATE_1.isoformat(), "exclude_stale": False}, + 2, + [DAG1_ID, DAG3_ID], + ), ( { "dag_run_start_date_gte": DAG1_START_DATE.isoformat(), @@ -194,6 +199,45 @@ class TestGetDags(TestDagEndpoint): 1, [DAG1_ID], ), + ( + { + "dag_run_start_date_gt": DAG1_START_DATE.isoformat(), + "dag_run_start_date_lt": DAG2_START_DATE.isoformat(), + }, + 0, + [], + ), + ( + { + "dag_run_start_date_gte": (DAG1_START_DATE - timedelta(days=1)).isoformat(), + "dag_run_start_date_gt": (DAG1_START_DATE - timedelta(days=1)).isoformat(), + }, + 1, + [DAG1_ID], + ), + ( + { + "dag_run_start_date_gt": DAG1_START_DATE.isoformat(), + "dag_run_start_date_lte": DAG2_START_DATE.isoformat(), + }, + 0, + [], + ), + ( + { + "dag_run_start_date_lt": DAG2_START_DATE.isoformat(), + }, + 1, + [DAG1_ID], + ), + ( + { + "dag_run_start_date_lt": DAG2_START_DATE.isoformat(), + "dag_run_start_date_lte": DAG3_START_DATE_2.isoformat(), + }, + 1, + [DAG1_ID], + ), ( { "dag_run_end_date_lte": (datetime.now(tz=timezone.utc) + timedelta(days=1)).isoformat(), diff --git a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_task_instances.py b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_task_instances.py index 1100d9f25bf32..1798bf2450e35 100644 --- a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_task_instances.py +++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_task_instances.py @@ -933,6 +933,21 @@ class TestGetTaskInstances(TestTaskInstanceEndpoint): 2, id="test start date filter", ), + pytest.param( + [ + {"start_date": DEFAULT_DATETIME_1}, + {"start_date": DEFAULT_DATETIME_1 + dt.timedelta(days=1)}, + {"start_date": DEFAULT_DATETIME_1 + dt.timedelta(days=2)}, + ], + True, + "/dags/example_python_operator/dagRuns/~/taskInstances", + { + "start_date_gt": (DEFAULT_DATETIME_1 - dt.timedelta(hours=1)).isoformat(), + "start_date_lt": DEFAULT_DATETIME_STR_2, + }, + 1, + id="test start date gt and lt filter", + ), pytest.param( [ {"end_date": DEFAULT_DATETIME_1}, @@ -945,6 +960,21 @@ class TestGetTaskInstances(TestTaskInstanceEndpoint): 2, id="test end date filter", ), + pytest.param( + [ + {"end_date": DEFAULT_DATETIME_1}, + {"end_date": DEFAULT_DATETIME_1 + dt.timedelta(days=1)}, + {"end_date": DEFAULT_DATETIME_1 + dt.timedelta(days=2)}, + ], + True, + "/dags/example_python_operator/dagRuns/~/taskInstances?", + { + "end_date_gt": DEFAULT_DATETIME_1, + "end_date_lt": (DEFAULT_DATETIME_2 + dt.timedelta(hours=1)).isoformat(), + }, + 1, + id="test end date gt and lt filter", + ), pytest.param( [ {"duration": 100}, @@ -969,6 +999,18 @@ class TestGetTaskInstances(TestTaskInstanceEndpoint): 3, id="test duration filter ~", ), + pytest.param( + [ + {"duration": 100}, + {"duration": 150}, + {"duration": 200}, + ], + True, + "/dags/~/dagRuns/~/taskInstances", + {"duration_gt": 100, "duration_lt": 200}, + 1, + id="test duration gt and lt filter ~", + ), pytest.param( [ {"state": State.RUNNING}, diff --git a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_calendar.py b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_calendar.py index e052b677f8fdb..fce45ffe1ef25 100644 --- a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_calendar.py +++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_calendar.py @@ -141,6 +141,35 @@ def test_daily_calendar(self, test_client, query_params, result): ], }, ), + ( + { + "granularity": "hourly", + "logical_date_gte": "2025-01-02T00:00:00Z", + "logical_date_lte": "2025-01-02T23:23:59Z", + "logical_date_gt": "2025-01-02T00:00:00Z", + "logical_date_lt": "2025-01-02T23:23:59Z", + }, + { + "total_entries": 0, + "dag_runs": [], + }, + ), + ( + { + "granularity": "hourly", + "logical_date_gte": "2025-01-02T00:00:00Z", + "logical_date_lte": "2025-01-02T23:23:59Z", + "logical_date_gt": "2025-01-01T23:00:00Z", + "logical_date_lt": "2025-01-03T00:00:00Z", + }, + { + "total_entries": 2, + "dag_runs": [ + {"date": "2025-01-02T00:00:00Z", "state": "running", "count": 1}, + {"date": "2025-01-02T01:00:00Z", "state": "planned", "count": 1}, + ], + }, + ), ], ) def test_hourly_calendar(self, setup_dag_runs, test_client, query_params, result): diff --git a/airflow-ctl/src/airflowctl/api/datamodels/generated.py b/airflow-ctl/src/airflowctl/api/datamodels/generated.py index 59ab81083d4eb..86cfc4048e7d5 100644 --- a/airflow-ctl/src/airflowctl/api/datamodels/generated.py +++ b/airflow-ctl/src/airflowctl/api/datamodels/generated.py @@ -782,15 +782,25 @@ class TaskInstancesBatchBody(BaseModel): task_ids: Annotated[list[str] | None, Field(title="Task Ids")] = None state: Annotated[list[TaskInstanceState | None] | None, Field(title="State")] = None run_after_gte: Annotated[datetime | None, Field(title="Run After Gte")] = None + run_after_gt: Annotated[datetime | None, Field(title="Run After Gt")] = None run_after_lte: Annotated[datetime | None, Field(title="Run After Lte")] = None + run_after_lt: Annotated[datetime | None, Field(title="Run After Lt")] = None logical_date_gte: Annotated[datetime | None, Field(title="Logical Date Gte")] = None + logical_date_gt: Annotated[datetime | None, Field(title="Logical Date Gt")] = None logical_date_lte: Annotated[datetime | None, Field(title="Logical Date Lte")] = None + logical_date_lt: Annotated[datetime | None, Field(title="Logical Date Lt")] = None start_date_gte: Annotated[datetime | None, Field(title="Start Date Gte")] = None + start_date_gt: Annotated[datetime | None, Field(title="Start Date Gt")] = None start_date_lte: Annotated[datetime | None, Field(title="Start Date Lte")] = None + start_date_lt: Annotated[datetime | None, Field(title="Start Date Lt")] = None end_date_gte: Annotated[datetime | None, Field(title="End Date Gte")] = None + end_date_gt: Annotated[datetime | None, Field(title="End Date Gt")] = None end_date_lte: Annotated[datetime | None, Field(title="End Date Lte")] = None + end_date_lt: Annotated[datetime | None, Field(title="End Date Lt")] = None duration_gte: Annotated[float | None, Field(title="Duration Gte")] = None + duration_gt: Annotated[float | None, Field(title="Duration Gt")] = None duration_lte: Annotated[float | None, Field(title="Duration Lte")] = None + duration_lt: Annotated[float | None, Field(title="Duration Lt")] = None pool: Annotated[list[str] | None, Field(title="Pool")] = None queue: Annotated[list[str] | None, Field(title="Queue")] = None executor: Annotated[list[str] | None, Field(title="Executor")] = None @@ -1348,13 +1358,21 @@ class DAGRunsBatchBody(BaseModel): dag_ids: Annotated[list[str] | None, Field(title="Dag Ids")] = None states: Annotated[list[DagRunState | None] | None, Field(title="States")] = None run_after_gte: Annotated[datetime | None, Field(title="Run After Gte")] = None + run_after_gt: Annotated[datetime | None, Field(title="Run After Gt")] = None run_after_lte: Annotated[datetime | None, Field(title="Run After Lte")] = None + run_after_lt: Annotated[datetime | None, Field(title="Run After Lt")] = None logical_date_gte: Annotated[datetime | None, Field(title="Logical Date Gte")] = None + logical_date_gt: Annotated[datetime | None, Field(title="Logical Date Gt")] = None logical_date_lte: Annotated[datetime | None, Field(title="Logical Date Lte")] = None + logical_date_lt: Annotated[datetime | None, Field(title="Logical Date Lt")] = None start_date_gte: Annotated[datetime | None, Field(title="Start Date Gte")] = None + start_date_gt: Annotated[datetime | None, Field(title="Start Date Gt")] = None start_date_lte: Annotated[datetime | None, Field(title="Start Date Lte")] = None + start_date_lt: Annotated[datetime | None, Field(title="Start Date Lt")] = None end_date_gte: Annotated[datetime | None, Field(title="End Date Gte")] = None + end_date_gt: Annotated[datetime | None, Field(title="End Date Gt")] = None end_date_lte: Annotated[datetime | None, Field(title="End Date Lte")] = None + end_date_lt: Annotated[datetime | None, Field(title="End Date Lt")] = None class DAGVersionCollectionResponse(BaseModel):