refactor: adapt ai client factory to also handle ollama models

Author: nickchecan

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/auth/SessionManager.java

@@ -21,10 +21,10 @@ public abstract class SessionManager {
 
 
     public static boolean isUserLoggedIn() {
-    	return (isSapSessionOn() || isOllamaSessionOn()) ? true : false;
+    	return (isSapSession() || isOllamaSession()) ? true : false;
     }
 
-    private static boolean isSapSessionOn() {
+    public static boolean isSapSession() {
         MemoryAccessToken memoryAccessToken = MemoryAccessToken.getInstance();
         MemoryServiceKey memoryServiceKey = MemoryServiceKey.getInstance();
         MemoryResourceGroup memoryResourceGroup = MemoryResourceGroup.getInstance();
@@ -34,7 +34,7 @@ private static boolean isSapSessionOn() {
                 || memoryDeployment.isEmpty()) ? false : true;
     }
 
-    private static boolean isOllamaSessionOn() {
+    public static boolean isOllamaSession() {
         MemoryOllamaEndpoint memoryOllamaEndpoint = MemoryOllamaEndpoint.getInstance();
         MemoryOllamaModel memoryOllamaModel = MemoryOllamaModel.getInstance();
 

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/chat/AIClientFactory.java

@@ -4,6 +4,7 @@
 
 import com.developer.nefarious.zjoule.plugin.auth.AuthClient;
 import com.developer.nefarious.zjoule.plugin.auth.AuthClientHelper;
+import com.developer.nefarious.zjoule.plugin.auth.SessionManager;
 import com.developer.nefarious.zjoule.plugin.chat.memory.MemoryMessageHistory;
 import com.developer.nefarious.zjoule.plugin.chat.openai.OpenAIClient;
 import com.developer.nefarious.zjoule.plugin.chat.openai.OpenAIClientHelper;
@@ -29,8 +30,17 @@ public abstract class AIClientFactory {
      * @return an instance of {@link IAIClient} for the corresponding model, or {@code null} if unsupported.
      */
     public static IAIClient getClient() {
-
-        // Load memory components for access token, service key, resource group, deployment, and message history.
+        if (SessionManager.isSapSession()) {
+        	return getClientForSapAiCore();
+        } else if (SessionManager.isOllamaSession()) {
+        	return getClientForOllama();
+        } else {
+        	return null;
+        }
+    }
+    
+    private static IAIClient getClientForSapAiCore() {
+    	// Load memory components for access token, service key, resource group, deployment, and message history.
         MemoryAccessToken memoryAccessToken = MemoryAccessToken.getInstance();
         MemoryServiceKey memoryServiceKey = MemoryServiceKey.getInstance();
         MemoryResourceGroup memoryResourceGroup = MemoryResourceGroup.getInstance();
@@ -52,6 +62,11 @@ public static IAIClient getClient() {
             return null;
         }
     }
+    
+    private static IAIClient getClientForOllama() {
+    	return null;
+    
+    }
 
     /**
      * Checks if the given model name corresponds to an OpenAI model.

com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/chat/AIClientFactoryTest.java renamed to com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/chat/AIClientFactorySapTest.java

@@ -12,6 +12,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.MockitoAnnotations;
 
+import com.developer.nefarious.zjoule.plugin.auth.SessionManager;
 import com.developer.nefarious.zjoule.plugin.chat.AIClientFactory;
 import com.developer.nefarious.zjoule.plugin.chat.IAIClient;
 import com.developer.nefarious.zjoule.plugin.chat.memory.MemoryMessageHistory;
@@ -22,8 +23,10 @@
 import com.developer.nefarious.zjoule.plugin.memory.MemoryServiceKey;
 import com.developer.nefarious.zjoule.plugin.models.Deployment;
 
-public class AIClientFactoryTest {
-
+public class AIClientFactorySapTest {
+	
+	private MockedStatic<SessionManager> mockStaticSessionManager;
+	
 	private MockedStatic<MemoryAccessToken> mockStaticMemoryAccessToken;
 
 	private MockedStatic<MemoryServiceKey> mockStaticMemoryServiceKey;
@@ -61,12 +64,15 @@ public void setUp() {
 		mockStaticMemoryResourceGroup = mockStatic(MemoryResourceGroup.class);
 		mockStaticMemoryDeployment = mockStatic(MemoryDeployment.class);
 		mockStaticMemoryMessageHistory = mockStatic(MemoryMessageHistory.class);
+		mockStaticSessionManager = mockStatic(SessionManager.class);
 
 		mockStaticMemoryAccessToken.when(MemoryAccessToken::getInstance).thenReturn(mockMemoryAccessToken);
 		mockStaticMemoryServiceKey.when(MemoryServiceKey::getInstance).thenReturn(mockMemoryServiceKey);
 		mockStaticMemoryResourceGroup.when(MemoryResourceGroup::getInstance).thenReturn(mockMemoryResourceGroup);
 		mockStaticMemoryDeployment.when(MemoryDeployment::getInstance).thenReturn(mockMemoryDeployment);
 		mockStaticMemoryMessageHistory.when(MemoryMessageHistory::getInstance).thenReturn(mockMemoryMessageHistory);
+		mockStaticSessionManager.when(SessionManager::isSapSession).thenReturn(true);
+		mockStaticSessionManager.when(SessionManager::isOllamaSession).thenReturn(false);
 
 		when(mockMemoryDeployment.load()).thenReturn(mockDeployment);
 	}
@@ -138,6 +144,9 @@ public void tearDown() {
 		if (mockStaticMemoryMessageHistory != null) {
 			mockStaticMemoryMessageHistory.close();
 		}
+		if (mockStaticSessionManager != null) {
+			mockStaticSessionManager.close();
+		}
 	}
 
 }