From 3f17cec456566203a68d1ef2ef3f5bdc7e527e0b Mon Sep 17 00:00:00 2001 From: Joe Zuntz Date: Tue, 3 Oct 2023 10:28:30 +0100 Subject: [PATCH 1/2] Allow None as the type in the description generator --- ceci/stage.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ceci/stage.py b/ceci/stage.py index f146876..afdb06d 100644 --- a/ceci/stage.py +++ b/ceci/stage.py @@ -418,9 +418,15 @@ def _describe_configuration_text(cls): for name, val in cls.config_options.items(): if isinstance(val, StageParameter): if val.required: - txt = f"[{val.dtype.__name__}]: {val._help} (required)" + if val.dtype is None: + txt = f"[type not specified]: {val._help} (required)" + else: + txt = f"[{val.dtype.__name__}]: {val._help} (required)" else: - txt = f"[{val.dtype.__name__}]: {val._help} (default={val.default})" + if val.dtype is None: + txt = f"[{val.dtype.__name__}]: {val._help} (default={val.default})" + else: + txt = f"[type not specified]: {val._help} (default={val.default})" elif isinstance(val, type): txt = f"[{val.__name__}]: (required)" else: From cfde76067ff4de673f2d808fd3c70389bdc2cb52 Mon Sep 17 00:00:00 2001 From: Joe Zuntz Date: Tue, 3 Oct 2023 11:52:09 +0100 Subject: [PATCH 2/2] fix switched if statement --- ceci/stage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceci/stage.py b/ceci/stage.py index afdb06d..bba4089 100644 --- a/ceci/stage.py +++ b/ceci/stage.py @@ -424,9 +424,9 @@ def _describe_configuration_text(cls): txt = f"[{val.dtype.__name__}]: {val._help} (required)" else: if val.dtype is None: - txt = f"[{val.dtype.__name__}]: {val._help} (default={val.default})" - else: txt = f"[type not specified]: {val._help} (default={val.default})" + else: + txt = f"[{val.dtype.__name__}]: {val._help} (default={val.default})" elif isinstance(val, type): txt = f"[{val.__name__}]: (required)" else: