diff --git a/__init__.py b/__init__.py index c53e2fe..2089e00 100644 --- a/__init__.py +++ b/__init__.py @@ -23,10 +23,17 @@ NODE_CLASS_MAPPINGS = { #字符串处理：meyo_node_String "SingleTextInput": SingleTextInput, +<<<<<<< HEAD "TextToList": TextToList, "TextConcatenator": TextConcatenator, "MultiParamInputNode": MultiParamInputNode, "NumberExtractor": NumberExtractor, +======= + "TextConcatenator": TextConcatenator, + "MultiParamInputNode": MultiParamInputNode, + "NumberExtractor": NumberExtractor, + +>>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70 "AddPrefixSuffix": AddPrefixSuffix, "ExtractSubstring": ExtractSubstring, "ExtractSubstringByIndices": ExtractSubstringByIndices, @@ -88,6 +95,7 @@ NODE_DISPLAY_NAME_MAPPINGS = { "GetRandomIntegerInRange": "范围内随机数🐠meeeyo.com", #字符串处理：meyo_node_String +<<<<<<< HEAD "SingleTextInput": "文本输入🐠meeeyo.com", "TextToList": "文本到列表🐠meeeyo.com", "TextConcatenator": "文本拼接🐠meeeyo.com", @@ -121,6 +129,40 @@ NODE_DISPLAY_NAME_MAPPINGS = { "ExtractSpecificData": "提取多层指定数据🐠meeeyo.com", "FindFirstLineContent": "指定字符行参数🐠meeeyo.com", "GenerateVideoPrompt": "视频指令词模板🐠meeeyo.com", +======= + "SingleTextInput": "文本输入(meeeyo.com)", + "TextConcatenator": "文本拼接(meeeyo.com)", + "MultiParamInputNode": "多参数输入(meeeyo.com)", + "NumberExtractor": "整数参数(meeeyo.com)", + + "AddPrefixSuffix": "添加前后缀(meeeyo.com)", + "ExtractSubstring": "提取标签之间(meeeyo.com)", + "ExtractSubstringByIndices": "按数字范围提取(meeeyo.com)", + "SplitStringByDelimiter": "分隔符拆分两边(meeeyo.com)", + "ProcessString": "常规处理字符(meeeyo.com)", + "ExtractBeforeAfter": "提取前后字符(meeeyo.com)", + "ReplaceNthOccurrence": "替换第n次出现(meeeyo.com)", + "ReplaceMultiple": "多次出现依次替换(meeeyo.com)", + "BatchReplaceStrings": "批量替换字符(meeeyo.com)", + "RandomLineFromText": "随机行内容(meeeyo.com)", + "CheckSubstringPresence": "判断是否包含字符(meeeyo.com)", + "AddPrefixSuffixToLines": "段落每行添加前后缀(meeeyo.com)", + "ExtractAndCombineLines": "段落提取指定索引行(meeeyo.com)", + "FilterLinesBySubstrings": "段落提取或移除字符行(meeeyo.com)", + "FilterLinesByWordCount": "段落字数条件过滤行(meeeyo.com)", + "SplitAndExtractText": "按序号提取分割文本(meeeyo.com)", + "CountOccurrences": "文本出现次数(meeeyo.com)", + "ExtractLinesByIndex": "文本拆分(meeeyo.com)", + "ExtractSpecificLines": "提取特定行(meeeyo.com)", + "RemoveContentBetweenChars": "删除标签内的内容(meeeyo.com)", + "ShuffleTextLines": "随机打乱(meeeyo.com)", + "ConditionalTextOutput": "判断返回内容(meeeyo.com)", + "TextConditionCheck": "文本按条件判断(meeeyo.com)", + "TextConcatenation": "文本组合(meeeyo.com)", + "ExtractSpecificData": "提取多层指定数据(meeeyo.com)", + "FindFirstLineContent": "指定字符行参数(meeeyo.com)", + "GenerateVideoPrompt": "视频指令词模板(meeeyo.com)", +>>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70 #文件处理：meyo_node_File "LoadAndAdjustImage": "加载重置图像🐠meeeyo.com", diff --git a/meyo_node_File.py b/meyo_node_File.py index b7791fc..55770d9 100644 --- a/meyo_node_File.py +++ b/meyo_node_File.py @@ -161,6 +161,10 @@ class LoadAndAdjustImage: #======重置图像 +import torch +import numpy as np +from PIL import Image, ImageOps + class ImageAdjuster: @classmethod def INPUT_TYPES(s): diff --git a/meyo_node_String.py b/meyo_node_String.py index 13e893f..2beb442 100644 --- a/meyo_node_String.py +++ b/meyo_node_String.py @@ -114,6 +114,52 @@ class TextConcatenator: return (f"Error: {str(e)}",) +#======文本拼接 +class TextConcatenator: + def __init__(self): + pass + + @classmethod + def INPUT_TYPES(cls): + return { + "required": { + "text1": ("STRING", {"multiline": True, "default": ""}), + "text2": ("STRING", {"multiline": True, "default": ""}), + "text3": ("STRING", {"multiline": True, "default": ""}), + "text4": ("STRING", {"multiline": True, "default": ""}), + "combine_order": ("STRING", {"default": ""}) + }, + } + + RETURN_TYPES = ("STRING",) + FUNCTION = "combine_texts" + CATEGORY = "Meeeyo/String" + DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo" + + def combine_texts(self, text1, text2, text3, text4, combine_order): + try: + text_map = { + "1": text1, + "2": text2, + "3": text3, + "4": text4 + } + if not combine_order: + combine_order = "1+2+3+4" + parts = combine_order.split("+") + valid_parts = [] + for part in parts: + if part in text_map: + valid_parts.append(part) + else: + return (f"Error: Invalid input '{part}' in combine_order. Valid options are 1, 2, 3, 4.",) + non_empty_texts = [text_map[part] for part in valid_parts if text_map[part]] + result = ",".join(non_empty_texts) + return (result,) + except Exception as e: + return (f"Error: {str(e)}",) + + #======多参数输入 class MultiParamInputNode: @classmethod @@ -153,6 +199,7 @@ class NumberExtractor: RETURN_TYPES = ("INT", "INT") # 返回两个整数 FUNCTION = "process_inputs" +<<<<<<< HEAD OUTPUT_NODE = False CATEGORY = "Meeeyo/String" DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo" @@ -160,6 +207,12 @@ class NumberExtractor: def IS_CHANGED(): return float("NaN") +======= + CATEGORY = "Meeeyo/String" + DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo" + OUTPUT_NODE = False + +>>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70 def process_inputs(self, int1, int2): return (int1, int2) @@ -1360,9 +1413,12 @@ class GenerateVideoPrompt: CATEGORY = "Meeeyo/String" DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo" +<<<<<<< HEAD def IS_CHANGED(): return float("NaN") +======= +>>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70 def generate_prompt(self, input_text, mode): try: if mode == "原文本":