From 40065c6f476304051dce50c1366048b4209dc4cf Mon Sep 17 00:00:00 2001 From: Jason Schleifer Date: Sat, 21 Dec 2024 05:34:48 +1300 Subject: [PATCH 1/2] removed check for OPENAI_API_KEY from custom structure --- nodes/config/gtUIStructureConfig.py | 40 ++++------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/nodes/config/gtUIStructureConfig.py b/nodes/config/gtUIStructureConfig.py index 954bed4..2fd670b 100644 --- a/nodes/config/gtUIStructureConfig.py +++ b/nodes/config/gtUIStructureConfig.py @@ -7,18 +7,10 @@ DummyImageGenerationDriver, DummyPromptDriver, DummyTextToSpeechDriver, - OpenAiAudioTranscriptionDriver, - OpenAiChatPromptDriver, - OpenAiEmbeddingDriver, - OpenAiImageGenerationDriver, - OpenAiTextToSpeechDriver, ) -from ...py.griptape_settings import GriptapeSettings from ..gtUIBase import gtUIBase -default_env = "OPENAI_API_KEY" - class gtUIStructureConfig(gtUIBase): """ @@ -26,33 +18,11 @@ class gtUIStructureConfig(gtUIBase): """ def __init__(self): - # Check for the default OPENAI_API_KEY being set - settings = GriptapeSettings() - has_openai_key = settings.get_settings_key_or_use_env(default_env) is not None - if not has_openai_key: - self.default_chat_prompt_driver = DummyPromptDriver() - self.default_image_generation_driver = DummyImageGenerationDriver() - self.default_embedding_driver = DummyEmbeddingDriver() - self.default_text_to_speech_driver = DummyTextToSpeechDriver() - self.default_audio_transcription_driver = DummyAudioTranscriptionDriver() - else: - self.default_chat_prompt_driver = OpenAiChatPromptDriver(model="gpt-4o") - self.default_image_generation_driver = OpenAiImageGenerationDriver( - model="dall-e-3" - ) - self.default_chat_prompt_driver = OpenAiChatPromptDriver(model="gpt-4o") - self.default_image_generation_driver = OpenAiImageGenerationDriver( - model="dall-e-3" - ) - self.default_embedding_driver = OpenAiEmbeddingDriver() - self.default_text_to_speech_driver = OpenAiTextToSpeechDriver( - model="tts-1", voice="alloy" - ) - self.default_audio_transcription_driver = OpenAiAudioTranscriptionDriver( - model="whisper-1" - ) - - pass + self.default_chat_prompt_driver = DummyPromptDriver() + self.default_image_generation_driver = DummyImageGenerationDriver() + self.default_embedding_driver = DummyEmbeddingDriver() + self.default_text_to_speech_driver = DummyTextToSpeechDriver() + self.default_audio_transcription_driver = DummyAudioTranscriptionDriver() @classmethod def INPUT_TYPES(s): From c14de5841ec983ae18b71a61a31ebb56fbcee6a4 Mon Sep 17 00:00:00 2001 From: Jason Schleifer Date: Sat, 21 Dec 2024 05:40:13 +1300 Subject: [PATCH 2/2] updated versions and readme --- README.md | 4 ++++ js/versions.js | 4 ++-- pyproject-dev.toml | 31 ------------------------------- pyproject.toml | 6 +++--- requirements.txt | 2 +- 5 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 pyproject-dev.toml diff --git a/README.md b/README.md index 701149e..4cdaf9a 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,10 @@ You can previous and download more examples [here](examples/README.md). ## Recent Changelog +### Dec 21, 2024 + * Fixed issue where Griptape Agent Config: Custom Structure node was still requiring OPENAI_API_KEY. + * Updated to Griptape v1.0.2 + ### Dec 12, 2024 * Updated to Griptape Framework 1.0! * Added check for BlackForest install issues to not block Griptape Nodes running diff --git a/js/versions.js b/js/versions.js index 5285965..8656509 100644 --- a/js/versions.js +++ b/js/versions.js @@ -1,6 +1,6 @@ export const versions = { - version: "2.0.0", - releaseDate: "2024-11-9", + version: "2.0.3", + releaseDate: "2024-12-21", name: "ComfyUI-Griptape", description: "Griptape integration for ComfyUI", author: "Jason Schleifer", diff --git a/pyproject-dev.toml b/pyproject-dev.toml deleted file mode 100644 index d000d97..0000000 --- a/pyproject-dev.toml +++ /dev/null @@ -1,31 +0,0 @@ -[tool.poetry] -name = "comfyui-griptape" -version = "0.1.0" -description = "" -authors = ["Jason Schleifer "] -readme = "README.md" - -[tool.poetry.dependencies] -python = "^3.11" -python-dotenv = "^1.0.1" -griptape = { version = "^0.33.0", extras = ["drivers-image-generation-huggingface","drivers-prompt-cohere","drivers-prompt-anthropic","drivers-prompt-huggingface-hub","drivers-prompt-amazon-bedrock","drivers-prompt-amazon-sagemaker","drivers-prompt-google","drivers-prompt-ollama","drivers-embedding-amazon-bedrock","drivers-embedding-amazon-sagemaker","drivers-embedding-huggingface","drivers-embedding-voyageai","drivers-embedding-google","drivers-embedding-cohere","drivers-embedding-ollama","drivers-vector-pinecone","drivers-vector-marqo","drivers-vector-mongodb","drivers-vector-redis","drivers-vector-opensearch","drivers-vector-pgvector","drivers-vector-postgresql","drivers-vector-qdrant","drivers-web-scraper-trafilatura","drivers-web-scraper-markdownify","drivers-web-search-duckduckgo","loaders-dataframe","loaders-pdf","loaders-image","loaders-email","loaders-audio", "drivers-text-to-speech-elevenlabs"]} -icecream = "^2.1.3" -torch = {version = "^2.3.1+cu121", source = "pytorch-gpu-src"} -torchvision = {version = "^0.18.1+cu121", source = "pytorch-gpu-src"} -torchaudio = {version = "^2.3.1+cu121", source = "pytorch-gpu-src"} -comfy-cli = "^1.1.5" - -[tool.comfy] -PublisherId="shhlife" -DisplayName="Griptape" -Icon="" - -[[tool.poetry.source]] -name = "pytorch-gpu-src" -url = "https://download.pytorch.org/whl/cu121" -priority = "explicit" - - -[build-system] -requires = ["poetry-core"] -build-backend = "poetry.core.masonry.api" diff --git a/pyproject.toml b/pyproject.toml index 1b41b27..79faf6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ readme = "README.md" [tool.poetry.dependencies] python = "^3.11" python-dotenv = "^1.0.1" -griptape = { version = "^1.0.0", extras = ["all"]} +griptape = { version = "^1.0.2", extras = ["all"]} griptape-black-forest = {git = "https://github.com/griptape-ai/griptape-black-forest.git"} [tool.poetry.group.dev.dependencies] @@ -27,9 +27,9 @@ priority = "explicit" [project] name = "comfyui-griptape" description = "Griptape LLM(Large Language Model) Nodes for ComfyUI." -version = "2.0.2" +version = "2.0.3" license = {file = "LICENSE"} -dependencies = ["griptape[all]==^1.0.0", "python-dotenv", "poetry==1.8.4", "griptape-black-forest @ git+https://github.com/griptape-ai/griptape-black-forest.git"] +dependencies = ["griptape[all]==^1.0.2", "python-dotenv", "poetry==1.8.4", "griptape-black-forest @ git+https://github.com/griptape-ai/griptape-black-forest.git"] [project.urls] Repository = "https://github.com/griptape-ai/ComfyUI-Griptape" diff --git a/requirements.txt b/requirements.txt index 21e638c..9fa9b5c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -griptape[all]==1.0.0 +griptape[all]==1.0.2 python-dotenv poetry==1.8.4 git+https://github.com/griptape-ai/griptape-black-forest.git \ No newline at end of file