Merge pull request #1 from StableLlama/more_tests

Add more unit tests

Author: StableLlama

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "basic_data_handling"
-version = "0.0.8"
+version = "0.0.9"
 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.

src/basic_data_handling/__init__.py

@@ -1,12 +1,12 @@
-from . import (boolean_nodes, casting_nodes, comparison_nodes, control_flow,
+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)
 
 NODE_CLASS_MAPPINGS = {}
 NODE_CLASS_MAPPINGS.update(boolean_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(casting_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(comparison_nodes.NODE_CLASS_MAPPINGS)
-NODE_CLASS_MAPPINGS.update(control_flow.NODE_CLASS_MAPPINGS)
+NODE_CLASS_MAPPINGS.update(control_flow_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(data_list_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(dict_nodes.NODE_CLASS_MAPPINGS)
 NODE_CLASS_MAPPINGS.update(float_nodes.NODE_CLASS_MAPPINGS)
@@ -22,7 +22,7 @@
 NODE_DISPLAY_NAME_MAPPINGS.update(boolean_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(casting_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(comparison_nodes.NODE_DISPLAY_NAME_MAPPINGS)
-NODE_DISPLAY_NAME_MAPPINGS.update(control_flow.NODE_DISPLAY_NAME_MAPPINGS)
+NODE_DISPLAY_NAME_MAPPINGS.update(control_flow_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(data_list_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(dict_nodes.NODE_DISPLAY_NAME_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(float_nodes.NODE_DISPLAY_NAME_MAPPINGS)

src/basic_data_handling/casting_nodes.py

@@ -51,7 +51,7 @@ def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
     def convert_to_int(self, input: Any) -> tuple[int]:
         try:
             return (int(input),)
-        except ValueError:
+        except (ValueError, TypeError):
             raise ValueError(f"Cannot convert {input} to an INT.")
 
 
@@ -79,7 +79,7 @@ def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
     def convert_to_float(self, input: Any) -> tuple[float]:
         try:
             return (float(input),)
-        except ValueError:
+        except (ValueError, TypeError):
             raise ValueError(f"Cannot convert {input} to a FLOAT.")
 
 
@@ -161,7 +161,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def convert(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def convert(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         return (kwargs.get('list', []).copy(),)
 
 
@@ -218,7 +218,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def convert(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def convert(self, **kwargs: list[Any]) -> tuple[set[Any]]:
         return (set(kwargs.get('list', [])),)
 
 

src/basic_data_handling/control_flow.py renamed to src/basic_data_handling/control_flow_nodes.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Union
+from typing import Any
 from inspect import cleandoc
 
 class IfElse:

src/basic_data_handling/data_list_nodes.py

@@ -30,7 +30,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def append(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def append(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         result = kwargs.get('list', []).copy()
         item = kwargs.get('item', [])
         if len(item) > 0:
@@ -66,7 +66,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def extend(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def extend(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         return (kwargs.get('list_a', []) + kwargs.get('list_b', []),)
 
 
@@ -99,7 +99,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def insert(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def insert(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         result = kwargs.get('list', []).copy()
         result.insert(kwargs.get('index', [0])[0], kwargs.get('item', [None])[0])
         return (result,)
@@ -133,7 +133,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def remove(self, **kwargs: dict[str, list]) -> tuple[list[Any], bool]:
+    def remove(self, **kwargs: list[Any]) -> tuple[list[Any], bool]:
         result = kwargs.get('list', []).copy()
         value = kwargs.get('value', [])
         try:
@@ -172,12 +172,12 @@ def INPUT_TYPES(cls):
     OUTPUT_IS_LIST = (True, False)
 
     @classmethod
-    def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool|str:
-        if input_types[0].get("index", "INT") not in ("INT"):
+    def VALIDATE_INPUTS(cls, input_types: list[dict[str, str]]) -> bool|str:
+        if input_types[0].get("index", "INT") != "INT":
             return "index must be an INT type"
         return True
 
-    def pop(self, **kwargs: dict[str, list]) -> tuple[list[Any], Any]:
+    def pop(self, **kwargs: list[Any]) -> tuple[list[Any], Any]:
         result = kwargs.get('list', []).copy()
         index = kwargs.get('index', [-1])[0]
         try:
@@ -213,7 +213,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def clear(self, **kwargs: dict[str, list]) -> tuple[[]]:
+    def clear(self, **kwargs: list[Any]) -> tuple[list]:
         # Return a new empty list rather than modifying the input
         return ([],)
 
@@ -250,7 +250,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def list_index(self, **kwargs: dict[str, list]) -> tuple[int]:
+    def list_index(self, **kwargs: list[Any]) -> tuple[int]:
         input_list = kwargs.get('list', [])
         value = kwargs.get('value', [None])[0]
         start = kwargs.get('start', [0])[0]
@@ -291,7 +291,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def count(self, **kwargs: dict[str, list]) -> tuple[int]:
+    def count(self, **kwargs: list[Any]) -> tuple[int]:
         value = kwargs.get('value', [None])[0]
         return (kwargs.get('list', []).count(value),)
 
@@ -326,7 +326,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def sort(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def sort(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         # Convert string to boolean
         reverse = kwargs.get('reverse', ["False"])[0] == "True"
 
@@ -360,7 +360,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def reverse(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def reverse(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         result = kwargs.get('list', []).copy()
         result.reverse()
         return (result,)
@@ -392,7 +392,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def copy(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def copy(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         return (kwargs.get('list', []).copy(),)
 
 
@@ -421,7 +421,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def length(self, **kwargs: dict[str, list]) -> tuple[int]:
+    def length(self, **kwargs: list[Any]) -> tuple[int]:
         return (len(kwargs.get('list', [])),)
 
 
@@ -457,7 +457,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def slice(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def slice(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         input_list = kwargs.get('list', [])
         start = kwargs.get('start', [0])[0]
         stop = kwargs.get('stop', [-1])[0]
@@ -481,7 +481,7 @@ class DataListGetItem:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input_list": ("*",),
+                "list": ("*",),
                 "index": ("INT", {"default": 0}),
             }
         }
@@ -497,7 +497,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def get_item(self, **kwargs: dict[str, list]) -> tuple[Any]:
+    def get_item(self, **kwargs: list[Any]) -> tuple[Any]:
         index = kwargs.get('index', [0])[0]
         try:
             return (kwargs.get('list', [])[index],)
@@ -534,7 +534,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def set_item(self, **kwargs: dict[str, list]) -> tuple[Any]:
+    def set_item(self, **kwargs: list[Any]) -> tuple[Any]:
         input_list = kwargs.get('list', [])
         index = kwargs.get('index', [0])[0]
         value = kwargs.get('value', [None])[0]
@@ -557,7 +557,7 @@ class DataListContains:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "input_list": ("*",),
+                "list": ("*",),
                 "value": ("*",),
             }
         }
@@ -573,7 +573,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def contains(self, **kwargs: dict[str, list]) -> tuple[bool]:
+    def contains(self, **kwargs: list[Any]) -> tuple[bool]:
         value = kwargs.get('value', [])
         if len(value) == 0:
             return (False,)
@@ -597,7 +597,7 @@ def INPUT_TYPES(cls):
     FUNCTION = "create_empty"
     OUTPUT_IS_LIST = (True,)
 
-    def create_empty(self) -> tuple[[]]:
+    def create_empty(self) -> tuple[list]:
         return ([],)
 
 
@@ -634,7 +634,7 @@ def INPUT_TYPES(cls):
     def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool:
         return True
 
-    def zip_lists(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def zip_lists(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         lists = [kwargs.get('list1', []), kwargs.get('list2', [])]
 
         if 'list3' in kwargs:
@@ -677,12 +677,12 @@ def INPUT_TYPES(cls):
     OUTPUT_IS_LIST = (True,)
 
     @classmethod
-    def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool|str:
-        if input_types[0]["filter"] not in ("BOOLEAN"):
+    def VALIDATE_INPUTS(cls, input_types: list[dict[str, str]]) -> bool|str:
+        if input_types[0]["filter"] != "BOOLEAN":
             return "filter must be a BOOLEAN type"
         return True
 
-    def filter_data(self, **kwargs: dict[str, list]) -> tuple[list[Any]]:
+    def filter_data(self, **kwargs: list[Any]) -> tuple[list[Any]]:
         values = kwargs.get('value', [])
         filters = kwargs.get('filter', [])
 
@@ -716,12 +716,12 @@ def INPUT_TYPES(cls):
     INPUT_IS_LIST = True
 
     @classmethod
-    def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool|str:
+    def VALIDATE_INPUTS(cls, input_types: list[dict[str, str]]) -> bool|str:
         if input_types[0]["list"] not in ("FLOAT", "INT"):
             return "list must contain FLOAT or INT types"
         return True
 
-    def find_min(self, **kwargs: dict[str, list]) -> tuple[Any]:
+    def find_min(self, **kwargs: list[Any]) -> tuple[Any]:
         values = kwargs.get('list', [])
         if not values:
             return (None,)
@@ -758,12 +758,12 @@ def INPUT_TYPES(cls):
     INPUT_IS_LIST = True
 
     @classmethod
-    def VALIDATE_INPUTS(cls, input_types: dict[str, str]) -> bool|str:
+    def VALIDATE_INPUTS(cls, input_types: list[dict[str, str]]) -> bool|str:
         if input_types[0]["list"] not in ("FLOAT", "INT"):
             return "list must contain FLOAT or INT types"
         return True
 
-    def find_max(self, **kwargs: dict[str, list]) -> tuple[Any]:
+    def find_max(self, **kwargs: list[Any]) -> tuple[Any]:
         values = kwargs.get('list', [])
         if not values:
             return (None,)

src/basic_data_handling/dict_nodes.py

@@ -353,7 +353,7 @@ def popitem(self, input_dict: dict) -> tuple[dict, str, Any, bool]:
                 return result, key, value, True
             else:
                 return result, "", None, False
-        except Exception as e:
+        except:
             return result, "", None, False
 
 

src/basic_data_handling/int_nodes.py

@@ -201,7 +201,7 @@ def INPUT_TYPES(cls):
     DESCRIPTION = cleandoc(__doc__ or "")
     FUNCTION = "to_bytes"
 
-    def to_bytes(self, int_value: int, length: int, byteorder: Literal["big", "little"], signed: Literal["True", "False"]) -> tuple[int]:
+    def to_bytes(self, int_value: int, length: int, byteorder: Literal["big", "little"], signed: Literal["True", "False"]) -> tuple[bytes]:
         signed_bool = (signed == "True")
         return (int_value.to_bytes(length, byteorder=byteorder, signed=signed_bool),)
 

src/basic_data_handling/regex_nodes.py

@@ -1,4 +1,3 @@
-from typing import Any
 from inspect import cleandoc
 import re