update isOpenSourceModel

elastic · Oct 7, 2024 · 1008079 · 1008079
1 parent 9fc41f1
commit 1008079
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/x-pack/plugins/elastic_assistant/server/routes/utils.test.ts b/x-pack/plugins/elastic_assistant/server/routes/utils.test.ts
@@ -65,5 +65,17 @@ describe('Utils', () => {
       const isOpenModel = isOpenSourceModel(connector);
       expect(isOpenModel).toEqual(true);
     });
+
+    it('should return `true` when apiProvider of OpenAiProviderType.Other is specified', async () => {
+      const connector = {
+        actionTypeId: '.gen-ai',
+        config: {
+          apiUrl: OPENAI_CHAT_URL,
+          apiProvider: OpenAiProviderType.Other,
+        },
+      } as unknown as Connector;
+      const isOpenModel = isOpenSourceModel(connector);
+      expect(isOpenModel).toEqual(true);
+    });
   });
 });
diff --git a/x-pack/plugins/elastic_assistant/server/routes/utils.ts b/x-pack/plugins/elastic_assistant/server/routes/utils.ts
@@ -201,19 +201,25 @@ export const isOpenSourceModel = (connector?: Connector): boolean => {
   }
 
   const llmType = getLlmType(connector.actionTypeId);
-  const connectorApiUrl = connector.config?.apiUrl
-    ? (connector.config.apiUrl as string)
-    : undefined;
+  const isOpenAiType = llmType === 'openai';
+
+  if (!isOpenAiType) {
+    return false;
+  }
   const connectorApiProvider = connector.config?.apiProvider
     ? (connector.config?.apiProvider as OpenAiProviderType)
     : undefined;
+  if (connectorApiProvider === OpenAiProviderType.Other) {
+    return true;
+  }
 
-  const isOpenAiType = llmType === 'openai';
-  const isOpenAI =
-    isOpenAiType &&
-    (!connectorApiUrl ||
-      connectorApiUrl === OPENAI_CHAT_URL ||
-      connectorApiProvider === OpenAiProviderType.AzureAi);
+  const connectorApiUrl = connector.config?.apiUrl
+    ? (connector.config.apiUrl as string)
+    : undefined;
 
-  return isOpenAiType && !isOpenAI;
+  return (
+    !!connectorApiUrl &&
+    connectorApiUrl !== OPENAI_CHAT_URL &&
+    connectorApiProvider !== OpenAiProviderType.AzureAi
+  );
 };