Fixed Model Switching in AI Command and Model Command

ZeyoYT · Sep 15, 2024 · b54b6fe · b54b6fe
1 parent 23a71c6
commit b54b6fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/me/ailama/commands/AiCommand.java b/src/main/java/me/ailama/commands/AiCommand.java
@@ -71,6 +71,7 @@ public void handleCommand(SlashCommandInteractionEvent event) {
 
         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) {

diff --git a/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java b/src/main/java/me/ailama/handler/commandhandler/OllamaManager.java
@@ -416,7 +416,8 @@ public AiServices<Assistant> createAssistantX(String modelName) {
     public Assistant createAssistant(String modelName, String userID) {
 
         Assistant assistant = getAssistantFromID(userID);
-        if(assistant != null && !isTooledAssistant && modelName != null) {
+
+        if(assistant != null && !isTooledAssistant && modelName == null) {
             return assistant;
         }
 
@@ -529,7 +530,7 @@ public void setModel(String model, String userId) {
         }
 
         assistants.remove(userId);
-        assistants.put(userId, createAssistant(model, userId));
+        createAssistant(model, userId);
     }
 
     public boolean hasModel(String model) {