Change BoolOutput to Output

pier-digital · Feb 17, 2023 · 54272c4 · 54272c4
1 parent 33e3d50
commit 54272c4
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 116 deletions.
diff --git a/examples/age-check.json b/examples/age-check.json
@@ -135,8 +135,8 @@
 				}
 			},
 			"position": [
-				83.84765625,
-				-146.80078125
+				45.51953125,
+				-136.8515625
 			],
 			"name": "Check"
 		},
@@ -180,29 +180,6 @@
 			],
 			"name": "If"
 		},
-		"7": {
-			"id": 7,
-			"data": {
-				"message": "invalid age"
-			},
-			"inputs": {
-				"input_bool": {
-					"connections": [
-						{
-							"node": 8,
-							"output": "output_bool",
-							"data": {}
-						}
-					]
-				}
-			},
-			"outputs": {},
-			"position": [
-				972.3247551810931,
-				-8.462733235746624
-			],
-			"name": "BoolOutput"
-		},
 		"8": {
 			"id": 8,
 			"data": {
@@ -223,8 +200,8 @@
 				"output_bool": {
 					"connections": [
 						{
-							"node": 7,
-							"input": "input_bool",
+							"node": 11,
+							"input": "input_value",
 							"data": {}
 						}
 					]
@@ -257,7 +234,7 @@
 					"connections": [
 						{
 							"node": 10,
-							"input": "input_bool",
+							"input": "input_value",
 							"data": {}
 						}
 					]
@@ -275,7 +252,7 @@
 				"message": "valid age"
 			},
 			"inputs": {
-				"input_bool": {
+				"input_value": {
 					"connections": [
 						{
 							"node": 9,
@@ -287,10 +264,33 @@
 			},
 			"outputs": {},
 			"position": [
-				974.0269089794663,
-				-190.8242802623253
+				1015.5346416468075,
+				-247.2703893983769
+			],
+			"name": "Output"
+		},
+		"11": {
+			"id": 11,
+			"data": {
+				"message": "invalid age"
+			},
+			"inputs": {
+				"input_value": {
+					"connections": [
+						{
+							"node": 8,
+							"output": "output_bool",
+							"data": {}
+						}
+					]
+				}
+			},
+			"outputs": {},
+			"position": [
+				1008.826235840524,
+				-68.88453626006572
 			],
-			"name": "BoolOutput"
+			"name": "Output"
 		}
 	}
 }
diff --git a/retrack/nodes/__init__.py b/retrack/nodes/__init__.py
@@ -8,7 +8,7 @@
 from retrack.nodes.logic import And, Not, Or
 from retrack.nodes.match import If
 from retrack.nodes.math import Math
-from retrack.nodes.outputs import BoolOutput
+from retrack.nodes.outputs import Output
 from retrack.nodes.start import Start
 from retrack.nodes.startswith import StartsWith
 from retrack.nodes.startswithany import StartsWithAny
@@ -21,7 +21,7 @@
 registry.register("Constant", Constant)
 registry.register("List", List)
 registry.register("Bool", Bool)
-registry.register("BoolOutput", BoolOutput)
+registry.register("Output", Output)
 registry.register("Check", Check)
 registry.register("If", If)
 registry.register("And", And)

diff --git a/retrack/nodes/outputs.py b/retrack/nodes/outputs.py
@@ -18,24 +18,24 @@ class OutputMetadataModel(pydantic.BaseModel):
 ################################################
 # Output Inputs and Outputs
 ################################################
-class BoolOutputInputsModel(pydantic.BaseModel):
-    input_bool: InputConnectionModel
+class OutputInputsModel(pydantic.BaseModel):
+    input_value: InputConnectionModel
 
 
 ################################################
 # Output Node
 ################################################
 
 
-class BoolOutput(BaseNode):
-    inputs: typing.Optional[BoolOutputInputsModel]
+class Output(BaseNode):
+    inputs: typing.Optional[OutputInputsModel]
     data: OutputMetadataModel
 
     def kind(self) -> NodeKind:
         return NodeKind.OUTPUT
 
-    def run(self, input_bool: pd.Series) -> typing.Dict[str, pd.Series]:
+    def run(self, input_value: pd.Series) -> typing.Dict[str, pd.Series]:
         return {
-            constants.OUTPUT_REFERENCE_COLUMN: input_bool,
+            constants.OUTPUT_REFERENCE_COLUMN: input_value,
             constants.OUTPUT_MESSAGE_REFERENCE_COLUMN: self.data.message,
         }