From d02bdc52bedd9618046b7a588fe0040b1f83e7d0 Mon Sep 17 00:00:00 2001 From: Vladimir Blagojevic Date: Tue, 14 Nov 2023 22:10:50 +0100 Subject: [PATCH] Fix find_component_inputs, update unit tests --- canals/component/descriptions.py | 2 +- test/component/test_component.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/canals/component/descriptions.py b/canals/component/descriptions.py index ceba0e9e..c7bda6e0 100644 --- a/canals/component/descriptions.py +++ b/canals/component/descriptions.py @@ -18,7 +18,7 @@ def find_component_inputs(component: Any) -> Dict[str, Dict[str, Any]]: ) return { - name: {"type": socket.type, "is_optional": socket.is_optional} + name: {"type": socket.type, "is_mandatory": socket.is_mandatory, "is_variadic": socket.is_variadic} for name, socket in component.__canals_input__.items() } diff --git a/test/component/test_component.py b/test/component/test_component.py index 41dbedfb..9f1512d6 100644 --- a/test/component/test_component.py +++ b/test/component/test_component.py @@ -184,7 +184,7 @@ def run(self, value: int): return {"value": 1} comp = MockComponent() - assert find_component_inputs(comp) == {"value": {"is_optional": False, "type": int}} + assert find_component_inputs(comp) == {"value": {"is_mandatory": True, "is_variadic": False, "type": int}} def test_inputs_method_multiple_inputs(): @@ -195,8 +195,8 @@ def run(self, value1: int, value2: str): comp = MockComponent() assert find_component_inputs(comp) == { - "value1": {"is_optional": False, "type": int}, - "value2": {"is_optional": False, "type": str}, + "value1": {"is_mandatory": True, "is_variadic": False, "type": int}, + "value2": {"is_mandatory": True, "is_variadic": False, "type": str}, } @@ -208,8 +208,8 @@ def run(self, value1: int, value2: Optional[str]): comp = MockComponent() assert find_component_inputs(comp) == { - "value1": {"is_optional": False, "type": int}, - "value2": {"is_optional": True, "type": typing.Optional[str]}, + "value1": {"is_mandatory": True, "is_variadic": False, "type": int}, + "value2": {"is_mandatory": True, "is_variadic": False, "type": typing.Optional[str]}, } @@ -223,7 +223,7 @@ def run(self, *args): return {"value": 1} comp = MockComponent() - assert find_component_inputs(comp) == {"value": {"is_optional": False, "type": typing.Any}} + assert find_component_inputs(comp) == {"value": {"is_mandatory": True, "is_variadic": False, "type": typing.Any}} def test_inputs_method_variadic_keyword_positional_args(): @@ -236,7 +236,7 @@ def run(self, **kwargs): return {"value": 1} comp = MockComponent() - assert find_component_inputs(comp) == {"value": {"is_optional": False, "type": typing.Any}} + assert find_component_inputs(comp) == {"value": {"is_mandatory": True, "is_variadic": False, "type": typing.Any}} def test_inputs_dynamic_from_init(): @@ -249,7 +249,7 @@ def run(self, value: int, **kwargs): return {"value": 1} comp = MockComponent() - assert find_component_inputs(comp) == {"value": {"is_optional": False, "type": int}} + assert find_component_inputs(comp) == {"value": {"is_mandatory": True, "is_variadic": False, "type": int}} def test_outputs_method_no_outputs():