diff --git a/CHANGELOG.md b/CHANGELOG.md index f64cf17..34ba71d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --> +## [2.2.12] - 2025-01-03 +### Added +- Added `Griptape Display: Text as Markdown` node. +### Changed +- Reverted the `Griptape Display: Text` node back to just displaying text. + + ![Display Text and Markdown Images](docs/images/display_text_and_display_markdown.png) + ## [2.2.11] - 2025-28-02 ### Added - Added `min_p` and/or `top_k` to prompt drivers that support them. diff --git a/__init__.py b/__init__.py index ed9b56e..3483a41 100644 --- a/__init__.py +++ b/__init__.py @@ -77,6 +77,7 @@ from .nodes.display.gtUIOutputDataNode import gtUIOutputDataNode from .nodes.display.gtUIOutputDictionaryNode import gtUIOutputDictionaryNode from .nodes.display.gtUIOutputImageNode import gtUIOutputImageNode +from .nodes.display.gtUIOutputMarkdownNode import gtUIOutputMarkdownNode from .nodes.display.gtUIOutputStringNode import gtUIOutputStringNode # DRIVERS @@ -465,6 +466,7 @@ # DISPLAY "Griptape Display: Image": gtUIOutputImageNode, "Griptape Display: Text": gtUIOutputStringNode, + "Griptape Display: Text as Markdown": gtUIOutputMarkdownNode, "Griptape Display: Data as Text": gtUIOutputDataNode, "Griptape Display: Dictionary": gtUIOutputDictionaryNode, # AUDIO diff --git a/docs/images/display_text_and_display_markdown.png b/docs/images/display_text_and_display_markdown.png new file mode 100644 index 0000000..d6dd5a1 Binary files /dev/null and b/docs/images/display_text_and_display_markdown.png differ diff --git a/js/DisplayNodes.js b/js/DisplayNodes.js index a0e9c43..e6bb9bf 100644 --- a/js/DisplayNodes.js +++ b/js/DisplayNodes.js @@ -4,7 +4,10 @@ import { formatAndDisplayJSON } from "./gtUIUtils.js"; export function setupDisplayNodes(nodeType, nodeData, app) { if (nodeData.name === "Griptape Display: Artifact") { setupArtifactDisplayNode(nodeType, nodeData, app); - } else if (nodeData.name === "Griptape Display: Text") { + } else if ( + nodeData.name === "Griptape Display: Text" || + nodeData.name === "Griptape Display: Text as Markdown" + ) { setupTextDisplayNode(nodeType, nodeData, app); } else if (nodeData.name === "Griptape Display: Data as Text") { setupDataAsTextDisplayNode(nodeType, nodeData, app); diff --git a/nodes/display/gtUIOutputMarkdownNode.py b/nodes/display/gtUIOutputMarkdownNode.py new file mode 100644 index 0000000..cc6cd5c --- /dev/null +++ b/nodes/display/gtUIOutputMarkdownNode.py @@ -0,0 +1,12 @@ +from .gtUIOutputStringNode import gtUIOutputStringNode + + +class gtUIOutputMarkdownNode(gtUIOutputStringNode): + NAME = "Griptape Display: Text as Markdown" + DESCRIPTION = "Display string output as Markdown" + + @classmethod + def INPUT_TYPES(cls): + inputs = super().INPUT_TYPES() + inputs["optional"]["STRING"] = ("MARKDOWN", {"multiline": True}) + return inputs diff --git a/nodes/display/gtUIOutputStringNode.py b/nodes/display/gtUIOutputStringNode.py index 433dd39..7bf408f 100644 --- a/nodes/display/gtUIOutputStringNode.py +++ b/nodes/display/gtUIOutputStringNode.py @@ -9,7 +9,7 @@ def INPUT_TYPES(cls): "required": {}, "optional": { "INPUT": ("STRING", {"forceInput": True, "multiline": True}), - "STRING": ("MARKDOWN", {"multiline": True}), + "STRING": ("STRING", {"multiline": True}), }, } diff --git a/pyproject.toml b/pyproject.toml index 92c617d..7bf386b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "comfyui-griptape" -version = "2.2.11" +version = "2.2.12" description = "Griptape LLM(Large Language Model) Nodes for ComfyUI." authors = ["Jason Schleifer "] readme = "README.md" @@ -9,7 +9,7 @@ readme = "README.md" [project] name = "comfyui-griptape" description = "Griptape LLM(Large Language Model) Nodes for ComfyUI." -version = "2.2.11" +version = "2.2.12" license = {file = "LICENSE"} dependencies = ["attrs>=24.3.0,<26.0.0", "openai>=1.58.1,<2.0.0", "griptape[all]>=1.4.0", "python-dotenv", "poetry==1.8.5", "griptape-black-forest @ git+https://github.com/griptape-ai/griptape-black-forest.git", "griptape_serper_driver_extension @ git+https://github.com/mertdeveci5/griptape-serper-driver-extension.git"]