Added patch, and bot shows error when model is not downloaded

ZeyoYT · Aug 28, 2024 · 523e424 · 523e424
1 parent 73fafa3
commit 523e424
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/me/ailama/commands/AiCommand.java b/src/main/java/me/ailama/commands/AiCommand.java
@@ -69,6 +69,11 @@ public void handleCommand(SlashCommandInteractionEvent event) {
 
         String userId = event.getUser().getId();
 
+        if(modelOption != null && !OllamaManager.getInstance().hasModel(modelOption)) {
+            event.getHook().sendMessage("The model you provided is invalid, please provide a valid model").setEphemeral(true).queue();
+            return;
+        }
+
         if(resetSession) {
             OllamaManager.getInstance().getChatMemory(userId).clear();
         }

diff --git a/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java b/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java
@@ -416,12 +416,7 @@ public AiServices<Assistant> createAssistantX(String modelName) {
     public Assistant createAssistant(String modelName, String userID) {
 
         Assistant assistant = getAssistantFromID(userID);
-        if(assistant != null && !isTooledAssistant) {
-
-            if(modelName != null && !modelName.equals(model)) {
-                return createAssistant(modelName, userID);
-            }
-
+        if(assistant != null && !isTooledAssistant && modelName != null) {
             return assistant;
         }