diff --git a/funcs_common.py b/_dict.py similarity index 98% rename from funcs_common.py rename to _dict.py index 042ffd1..8b70e61 100644 --- a/funcs_common.py +++ b/_dict.py @@ -1,6 +1,6 @@ # encoding: utf-8 """ -Code shared between various `funcs_*` modules. +Shared code to deal with dicts. """ import typing as _t diff --git a/node_dict_add_any.py b/node_dict_add_any.py index f6351ab..ddb20b2 100644 --- a/node_dict_add_any.py +++ b/node_dict_add_any.py @@ -11,9 +11,9 @@ from frozendict import deepfreeze as _deepfreeze from comfy.comfy_types.node_typing import IO as _IO from .__meta import category_dict +from ._dict import _new_dict_with_updated_key from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _new_dict_with_updated_key from .node_dict_add_string import _input_types as _input_types_str diff --git a/node_dict_add_string.py b/node_dict_add_string.py index 9a45d5c..fecfe05 100644 --- a/node_dict_add_string.py +++ b/node_dict_add_string.py @@ -11,9 +11,9 @@ from frozendict import deepfreeze as _deepfreeze from comfy.comfy_types.node_typing import IO as _IO from .__meta import category_dict +from ._dict import _new_dict_with_updated_key, _T from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _new_dict_with_updated_key, _T # A tiny optimization by reusing the same immutable dict: diff --git a/node_dict_from_text.py b/node_dict_from_text.py index eafe0d8..2a03777 100644 --- a/node_dict_from_text.py +++ b/node_dict_from_text.py @@ -11,9 +11,9 @@ from frozendict import frozendict as _frozendict, deepfreeze as _deepfreeze from comfy.comfy_types.node_typing import IO as _IO from .__meta import category +from ._dict import _show_text_on_node, _new_updated_dict, _T from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _show_text_on_node, _new_updated_dict, _T from .node_dict_add_string import _input_types as _input_types_str diff --git a/node_dict_key_extract.py b/node_dict_key_extract.py index b53f604..78d2ac3 100644 --- a/node_dict_key_extract.py +++ b/node_dict_key_extract.py @@ -11,9 +11,9 @@ from frozendict import deepfreeze as _deepfreeze from comfy.comfy_types.node_typing import IO as _IO from .__meta import category_dict +from ._dict import _show_text_on_node, _new_dict_with_updated_key, _T from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _show_text_on_node, _new_dict_with_updated_key, _T _input_types = _deepfreeze({ diff --git a/node_dict_preview.py b/node_dict_preview.py index e342099..75bf1e6 100644 --- a/node_dict_preview.py +++ b/node_dict_preview.py @@ -10,9 +10,9 @@ from pprint import pformat as _pformat from frozendict import deepfreeze as _deepfreeze, frozendict as _frozendict from .__meta import category_dict +from ._dict import _show_text_on_node, _verify_input_dict_into_new from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _show_text_on_node, _verify_input_dict_into_new def _to_regular_dict_recursive_copy(input_dict: dict = None) -> dict: diff --git a/node_formatter.py b/node_formatter.py index fc67818..5578b1c 100644 --- a/node_formatter.py +++ b/node_formatter.py @@ -15,9 +15,9 @@ from frozendict import deepfreeze as _deepfreeze from comfy.comfy_types.node_typing import IO as _IO from .__meta import category +from ._dict import _show_text_on_node, _verify_input_dict from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _show_text_on_node, _verify_input_dict _RECURSION_LIMIT = max(int(_sys.getrecursionlimit()), 1) # You can externally monkey-patch it... but if it blows up, your fault 🤷🏻‍♂️single diff --git a/node_validate_keys.py b/node_validate_keys.py index 8f8d51d..9fe9708 100644 --- a/node_validate_keys.py +++ b/node_validate_keys.py @@ -9,9 +9,9 @@ from inspect import cleandoc as _cleandoc from frozendict import deepfreeze as _deepfreeze from .__meta import category_dict +from ._dict import _verify_input_dict, _show_text_on_node, _T from .docstring_formatter import format_docstring as _format_docstring from .enums import DataTypes as _DataTypes -from .funcs_common import _verify_input_dict, _show_text_on_node, _T _input_types = _deepfreeze({