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

…ender

.devcontainer/devcontainer.json

@@ -22,7 +22,7 @@
     // Terraform support
     "ghcr.io/devcontainers/features/terraform:1": {},
     // Just a wrap to install needed packages
-    "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+    "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
       // Dependencies copied from ../docker/Dockerfile plus some dev stuff
       "packages": [
         "build-essential",

.prettierignore

@@ -10,3 +10,7 @@ frontend/bundleinspector.html
 
 #server
 server/swagger/openapi.json
+
+#embed
+**/static/**
+embed/src/utils/chat/hljs.js

.prettierrc

@@ -17,7 +17,7 @@
       }
     },
     {
-      "files": "*.config.js",
+      "files": ["*.config.js"],
       "options": {
         "semi": false,
         "parser": "flow",

README.md

@@ -29,7 +29,7 @@
 </p>
 
 <p align="center">
-  <b>English</b> · <a href='/README.zh-CN.md'>简体中文</a>
+  <b>English</b> · <a href='./locales/README.zh-CN.md'>简体中文</a> · <a href='./locales/README.ja-JP.md'>日本語</a>
 </p>
 
 <p align="center">
@@ -123,7 +123,7 @@ Some cool features of AnythingLLM
 - [Pinecone](https://pinecone.io)
 - [Chroma](https://trychroma.com)
 - [Weaviate](https://weaviate.io)
-- [QDrant](https://qdrant.tech)
+- [Qdrant](https://qdrant.tech)
 - [Milvus](https://milvus.io)
 - [Zilliz](https://zilliz.com)
 

collector/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "dev": "NODE_ENV=development nodemon --ignore hotdir --ignore storage --trace-warnings index.js",
     "start": "NODE_ENV=production node index.js",
-    "lint": "yarn prettier --write ./processSingleFile ./processLink ./utils index.js"
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./processSingleFile ./processLink ./utils index.js"
   },
   "dependencies": {
     "@googleapis/youtube": "^9.0.0",

collector/utils/extensions/GithubRepo/RepoLoader/index.js

@@ -14,7 +14,11 @@ class RepoLoader {
   #validGithubUrl() {
     const UrlPattern = require("url-pattern");
     const pattern = new UrlPattern(
-      "https\\://github.com/(:author)/(:project(*))"
+      "https\\://github.com/(:author)/(:project(*))",
+      {
+        // fixes project names with special characters (.github)
+        segmentValueCharset: "a-zA-Z0-9-._~%/+",
+      }
     );
     const match = pattern.match(this.repo);
     if (!match) return false;

collector/utils/files/mime.js

@@ -23,6 +23,7 @@ class MimeDetector {
       {
         "text/plain": [
           "ts",
+          "tsx",
           "py",
           "opts",
           "lock",
@@ -35,6 +36,7 @@ class MimeDetector {
           "js",
           "lua",
           "pas",
+          "r",
         ],
       },
       true

docker/.env.example

@@ -128,6 +128,12 @@ GID='1000'
 # VOYAGEAI_API_KEY=
 # EMBEDDING_MODEL_PREF='voyage-large-2-instruct'
 
+# EMBEDDING_ENGINE='litellm'
+# EMBEDDING_MODEL_PREF='text-embedding-ada-002'
+# EMBEDDING_MODEL_MAX_CHUNK_LENGTH=8192
+# LITE_LLM_BASE_PATH='http://127.0.0.1:4000'
+# LITE_LLM_API_KEY='sk-123abc'
+
 ###########################################
 ######## Vector Database Selection ########
 ###########################################
@@ -232,4 +238,10 @@ GID='1000'
 # AGENT_GSE_CTX=
 
 #------ Serper.dev ----------- https://serper.dev/
-# AGENT_SERPER_DEV_KEY=
+# AGENT_SERPER_DEV_KEY=
+
+#------ Bing Search ----------- https://portal.azure.com/
+# AGENT_BING_SEARCH_API_KEY=
+
+#------ Serply.io ----------- https://serply.io/
+# AGENT_SERPLY_API_KEY=

docker/HOW_TO_USE_DOCKER.md

@@ -86,6 +86,49 @@ mintplexlabs/anythingllm;
 
 </td>
 </tr>
+<tr>
+  <td> Docker Compose</td>
+  <td>
+      version: '3.8'
+      services:
+        anythingllm:
+          image: mintplexlabs/anythingllm
+          container_name: anythingllm
+          ports:
+          - "3001:3001"
+          cap_add:
+            - SYS_ADMIN
+          environment:
+          # Adjust for your environemnt
+            - STORAGE_DIR=/app/server/storage
+            - JWT_SECRET="make this a large list of random numbers and letters 20+"
+            - LLM_PROVIDER=ollama
+            - OLLAMA_BASE_PATH=http://127.0.0.1:11434
+            - OLLAMA_MODEL_PREF=llama2
+            - OLLAMA_MODEL_TOKEN_LIMIT=4096
+            - EMBEDDING_ENGINE=ollama
+            - EMBEDDING_BASE_PATH=http://127.0.0.1:11434
+            - EMBEDDING_MODEL_PREF=nomic-embed-text:latest
+            - EMBEDDING_MODEL_MAX_CHUNK_LENGTH=8192
+            - VECTOR_DB=lancedb
+            - WHISPER_PROVIDER=local
+            - TTS_PROVIDER=native
+            - PASSWORDMINCHAR=8
+            - AGENT_SERPER_DEV_KEY="SERPER DEV API KEY"
+            - AGENT_SERPLY_API_KEY="Serply.io API KEY"
+          volumes:
+            - anythingllm_storage:/app/server/storage
+          restart: always
+
+      volumes:
+        anythingllm_storage:
+          driver: local
+          driver_opts:
+            type: none
+            o: bind
+            device: /path/on/local/disk
+  </td>
+</tr>
 </table>
 
 Go to `http://localhost:3001` and you are now using AnythingLLM! All your data and progress will persist between

embed/jsconfig.json

@@ -4,9 +4,7 @@
     "target": "esnext",
     "jsx": "react",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ],
-    }
-  }
-}
+      "@/*": ["./src/*"],
+    },
+  },
+}

embed/package.json

@@ -1,14 +1,15 @@
 {
   "name": "anythingllm-embedded-chat",
   "private": false,
+  "license": "MIT",
   "type": "module",
   "scripts": {
     "dev": "nodemon -e js,jsx,css --watch src --exec \"yarn run dev:preview\"",
     "dev:preview": "yarn run dev:build && yarn serve . -p 3080 --no-clipboard",
     "dev:build": "vite build && cat src/static/[email protected] >> dist/anythingllm-chat-widget.js",
     "build": "vite build && cat src/static/[email protected] >> dist/anythingllm-chat-widget.js && npx terser --compress -o dist/anythingllm-chat-widget.min.js -- dist/anythingllm-chat-widget.js",
     "build:publish": "yarn build && mkdir -p ../frontend/public/embed && cp -r dist/anythingllm-chat-widget.min.js ../frontend/public/embed/anythingllm-chat-widget.min.js",
-    "lint": "yarn prettier --write ./src"
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./src"
   },
   "dependencies": {
     "@microsoft/fetch-event-source": "^2.0.1",

embed/vite.config.js

@@ -38,7 +38,7 @@ export default defineConfig({
     rollupOptions: {
       external: [
         // Reduces transformation time by 50% and we don't even use this variant, so we can ignore.
-        /@phosphor-icons\/react\/dist\/ssr/,
+        /@phosphor-icons\/react\/dist\/ssr/
       ]
     },
     commonjsOptions: {
@@ -51,7 +51,7 @@ export default defineConfig({
     emptyOutDir: true,
     inlineDynamicImports: true,
     assetsDir: "",
-    sourcemap: 'inline',
+    sourcemap: "inline"
   },
   optimizeDeps: {
     esbuildOptions: {
@@ -60,5 +60,5 @@ export default defineConfig({
       },
       plugins: []
     }
-  },
+  }
 })

frontend/jsconfig.json

@@ -4,9 +4,7 @@
     "target": "esnext",
     "jsx": "react",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ],
+      "@/*": ["./src/*"]
     }
   }
-}
+}

frontend/package.json

@@ -7,7 +7,7 @@
     "start": "vite --open",
     "dev": "NODE_ENV=development vite --debug --host=0.0.0.0",
     "build": "vite build",
-    "lint": "yarn prettier --write ./src",
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./src",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -19,6 +19,7 @@
     "file-saver": "^2.0.5",
     "he": "^1.2.0",
     "highlight.js": "^11.9.0",
+    "js-levenshtein": "^1.1.6",
     "lodash.debounce": "^4.0.8",
     "markdown-it": "^13.0.1",
     "pluralize": "^8.0.0",

frontend/src/LogoContext.jsx

@@ -1,27 +1,41 @@
 import { createContext, useEffect, useState } from "react";
 import AnythingLLM from "./media/logo/anything-llm.png";
+import DefaultLoginLogo from "./media/illustrations/login-logo.svg";
 import System from "./models/system";
 
 export const LogoContext = createContext();
 
 export function LogoProvider({ children }) {
   const [logo, setLogo] = useState("");
+  const [loginLogo, setLoginLogo] = useState("");
+  const [isCustomLogo, setIsCustomLogo] = useState(false);
 
   useEffect(() => {
     async function fetchInstanceLogo() {
       try {
-        const logoURL = await System.fetchLogo();
-        logoURL ? setLogo(logoURL) : setLogo(AnythingLLM);
+        const { isCustomLogo, logoURL } = await System.fetchLogo();
+        if (logoURL) {
+          setLogo(logoURL);
+          setLoginLogo(isCustomLogo ? logoURL : DefaultLoginLogo);
+          setIsCustomLogo(isCustomLogo);
+        } else {
+          setLogo(AnythingLLM);
+          setLoginLogo(DefaultLoginLogo);
+          setIsCustomLogo(false);
+        }
       } catch (err) {
         setLogo(AnythingLLM);
+        setLoginLogo(DefaultLoginLogo);
+        setIsCustomLogo(false);
         console.error("Failed to fetch logo:", err);
       }
     }
+
     fetchInstanceLogo();
   }, []);
 
   return (
-    <LogoContext.Provider value={{ logo, setLogo }}>
+    <LogoContext.Provider value={{ logo, setLogo, loginLogo, isCustomLogo }}>
       {children}
     </LogoContext.Provider>
   );

frontend/src/components/ChatBubble/index.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Jazzicon from "../UserIcon";
+import UserIcon from "../UserIcon";
 import { userFromStorage } from "@/utils/request";
 import { AI_BACKGROUND_COLOR, USER_BACKGROUND_COLOR } from "@/utils/constants";
 
@@ -11,8 +11,7 @@ export default function ChatBubble({ message, type, popMsg }) {
     <div className={`flex justify-center items-end w-full ${backgroundColor}`}>
       <div className={`py-8 px-4 w-full flex gap-x-5 md:max-w-[80%] flex-col`}>
         <div className="flex gap-x-5">
-          <Jazzicon
-            size={36}
+          <UserIcon
             user={{ uid: isUser ? userFromStorage()?.username : "system" }}
             role={type}
           />