Merge pull request #157 from griptape-ai:dev

* Upgrade to Griptape Framework v0.34.1 * Fix to `WebScraperTool` provides better results when using `off_prompt`. * Fixed bug where urls were dropping any text after the `:`. Example: "What is https://griptape.ai" was being converted to "What is https:". This is due to the `dynamicprompt` functionality of ComfyUI, so I've disabled that. * Added context string to all BOOLEAN parameters to give the user a better idea as to what the particular boolean option does. For example, intead of just `True` or `False`, the tools now explain `off_prompt`.
griptape-ai · Nov 5, 2024 · 4f21c45 · 4f21c45
2 parents 76e52ac + 2f03102
commit 4f21c45
Show file tree

Hide file tree

Showing 18 changed files with 113 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -104,8 +104,13 @@ You can previous and download more examples [here](examples/README.md).
 
 ## Recent Changelog
 
-### Nov 5, 2024
+### Nov 6, 2024
+* Upgrade to Griptape Framework v0.34.1
+  * Fix to `WebScraperTool` provides better results when using `off_prompt`.
 * Fixed bug where urls were dropping any text after the `:`. Example: "What is https://griptape.ai" was being converted to "What is https:". This is due to the `dynamicprompt` functionality of ComfyUI, so I've disabled that.
+* Added context string to all BOOLEAN parameters to give the user a better idea as to what the particular boolean option does. For example, intead of just `True` or `False`, the tools now explain `off_prompt`.
+
+  ![WebsScraper tool with off_prompt](docs/images/off_prompt_parameter.png)
 
 ### Nov 4, 2024
 * Fixed bug where OPENAI_API_KEY was still required, and was causing some install issues.

