Merge pull request #5 from StableLlama/consolidation

version 0.2.0 with consolidation of nodes

Author: StableLlama

pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "basic_data_handling"
-version = "0.1.0"
+version = "0.2.0"
 description = """NOTE: Still in development! Expect breaking changes!
 Basic Python functions for manipulating data that every programmer is used to.
 Currently supported ComfyUI data types: BOOLEAN, FLOAT, INT, STRING and data lists.
 Additionally supported Python data types as custom data types: DICT, LIST.
 Data handling is supported with comparisons and control flow operations.
 Also contains math, regex, and file system path manipulation functions."""
 authors = [
-  {name = "Basic data handling"}
+  {name = "StableLlama"}
 ]
 readme = "README.md"
 license = {text = "MIT license"}
@@ -44,7 +44,10 @@ Icon = ""
 
 [tool.pytest.ini_options]
 minversion = "8.0"
-pythonpath = "src"
+pythonpath = [
+    "src",
+    "../..",  # Path to parent directory containing comfy module
+]
 testpaths = [
     "tests",
 ]

src/basic_data_handling/__init__.py

@@ -1,6 +1,7 @@
 from . import (boolean_nodes, casting_nodes, comparison_nodes, control_flow_nodes,
                data_list_nodes, dict_nodes, float_nodes, int_nodes, list_nodes,
-               math_nodes, path_nodes, regex_nodes, set_nodes, string_nodes)
+               math_nodes, math_formula_node, path_nodes, regex_nodes, set_nodes,
+               string_nodes)
 
 NODE_CLASS_MAPPINGS = {}
 NODE_CLASS_MAPPINGS.update(boolean_nodes.NODE_CLASS_MAPPINGS)
@@ -16,6 +17,7 @@
 NODE_CLASS_MAPPINGS.update(regex_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(set_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(math_nodes.NODE_CLASS_MAPPINGS)
+NODE_CLASS_MAPPINGS.update(math_formula_node.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(string_nodes.NODE_CLASS_MAPPINGS)
 
 NODE_DISPLAY_NAME_MAPPINGS = {}
@@ -32,4 +34,5 @@
 NODE_DISPLAY_NAME_MAPPINGS.update(regex_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(set_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(math_nodes.NODE_DISPLAY_NAME_MAPPINGS)
+NODE_DISPLAY_NAME_MAPPINGS.update(math_formula_node.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(string_nodes.NODE_DISPLAY_NAME_MAPPINGS)

src/basic_data_handling/boolean_nodes.py

@@ -1,6 +1,7 @@
 from inspect import cleandoc
+from comfy.comfy_types.node_typing import IO, ComfyNodeABC
 
-class BooleanAnd:
+class BooleanAnd(ComfyNodeABC):
     """
     Returns the logical AND result of two boolean values.
 
@@ -10,12 +11,12 @@ class BooleanAnd:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input1": ("BOOLEAN", {"default": False, "forceInput": True}),
-                "input2": ("BOOLEAN", {"default": False, "forceInput": True}),
+                "input1": (IO.BOOLEAN, {"default": False, "forceInput": True}),
+                "input2": (IO.BOOLEAN, {"default": False, "forceInput": True}),
             }
         }
 
-    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_TYPES = (IO.BOOLEAN,)
     CATEGORY = "Basic/BOOLEAN"
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "and_operation"
@@ -24,7 +25,7 @@ def and_operation(self, input1: bool, input2: bool) -> tuple[bool]:
         return (input1 and input2,)
 
 
-class BooleanOr:
+class BooleanOr(ComfyNodeABC):
     """
     Returns the logical OR result of two boolean values.
 
@@ -34,12 +35,12 @@ class BooleanOr:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input1": ("BOOLEAN", {"default": False, "forceInput": True}),
-                "input2": ("BOOLEAN", {"default": False, "forceInput": True}),
+                "input1": (IO.BOOLEAN, {"default": False, "forceInput": True}),
+                "input2": (IO.BOOLEAN, {"default": False, "forceInput": True}),
             }
         }
 
-    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_TYPES = (IO.BOOLEAN,)
     CATEGORY = "Basic/BOOLEAN"
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "or_operation"
@@ -48,7 +49,7 @@ def or_operation(self, input1: bool, input2: bool) -> tuple[bool]:
         return (input1 or input2,)
 
 
-class BooleanNot:
+class BooleanNot(ComfyNodeABC):
     """
     Returns the logical NOT result of a boolean value.
 
@@ -58,11 +59,11 @@ class BooleanNot:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input": ("BOOLEAN", {"default": False, "forceInput": True}),
+                "input": (IO.BOOLEAN, {"default": False, "forceInput": True}),
             }
         }
 
-    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_TYPES = (IO.BOOLEAN,)
     CATEGORY = "Basic/BOOLEAN"
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "not_operation"
@@ -71,7 +72,7 @@ def not_operation(self, input: bool) -> tuple[bool]:
         return (not input,)
 
 
-class BooleanXor:
+class BooleanXor(ComfyNodeABC):
     """
     Returns the logical XOR result of two boolean values.
 
@@ -81,12 +82,12 @@ class BooleanXor:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input1": ("BOOLEAN", {"default": False, "forceInput": True}),
-                "input2": ("BOOLEAN", {"default": False, "forceInput": True}),
+                "input1": (IO.BOOLEAN, {"default": False, "forceInput": True}),
+                "input2": (IO.BOOLEAN, {"default": False, "forceInput": True}),
             }
         }
 
-    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_TYPES = (IO.BOOLEAN,)
     CATEGORY = "Basic/BOOLEAN"
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "xor_operation"
@@ -95,7 +96,7 @@ def xor_operation(self, input1: bool, input2: bool) -> tuple[bool]:
         return (input1 != input2,)
 
 
-class BooleanNand:
+class BooleanNand(ComfyNodeABC):
     """
     Returns the logical NAND result of two boolean values.
 
@@ -105,12 +106,12 @@ class BooleanNand:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input1": ("BOOLEAN", {"default": False, "forceInput": True}),
-                "input2": ("BOOLEAN", {"default": False, "forceInput": True}),
+                "input1": (IO.BOOLEAN, {"default": False, "forceInput": True}),
+                "input2": (IO.BOOLEAN, {"default": False, "forceInput": True}),
             }
         }
 
-    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_TYPES = (IO.BOOLEAN,)
     CATEGORY = "Basic/BOOLEAN"
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "nand_operation"
@@ -119,7 +120,7 @@ def nand_operation(self, input1: bool, input2: bool) -> tuple[bool]:
         return (not (input1 and input2),)
 
 
-class BooleanNor:
+class BooleanNor(ComfyNodeABC):
     """
     Returns the logical NOR result of two boolean values.
 
@@ -129,12 +130,12 @@ class BooleanNor:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input1": ("BOOLEAN", {"default": False, "forceInput": True}),
-                "input2": ("BOOLEAN", {"default": False, "forceInput": True}),
+                "input1": (IO.BOOLEAN, {"default": False, "forceInput": True}),
+                "input2": (IO.BOOLEAN, {"default": False, "forceInput": True}),
             }
         }
 
-    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_TYPES = (IO.BOOLEAN,)
     CATEGORY = "Basic/BOOLEAN"
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "nor_operation"