Skip to content

Commit 9d2e2d6

Browse files
committed
Minor fixes; add path-template-fallback
1 parent 065c6c0 commit 9d2e2d6

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

src/boutiques_schema_pydantic/v_styx_1/descriptor.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ListInput(pydantic.BaseModel):
8484
class StringInput(BaseInput):
8585
"""String input."""
8686

87-
type_: typing.Union[Literal["String"]] = pydantic.Field(alias="type")
87+
type_: Literal["String"] = pydantic.Field(alias="type")
8888

8989
value_choices: Optional[list[str]] = pydantic.Field(
9090
alias="value-choices",
@@ -112,7 +112,7 @@ class StringInput(BaseInput):
112112
class FileInput(BaseInput):
113113
"""File input."""
114114

115-
type_: typing.Union[Literal["File"]] = pydantic.Field(alias="type")
115+
type_: Literal["File"] = pydantic.Field(alias="type")
116116

117117
mutable: bool = pydantic.Field(
118118
description="Specifies that the tool may modify the input file. "
@@ -133,7 +133,7 @@ class FileInput(BaseInput):
133133
class IntegerInput(BaseInput):
134134
"""Integer input."""
135135

136-
type_: typing.Union[Literal["Number"]] = pydantic.Field(alias="type")
136+
type_: Literal["Number"] = pydantic.Field(alias="type")
137137

138138
integer: Literal[True] = pydantic.Field(
139139
description="Specify whether the input should be an integer. "
@@ -178,7 +178,7 @@ class IntegerInput(BaseInput):
178178
class FloatInput(BaseInput):
179179
"""Float input."""
180180

181-
type_: typing.Union[Literal["Number"]] = pydantic.Field(alias="type")
181+
type_: Literal["Number"] = pydantic.Field(alias="type")
182182

183183
integer: Optional[Literal[False]] = pydantic.Field(
184184
description="Specify whether the input should be an integer. "
@@ -216,7 +216,7 @@ class FloatInput(BaseInput):
216216
class FlagInput(BaseInput):
217217
"""Flag input."""
218218

219-
type_: typing.Union[Literal["Flag"]] = pydantic.Field(alias="type")
219+
type_: Literal["Flag"] = pydantic.Field(alias="type")
220220

221221
default_value: Optional[bool] = pydantic.Field(
222222
alias="default-value",
@@ -470,6 +470,11 @@ class Output(pydantic.BaseModel):
470470
'[".nii",".nii.gz"].',
471471
default=None,
472472
)
473+
path_template_fallback: Optional[str] = pydantic.Field(
474+
alias="path-template-fallback",
475+
description="Fall back to this value if the referenced input is optional and set to None.",
476+
default=None,
477+
)
473478

474479

475480
class ContainerImage(pydantic.BaseModel):
@@ -530,7 +535,7 @@ class Descriptor(SubCommand):
530535
tool_version: StringProperty = pydantic.Field(
531536
alias="tool-version", description="Tool version."
532537
)
533-
schema_version: Literal["0.5", "styx-d1"] = pydantic.Field(alias="schema-version")
538+
schema_version: Literal["0.5", "0.5+styx"] = pydantic.Field(alias="schema-version")
534539

535540
# Optional fields
536541
author: Optional[StringProperty] = pydantic.Field(

0 commit comments

Comments
 (0)