merge dev into main

Author: rookiestar28

.gitignore

@@ -6,7 +6,8 @@ __pycache__/
 *.pyd
 .DS_Store
 .vscode/
-text_storage.json
+text_storage/*
+!text_storage/.gitkeep
 wildcards/*
 !wildcards/.gitkeep
 !wildcards/example_format.txt

README.md

@@ -80,14 +80,27 @@ Fetches and formats headlines from any URL. Ideal for injecting real-time contex
 * **Safe:** Includes timeouts and error handling to prevent workflow freezing.
 
 ### Text Storage Nodes (Reader & Writer)
-A persistent "clipboard" for ComfyUI. We have split this into two separate nodes for better clarity and workflow management.
-* **Text Storage (Reader)**:
-    * **Simple Interface:** Just a dropdown menu to select and output your saved text.
-    * **Auto-Refresh:** Automatically updates the list when new text is saved via the Writer node.
-* **Text Storage (Writer)**:
-    * **Dedicated Actions:** Supports `Add New (Auto Rename)`, `Overwrite Existing`, and `Delete`.
-    * **Force Input:** Accepts text input directly from other nodes (string connection).
-    * **Local Storage:** All data is saved safely to `text_storage.json` within the node folder.
+A persistent "clipboard" for ComfyUI. These nodes allow you to save and retrieve text data across different workflows or sessions. All data is securely stored in the `text_storage/` directory within the node folder.
+
+#### **Text Storage (Writer)**
+Saves text content to a file or internal database.
+* **Inputs:**
+    * `text_input`: The text content to save.
+    * `filename_prefix`: Optional prefix for categorization (e.g., `ProjectA_`).
+    * `save_name`: The main filename or key. Supports **Time Formatting** (e.g., `%Y-%m-%d`) and **Wildcards** (e.g., `***` for auto-incrementing 001, 002...).
+    * `mode`:
+        * **Add New (Auto Rename)**: Automatically avoids conflicts by renaming (e.g., `Log_2024-11-26_001.txt`).
+        * **Overwrite Existing**: Replaces content if the name exists.
+        * **Delete**: Removes the specified file/key.
+    * **`storage_format` (New!)**:
+        * `json`: Saves as a key inside the internal `text_storage.json` database.
+        * `txt`: Saves as a standalone `.txt` file for easy external editing.
+
+#### **Text Storage (Reader)**
+Retrieves saved text content.
+* **Unified List:** Automatically scans and lists both JSON keys and `.txt` files from the storage folder.
+* **Passthrough:** Outputs the selected text content string.
+* **> Important Note:** The dropdown list is generated when the node loads. If you have just saved a NEW file using the Writer node, you must **Refresh the ComfyUI Page (F5)** to see the new file appear in the Reader's list.
 
 ### Wildcards Processor (Dynamic Prompt Mixer)
 

README.zh-TW.md

@@ -80,14 +80,27 @@
 * **安全機制：** 內建超時與錯誤處理，防止工作流卡死。
 
 ### Text Storage Nodes (文字倉庫 - 讀寫分離版)
-ComfyUI 內部的「持久化剪貼簿」。為了提升易用性，我們將其拆分為讀取與寫入兩個專用節點。
-* **Text Storage (Reader / 讀取器)**：
-    * **介面乾淨：** 僅需透過下拉選單選擇檔案，即可輸出文字內容。
-    * **自動刷新：** 當透過寫入器存入新檔案後，列表會自動更新。
-* **Text Storage (Writer / 寫入器)**：
-    * **明確操作：** 支援 `新增 (自動重新命名)`、`覆蓋現有檔案` 與 `刪除` 三種模式。
-    * **強制輸入：** 透過連線接收來自其他節點的字串輸入 (String Input)，符合自動化邏輯。
-    * **本地儲存：** 數據保存在節點目錄下的 `text_storage.json`，安全且易於備份。
+ComfyUI 內部的「持久化剪貼簿」。允許您在不同的工作流或會話之間保存與讀取文字數據，所有資料皆安全儲存在節點目錄下的 `text_storage/` 資料夾中。
+
+#### **Text Storage (Writer / 寫入器)**
+將文字內容保存到檔案或內部資料庫。
+* **Inputs (輸入):**
+    * `text_input`: 要保存的文字內容。
+    * `filename_prefix`: 可選的分類前綴 (例如 `ProjectA_`)。
+    * `save_name`: 主要檔名或鍵值。支援 **時間格式化** (如 `%Y-%m-%d`) 與 **通配符** (如 `***` 代表自動編號 001, 002...)。
+    * `mode`:
+        * **Add New (Auto Rename)**: 新增模式。若檔名重複會自動更名 (例如 `Log_2024-11-26_001.txt`)，避免覆蓋。
+        * **Overwrite Existing**: 覆蓋模式。若檔名存在則直接覆蓋內容。
+        * **Delete**: 刪除模式。移除指定的檔案或鍵值。
+    * **`storage_format` (新功能!)**:
+        * `json`: 作為鍵值對 (Key-Value) 儲存在內部的 `text_storage.json` 資料庫中。
+        * `txt`: 儲存為獨立的 `.txt` 文字檔，方便外部編輯或查看。
+
+#### **Text Storage (Reader / 讀取器)**
+讀取已保存的文字內容。
+* **統一列表:** 自動掃描並列出資料夾內所有的 JSON 鍵值與 `.txt` 檔案。
+* **直通輸出:** 輸出選定的文字內容字串。
+* **> 重要提示:** 下拉選單是在節點載入時生成的。如果您剛剛透過 Writer 寫入了新檔案，必須 **重新整理 ComfyUI 網頁 (F5)**，新檔案才會出現在 Reader 的列表中。
 
 ### Wildcards Processor (動態提示詞混合器)
 使用通配符語法（如 `__style__`）和隨機選擇（如 `{cat|dog}`）生成豐富的動態提示詞。此節點已進化為強大的 **7 槽混合器**。

__init__.py

@@ -10,6 +10,9 @@
 from .image_cropper import NODE_CLASS_MAPPINGS as IMAGE_CLASS_MAPPINGS
 from .image_cropper import NODE_DISPLAY_NAME_MAPPINGS as IMAGE_DISPLAY_NAME_MAPPINGS
 
+from .mask_nodes import NODE_CLASS_MAPPINGS as MASK_CLASS_MAPPINGS
+from .mask_nodes import NODE_DISPLAY_NAME_MAPPINGS as MASK_DISPLAY_NAME_MAPPINGS
+
 NODE_CLASS_MAPPINGS = {
     "AdvancedTextFilter": AdvancedTextFilter,
     "TextInput": TextInput,
@@ -38,4 +41,7 @@
 NODE_CLASS_MAPPINGS.update(IMAGE_CLASS_MAPPINGS)
 NODE_DISPLAY_NAME_MAPPINGS.update(IMAGE_DISPLAY_NAME_MAPPINGS)
 
+NODE_CLASS_MAPPINGS.update(MASK_CLASS_MAPPINGS)
+NODE_DISPLAY_NAME_MAPPINGS.update(MASK_DISPLAY_NAME_MAPPINGS)
+
 __all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS']

mask_nodes.py

@@ -0,0 +1,100 @@
+import os
+import numpy as np
+import torch
+from PIL import Image, ImageOps
+import folder_paths
+
+class TP_SaveMask:
+    def __init__(self):
+        self.output_dir = folder_paths.get_output_directory()
+        self.type = "output"
+        self.prefix_append = ""
+
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "mask": ("MASK", ),
+                "filename_prefix": ("STRING", {"default": "Mask_Output"}),
+            },
+        }
+
+    RETURN_TYPES = ()
+    FUNCTION = "save_mask"
+    OUTPUT_NODE = True
+    CATEGORY = "ComfyUI Text Processor/Image"
+
+    def save_mask(self, mask, filename_prefix="Mask_Output"):
+        full_output_folder, filename, counter, subfolder, filename_prefix = \
+            folder_paths.get_save_image_path(filename_prefix, self.output_dir, mask.shape[2], mask.shape[1])
+        
+        results = list()
+        for batch_number, single_mask in enumerate(mask):
+            i = 255. * single_mask.cpu().numpy()
+            img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
+            
+            file = f"{filename}_{counter:05}_.png"
+            img.save(os.path.join(full_output_folder, file))
+            results.append({
+                "filename": file,
+                "subfolder": subfolder,
+                "type": self.type
+            })
+            counter += 1
+        
+        return { "ui": { "images": results } }
+
+class TP_LoadMask:
+    @classmethod
+    def INPUT_TYPES(s):
+        input_dir = folder_paths.get_input_directory()
+        files = []
+        
+        try:
+            files = folder_paths.get_filename_list("input")
+        except (KeyError, AttributeError):
+            if os.path.exists(input_dir):
+                supported_ext = {'.png', '.jpg', '.jpeg', '.bmp', '.webp', '.tiff'}
+                for root, dirs, filenames in os.walk(input_dir):
+                    for filename in filenames:
+                        if os.path.splitext(filename)[1].lower() in supported_ext:
+                            filepath = os.path.join(root, filename)
+                            rel_path = os.path.relpath(filepath, input_dir)
+                            rel_path = rel_path.replace("\\", "/") 
+                            files.append(rel_path)
+            else:
+                files = []
+        
+        return {
+            "required": {
+                "image": (sorted(files), {"image_upload": True})
+            },
+        }
+
+    CATEGORY = "ComfyUI Text Processor/Image"
+    RETURN_TYPES = ("MASK", )
+    FUNCTION = "load_mask"
+
+    def load_mask(self, image):
+        image_path = folder_paths.get_annotated_filepath(image)
+        i = Image.open(image_path)
+        i = ImageOps.exif_transpose(i)
+        
+        if i.mode != 'L':
+            i = i.convert('L')
+            
+        image = np.array(i).astype(np.float32) / 255.0
+        mask = torch.from_numpy(image)
+        mask = mask.unsqueeze(0)
+        
+        return (mask, )
+
+NODE_CLASS_MAPPINGS = {
+    "TP_SaveMask": TP_SaveMask,
+    "TP_LoadMask": TP_LoadMask
+}
+
+NODE_DISPLAY_NAME_MAPPINGS = {
+    "TP_SaveMask": "Save Mask",
+    "TP_LoadMask": "Load Mask"
+}

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "text_processor"
 description = "A comprehensive suite of utility nodes for ComfyUI: Text Processing, Logic Evaluation, and Image Tools."
-version = "1.2.6"
+version = "1.3.0"
 license = {file = "LICENSE"} 
 # classifiers = [
 #     # For OS-independent nodes (works on all operating systems)