Update Cadwyn migrations with v3-1-test changes (#57011)

After cherry-picking, the versions needs to change on one of the Cadwyn migrations.

Author: kaxil

airflow-core/src/airflow/api_fastapi/execution_api/versions/__init__.py

@@ -26,14 +26,13 @@
     AddIncludePriorDatesToGetXComSlice,
 )
 from airflow.api_fastapi.execution_api.versions.v2025_09_23 import AddDagVersionIdField
-from airflow.api_fastapi.execution_api.versions.v2025_10_10 import (
-    AddTriggeringUserNameField,
-    MakeDagRunConfNullable,
-)
+from airflow.api_fastapi.execution_api.versions.v2025_10_27 import MakeDagRunConfNullable
+from airflow.api_fastapi.execution_api.versions.v2026_01_01 import AddTriggeringUserNameField
 
 bundle = VersionBundle(
     HeadVersion(),
-    Version("2025-10-10", AddTriggeringUserNameField, MakeDagRunConfNullable),
+    Version("2026-01-01", AddTriggeringUserNameField),
+    Version("2025-10-27", MakeDagRunConfNullable),
     Version("2025-09-23", AddDagVersionIdField),
     Version(
         "2025-08-10",

airflow-core/src/airflow/api_fastapi/execution_api/versions/v2025_10_27.py

@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+from cadwyn import ResponseInfo, VersionChange, convert_response_to_previous_version_for
+
+from airflow.api_fastapi.execution_api.datamodels.taskinstance import TIRunContext
+
+
+class MakeDagRunConfNullable(VersionChange):
+    """Make DagRun.conf field nullable to match database schema."""
+
+    description = __doc__
+
+    instructions_to_migrate_to_previous_version = ()
+
+    @convert_response_to_previous_version_for(TIRunContext)  # type: ignore[arg-type]
+    def ensure_conf_is_dict_in_dag_run(response: ResponseInfo) -> None:  # type: ignore[misc]
+        """Ensure conf is always a dict (never None) in previous versions."""
+        if "dag_run" in response.body and isinstance(response.body["dag_run"], dict):
+            if response.body["dag_run"].get("conf") is None:
+                response.body["dag_run"]["conf"] = {}

…pi/execution_api/versions/v2025_10_10.py …pi/execution_api/versions/v2026_01_01.pyairflow-core/src/airflow/api_fastapi/execution_api/versions/v2025_10_10.py renamed to airflow-core/src/airflow/api_fastapi/execution_api/versions/v2026_01_01.py airflow-core/src/airflow/api_fastapi/execution_api/versions/v2025_10_10.py renamed to airflow-core/src/airflow/api_fastapi/execution_api/versions/v2026_01_01.py

@@ -34,18 +34,3 @@ def remove_triggering_user_name_from_dag_run(response: ResponseInfo) -> None:  #
         """Remove the `triggering_user_name` field from the dag_run object when converting to the previous version."""
         if "dag_run" in response.body and isinstance(response.body["dag_run"], dict):
             response.body["dag_run"].pop("triggering_user_name", None)
-
-
-class MakeDagRunConfNullable(VersionChange):
-    """Make DagRun.conf field nullable to match database schema."""
-
-    description = __doc__
-
-    instructions_to_migrate_to_previous_version = ()
-
-    @convert_response_to_previous_version_for(TIRunContext)  # type: ignore[arg-type]
-    def ensure_conf_is_dict_in_dag_run(response: ResponseInfo) -> None:  # type: ignore[misc]
-        """Ensure conf is always a dict (never None) in previous versions."""
-        if "dag_run" in response.body and isinstance(response.body["dag_run"], dict):
-            if response.body["dag_run"].get("conf") is None:
-                response.body["dag_run"]["conf"] = {}

airflow-core/tests/unit/api_fastapi/execution_api/versions/v2025_04_28/__init__.py

@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.

task-sdk/src/airflow/sdk/api/datamodels/_generated.py

@@ -27,7 +27,7 @@
 
 from pydantic import AwareDatetime, BaseModel, ConfigDict, Field, JsonValue, RootModel
 
-API_VERSION: Final[str] = "2025-10-10"
+API_VERSION: Final[str] = "2026-01-01"
 
 
 class AssetAliasReferenceAssetEventDagRun(BaseModel):