diff --git a/js/versions.js b/js/versions.js index 2937a3b..1312fec 100644 --- a/js/versions.js +++ b/js/versions.js @@ -1,5 +1,5 @@ export const versions = { - version: "2.0.4", + version: "2.0.5", releaseDate: "2024-12-21", name: "ComfyUI-Griptape", description: "Griptape integration for ComfyUI", diff --git a/nodes/drivers/gtUIOpenAiAudioTranscriptionDriver.py b/nodes/drivers/gtUIOpenAiAudioTranscriptionDriver.py index 54caddc..4dd0d4b 100644 --- a/nodes/drivers/gtUIOpenAiAudioTranscriptionDriver.py +++ b/nodes/drivers/gtUIOpenAiAudioTranscriptionDriver.py @@ -4,7 +4,9 @@ from ..utils.openai_utils import get_available_models from .gtUIBaseAudioTranscriptionDriver import gtUIBaseAudioTranscriptionDriver models = get_available_models("AudioModel") -# models = ["whisper-1"] +DEFAULT_MODEL = "" +if len(models) > 0: + DEFAULT_MODEL = models[0] DEFAULT_API_KEY = "OPENAI_API_KEY" @@ -21,7 +23,7 @@ class gtUIOpenAiAudioTranscriptionDriver(gtUIBaseAudioTranscriptionDriver): "audio_transcription_model": ( models, { - "default": models[0], + "default": DEFAULT_MODEL, "tooltip": "Select the audio transcription model to use.", }, ), @@ -38,7 +40,7 @@ class gtUIOpenAiAudioTranscriptionDriver(gtUIBaseAudioTranscriptionDriver): return inputs def build_params(self, **kwargs): - model = kwargs.get("audio_transcription_model", models[0]) + model = kwargs.get("audio_transcription_model", DEFAULT_MODEL) api_key = self.getenv(kwargs.get("api_key_env_var", DEFAULT_API_KEY)) params = {} diff --git a/nodes/drivers/gtUIOpenAiChatPromptDriver.py b/nodes/drivers/gtUIOpenAiChatPromptDriver.py index 2a6850b..c3d05ec 100644 --- a/nodes/drivers/gtUIOpenAiChatPromptDriver.py +++ b/nodes/drivers/gtUIOpenAiChatPromptDriver.py @@ -4,6 +4,7 @@ from ..utils.openai_utils import get_available_models from .gtUIBasePromptDriver import gtUIBasePromptDriver models = get_available_models("ChatModel") + DEFAULT_MODEL = "gpt-4o-mini" DEFAULT_API_KEY = "OPENAI_API_KEY" diff --git a/nodes/drivers/gtUIOpenAiEmbeddingDriver.py b/nodes/drivers/gtUIOpenAiEmbeddingDriver.py index 0aa5707..29b1611 100644 --- a/nodes/drivers/gtUIOpenAiEmbeddingDriver.py +++ b/nodes/drivers/gtUIOpenAiEmbeddingDriver.py @@ -5,6 +5,9 @@ from .gtUIBaseEmbeddingDriver import gtUIBaseEmbeddingDriver models = get_available_models("EmbeddingModel") # models = ["text-embedding-3-small", "text-embedding-3-large", "text-embedding-ada-002"] +DEFAULT_MODEL = "" +if len(models) > 0: + DEFAULT_MODEL = models[0] DEFAULT_API_KEY = "OPENAI_API_KEY" @@ -22,7 +25,7 @@ class gtUIOpenAiEmbeddingDriver(gtUIBaseEmbeddingDriver): "embedding_model": ( models, { - "default": models[0], + "default": DEFAULT_MODEL, "tooltip": "Select the embedding model to use.", }, ), diff --git a/nodes/drivers/gtUIOpenAiTextToSpeechDriver.py b/nodes/drivers/gtUIOpenAiTextToSpeechDriver.py index 77a3c4b..ae59747 100644 --- a/nodes/drivers/gtUIOpenAiTextToSpeechDriver.py +++ b/nodes/drivers/gtUIOpenAiTextToSpeechDriver.py @@ -5,7 +5,7 @@ from .gtUIBaseTextToSpeechDriver import gtUIBaseTextToSpeechDriver voices = ["alloy", "echo", "fable", "onyx", "nova", "shimmer"] models = get_available_models("SpeechModel") -default_model = "tts-1" +DEFAULT_MODEL = "tts-1" DEFAULT_API_KEY = "OPENAI_API_KEY" @@ -22,7 +22,7 @@ class gtUIOpenAiTextToSpeechDriver(gtUIBaseTextToSpeechDriver): "text_to_speech_model": ( models, { - "default": models[0], + "default": DEFAULT_MODEL, "tooltip": "Enter the text-to-speech model name.", }, ), @@ -48,7 +48,7 @@ class gtUIOpenAiTextToSpeechDriver(gtUIBaseTextToSpeechDriver): def build_params(self, **kwargs): api_key = self.getenv(kwargs.get("api_key_env_var", DEFAULT_API_KEY)) - model = kwargs.get("text_to_speech_model", models[0]) + model = kwargs.get("text_to_speech_model", DEFAULT_MODEL) voice = kwargs.get("voice", voices[0]) params = {} diff --git a/pyproject.toml b/pyproject.toml index 6ce085c..fefb306 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "comfyui-griptape" -version = "2.0.4" +version = "2.0.5" description = "Griptape LLM(Large Language Model) Nodes for ComfyUI." authors = ["Jason Schleifer "] readme = "README.md" @@ -27,7 +27,7 @@ priority = "explicit" [project] name = "comfyui-griptape" description = "Griptape LLM(Large Language Model) Nodes for ComfyUI." -version = "2.0.4" +version = "2.0.5" license = {file = "LICENSE"} 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"]