From f04c2320ed3323386edd277bee421a10e5a1ece7 Mon Sep 17 00:00:00 2001 From: mcDandy Date: Thu, 11 Dec 2025 21:35:57 +0100 Subject: [PATCH] Moved more_math out of src, apparently it is done like that. --- __init__.py | 14 +------------- {src/more_math => more_math}/AudioMathNode.py | 0 .../ConditioningMathNode.py | 0 {src/more_math => more_math}/FloatMathNode.py | 0 {src/more_math => more_math}/ImageMathNode.py | 0 {src/more_math => more_math}/LatentMathNode.py | 0 {src/more_math => more_math}/NoiseMathNode.py | 0 .../Parser/FloatEvalVisitor.py | 0 {src/more_math => more_math}/Parser/MathExpr.g4 | 0 .../more_math => more_math}/Parser/MathExpr.interp | 0 .../more_math => more_math}/Parser/MathExpr.tokens | 0 .../Parser/MathExprLexer.interp | 0 .../Parser/MathExprLexer.py | 0 .../Parser/MathExprLexer.tokens | 0 .../Parser/MathExprListener.py | 0 .../Parser/MathExprParser.py | 0 .../Parser/MathExprVisitor.py | 0 .../Parser/TensorEvalVisitor.py | 0 {src/more_math => more_math}/VideoMathNode.py | 0 {src => more_math}/__init__.py | 0 {src/more_math => more_math}/helper_functions.py | 0 {src/more_math => more_math}/nodes.py | 0 src/more_math/__init__.py | 0 tests/test_more_math.py | 8 ++++---- 24 files changed, 5 insertions(+), 17 deletions(-) rename {src/more_math => more_math}/AudioMathNode.py (100%) rename {src/more_math => more_math}/ConditioningMathNode.py (100%) rename {src/more_math => more_math}/FloatMathNode.py (100%) rename {src/more_math => more_math}/ImageMathNode.py (100%) rename {src/more_math => more_math}/LatentMathNode.py (100%) rename {src/more_math => more_math}/NoiseMathNode.py (100%) rename {src/more_math => more_math}/Parser/FloatEvalVisitor.py (100%) rename {src/more_math => more_math}/Parser/MathExpr.g4 (100%) rename {src/more_math => more_math}/Parser/MathExpr.interp (100%) rename {src/more_math => more_math}/Parser/MathExpr.tokens (100%) rename {src/more_math => more_math}/Parser/MathExprLexer.interp (100%) rename {src/more_math => more_math}/Parser/MathExprLexer.py (100%) rename {src/more_math => more_math}/Parser/MathExprLexer.tokens (100%) rename {src/more_math => more_math}/Parser/MathExprListener.py (100%) rename {src/more_math => more_math}/Parser/MathExprParser.py (100%) rename {src/more_math => more_math}/Parser/MathExprVisitor.py (100%) rename {src/more_math => more_math}/Parser/TensorEvalVisitor.py (100%) rename {src/more_math => more_math}/VideoMathNode.py (100%) rename {src => more_math}/__init__.py (100%) rename {src/more_math => more_math}/helper_functions.py (100%) rename {src/more_math => more_math}/nodes.py (100%) delete mode 100644 src/more_math/__init__.py diff --git a/__init__.py b/__init__.py index 9df9453..f9e7a96 100644 --- a/__init__.py +++ b/__init__.py @@ -1,14 +1,2 @@ -"""Top-level package for more_math.""" - -__all__ = [ - "NODE_CLASS_MAPPINGS", - "NODE_id_MAPPINGS", - -] - -__author__ = """Daniel Martinek""" -__email__ = "danda.martinek@gmail.com" -__version__ = "0.0.1" - - +from .more_math.nodes import comfy_entrypoint diff --git a/src/more_math/AudioMathNode.py b/more_math/AudioMathNode.py similarity index 100% rename from src/more_math/AudioMathNode.py rename to more_math/AudioMathNode.py diff --git a/src/more_math/ConditioningMathNode.py b/more_math/ConditioningMathNode.py similarity index 100% rename from src/more_math/ConditioningMathNode.py rename to more_math/ConditioningMathNode.py diff --git a/src/more_math/FloatMathNode.py b/more_math/FloatMathNode.py similarity index 100% rename from src/more_math/FloatMathNode.py rename to more_math/FloatMathNode.py diff --git a/src/more_math/ImageMathNode.py b/more_math/ImageMathNode.py similarity index 100% rename from src/more_math/ImageMathNode.py rename to more_math/ImageMathNode.py diff --git a/src/more_math/LatentMathNode.py b/more_math/LatentMathNode.py similarity index 100% rename from src/more_math/LatentMathNode.py rename to more_math/LatentMathNode.py diff --git a/src/more_math/NoiseMathNode.py b/more_math/NoiseMathNode.py similarity index 100% rename from src/more_math/NoiseMathNode.py rename to more_math/NoiseMathNode.py diff --git a/src/more_math/Parser/FloatEvalVisitor.py b/more_math/Parser/FloatEvalVisitor.py similarity index 100% rename from src/more_math/Parser/FloatEvalVisitor.py rename to more_math/Parser/FloatEvalVisitor.py diff --git a/src/more_math/Parser/MathExpr.g4 b/more_math/Parser/MathExpr.g4 similarity index 100% rename from src/more_math/Parser/MathExpr.g4 rename to more_math/Parser/MathExpr.g4 diff --git a/src/more_math/Parser/MathExpr.interp b/more_math/Parser/MathExpr.interp similarity index 100% rename from src/more_math/Parser/MathExpr.interp rename to more_math/Parser/MathExpr.interp diff --git a/src/more_math/Parser/MathExpr.tokens b/more_math/Parser/MathExpr.tokens similarity index 100% rename from src/more_math/Parser/MathExpr.tokens rename to more_math/Parser/MathExpr.tokens diff --git a/src/more_math/Parser/MathExprLexer.interp b/more_math/Parser/MathExprLexer.interp similarity index 100% rename from src/more_math/Parser/MathExprLexer.interp rename to more_math/Parser/MathExprLexer.interp diff --git a/src/more_math/Parser/MathExprLexer.py b/more_math/Parser/MathExprLexer.py similarity index 100% rename from src/more_math/Parser/MathExprLexer.py rename to more_math/Parser/MathExprLexer.py diff --git a/src/more_math/Parser/MathExprLexer.tokens b/more_math/Parser/MathExprLexer.tokens similarity index 100% rename from src/more_math/Parser/MathExprLexer.tokens rename to more_math/Parser/MathExprLexer.tokens diff --git a/src/more_math/Parser/MathExprListener.py b/more_math/Parser/MathExprListener.py similarity index 100% rename from src/more_math/Parser/MathExprListener.py rename to more_math/Parser/MathExprListener.py diff --git a/src/more_math/Parser/MathExprParser.py b/more_math/Parser/MathExprParser.py similarity index 100% rename from src/more_math/Parser/MathExprParser.py rename to more_math/Parser/MathExprParser.py diff --git a/src/more_math/Parser/MathExprVisitor.py b/more_math/Parser/MathExprVisitor.py similarity index 100% rename from src/more_math/Parser/MathExprVisitor.py rename to more_math/Parser/MathExprVisitor.py diff --git a/src/more_math/Parser/TensorEvalVisitor.py b/more_math/Parser/TensorEvalVisitor.py similarity index 100% rename from src/more_math/Parser/TensorEvalVisitor.py rename to more_math/Parser/TensorEvalVisitor.py diff --git a/src/more_math/VideoMathNode.py b/more_math/VideoMathNode.py similarity index 100% rename from src/more_math/VideoMathNode.py rename to more_math/VideoMathNode.py diff --git a/src/__init__.py b/more_math/__init__.py similarity index 100% rename from src/__init__.py rename to more_math/__init__.py diff --git a/src/more_math/helper_functions.py b/more_math/helper_functions.py similarity index 100% rename from src/more_math/helper_functions.py rename to more_math/helper_functions.py diff --git a/src/more_math/nodes.py b/more_math/nodes.py similarity index 100% rename from src/more_math/nodes.py rename to more_math/nodes.py diff --git a/src/more_math/__init__.py b/src/more_math/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_more_math.py b/tests/test_more_math.py index a1f7387..efb6401 100644 --- a/tests/test_more_math.py +++ b/tests/test_more_math.py @@ -17,10 +17,10 @@ elif _project_root not in sys.path: sys.path.insert(0, _project_root) import torch -from ....more_math.ConditioningMathNode import ConditioningMathNode -from ....more_math.LatentMathNode import LatentMathNode -from ....more_math.ImageMathNode import ImageMathNode -from ....more_math.FloatMathNode import FloatMathNode +from more_math.ConditioningMathNode import ConditioningMathNode +from more_math.LatentMathNode import LatentMathNode +from more_math.ImageMathNode import ImageMathNode +from more_math.FloatMathNode import FloatMathNode # ==========================================