Concatenate Nodes is now Merge Nodes

This commit is contained in:
Jason Schleifer
2024-05-19 13:12:05 +12:00
parent 9cee16a867
commit c54c4ef962
2 changed files with 10 additions and 15 deletions
+7 -7
View File
@@ -12,7 +12,7 @@ from dotenv import load_dotenv
# Load the griptape_config.json data
from .nodes.agent import CreateAgent, ExpandAgent
from .nodes.combine_nodes import ConcatenateStrings, ToolList
from .nodes.combine_nodes import MergeStrings, ToolList
from .nodes.config import (
gtUIAmazonBedrockStructureConfig,
gtUIAnthropicStructureConfig,
@@ -94,7 +94,7 @@ NODE_CLASS_MAPPINGS = {
"WebScraper": gtUIWebScraper,
"gtUIFileManager": gtUIFileManager,
"ToolList": ToolList,
"ConcatenateStrings": ConcatenateStrings,
"MergeStrings": MergeStrings,
"PromptTask": gtUIPromptTask,
"ToolTask": gtUIToolTask,
"ToolkitTask": gtUIToolkitTask,
@@ -114,10 +114,10 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"PromptImageGenerationTask": "Griptape Create: Image from Text",
"PromptImageVariationTask": "Griptape Create: Image Variation",
"Rule": "Griptape Create: Rules",
"gtUIOpenAiImageGenerationDriver": "Griptape Driver: OpenAI Image Generation",
"gtUIAmazonBedrockStableDiffusionImageGenerationDriver": "Griptape Driver: Amazon Bedrock Stable Diffusion Image Generation",
"gtUIAmazonBedrockTitanImageGenerationDriver": "Griptape Driver: Amazon Bedrock Titan Image Generation",
"gtUILeonardoImageGenerationDriver": "Griptape Driver: Leonardo Image Generation",
"gtUIOpenAiImageGenerationDriver": "Griptape Driver: OpenAI",
"gtUIAmazonBedrockStableDiffusionImageGenerationDriver": "Griptape Driver: Amazon Bedrock Stable Diffusion",
"gtUIAmazonBedrockTitanImageGenerationDriver": "Griptape Driver: Amazon Bedrock Titan",
"gtUILeonardoImageGenerationDriver": "Griptape Driver: Leonardo.AI",
"gtUIOutputStringNode": "Griptape Display: String",
"gtUIOutputImageNode": "Griptape Display: Image",
"ImageQueryTask": "Griptape Run: Image Description",
@@ -135,7 +135,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"WebScraper": "Griptape Tool: WebScraper",
"gtUIFileManager": "Griptape Tool: FileManager",
"ToolList": "Griptape Combine: Tool List",
"ConcatenateStrings": "Griptape Combine: Concatenate Strings",
"MergeStrings": "Griptape Combine: Merge Strings",
}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
+3 -8
View File
@@ -1,6 +1,6 @@
class ConcatenateStrings:
class MergeStrings:
"""
Concatenate Strings
Merge Strings
"""
def __init__(self):
@@ -15,7 +15,6 @@ class ConcatenateStrings:
"string_2": ("STRING", {"forceInput": True}),
"string_3": ("STRING", {"forceInput": True}),
"string_4": ("STRING", {"forceInput": True}),
"separator": ("STRING", {"default": "\\n"}),
},
}
@@ -31,13 +30,9 @@ class ConcatenateStrings:
string_2="",
string_3="",
string_4="",
separator="\n",
):
# If the user enters \n, we need to convert it to a newline
separator = separator.replace("\\n", "\n")
# Join strings by newline
concatenated_string = separator.join(
concatenated_string = "\n\n".join(
[
string
for string in [string_1, string_2, string_3, string_4]