fixup! fix: use Dag form when materializing asset

Author: Lee-W

airflow-core/src/airflow/api_fastapi/core_api/datamodels/assets.py

@@ -21,7 +21,7 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from pydantic import AliasPath, ConfigDict, Field, JsonValue, NonNegativeInt, field_validator
+from pydantic import AliasPath, AwareDatetime, ConfigDict, Field, JsonValue, NonNegativeInt, field_validator
 
 from airflow._shared.secrets_masker import redact
 from airflow._shared.timezones import timezone
@@ -197,7 +197,7 @@ def set_from_rest_api(cls, v: dict) -> dict:
 class MaterializeAssetBody(TriggerDAGRunPostBody):
     """Materialize asset request."""
 
-    logical_date: datetime | None = None
+    logical_date: AwareDatetime | None = None
 
     def validate_context(self, dag: SerializedDAG) -> dict:
         params = super().validate_context(dag)

airflow-core/src/airflow/ui/src/components/TriggerDag/TriggerDAGForm.tsx

@@ -104,8 +104,6 @@ const TriggerDAGForm = ({
   // Pre-fill form when prefillConfig is provided (priority over conf)
   // Only restore 'conf' (parameters), not logicalDate, runId, or partitionKey to avoid 409 conflicts
   useEffect(() => {
-    // Also update the param store to keep it in sync.
-    // Wait until we have the initial params so section ordering stays consistent.
     if (prefillConfig && open) {
       const confString = prefillConfig.conf ? JSON.stringify(prefillConfig.conf, undefined, 2) : "";
 
@@ -119,6 +117,8 @@ const TriggerDAGForm = ({
         note: "",
         partitionKey: undefined,
       });
+      // Also update the param store to keep it in sync.
+      // Wait until we have the initial params so section ordering stays consistent.
       if (confString && Object.keys(initialParamsDict.paramsDict).length > 0) {
         if (Object.keys(initialParamDict).length === 0) {
           setInitialParamDict(initialParamsDict.paramsDict);
@@ -137,13 +137,10 @@ const TriggerDAGForm = ({
     isPartitioned,
   ]);
 
+  // Automatically reset form when conf is fetched (only if no prefillConfig)
   useEffect(() => {
-    // Automatically reset form when conf is fetched (only if no prefillConfig)
     if (conf && !prefillConfig && open) {
-      reset((prevValues) => ({
-        ...prevValues,
-        conf,
-      }));
+      reset((prevValues) => ({ ...prevValues, conf }));
     }
   }, [conf, prefillConfig, open, reset]);
 

airflow-ctl/src/airflowctl/api/datamodels/generated.py

@@ -620,6 +620,24 @@ class LastAssetEventResponse(BaseModel):
     timestamp: Annotated[datetime | None, Field(title="Timestamp")] = None
 
 
+class MaterializeAssetBody(BaseModel):
+    """
+    Materialize asset request.
+    """
+
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    dag_run_id: Annotated[str | None, Field(title="Dag Run Id")] = None
+    data_interval_start: Annotated[datetime | None, Field(title="Data Interval Start")] = None
+    data_interval_end: Annotated[datetime | None, Field(title="Data Interval End")] = None
+    logical_date: Annotated[datetime | None, Field(title="Logical Date")] = None
+    run_after: Annotated[datetime | None, Field(title="Run After")] = None
+    conf: Annotated[dict[str, Any] | None, Field(title="Conf")] = None
+    note: Annotated[str | None, Field(title="Note")] = None
+    partition_key: Annotated[str | None, Field(title="Partition Key")] = None
+
+
 class PluginImportErrorResponse(BaseModel):
     """
     Plugin Import Error serializer for responses.