From e6b06172bdd3a909e76c7b3ab184ac5fb300c74d Mon Sep 17 00:00:00 2001 From: Florian Rupprecht Date: Fri, 12 Jul 2024 12:16:07 -0400 Subject: [PATCH] Minor typing fixes --- src/styx/compiler/compile/descriptor.py | 2 +- src/styx/compiler/compile/inputs.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/styx/compiler/compile/descriptor.py b/src/styx/compiler/compile/descriptor.py index 74a8133..c6ad71e 100644 --- a/src/styx/compiler/compile/descriptor.py +++ b/src/styx/compiler/compile/descriptor.py @@ -39,7 +39,7 @@ def _generate_run_function( # Function arguments func.args.extend(build_input_arguments(inputs, sub_aliases)) - func.args.append(PyArg(name="runner", type="Runner", default="None", docstring="Command runner")) + func.args.append(PyArg(name="runner", type="Runner | None", default="None", docstring="Command runner")) # Function body: Runner instantiation func.body.extend([ diff --git a/src/styx/compiler/compile/inputs.py b/src/styx/compiler/compile/inputs.py index b69d688..8fd5308 100644 --- a/src/styx/compiler/compile/inputs.py +++ b/src/styx/compiler/compile/inputs.py @@ -34,12 +34,13 @@ def _base() -> str: case _: assert False + type_ = _base() if arg.type.primitive != InputTypePrimitive.Flag: if arg.type.is_list: - return f"list[{_base()}]" + type_ = f"list[{type_}]" if arg.type.is_optional: - return f"{_base()} | None" - return _base() + type_ = f"{type_} | None" + return type_ def build_input_arguments(