accept 'format' alias on Data/DataCollection parameter models

AliasChoices("extensions", "format") on DataParameterModel and
DataCollectionParameterModel; populate_by_name per-class. Serialization
unchanged (always emits 'extensions'). model_validator hard-errors if
both keys present. Regenerated ToolSourceSchema.json.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jmchilton

client/src/components/Tool/ToolSourceSchema.json

@@ -1113,11 +1113,14 @@ class BatchDataNonCollectionInstanceInternal(StrictModel):
 
 
 class DataParameterModel(BaseGalaxyToolParameterModelDefinition):
+    model_config = ConfigDict(populate_by_name=True)
+
     parameter_type: Literal["gx_data"] = "gx_data"
     type: Literal["data"]
     extensions: Annotated[
         List[str],
         Field(
+            validation_alias=AliasChoices("extensions", "format"),
             description="Limit inputs to datasets with these extensions. Use 'data' to allow all input datasets.",
             examples=["txt", "tabular", "tiff"],
         ),
@@ -1126,6 +1129,13 @@ class DataParameterModel(BaseGalaxyToolParameterModelDefinition):
     min: Optional[int] = None
     max: Optional[int] = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def _reject_extensions_and_format(cls, data):
+        if isinstance(data, dict) and "extensions" in data and "format" in data:
+            raise ValueError("Specify either 'extensions' or 'format', not both")
+        return data
+
     def field_kwargs(self) -> Dict[str, Any]:
         kwargs = super().field_kwargs()
         extra = kwargs["json_schema_extra"]
@@ -1341,12 +1351,24 @@ class AdaptedDataCollectionPromoteDatasetsToCollectionRequestInternal(AdaptedDat
 
 
 class DataCollectionParameterModel(BaseGalaxyToolParameterModelDefinition):
+    model_config = ConfigDict(populate_by_name=True)
+
     parameter_type: Literal["gx_data_collection"] = "gx_data_collection"
     type: Literal["data_collection"]
     collection_type: Optional[str] = None
-    extensions: List[str] = ["data"]
+    extensions: Annotated[
+        List[str],
+        Field(validation_alias=AliasChoices("extensions", "format")),
+    ] = ["data"]
     value: Optional[Dict[str, Any]]
 
+    @model_validator(mode="before")
+    @classmethod
+    def _reject_extensions_and_format(cls, data):
+        if isinstance(data, dict) and "extensions" in data and "format" in data:
+            raise ValueError("Specify either 'extensions' or 'format', not both")
+        return data
+
     def field_kwargs(self) -> Dict[str, Any]:
         kwargs = super().field_kwargs()
         kwargs["json_schema_extra"]["gx_extensions"] = self.extensions

lib/galaxy/tool_util_models/parameters.py

@@ -16,6 +16,7 @@
     BooleanParameterModel,
     ConditionalParameterModel,
     create_job_runtime_model,
+    DataCollectionParameterModel,
     DataParameterModel,
     HiddenParameterModel,
     RepeatParameterModel,
@@ -353,3 +354,46 @@ def test_published_tool_source_schema_has_no_xml_only_leaks():
     all_property_names.update(raw.get("properties", {}).keys())
     leaks = [bad for bad in _BLACKLIST_SUBSTRINGS if bad in all_property_names]
     assert not leaks, f"XML-only fields leaked into published schema: {leaks}"
+
+
+def test_data_param_accepts_format_alias():
+    m = DataParameterModel(type="data", name="x", format=["txt", "tabular"])
+    assert m.extensions == ["txt", "tabular"]
+
+
+def test_data_param_accepts_extensions_name():
+    m = DataParameterModel(type="data", name="x", extensions=["bam"])
+    assert m.extensions == ["bam"]
+
+
+def test_data_param_default_extensions():
+    m = DataParameterModel(type="data", name="x")
+    assert m.extensions == ["data"]
+
+
+def test_data_param_serializes_as_extensions():
+    dumped = DataParameterModel(type="data", name="x", format=["txt"]).model_dump()
+    assert "extensions" in dumped
+    assert "format" not in dumped
+    assert dumped["extensions"] == ["txt"]
+
+
+def test_data_param_rejects_both_format_and_extensions():
+    with pytest.raises(ValidationError):
+        DataParameterModel(type="data", name="x", extensions=["a"], format=["b"])
+
+
+def test_data_collection_param_accepts_format_alias():
+    m = DataCollectionParameterModel(type="data_collection", name="c", format=["bam"], value=None)
+    assert m.extensions == ["bam"]
+
+
+def test_data_collection_param_serializes_as_extensions():
+    dumped = DataCollectionParameterModel(type="data_collection", name="c", format=["bam"], value=None).model_dump()
+    assert "extensions" in dumped
+    assert "format" not in dumped
+
+
+def test_data_collection_param_rejects_both_format_and_extensions():
+    with pytest.raises(ValidationError):
+        DataCollectionParameterModel(type="data_collection", name="c", extensions=["a"], format=["b"], value=None)