From de907cceb259352437bdfb5f75105e0ef2da074c Mon Sep 17 00:00:00 2001
From: nkchocoai <nkai3359@gmail.com>
Date: Sat, 27 Jan 2024 14:04:53 +0900
Subject: [PATCH] Refactoring

---
 __init__.py                    |  5 +++-
 py/node/__init__.py            |  0
 py/node/base.py                |  2 ++
 py/node/const.py               | 28 ++++++++++++++++++
 py/{node.py => node/format.py} | 54 ++--------------------------------
 py/node/preset.py              | 19 ++++++++++++
 6 files changed, 55 insertions(+), 53 deletions(-)
 create mode 100644 py/node/__init__.py
 create mode 100644 py/node/base.py
 create mode 100644 py/node/const.py
 rename py/{node.py => node/format.py} (50%)
 create mode 100644 py/node/preset.py

diff --git a/__init__.py b/__init__.py
index 2931ca5..404b61a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,7 @@
-from .py.node import *
+from .py.node.const import *
+from .py.node.format import *
+from .py.node.preset import *
+
 
 NODE_CLASS_MAPPINGS = {
     "PromptUtilitiesFormatString": PromptUtilitiesFormatString,
diff --git a/py/node/__init__.py b/py/node/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/py/node/base.py b/py/node/base.py
new file mode 100644
index 0000000..2b8db09
--- /dev/null
+++ b/py/node/base.py
@@ -0,0 +1,2 @@
+class BaseNode:
+    CATEGORY = "PromptUtilities"
\ No newline at end of file
diff --git a/py/node/const.py b/py/node/const.py
new file mode 100644
index 0000000..63ef23f
--- /dev/null
+++ b/py/node/const.py
@@ -0,0 +1,28 @@
+from .base import BaseNode
+
+class PromptUtilitiesConstStringBase(BaseNode):
+    RETURN_TYPES = ("STRING",)
+    FUNCTION = "get_string"
+
+    def get_string(self, string):
+        return (string,)
+
+
+class PromptUtilitiesConstString(PromptUtilitiesConstStringBase):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "string": ("STRING", {"default": "", "multiline": False})
+            }
+        }
+
+
+class PromptUtilitiesConstStringMultiLine(PromptUtilitiesConstStringBase):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "string": ("STRING", {"default": "", "multiline": True})
+            }
+        }
\ No newline at end of file
diff --git a/py/node.py b/py/node/format.py
similarity index 50%
rename from py/node.py
rename to py/node/format.py
index 70f44d7..11707a2 100644
--- a/py/node.py
+++ b/py/node/format.py
@@ -1,37 +1,4 @@
-import folder_paths
-
-from .preset import PresetManager
-
-class BaseNode:
-    CATEGORY = "PromptUtilities"
-
-
-class PromptUtilitiesConstStringBase(BaseNode):
-    RETURN_TYPES = ("STRING",)
-    FUNCTION = "get_string"
-
-    def get_string(self, string):
-        return (string,)
-
-
-class PromptUtilitiesConstString(PromptUtilitiesConstStringBase):
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            "required": {
-                "string": ("STRING", {"default": "", "multiline": False})
-            }
-        }
-
-
-class PromptUtilitiesConstStringMultiLine(PromptUtilitiesConstStringBase):
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            "required": {
-                "string": ("STRING", {"default": "", "multiline": True})
-            }
-        }
+from .base import BaseNode
 
 
 class PromptUtilitiesFormatString(BaseNode):
@@ -81,21 +48,4 @@ class PromptUtilitiesJoinStringList(BaseNode):
         print(kwargs)
         print(kwargs.values())
         result = separator.join(kwargs.values())
-        return (result,)
-
-
-class PromptUtilitiesLoadPreset(BaseNode):
-    @classmethod
-    def INPUT_TYPES(s):
-        return {
-            "required": { 
-                "preset": (list(PresetManager.get_presets().keys()), ),
-            }
-        }
-            
-    RETURN_TYPES = ("STRING",)
-    FUNCTION = "load_preset"
-
-    def load_preset(self, preset):
-        prompt = PresetManager.get_prompt(preset)
-        return (prompt,)
\ No newline at end of file
+        return (result,)
\ No newline at end of file
diff --git a/py/node/preset.py b/py/node/preset.py
new file mode 100644
index 0000000..f6dc46d
--- /dev/null
+++ b/py/node/preset.py
@@ -0,0 +1,19 @@
+from .base import BaseNode
+from ..preset import PresetManager
+
+
+class PromptUtilitiesLoadPreset(BaseNode):
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": { 
+                "preset": (list(PresetManager.get_presets().keys()), ),
+            }
+        }
+            
+    RETURN_TYPES = ("STRING",)
+    FUNCTION = "load_preset"
+
+    def load_preset(self, preset):
+        prompt = PresetManager.get_prompt(preset)
+        return (prompt,)
\ No newline at end of file