Merge pull request #199 from griptape-ai:remove-ollama-check

Remove-ollama-check
griptape-ai · Dec 23, 2024 · e9b67b9 · e9b67b9
2 parents ca525ad + ef12c37
commit e9b67b9
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -106,6 +106,7 @@ You can previous and download more examples [here](examples/README.md).
 
 ### Dec 24, 2024
  * Fixed missing api key for OpenAI when getting a list of available models.
+ * Removed Ollama's model check using the library in favor of a javascript option.
 
 ### Dec 21, 2024
  * Fixed issue where Griptape Agent Config: Custom Structure node was still requiring OPENAI_API_KEY.

diff --git a/js/ConfigurationNodes.js b/js/ConfigurationNodes.js
@@ -32,9 +32,9 @@ export function setupConfigurationNodes(nodeType, nodeData, app) {
 
 
             let engine = null;
-            // if ((nodeData.name.includes("Ollama")) || (nodeData.name.includes("Griptape Util: Create Agent Modelfile"))) {
-            //   engine="ollama"
-            // }
+            if ((nodeData.name.includes("Ollama")) || (nodeData.name.includes("Griptape Util: Create Agent Modelfile"))) {
+              engine="ollama"
+            }
             if (nodeData.name.includes("LM Studio")) {
               engine="lmstudio"
             }

diff --git a/js/versions.js b/js/versions.js
@@ -1,5 +1,5 @@
 export const versions = {
-  version: "2.0.6",
+  version: "2.0.7",
   releaseDate: "2024-12-24",
   name: "ComfyUI-Griptape",
   description: "Griptape integration for ComfyUI",

diff --git a/nodes/drivers/gtUIOllamaEmbeddingDriver.py b/nodes/drivers/gtUIOllamaEmbeddingDriver.py
@@ -1,17 +1,16 @@
 from griptape.drivers import DummyEmbeddingDriver, OllamaEmbeddingDriver
 
-from ..utils.ollama_utils import get_available_models
 from .gtUIBaseEmbeddingDriver import gtUIBaseEmbeddingDriver
 
 default_port = "11434"
 default_base_url = "http://127.0.0.1"
 
-models = get_available_models()
-DEFAULT_MODEL = ""
-for model in models:
-    if "embed" in model.lower():
-        DEFAULT_MODEL = model
-        break
+# models = get_available_models()
+# DEFAULT_MODEL = ""
+# for model in models:
+#     if "embed" in model.lower():
+#         DEFAULT_MODEL = model
+#         break
 
 
 class gtUIOllamaEmbeddingDriver(gtUIBaseEmbeddingDriver):
@@ -40,8 +39,8 @@ def INPUT_TYPES(s):
         inputs["optional"].update(
             {
                 "embedding_model": (
-                    models,
-                    {"default": DEFAULT_MODEL, "tooltip": "The embedding model to use"},
+                    (),
+                    {"tooltip": "The embedding model to use"},
                 ),
             }
         )

diff --git a/nodes/drivers/gtUIOllamaPromptDriver.py b/nodes/drivers/gtUIOllamaPromptDriver.py
@@ -1,15 +1,14 @@
 from griptape.drivers import OllamaPromptDriver
 
-from ..utils.ollama_utils import get_available_models
 from .gtUIBasePromptDriver import gtUIBasePromptDriver
 
 default_port = "11434"
 default_base_url = "http://127.0.0.1"
 
-models = get_available_models()
-DEFAULT_MODEL = ""
-if len(models) > 0:
-    DEFAULT_MODEL = models[0]
+# models = get_available_models()
+# DEFAULT_MODEL = ""
+# if len(models) > 0:
+#     DEFAULT_MODEL = models[0]
 
 
 class gtUIOllamaPromptDriver(gtUIBasePromptDriver):
@@ -51,8 +50,8 @@ def INPUT_TYPES(s):
         inputs["optional"].update(base_optional_inputs)
         # inputs["optional"]["model"] = ((), {"tooltip": "The prompt model to use"})
         inputs["optional"]["model"] = (
-            models,
-            {"default": DEFAULT_MODEL, "tooltip": "The prompt model to use"},
+            (),
+            {"tooltip": "The prompt model to use"},
         )
         inputs["optional"]["keep_alive"] = (
             "INT",

diff --git a/nodes/utils/gtUICreateAgentModelfile.py b/nodes/utils/gtUICreateAgentModelfile.py
@@ -1,12 +1,12 @@
-from ..utils.ollama_utils import check_ollama_installed, get_available_models
+from ..utils.ollama_utils import check_ollama_installed
 
 default_port = "11434"
 default_base_url = "http://127.0.0.1"
 
-models = get_available_models()
-DEFAULT_MODEL = ""
-if len(models) > 0:
-    DEFAULT_MODEL = models[0]
+# models = get_available_models()
+# DEFAULT_MODEL = ""
+# if len(models) > 0:
+#     DEFAULT_MODEL = models[0]
 
 
 class gtUICreateAgentModelfile:
@@ -31,8 +31,8 @@ def INPUT_TYPES(s):
                     },
                 ),
                 "base_model": (
-                    models,
-                    {"default": DEFAULT_MODEL, "tooltip": "The base model to use"},
+                    (),
+                    {"tooltip": "The base model to use"},
                 ),
                 "agent": ("AGENT", {}),
                 "include_conversation_memory": ("BOOLEAN", {"default": True}),

diff --git a/nodes/utils/gtUIRemoveOllamaModel.py b/nodes/utils/gtUIRemoveOllamaModel.py
@@ -1,17 +1,16 @@
 from .ollama_utils import (
     check_ollama_installed,
     clean_result,
-    get_available_models,
     run_ollama_command,
 )
 
 default_port = "11434"
 default_base_url = "http://127.0.0.1"
 
-models = get_available_models()
-DEFAULT_MODEL = ""
-if len(models) > 0:
-    DEFAULT_MODEL = models[0]
+# models = get_available_models()
+# DEFAULT_MODEL = ""
+# if len(models) > 0:
+#     DEFAULT_MODEL = models[0]
 
 
 class gtUIRemoveOllamaModel:
@@ -36,8 +35,8 @@ def INPUT_TYPES(s):
                     },
                 ),
                 "model": (
-                    models,
-                    {"default": DEFAULT_MODEL, "tooltip": "The model to remove"},
+                    (),
+                    {"tooltip": "The model to remove"},
                 ),
             }
         }