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

Author: timothycarambat

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

@@ -15,6 +15,7 @@ on:
     branches: ['master'] # master branch only. Do not modify.
     paths-ignore:
       - '**.md'
+      - '.gitmodules'
       - 'cloud-deployments/**/*'
       - 'images/**/*'
       - '.vscode/**/*'

.github/workflows/dev-build.yaml

@@ -6,15 +6,17 @@ concurrency:
 
 on:
   push:
-    branches: ['chore/anthropic-model-endpoint'] # put your current branch to create a build. Core team only.
+    branches: ['3157-feat-prompt-variables'] # put your current branch to create a build. Core team only.
     paths-ignore:
       - '**.md'
       - 'cloud-deployments/*'
       - 'images/**/*'
       - '.vscode/**/*'
       - '**/.env.example'
       - '.github/ISSUE_TEMPLATE/**/*'
+      - '.devcontainer/**/*'
       - 'embed/**/*' # Embed should be published to frontend (yarn build:publish) if any changes are introduced
+      - 'browser-extension/**/*' # Chrome extension is submodule
       - 'server/utils/agents/aibitat/example/**/*' # Do not push new image for local dev testing of new aibitat images.
 
 jobs:
@@ -43,6 +45,8 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: v0.19.0
 
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "browser-extension"]
 	path = browser-extension
-	url = git@github.com:Mintplex-Labs/anythingllm-extension.git
+	url = https://github.com/Mintplex-Labs/anythingllm-extension.git
 [submodule "embed"]
 	path = embed
-	url = git@github.com:Mintplex-Labs/anythingllm-embed.git
+	url = https://github.com/Mintplex-Labs/anythingllm-embed.git
 	branch = main

docker/Dockerfile

@@ -131,13 +131,13 @@ WORKDIR /app
 # Install server layer
 # Also pull and build collector deps (chromium issues prevent bad bindings)
 FROM build AS backend-build
-COPY ./server /app/server/
+COPY --chown=anythingllm:anythingllm ./server /app/server/
 WORKDIR /app/server
 RUN yarn install --production --network-timeout 100000 && yarn cache clean
 WORKDIR /app
 
 # Install collector dependencies
-COPY ./collector/ ./collector/
+COPY --chown=anythingllm:anythingllm ./collector/ ./collector/
 WORKDIR /app/collector
 ENV PUPPETEER_DOWNLOAD_BASE_URL=https://storage.googleapis.com/chrome-for-testing-public
 RUN yarn install --production --network-timeout 100000 && yarn cache clean

frontend/package.json

@@ -33,6 +33,7 @@
     "react-device-detect": "^2.2.2",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
+    "react-highlight-words": "^0.21.0",
     "react-i18next": "^14.1.1",
     "react-loading-skeleton": "^3.1.0",
     "react-router-dom": "^6.3.0",
@@ -54,6 +55,7 @@
     "@vitejs/plugin-react": "^4.0.0-beta.0",
     "autoprefixer": "^10.4.14",
     "buffer": "^6.0.3",
+    "cross-env": "^7.0.3",
     "eslint": "^8.50.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-ft-flow": "^3.0.0",
@@ -69,7 +71,6 @@
     "prettier": "^3.0.3",
     "rollup-plugin-visualizer": "^5.9.0",
     "tailwindcss": "^3.3.1",
-    "vite": "^4.3.0",
-    "cross-env": "^7.0.3"
+    "vite": "^4.3.0"
   }
 }

frontend/src/App.jsx

@@ -68,7 +68,6 @@ const LiveDocumentSyncManage = lazy(
   () => import("@/pages/Admin/ExperimentalFeatures/Features/LiveSync/manage")
 );
 const AgentBuilder = lazy(() => import("@/pages/Admin/AgentBuilder"));
-
 const CommunityHubTrending = lazy(
   () => import("@/pages/GeneralSettings/CommunityHub/Trending")
 );
@@ -78,6 +77,9 @@ const CommunityHubAuthentication = lazy(
 const CommunityHubImportItem = lazy(
   () => import("@/pages/GeneralSettings/CommunityHub/ImportItem")
 );
+const SystemPromptVariables = lazy(
+  () => import("@/pages/Admin/SystemPromptVariables")
+);
 
 export default function App() {
   return (
@@ -195,6 +197,10 @@ export default function App() {
                     path="/settings/api-keys"
                     element={<AdminRoute Component={GeneralApiKeys} />}
                   />
+                  <Route
+                    path="/settings/system-prompt-variables"
+                    element={<AdminRoute Component={SystemPromptVariables} />}
+                  />
                   <Route
                     path="/settings/browser-extension"
                     element={

frontend/src/components/SettingsSidebar/index.jsx

@@ -354,6 +354,12 @@ const SidebarOptions = ({ user = null, t }) => (
               flex: true,
               roles: ["admin"],
             },
+            {
+              btnText: t("settings.system-prompt-variables"),
+              href: paths.settings.systemPromptVariables(),
+              flex: true,
+              roles: ["admin"],
+            },
             {
               btnText: t("settings.browser-extension"),
               href: paths.settings.browserExtension(),

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/SlashCommands/SlashPresets/index.jsx

@@ -8,7 +8,7 @@ import { DotsThree, Plus } from "@phosphor-icons/react";
 import showToast from "@/utils/toast";
 
 export const CMD_REGEX = new RegExp(/[^a-zA-Z0-9_-]/g);
-export default function SlashPresets({ setShowing, sendCommand }) {
+export default function SlashPresets({ setShowing, sendCommand, promptRef }) {
   const isActiveAgentSession = useIsAgentSessionActive();
   const {
     isOpen: isAddModalOpen,
@@ -84,6 +84,7 @@ export default function SlashPresets({ setShowing, sendCommand }) {
           onClick={() => {
             setShowing(false);
             sendCommand(`${preset.command} `, false);
+            promptRef?.current?.focus();
           }}
           className="border-none w-full hover:cursor-pointer hover:bg-theme-action-menu-item-hover px-2 py-2 rounded-xl flex flex-row justify-start"
         >

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/SlashCommands/index.jsx

@@ -32,7 +32,7 @@ export default function SlashCommandsButton({ showing, setShowSlashCommand }) {
   );
 }
 
-export function SlashCommands({ showing, setShowing, sendCommand }) {
+export function SlashCommands({ showing, setShowing, sendCommand, promptRef }) {
   const cmdRef = useRef(null);
   useEffect(() => {
     function listenForOutsideClick() {
@@ -58,7 +58,11 @@ export function SlashCommands({ showing, setShowing, sendCommand }) {
         >
           <ResetCommand sendCommand={sendCommand} setShowing={setShowing} />
           <EndAgentSession sendCommand={sendCommand} setShowing={setShowing} />
-          <SlashPresets sendCommand={sendCommand} setShowing={setShowing} />
+          <SlashPresets
+            sendCommand={sendCommand}
+            setShowing={setShowing}
+            promptRef={promptRef}
+          />
         </div>
       </div>
     </div>

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/index.jsx

@@ -237,6 +237,7 @@ export default function PromptInput({
         showing={showSlashCommand}
         setShowing={setShowSlashCommand}
         sendCommand={sendCommand}
+        promptRef={textareaRef}
       />
       <AvailableAgents
         showing={showAgents}