Merge pull request #107 from griptape-ai:dev

Dev
griptape-ai · Aug 20, 2024 · 0ec27f6 · 0ec27f6
2 parents 1bd11dc + b0e2a53
commit 0ec27f6
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -103,6 +103,9 @@ You can previous and download more examples [here](examples/README.md).
 
 ## Recent Changelog
 
+### Aug 21, 2024
+* Fixed querying for models in LMStudio and Ollama on import
+
 ### Aug 20, 2024
 * Update Griptape Framework to v029.2
 * Modified ImageQueryTask to switch to a workflow if more than 2 images are specified

diff --git a/__init__.py b/__init__.py
@@ -185,7 +185,6 @@
 
 # RULES
 from .nodes.rules.gtUIRule import gtUIRule
-from .nodes.Separator import Separator
 
 # TASKS
 # - Audio

diff --git a/nodes/config/gtUILMStudioStructureConfig.py b/nodes/config/gtUILMStudioStructureConfig.py
@@ -7,14 +7,10 @@
     OpenAiChatPromptDriver,
 )
 
-from ..utilities import get_models
 from .gtUIBaseConfig import gtUIBaseConfig
 
 lmstudio_port = "1234"
 lmstudio_base_url = "http://127.0.0.1"
-lmstudio_models = get_models("lmstudio", lmstudio_base_url, lmstudio_port)
-if len(lmstudio_models) == 0:
-    lmstudio_models.append("")
 
 
 class gtUILMStudioStructureConfig(gtUIBaseConfig):

diff --git a/nodes/config/gtUIOllamaStructureConfig.py b/nodes/config/gtUIOllamaStructureConfig.py
@@ -7,13 +7,10 @@
     OllamaPromptDriver,
 )
 
-from ..utilities import get_models
 from .gtUIBaseConfig import gtUIBaseConfig
 
 ollama_port = "11434"
 ollama_base_url = "http://127.0.0.1"
-ollama_models = get_models("ollama", ollama_base_url, ollama_port)
-ollama_models.append("")
 
 
 class gtUIOllamaStructureConfig(gtUIBaseConfig):

diff --git a/nodes/drivers/gtUILMStudioChatPromptDriver.py b/nodes/drivers/gtUILMStudioChatPromptDriver.py
@@ -1,14 +1,10 @@
 from griptape.drivers import OpenAiChatPromptDriver
 
-from ..utilities import get_models
 from .gtUIBasePromptDriver import gtUIBasePromptDriver
 
 default_port = "1234"
 default_base_url = "http://127.0.0.1"
 DEFAULT_API_KEY = "lm_studio"
-models = get_models("lmstudio", default_base_url, default_port)
-if len(models) == 0:
-    models.append("")
 
 
 class gtUILMStudioChatPromptDriver(gtUIBasePromptDriver):

diff --git a/nodes/drivers/gtUIOllamaEmbeddingDriver.py b/nodes/drivers/gtUIOllamaEmbeddingDriver.py
@@ -1,13 +1,9 @@
 from griptape.drivers import OllamaEmbeddingDriver
 
-from ..utilities import get_models
 from .gtUIBaseEmbeddingDriver import gtUIBaseEmbeddingDriver
 
 default_port = "11434"
 default_base_url = "http://127.0.0.1"
-models = get_models("ollama", default_base_url, default_port)
-if len(models) == 0:
-    models.append("")
 
 
 class gtUIOllamaEmbeddingDriver(gtUIBaseEmbeddingDriver):

diff --git a/nodes/drivers/gtUIOllamaPromptDriver.py b/nodes/drivers/gtUIOllamaPromptDriver.py
@@ -1,13 +1,9 @@
 from griptape.drivers import OllamaPromptDriver
 
-from ..utilities import get_models
 from .gtUIBasePromptDriver import gtUIBasePromptDriver
 
 default_port = "11434"
 default_base_url = "http://127.0.0.1"
-models = get_models("ollama", default_base_url, default_port)
-if len(models) == 0:
-    models.append("")
 
 
 class gtUIOllamaPromptDriver(gtUIBasePromptDriver):
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,7 +185,6 @@ @@
     # RULES
     from .nodes.rules.gtUIRule import gtUIRule
-    from .nodes.Separator import Separator
     # TASKS
     # - Audio
@@ Expand Down @@