diff --git a/docs/images/off_prompt_parameter.png b/docs/images/off_prompt_parameter.png
diff --git a/js/versions.js b/js/versions.js
@@ -1,11 +1,18 @@
 export const versions = {
-  "version": "0.34.0g",
+  "version": "0.34.1",
   "releaseDate": "2024-11-5",
   "name": "ComfyUI-Griptape",
   "description": "Griptape integration for ComfyUI",
   "author": "Jason Schleifer",
   "repository": "https://github.com/griptape-ai/ComfyUI-Griptape",
   "changelog": [
+    {
+      "version": "0.34.1",
+      "date": "2024-11-6",
+      "changes": [
+        "Fixed issue with `dynamicprompt` inputs",
+      ]
+    }, 
     {
       "version": "0.34.0g",
       "date": "2024-11-5",

diff --git a/nodes/config/depricated/gtUILMStudioStructureConfig.py b/nodes/config/depricated/gtUILMStudioStructureConfig.py
@@ -37,7 +37,14 @@ def INPUT_TYPES(s):
         )
         inputs["optional"].update(
             {
-                "use_native_tools": ("BOOLEAN", {"default": False}),
+                "use_native_tools": (
+                    "BOOLEAN",
+                    {
+                        "default": False,
+                        "label_on": "True (LLM-native tool calling)",
+                        "label_off": "False (Griptape tool calling)",
+                    },
+                ),
             }
         )
         return inputs

diff --git a/nodes/config/gtUIBaseConfig.py b/nodes/config/gtUIBaseConfig.py
@@ -49,7 +49,14 @@ def INPUT_TYPES(s):
                 ),
                 # "stream": ([True, False], {"default": False}),
                 "env": ("ENV", {"default": None}),
-                "use_native_tools": ("BOOLEAN", {"default": True}),
+                "use_native_tools": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "label_on": "True (LLM-native tool calling)",
+                        "label_off": "False (Griptape tool calling)",
+                    },
+                ),
                 "max_tokens": (
                     "INT",
                     {

diff --git a/nodes/drivers/gtUIBasePromptDriver.py b/nodes/drivers/gtUIBasePromptDriver.py
@@ -11,7 +11,6 @@ def INPUT_TYPES(s):
         inputs["optional"].update(
             {
                 "model": ("STRING", {"tooltip": "The prompt model to use"}),
-                # "stream": ("BOOLEAN", {"default": False, "tooltip": "Enable or disable streaming"}),
                 "max_attempts_on_fail": (
                     "INT",
                     {
@@ -40,7 +39,12 @@ def INPUT_TYPES(s):
                 ),
                 "use_native_tools": (
                     "BOOLEAN",
-                    {"default": True, "tooltip": "Use native tools for the LLM."},
+                    {
+                        "default": True,
+                        "tooltip": "Use native tools for the LLM.",
+                        "label_on": "True (LLM-native tool calling)",
+                        "label_off": "False (Griptape tool calling)",
+                    },
                 ),
                 "max_tokens": (
                     "INT",

diff --git a/nodes/drivers/gtUILMStudioChatPromptDriver.py b/nodes/drivers/gtUILMStudioChatPromptDriver.py
@@ -34,7 +34,12 @@ def INPUT_TYPES(s):
                 ),
                 "use_native_tools": (
                     "BOOLEAN",
-                    {"default": False, "tooltip": "Whether to use native tools."},
+                    {
+                        "default": False,
+                        "tooltip": "Whether to use native tools.",
+                        "label_on": "True (LLM-native tool calling)",
+                        "label_off": "False (Griptape tool calling)",
+                    },
                 ),
                 "api_key": (
                     "STRING",

diff --git a/nodes/drivers/gtUILMStudioEmbeddingDriver.py b/nodes/drivers/gtUILMStudioEmbeddingDriver.py
@@ -39,6 +39,8 @@ def INPUT_TYPES(s):
                     {
                         "default": False,
                         "tooltip": "Enable or disable the use of native tools.",
+                        "label_on": "True (LLM-native tool calling)",
+                        "label_off": "False (Griptape tool calling)",
                     },
                 ),
                 "api_key": (

diff --git a/nodes/drivers/gtUILeonardoImageGenerationDriver.py b/nodes/drivers/gtUILeonardoImageGenerationDriver.py
@@ -87,7 +87,12 @@ def INPUT_TYPES(s):
                 ),
                 "use_custom_model": (
                     "BOOLEAN",
-                    {"default": False, "tooltip": "Enable to use a custom model ID."},
+                    {
+                        "default": False,
+                        "tooltip": "Enable to use a custom model ID.",
+                        "label_on": "True (Use Custom Model ID)",
+                        "label_off": "False (Choose from model list)",
+                    },
                 ),
                 "custom_model": (
                     "STRING",

diff --git a/nodes/drivers/gtUILocalVectorStoreDriver.py b/nodes/drivers/gtUILocalVectorStoreDriver.py
@@ -21,6 +21,8 @@ def INPUT_TYPES(s):
                     {
                         "default": False,
                         "tooltip": "Enable or disable persistence to a file.",
+                        "label_on": "True (Save data to file)",
+                        "label_off": "False (Keep data in memory)",
                     },
                 ),
                 "persist_filename": (

diff --git a/nodes/tools/gtUIAudioTranscriptionClient.py b/nodes/tools/gtUIAudioTranscriptionClient.py
@@ -15,7 +15,16 @@ class gtUIAudioTranscriptionClient(gtUIBaseTool):
     @classmethod
     def INPUT_TYPES(s):
         return {
-            "required": {"off_prompt": ("BOOLEAN", {"default": True})},
+            "required": {
+                "off_prompt": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "label_on": "True (Keep output private)",
+                        "label_off": "False (Provide output to LLM)",
+                    },
+                )
+            },
             "optional": {"driver": ("DRIVER", {"default": None})},
         }
 

diff --git a/nodes/tools/gtUIBaseTool.py b/nodes/tools/gtUIBaseTool.py
@@ -12,7 +12,16 @@ def __init__(self):
     @classmethod
     def INPUT_TYPES(s):
         return {
-            "required": {"off_prompt": ("BOOLEAN", {"default": False})},
+            "required": {
+                "off_prompt": (
+                    "BOOLEAN",
+                    {
+                        "default": False,
+                        "label_on": "True (Keep output private)",
+                        "label_off": "False (Provide output to LLM)",
+                    },
+                )
+            },
             "optional": {},
             "hidden": {},
         }

diff --git a/nodes/tools/gtUIFileManager.py b/nodes/tools/gtUIFileManager.py
@@ -15,7 +15,16 @@ class gtUIFileManager(gtUIBaseTool):
     @classmethod
     def INPUT_TYPES(s):
         return {
-            "required": {"off_prompt": ("BOOLEAN", {"default": True})},
+            "required": {
+                "off_prompt": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "label_on": "True (Keep output private)",
+                        "label_off": "False (Provide output to LLM)",
+                    },
+                )
+            },
         }
 
     def create(self, off_prompt, workdir=""):

diff --git a/nodes/tools/gtUIKnowledgeBaseTool.py b/nodes/tools/gtUIKnowledgeBaseTool.py
@@ -19,7 +19,14 @@ class gtUIKnowledgeBaseTool(gtUIBaseTool):
     def INPUT_TYPES(s):
         return {
             "required": {
-                "off_prompt": ("BOOLEAN", {"default": False}),
+                "off_prompt": (
+                    "BOOLEAN",
+                    {
+                        "default": False,
+                        "label_on": "True (Keep output private)",
+                        "label_off": "False (Provide output to LLM)",
+                    },
+                ),
                 "api_key_environment_variable": (
                     "STRING",
                     {"default": "GRIPTAPE_CLOUD_API_KEY"},

diff --git a/nodes/tools/gtUITextToSpeechClient.py b/nodes/tools/gtUITextToSpeechClient.py
@@ -20,7 +20,16 @@ def INPUT_TYPES(s):
         # return inputs
 
         return {
-            "required": {"off_prompt": ("BOOLEAN", {"default": True})},
+            "required": {
+                "off_prompt": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "label_on": "True (Keep output private)",
+                        "label_off": "False (Provide output to LLM)",
+                    },
+                )
+            },
             "optional": {"driver": ("TEXT_TO_SPEECH_DRIVER", {"default": None})},
         }
 

diff --git a/nodes/utils/gtUICreateAgentModelfile.py b/nodes/utils/gtUICreateAgentModelfile.py
@@ -28,7 +28,14 @@ def INPUT_TYPES(s):
                 "base_model": ((), {}),
                 "agent": ("AGENT", {}),
                 "include_conversation_memory": ("BOOLEAN", {"default": True}),
-                "include_rulesets": ("BOOLEAN", {"default": True}),
+                "include_rulesets": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "label_on": "True (Use default rulesets)",
+                        "label_off": "False (Create your own rulesets)",
+                    },
+                ),
             }
         }
         return inputs

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,14 +1,14 @@
 [tool.poetry]
 name = "comfyui-griptape"
-version = "1.0.18"
+version = "1.0.19"
 description = "Griptape LLM(Large Language Model) Nodes for ComfyUI."
 authors = ["Jason Schleifer <[email protected]>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
 python-dotenv = "^1.0.1"
-griptape = { version = "^0.34.0", extras = ["all"]}
+griptape = { version = "^0.34.1", extras = ["all"]}
 
 [tool.poetry.group.dev.dependencies]
 icecream = "^2.1.3"
@@ -26,9 +26,9 @@ priority = "explicit"
 [project]
 name = "comfyui-griptape"
 description = "Griptape LLM(Large Language Model) Nodes for ComfyUI."
-version = "1.0.18"
+version = "1.0.19"
 license = {file = "LICENSE"}
-dependencies = ["griptape[all]==0.34.0", "python-dotenv"]
+dependencies = ["griptape[all]==0.34.1", "python-dotenv"]
 
 [project.urls]
 Repository = "https://github.com/griptape-ai/ComfyUI-Griptape"

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-griptape[all]==0.34.0
+griptape[all]==0.34.1
 python-dotenv