Merge pull request #20539 from nsoranzo/release_24.2_fix_pydantic

[24.2] Move definition of ``DatasetCollectionDescriptionT`` before its use

Author: jmchilton

lib/galaxy/tool_util/parser/output_models.py

@@ -29,6 +29,35 @@ class ToolOutputBaseModel(BaseModel):
     hidden: bool
 
 
+DiscoverViaT = Literal["tool_provided_metadata", "pattern"]
+SortKeyT = Literal["filename", "name", "designation", "dbkey"]
+SortCompT = Literal["lexical", "numeric"]
+
+
+class DatasetCollectionDescription(BaseModel):
+    discover_via: DiscoverViaT
+    format: Optional[str]
+    visible: bool
+    assign_primary_output: bool
+    directory: Optional[str]
+    recurse: bool
+    match_relative_path: bool
+
+
+class ToolProvidedMetadataDatasetCollection(DatasetCollectionDescription):
+    discover_via: Literal["tool_provided_metadata"]
+
+
+class FilePatternDatasetCollectionDescription(DatasetCollectionDescription):
+    discover_via: Literal["pattern"]
+    sort_key: SortKeyT
+    sort_comp: SortCompT
+    pattern: str
+
+
+DatasetCollectionDescriptionT = Union[FilePatternDatasetCollectionDescription, ToolProvidedMetadataDatasetCollection]
+
+
 class ToolOutputDataset(ToolOutputBaseModel):
     type: Literal["data"]
     format: str
@@ -70,35 +99,6 @@ class ToolOutputBoolean(ToolOutputSimple):
     type: Literal["boolean"]
 
 
-DiscoverViaT = Literal["tool_provided_metadata", "pattern"]
-SortKeyT = Literal["filename", "name", "designation", "dbkey"]
-SortCompT = Literal["lexical", "numeric"]
-
-
-class DatasetCollectionDescription(BaseModel):
-    discover_via: DiscoverViaT
-    format: Optional[str]
-    visible: bool
-    assign_primary_output: bool
-    directory: Optional[str]
-    recurse: bool
-    match_relative_path: bool
-
-
-class ToolProvidedMetadataDatasetCollection(DatasetCollectionDescription):
-    discover_via: Literal["tool_provided_metadata"]
-
-
-class FilePatternDatasetCollectionDescription(DatasetCollectionDescription):
-    discover_via: Literal["pattern"]
-    sort_key: SortKeyT
-    sort_comp: SortCompT
-    pattern: str
-
-
-DatasetCollectionDescriptionT = Union[FilePatternDatasetCollectionDescription, ToolProvidedMetadataDatasetCollection]
-
-
 ToolOutputT = Union[
     ToolOutputDataset, ToolOutputCollection, ToolOutputText, ToolOutputInteger, ToolOutputFloat, ToolOutputBoolean
 ]