Merge branch 'master' of github.com:Mintplex-Labs/anything-llm into render

Author: timothycarambat

.github/workflows/build-and-push-image-semver.yaml

@@ -102,7 +102,7 @@ jobs:
           CVE_EXCEPTIONS: ${{ steps.cve-list.outputs.CVE_EXCEPTIONS }}
         run: |
           echo $CVE_EXCEPTIONS
-          curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s -- v1.15.1
+          curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s --
           for cve in $CVE_EXCEPTIONS; do
             for tag in "${{ join(fromJSON(steps.meta.outputs.json).tags, ' ') }}"; do
               echo "Attaching VEX exception $cve to $tag"

.github/workflows/build-and-push-image.yaml

@@ -121,7 +121,7 @@ jobs:
           CVE_EXCEPTIONS: ${{ steps.cve-list.outputs.CVE_EXCEPTIONS }}
         run: |
           echo $CVE_EXCEPTIONS
-          curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s -- v1.15.1
+          curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s --
           for cve in $CVE_EXCEPTIONS; do
             for tag in "${{ join(fromJSON(steps.meta.outputs.json).tags, ' ') }}"; do
               echo "Attaching VEX exception $cve to $tag"

.github/workflows/dev-build.yaml

@@ -101,7 +101,7 @@ jobs:
           CVE_EXCEPTIONS: ${{ steps.cve-list.outputs.CVE_EXCEPTIONS }}
         run: |
           echo $CVE_EXCEPTIONS
-          curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s -- v1.15.1
+          curl -sSfL https://raw.githubusercontent.com/docker/scout-cli/main/install.sh | sh -s --
           for cve in $CVE_EXCEPTIONS; do
             for tag in "${{ join(fromJSON(steps.meta.outputs.json).tags, ' ') }}"; do
               echo "Attaching VEX exception $cve to $tag"

server/endpoints/api/workspace/index.js

@@ -123,6 +123,7 @@ function apiWorkspaceEndpoints(app) {
             select: {
               user_id: true,
               slug: true,
+              name: true,
             },
           },
         },

server/utils/AiProviders/apipie/index.js

@@ -1,8 +1,4 @@
 const { NativeEmbedder } = require("../../EmbeddingEngines/native");
-const {
-  handleDefaultStreamResponseV2,
-} = require("../../helpers/chat/responses");
-
 const { v4: uuidv4 } = require("uuid");
 const {
   writeResponseChunk,
@@ -98,6 +94,24 @@ class ApiPieLLM {
     );
   }
 
+  chatModels() {
+    const allModels = this.models();
+    return Object.entries(allModels).reduce(
+      (chatModels, [modelId, modelInfo]) => {
+        // Filter for chat models
+        if (
+          modelInfo.subtype &&
+          (modelInfo.subtype.includes("chat") ||
+            modelInfo.subtype.includes("chatx"))
+        ) {
+          chatModels[modelId] = modelInfo;
+        }
+        return chatModels;
+      },
+      {}
+    );
+  }
+
   streamingEnabled() {
     return "streamGetChatCompletion" in this;
   }
@@ -114,13 +128,13 @@ class ApiPieLLM {
   }
 
   promptWindowLimit() {
-    const availableModels = this.models();
+    const availableModels = this.chatModels();
     return availableModels[this.model]?.maxLength || 4096;
   }
 
   async isValidChatCompletionModel(model = "") {
     await this.#syncModels();
-    const availableModels = this.models();
+    const availableModels = this.chatModels();
     return availableModels.hasOwnProperty(model);
   }
 
@@ -189,22 +203,20 @@ class ApiPieLLM {
     return result.choices[0].message.content;
   }
 
-  // APIPie says it supports streaming, but it does not work across all models and providers.
-  // Notably, it is not working for OpenRouter models at all.
-  // async streamGetChatCompletion(messages = null, { temperature = 0.7 }) {
-  //   if (!(await this.isValidChatCompletionModel(this.model)))
-  //     throw new Error(
-  //       `ApiPie chat: ${this.model} is not valid for chat completion!`
-  //     );
-
-  //   const streamRequest = await this.openai.chat.completions.create({
-  //     model: this.model,
-  //     stream: true,
-  //     messages,
-  //     temperature,
-  //   });
-  //   return streamRequest;
-  // }
+  async streamGetChatCompletion(messages = null, { temperature = 0.7 }) {
+    if (!(await this.isValidChatCompletionModel(this.model)))
+      throw new Error(
+        `ApiPie chat: ${this.model} is not valid for chat completion!`
+      );
+
+    const streamRequest = await this.openai.chat.completions.create({
+      model: this.model,
+      stream: true,
+      messages,
+      temperature,
+    });
+    return streamRequest;
+  }
 
   handleStream(response, stream, responseProps) {
     const { uuid = uuidv4(), sources = [] } = responseProps;
@@ -264,10 +276,6 @@ class ApiPieLLM {
     });
   }
 
-  // handleStream(response, stream, responseProps) {
-  //   return handleDefaultStreamResponseV2(response, stream, responseProps);
-  // }
-
   // Simple wrapper for dynamic embedder & normalize interface for all LLM implementations
   async embedTextInput(textInput) {
     return await this.embedder.embedTextInput(textInput);
@@ -300,6 +308,7 @@ async function fetchApiPieModels(providedApiKey = null) {
           id: `${model.provider}/${model.model}`,
           name: `${model.provider}/${model.model}`,
           organization: model.provider,
+          subtype: model.subtype,
           maxLength: model.max_tokens,
         };
       });

server/utils/helpers/customModels.js

@@ -401,13 +401,21 @@ async function getAPIPieModels(apiKey = null) {
   if (!Object.keys(knownModels).length === 0)
     return { models: [], error: null };
 
-  const models = Object.values(knownModels).map((model) => {
-    return {
-      id: model.id,
-      organization: model.organization,
-      name: model.name,
-    };
-  });
+  const models = Object.values(knownModels)
+    .filter((model) => {
+      // Filter for chat models
+      return (
+        model.subtype &&
+        (model.subtype.includes("chat") || model.subtype.includes("chatx"))
+      );
+    })
+    .map((model) => {
+      return {
+        id: model.id,
+        organization: model.organization,
+        name: model.name,
+      };
+    });
   return { models, error: null };
 }