docs: add crisp chat

2024-03-26 14:50:39 -04:00
1173 changed files with 34186 additions and 134860 deletions
--- a/.env.example
+++ b/.env.example
@@ -2,9 +2,11 @@
 #                       LibreChat Configuration                       #
 #=====================================================================#
 # Please refer to the reference documentation for assistance          #
-# with configuring your LibreChat environment.                        #
-#                                                                     #
-# https://www.librechat.ai/docs/configuration/dotenv                  #
+# with configuring your LibreChat environment. The guide is           #
+# available both online and within your local LibreChat               #
+# directory:                                                          #
+# Online: https://docs.librechat.ai/install/configuration/dotenv.html #
+# Locally: ./docs/install/configuration/dotenv.md                     #
 #=====================================================================#

 #==================================================#
@@ -21,13 +23,6 @@ DOMAIN_SERVER=http://localhost:3080

 NO_INDEX=true

-#===============#
-# JSON Logging  #
-#===============#
-
-# Use when process console logs in cloud deployment like GCP/AWS
-CONSOLE_JSON=false
-
 #===============#
 # Debug Logging #
 #===============#
@@ -60,35 +55,30 @@ PROXY=
 #===================================#
 # Known Endpoints - librechat.yaml  #
 #===================================#
-# https://www.librechat.ai/docs/configuration/librechat_yaml/ai_endpoints
+# https://docs.librechat.ai/install/configuration/ai_endpoints.html

-# ANYSCALE_API_KEY=
-# APIPIE_API_KEY=
-# COHERE_API_KEY=
-# DEEPSEEK_API_KEY=
-# DATABRICKS_API_KEY=
-# FIREWORKS_API_KEY=
 # GROQ_API_KEY=
-# HUGGINGFACE_TOKEN=
-# MISTRAL_API_KEY=
+# SHUTTLEAI_KEY=
 # OPENROUTER_KEY=
+# MISTRAL_API_KEY=
+# ANYSCALE_API_KEY=
+# FIREWORKS_API_KEY=
 # PERPLEXITY_API_KEY=
-# SHUTTLEAI_API_KEY=
 # TOGETHERAI_API_KEY=
-# UNIFY_API_KEY=

 #============#
 # Anthropic  #
 #============#

 ANTHROPIC_API_KEY=user_provided
-# ANTHROPIC_MODELS=claude-3-5-sonnet-20240620,claude-3-opus-20240229,claude-3-sonnet-20240229,claude-3-haiku-20240307,claude-2.1,claude-2,claude-1.2,claude-1,claude-1-100k,claude-instant-1,claude-instant-1-100k
+# ANTHROPIC_MODELS=claude-3-opus-20240229,claude-3-sonnet-20240229,claude-2.1,claude-2,claude-1.2,claude-1,claude-1-100k,claude-instant-1,claude-instant-1-100k
 # ANTHROPIC_REVERSE_PROXY=

 #============#
 # Azure      #
 #============#

+
 # Note: these variables are DEPRECATED
 # Use the `librechat.yaml` configuration for `azureOpenAI` instead
 # You may also continue to use them if you opt out of using the `librechat.yaml` configuration
@@ -116,40 +106,15 @@ BINGAI_TOKEN=user_provided
 #============#

 GOOGLE_KEY=user_provided
+# GOOGLE_MODELS=gemini-pro,gemini-pro-vision,chat-bison,chat-bison-32k,codechat-bison,codechat-bison-32k,text-bison,text-bison-32k,text-unicorn,code-gecko,code-bison,code-bison-32k
 # GOOGLE_REVERSE_PROXY=

-# Gemini API (AI Studio)
-# GOOGLE_MODELS=gemini-1.5-flash-latest,gemini-1.0-pro,gemini-1.0-pro-001,gemini-1.0-pro-latest,gemini-1.0-pro-vision-latest,gemini-1.5-pro-latest,gemini-pro,gemini-pro-vision
-
-# Vertex AI
-# GOOGLE_MODELS=gemini-1.5-flash-preview-0514,gemini-1.5-pro-preview-0514,gemini-1.0-pro-vision-001,gemini-1.0-pro-002,gemini-1.0-pro-001,gemini-pro-vision,gemini-1.0-pro
-
-# GOOGLE_TITLE_MODEL=gemini-pro
-
-# Google Safety Settings
-# NOTE: These settings apply to both Vertex AI and Gemini API (AI Studio)
-#
-# For Vertex AI:
-# To use the BLOCK_NONE setting, you need either:
-# (a) Access through an allowlist via your Google account team, or
-# (b) Switch to monthly invoiced billing: https://cloud.google.com/billing/docs/how-to/invoiced-billing
-#
-# For Gemini API (AI Studio):
-# BLOCK_NONE is available by default, no special account requirements.
-#
-# Available options: BLOCK_NONE, BLOCK_ONLY_HIGH, BLOCK_MEDIUM_AND_ABOVE, BLOCK_LOW_AND_ABOVE
-#
-# GOOGLE_SAFETY_SEXUALLY_EXPLICIT=BLOCK_ONLY_HIGH
-# GOOGLE_SAFETY_HATE_SPEECH=BLOCK_ONLY_HIGH
-# GOOGLE_SAFETY_HARASSMENT=BLOCK_ONLY_HIGH
-# GOOGLE_SAFETY_DANGEROUS_CONTENT=BLOCK_ONLY_HIGH
-
 #============#
 # OpenAI     #
 #============#

 OPENAI_API_KEY=user_provided
-# OPENAI_MODELS=gpt-4o,chatgpt-4o-latest,gpt-4o-mini,gpt-3.5-turbo-0125,gpt-3.5-turbo-0301,gpt-3.5-turbo,gpt-4,gpt-4-0613,gpt-4-vision-preview,gpt-3.5-turbo-0613,gpt-3.5-turbo-16k-0613,gpt-4-0125-preview,gpt-4-turbo-preview,gpt-4-1106-preview,gpt-3.5-turbo-1106,gpt-3.5-turbo-instruct,gpt-3.5-turbo-instruct-0914,gpt-3.5-turbo-16k
+# OPENAI_MODELS=gpt-3.5-turbo-0125,gpt-3.5-turbo-0301,gpt-3.5-turbo,gpt-4,gpt-4-0613,gpt-4-vision-preview,gpt-3.5-turbo-0613,gpt-3.5-turbo-16k-0613,gpt-4-0125-preview,gpt-4-turbo-preview,gpt-4-1106-preview,gpt-3.5-turbo-1106,gpt-3.5-turbo-instruct,gpt-3.5-turbo-instruct-0914,gpt-3.5-turbo-16k

 DEBUG_OPENAI=false

@@ -163,7 +128,7 @@ DEBUG_OPENAI=false

 # OPENAI_REVERSE_PROXY=

-# OPENAI_ORGANIZATION=
+# OPENAI_ORGANIZATION= 

 #====================#
 #   Assistants API   #
@@ -171,29 +136,19 @@ DEBUG_OPENAI=false

 ASSISTANTS_API_KEY=user_provided
 # ASSISTANTS_BASE_URL=
-# ASSISTANTS_MODELS=gpt-4o,gpt-4o-mini,gpt-3.5-turbo-0125,gpt-3.5-turbo-16k-0613,gpt-3.5-turbo-16k,gpt-3.5-turbo,gpt-4,gpt-4-0314,gpt-4-32k-0314,gpt-4-0613,gpt-3.5-turbo-0613,gpt-3.5-turbo-1106,gpt-4-0125-preview,gpt-4-turbo-preview,gpt-4-1106-preview
-
-#==========================#
-#   Azure Assistants API   #
-#==========================#
-
-# Note: You should map your credentials with custom variables according to your Azure OpenAI Configuration
-# The models for Azure Assistants are also determined by your Azure OpenAI configuration.
-
-# More info, including how to enable use of Assistants with Azure here:
-# https://www.librechat.ai/docs/configuration/librechat_yaml/ai_endpoints/azure#using-assistants-with-azure
+# ASSISTANTS_MODELS=gpt-3.5-turbo-0125,gpt-3.5-turbo-16k-0613,gpt-3.5-turbo-16k,gpt-3.5-turbo,gpt-4,gpt-4-0314,gpt-4-32k-0314,gpt-4-0613,gpt-3.5-turbo-0613,gpt-3.5-turbo-1106,gpt-4-0125-preview,gpt-4-turbo-preview,gpt-4-1106-preview

 #============#
 # OpenRouter #
 #============#
-# !!!Warning: Use the variable above instead of this one. Using this one will override the OpenAI endpoint
+
 # OPENROUTER_API_KEY=

 #============#
 # Plugins    #
 #============#

-# PLUGIN_MODELS=gpt-4o,gpt-4o-mini,gpt-4,gpt-4-turbo-preview,gpt-4-0125-preview,gpt-4-1106-preview,gpt-4-0613,gpt-3.5-turbo,gpt-3.5-turbo-0125,gpt-3.5-turbo-1106,gpt-3.5-turbo-0613
+# PLUGIN_MODELS=gpt-4,gpt-4-turbo-preview,gpt-4-0125-preview,gpt-4-1106-preview,gpt-4-0613,gpt-3.5-turbo,gpt-3.5-turbo-0125,gpt-3.5-turbo-1106,gpt-3.5-turbo-0613

 DEBUG_PLUGINS=true

@@ -230,7 +185,7 @@ AZURE_AI_SEARCH_SEARCH_OPTION_SELECT=

 # Google
 #-----------------
-GOOGLE_SEARCH_API_KEY=
+GOOGLE_API_KEY=
 GOOGLE_CSE_ID=

 # SerpAPI
@@ -266,23 +221,6 @@ MEILI_NO_ANALYTICS=true
 MEILI_HOST=http://0.0.0.0:7700
 MEILI_MASTER_KEY=DrhYf7zENyR6AlUCKmnz0eYASOQdl6zxH7s7MKFSfFCt

-#==================================================#
-#          Speech to Text & Text to Speech         #
-#==================================================#
-
-STT_API_KEY=
-TTS_API_KEY=
-
-#==================================================#
-#                        RAG                       #
-#==================================================#
-# More info: https://www.librechat.ai/docs/configuration/rag_api
-
-# RAG_OPENAI_BASEURL=
-# RAG_OPENAI_API_KEY=
-# EMBEDDINGS_PROVIDER=openai
-# EMBEDDINGS_MODEL=text-embedding-3-small
-
 #===================================================#
 #                    User System                    #
 #===================================================#
@@ -337,9 +275,6 @@ ALLOW_EMAIL_LOGIN=true
 ALLOW_REGISTRATION=true
 ALLOW_SOCIAL_LOGIN=false
 ALLOW_SOCIAL_REGISTRATION=false
-ALLOW_PASSWORD_RESET=false
-# ALLOW_ACCOUNT_DELETION=true # note: enabled by default if omitted/commented out
-ALLOW_UNVERIFIED_EMAIL_LOGIN=true

 SESSION_EXPIRY=1000 * 60 * 15
 REFRESH_TOKEN_EXPIRY=(1000 * 60 * 60 * 24) * 7
@@ -374,39 +309,23 @@ OPENID_ISSUER=
 OPENID_SESSION_SECRET=
 OPENID_SCOPE="openid profile email"
 OPENID_CALLBACK_URL=/oauth/openid/callback
-OPENID_REQUIRED_ROLE=
-OPENID_REQUIRED_ROLE_TOKEN_KIND=
-OPENID_REQUIRED_ROLE_PARAMETER_PATH=

 OPENID_BUTTON_LABEL=
 OPENID_IMAGE_URL=

-# LDAP
-LDAP_URL=
-LDAP_BIND_DN=
-LDAP_BIND_CREDENTIALS=
-LDAP_USER_SEARCH_BASE=
-LDAP_SEARCH_FILTER=mail={{username}}
-LDAP_CA_CERT_PATH=
-# LDAP_TLS_REJECT_UNAUTHORIZED=
-# LDAP_LOGIN_USES_USERNAME=true
-# LDAP_ID=
-# LDAP_USERNAME=
-# LDAP_FULL_NAME=
-
 #========================#
 # Email Password Reset   #
 #========================#

-EMAIL_SERVICE=
-EMAIL_HOST=
-EMAIL_PORT=25
-EMAIL_ENCRYPTION=
-EMAIL_ENCRYPTION_HOSTNAME=
-EMAIL_ALLOW_SELFSIGNED=
-EMAIL_USERNAME=
-EMAIL_PASSWORD=
-EMAIL_FROM_NAME=
+EMAIL_SERVICE=                  
+EMAIL_HOST=                     
+EMAIL_PORT=25                   
+EMAIL_ENCRYPTION=               
+EMAIL_ENCRYPTION_HOSTNAME=      
+EMAIL_ALLOW_SELFSIGNED=         
+EMAIL_USERNAME=                 
+EMAIL_PASSWORD=                 
+EMAIL_FROM_NAME=                
 EMAIL_FROM=noreply@librechat.ai

 #========================#
@@ -420,25 +339,6 @@ FIREBASE_STORAGE_BUCKET=
 FIREBASE_MESSAGING_SENDER_ID=
 FIREBASE_APP_ID=

-#========================#
-# Shared Links           #
-#========================#
-
-ALLOW_SHARED_LINKS=true
-ALLOW_SHARED_LINKS_PUBLIC=true
-
-#==============================#
-# Static File Cache Control    #
-#==============================#
-
-# Leave commented out to use defaults: 1 day (86400 seconds) for s-maxage and 2 days (172800 seconds) for max-age
-# NODE_ENV must be set to production for these to take effect
-# STATIC_CACHE_MAX_AGE=172800
-# STATIC_CACHE_S_MAX_AGE=86400
-
-# If you have another service in front of your LibreChat doing compression, disable express based compression here
-# DISABLE_COMPRESSION=true
-
 #===================================================#
 #                        UI                         #
 #===================================================#
@@ -449,9 +349,6 @@ HELP_AND_FAQ_URL=https://librechat.ai

 # SHOW_BIRTHDAY_ICON=true

-# Google tag manager id
-#ANALYTICS_GTM_ID=user provided google tag manager id
-
 #==================================================#
 #                      Others                      #
 #==================================================#
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,7 +12,6 @@ module.exports = {
    'plugin:react-hooks/recommended',
    'plugin:jest/recommended',
    'prettier',
-    'plugin:jsx-a11y/recommended',
  ],
  ignorePatterns: [
    'client/dist/**/*',
@@ -33,7 +32,7 @@ module.exports = {
      jsx: true,
    },
  },
-  plugins: ['react', 'react-hooks', '@typescript-eslint', 'import', 'jsx-a11y'],
+  plugins: ['react', 'react-hooks', '@typescript-eslint', 'import'],
  rules: {
    'react/react-in-jsx-scope': 'off',
    '@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': 'allow' }],
@@ -66,7 +65,6 @@ module.exports = {
    'no-restricted-syntax': 'off',
    'react/prop-types': ['off'],
    'react/display-name': ['off'],
-    'no-nested-ternary': 'error',
    'no-unused-vars': ['error', { varsIgnorePattern: '^_' }],
    quotes: ['error', 'single'],
  },
@@ -120,8 +118,6 @@ module.exports = {
      ],
      rules: {
        '@typescript-eslint/no-explicit-any': 'error',
-        '@typescript-eslint/no-unnecessary-condition': 'warn',
-        '@typescript-eslint/strict-boolean-expressions': 'warn',
      },
    },
    {
@@ -136,13 +132,6 @@ module.exports = {
        },
      ],
    },
-    {
-      files: './config/translations/**/*.ts',
-      parser: '@typescript-eslint/parser',
-      parserOptions: {
-        project: './config/translations/tsconfig.json',
-      },
-    },
    {
      files: ['./packages/data-provider/specs/**/*.ts'],
      parserOptions: {
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -126,18 +126,6 @@ Apply the following naming conventions to branches, labels, and other Git-relate
      
   - **Current Stance**: At present, this backend transition is of lower priority and might not be pursued.

-## 7. Module Import Conventions
-
- `npm` packages first, 
-     - from shortest line (top) to longest (bottom)
-
- Followed by typescript types (pertains to data-provider and client workspaces)
-     - longest line (top) to shortest (bottom)
-     - types from package come first
-
- Lastly, local imports
-     - longest line (top) to shortest (bottom)
-     - imports with alias `~` treated the same as relative import with respect to line length

 ---

--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -50,7 +50,7 @@ body:
    id: terms
    attributes:
      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/danny-avila/LibreChat/blob/main/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/danny-avila/LibreChat/blob/main/CODE_OF_CONDUCT.md)
      options:
        - label: I agree to follow this project's Code of Conduct
          required: true
--- a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
@@ -43,7 +43,7 @@ body:
    id: terms
    attributes:
      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/danny-avila/LibreChat/blob/main/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/danny-avila/LibreChat/blob/main/CODE_OF_CONDUCT.md)
      options:
        - label: I agree to follow this project's Code of Conduct
          required: true
--- a/.github/ISSUE_TEMPLATE/QUESTION.yml
+++ b/.github/ISSUE_TEMPLATE/QUESTION.yml
@@ -44,7 +44,7 @@ body:
    id: terms
    attributes:
      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/danny-avila/LibreChat/blob/main/.github/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/danny-avila/LibreChat/blob/main/CODE_OF_CONDUCT.md)
      options:
        - label: I agree to follow this project's Code of Conduct
          required: true
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,10 +1,7 @@
 # Pull Request Template

-⚠️ Before Submitting a PR, Please Review:
- Please ensure that you have thoroughly read and understood the [Contributing Docs](https://github.com/danny-avila/LibreChat/blob/main/.github/CONTRIBUTING.md) before submitting your Pull Request.

-⚠️ Documentation Updates Notice:
- Kindly note that documentation updates are managed in this repository: [librechat.ai](https://github.com/LibreChat-AI/librechat.ai)
+### ⚠️ Before Submitting a PR, read the [Contributing Docs](https://github.com/danny-avila/LibreChat/blob/main/.github/CONTRIBUTING.md) in full!

 ## Summary

@@ -19,6 +16,8 @@ Please delete any irrelevant options.
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] This change requires a documentation update
 - [ ] Translation update
+- [ ] Documentation update
+

 ## Testing

@@ -38,4 +37,4 @@ Please delete any irrelevant options.
 - [ ] I have written tests demonstrating that my changes are effective or that my feature works
 - [ ] Local unit tests pass with my changes
 - [ ] Any changes dependent on mine have been merged and published in downstream modules.
- [ ] A pull request for updating the documentation has been submitted.
+- [ ] New documents have been locally validated with mkdocs
--- a/.github/workflows/a11y.yml
+++ b/.github/workflows/a11y.yml
@@ -1,26 +0,0 @@
-name: Lint for accessibility issues
-
-on:
-  pull_request:
-    paths:
-      - 'client/src/**'
-  workflow_dispatch:
-    inputs:
-      run_workflow:
-        description: 'Set to true to run this workflow'
-        required: true
-        default: 'false'
-
-jobs:
-  axe-linter:
-    runs-on: ubuntu-latest
-    if: >
-      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'danny-avila/LibreChat') ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.run_workflow == 'true')
-    
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dequelabs/axe-linter-action@v1
-        with:
-          api_key: ${{ secrets.AXE_LINTER_API_KEY }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/backend-review.yml
+++ b/.github/workflows/backend-review.yml
@@ -51,9 +51,6 @@ jobs:
            exit 1
          fi

-      - name: Prepare .env.test file
-        run: cp api/test/.env.test.example api/test/.env.test
-
      - name: Run unit tests
        run: cd api && npm run test:ci

@@ -63,4 +60,4 @@ jobs:
      - name: Run linters
        uses: wearerequired/lint-action@v2
        with:
-          eslint: true
+          eslint: true
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -0,0 +1,83 @@
+name: Docker Compose Build on Tag
+
+# The workflow is triggered when a tag is pushed
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Check out the repository
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Set up Docker
+      - 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
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Prepare Docker Build
+      - name: Build Docker images
+        run: |
+          cp .env.example .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}}
+
+      - 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
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -1,41 +0,0 @@
-name: Update Test Server
-
-on:
-  workflow_run:
-    workflows: ["Docker Dev Images Build"]
-    types:
-      - completed
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'danny-avila/LibreChat' &&
-      (github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success')
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Install SSH Key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.DO_SSH_PRIVATE_KEY }}
-        known_hosts: ${{ secrets.DO_KNOWN_HOSTS }}
-
-    - name: Run update script on DigitalOcean Droplet
-      env:
-        DO_HOST: ${{ secrets.DO_HOST }}
-        DO_USER: ${{ secrets.DO_USER }}
-      run: |
-        ssh -o StrictHostKeyChecking=no ${DO_USER}@${DO_HOST} << EOF
-        sudo -i -u danny bash << EEOF
-        cd ~/LibreChat && \
-        git fetch origin main && \
-        npm run update:deployed && \
-        git checkout do-deploy && \
-        git rebase main && \
-        npm run start:deployed && \
-        echo "Update completed. Application should be running now."
-        EEOF
-        EOF
--- a/.github/workflows/frontend-review.yml
+++ b/.github/workflows/frontend-review.yml
@@ -1,6 +1,11 @@
+#github action to run unit tests for frontend with jest
 name: Frontend Unit Tests
-
 on:
+  # push:
+  #   branches: 
+  #     - main
+  #     - dev
+  #     - release/*
  pull_request:
    branches: 
      - main
@@ -9,10 +14,9 @@ on:
    paths:
      - 'client/**'
      - 'packages/**'
-
 jobs:
-  tests_frontend_ubuntu:
-    name: Run frontend unit tests on Ubuntu
+  tests_frontend:
+    name: Run frontend unit tests
    timeout-minutes: 60
    runs-on: ubuntu-latest
    steps:
@@ -31,26 +35,4 @@ jobs:

      - name: Run unit tests
        run: npm run test:ci --verbose
-        working-directory: client
-
-  tests_frontend_windows:
-    name: Run frontend unit tests on Windows
-    timeout-minutes: 60
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build Client
-        run: npm run frontend:ci
-
-      - name: Run unit tests
-        run: npm run test:ci --verbose
-        working-directory: client
+        working-directory: client
--- a/.github/workflows/helmcharts.yml
+++ b/.github/workflows/helmcharts.yml
@@ -1,35 +0,0 @@
-name: Build Helm Charts on Tag
-
-# The workflow is triggered when a tag is pushed
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-      - name: Install Helm
-        uses: azure/setup-helm@v4
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"       
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
-        with:
-          charts_dir: helmchart
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/latest-images-main.yml
+++ b/.github/workflows/latest-images-main.yml
@@ -0,0 +1,88 @@
+name: Docker Compose Build Latest Tag (Manual Dispatch)
+
+# The workflow is manually triggered
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Check out the repository
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Fetch all tags and set the latest tag
+      - name: Fetch tags and set the latest tag
+        run: |
+          git fetch --tags
+          echo "LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_ENV
+
+      # Set up Docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      # Set up QEMU
+      - 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
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Prepare Docker Build
+      - name: Build Docker images
+        run: cp .env.example .env
+
+      # Docker metadata for 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=${{ env.LATEST_TAG }},enable=true
+            type=raw,value=latest,enable=true
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      # Build and push librechat-api
+      - name: Build and push 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
+
+      # Docker metadata for 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=${{ env.LATEST_TAG }},enable=true
+            type=raw,value=latest,enable=true
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      # Build and push librechat
+      - name: Build and push 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
--- a/.github/workflows/main-image-workflow.yml
+++ b/.github/workflows/main-image-workflow.yml
@@ -1,20 +1,12 @@
 name: Docker Compose Build Latest Main Image Tag (Manual Dispatch)

+# The workflow is manually triggered
 on:
  workflow_dispatch:

 jobs:
  build:
    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - target: api-build
-            file: Dockerfile.multi
-            image_name: librechat-api
-          - target: node
-            file: Dockerfile
-            image_name: librechat

    steps:
      - name: Checkout
@@ -25,15 +17,12 @@ jobs:
          git fetch --tags
          echo "LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_ENV

-      # Set up QEMU
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3

-      # Set up Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Log in to GitHub Container Registry
      - name: Log in to GitHub Container Registry
        uses: docker/login-action@v2
        with:
@@ -41,29 +30,26 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      # Login to Docker Hub
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+      # Docker metadata for librechat
+      - name: Docker metadata for librechat
+        id: meta-librechat
+        uses: docker/metadata-action@v5
        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          images: ghcr.io/${{ github.repository_owner }}/librechat
+          tags: |
+            type=raw,value=${{ env.LATEST_TAG }},enable=true
+            type=raw,value=latest,enable=true
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}

-      # Prepare the environment
-      - name: Prepare environment
-        run: |
-          cp .env.example .env
-
-      # Build and push Docker images for each target
-      - name: Build and push Docker images
+      # Build and push librechat with only linux/amd64 platform
+      - name: Build and push librechat
        uses: docker/build-push-action@v5
        with:
+          file: Dockerfile
          context: .
-          file: ${{ matrix.file }}
          push: true
-          tags: |
-            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ env.LATEST_TAG }}
-            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.image_name }}:${{ env.LATEST_TAG }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.image_name }}:latest
-          platforms: linux/amd64,linux/arm64
-          target: ${{ matrix.target }}
+          tags: ${{ steps.meta-librechat.outputs.tags }}
+          platforms: linux/amd64
+          target: node
--- a/.github/workflows/mkdocs.yaml
+++ b/.github/workflows/mkdocs.yaml
@@ -0,0 +1,27 @@
+name: mkdocs
+on:
+  push:
+    branches:
+      - main
+permissions:
+  contents: write
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
+      - uses: actions/cache@v3
+        with:
+          key: mkdocs-material-${{ env.cache_id }}
+          path: .cache
+          restore-keys: |
+            mkdocs-material-
+      - run: pip install mkdocs-material 
+      - run: pip install mkdocs-nav-weight
+      - run: pip install mkdocs-publisher
+      - run: pip install mkdocs-exclude
+      - run: mkdocs gh-deploy --force
--- a/.github/workflows/tag-images.yml
+++ b/.github/workflows/tag-images.yml
@@ -1,67 +0,0 @@
-name: Docker Images Build on Tag
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - target: api-build
-            file: Dockerfile.multi
-            image_name: librechat-api
-          - target: node
-            file: Dockerfile
-            image_name: librechat
-
-    steps:
-      # Check out the repository
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # Set up QEMU
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      # Set up Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Log in to GitHub Container Registry
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Login to Docker Hub
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      # Prepare the environment
-      - name: Prepare environment
-        run: |
-          cp .env.example .env
-
-      # Build and push Docker images for each target
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ${{ matrix.file }}
-          push: true
-          tags: |
-            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.ref_name }}
-            ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.image_name }}:${{ github.ref_name }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.image_name }}:latest
-          platforms: linux/amd64,linux/arm64
-          target: ${{ matrix.target }}
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ logs
 pids
 *.pid
 *.seed
-.git

 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
@@ -22,10 +21,6 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt

-# translation services
-config/translations/stores/*
-client/src/localization/languages/*_missing_keys.json
-
 # Compiled Dirs (http://nodejs.org/api/addons.html)
 build/
 dist/
@@ -46,7 +41,6 @@ api/node_modules/
 client/node_modules/
 bower_components/
 *.d.ts
-!vite-env.d.ts

 # Floobits
 .floo
@@ -56,7 +50,6 @@ bower_components/

 #config file
 librechat.yaml
-librechat.yml

 # Environment
 .npmrc
@@ -75,8 +68,6 @@ src/style - official.css
 /playwright/.cache/
 .DS_Store
 *.code-workspace
-.idx
-monospace.json
 .idea
 *.iml
 *.pem
@@ -84,7 +75,6 @@ config.local.ts
 **/storageState.json
 junit.xml
 **/.venv/
-**/venv/

 # docker override file
 docker-compose.override.yaml
@@ -102,7 +92,4 @@ auth.json
 !client/src/components/Nav/SettingsTabs/Data/

 # User uploads
-uploads/
-
-# owner
-release/
+uploads/
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh 
+#!/usr/bin/env sh
 set -e
 . "$(dirname -- "$0")/_/husky.sh"
 [ -n "$CI" ] && exit 0
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,16 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Launch LibreChat (debug)",
-      "skipFiles": ["<node_internals>/**"],
-      "program": "${workspaceFolder}/api/server/index.js",
-      "env": {
-        "NODE_ENV": "production"
-      },
-      "console": "integratedTerminal"
-    }
-  ]
-}
--- a/28
+++ b/28
@@ -1,8 +1,8 @@
-# v0.7.5-rc1
-
 # Base node image
-FROM node:20-alpine AS node
+FROM node:18-alpine AS node

+RUN apk add g++ make py3-pip
+RUN npm install -g node-gyp
 RUN apk --no-cache add curl

 RUN mkdir -p /app && chown node:node /app
@@ -12,21 +12,15 @@ USER node

 COPY --chown=node:node . .

-RUN \
-    # Allow mounting of these files, which have no default
-    touch .env ; \
-    # Create directories for the volumes to inherit the correct permissions
-    mkdir -p /app/client/public/images /app/api/logs ; \
-    npm config set fetch-retry-maxtimeout 600000 ; \
-    npm config set fetch-retries 5 ; \
-    npm config set fetch-retry-mintimeout 15000 ; \
-    npm install --no-audit; \
-    # React client build
-    NODE_OPTIONS="--max-old-space-size=2048" npm run frontend; \
-    npm prune --production; \
-    npm cache clean --force
+# Allow mounting of these files, which have no default
+# values.
+RUN touch .env
+RUN npm config set fetch-retry-maxtimeout 300000
+RUN npm install --no-audit

-RUN mkdir -p /app/client/public/images /app/api/logs
+# React client build
+ENV NODE_OPTIONS="--max-old-space-size=2048"
+RUN npm run frontend

 # Node API setup
 EXPOSE 3080
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -1,44 +1,39 @@
-# Dockerfile.multi
-# v0.7.5-rc1
-
-# Base for all builds
+# Build API, Client and Data Provider
 FROM node:20-alpine AS base
-WORKDIR /app
-RUN apk --no-cache add curl
-RUN npm config set fetch-retry-maxtimeout 600000 && \
-    npm config set fetch-retries 5 && \
-    npm config set fetch-retry-mintimeout 15000
-COPY package*.json ./
-COPY packages/data-provider/package*.json ./packages/data-provider/
-COPY client/package*.json ./client/
-COPY api/package*.json ./api/
-RUN npm ci

 # Build data-provider
 FROM base AS data-provider-build
 WORKDIR /app/packages/data-provider
-COPY packages/data-provider ./
+COPY ./packages/data-provider ./
+RUN npm install
 RUN npm run build
-RUN npm prune --production

-# Client build
-FROM base AS client-build
+# React client build
+FROM data-provider-build AS client-build
 WORKDIR /app/client
-COPY client ./
-COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
+COPY ./client/ ./
+# Copy data-provider to client's node_modules
+RUN mkdir -p /app/client/node_modules/librechat-data-provider/
+RUN cp -R /app/packages/data-provider/* /app/client/node_modules/librechat-data-provider/
+RUN npm install
 ENV NODE_OPTIONS="--max-old-space-size=2048"
 RUN npm run build
-RUN npm prune --production

-# API setup (including client dist)
-FROM base AS api-build
-WORKDIR /app
-COPY api ./api
-COPY config ./config
-COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
-COPY --from=client-build /app/client/dist ./client/dist
+# Node API setup
+FROM data-provider-build AS api-build
 WORKDIR /app/api
-RUN npm prune --production
+COPY api/package*.json ./
+COPY api/ ./
+# Copy data-provider to API's node_modules
+RUN mkdir -p /app/api/node_modules/librechat-data-provider/
+RUN cp -R /app/packages/data-provider/* /app/api/node_modules/librechat-data-provider/
+RUN npm install
+COPY --from=client-build /app/client/dist /app/client/dist
 EXPOSE 3080
 ENV HOST=0.0.0.0
 CMD ["node", "server/index.js"]
+
+# Nginx setup
+FROM nginx:1.21.1-alpine AS prod-stage
+COPY ./client/nginx.conf /etc/nginx/conf.d/default.conf
+CMD ["nginx", "-g", "daemon off;"]
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
  <a href="https://librechat.ai">
-    <img src="client/public/assets/logo.svg" height="256">
+    <img src="docs/assets/LibreChat.svg" height="256">
  </a>
  <h1 align="center">
    <a href="https://librechat.ai">LibreChat</a>
@@ -41,39 +41,23 @@
 # 📃 Features

 - 🖥️ UI matching ChatGPT, including Dark mode, Streaming, and latest updates
- 🤖 AI model selection:
-  - OpenAI, Azure OpenAI, BingAI, ChatGPT, Google Vertex AI, Anthropic (Claude), Plugins, Assistants API (including Azure Assistants)
- ✅ Compatible across both **[Remote & Local AI services](https://www.librechat.ai/docs/configuration/librechat_yaml/ai_endpoints):**
-  - groq, Ollama, Cohere, Mistral AI, Apple MLX, koboldcpp, OpenRouter, together.ai, Perplexity, ShuttleAI, and more
- 💾 Create, Save, & Share Custom Presets
- 🔀 Switch between AI Endpoints and Presets, mid-chat
- 🔄 Edit, Resubmit, and Continue Messages with Conversation branching
- 🌿 Fork Messages & Conversations for Advanced Context control
 - 💬 Multimodal Chat:
-    - Upload and analyze images with Claude 3, GPT-4 (including `gpt-4o` and `gpt-4o-mini`), and Gemini Vision 📸
-    - Chat with Files using Custom Endpoints, OpenAI, Azure, Anthropic, & Google. 🗃️
-    - Advanced Agents with Files, Code Interpreter, Tools, and API Actions 🔦
-      - Available through the [OpenAI Assistants API](https://platform.openai.com/docs/assistants/overview) 🌤️
-      - Non-OpenAI Agents in Active Development 🚧
+  - Upload and analyze images with GPT-4 and Gemini Vision 📸
+  - General file support now available through the Assistants API integration. 🗃️
+  - Local RAG in Active Development 🚧
 - 🌎 Multilingual UI:
  - English, 中文, Deutsch, Español, Français, Italiano, Polski, Português Brasileiro,
  - Русский, 日本語, Svenska, 한국어, Tiếng Việt, 繁體中文, العربية, Türkçe, Nederlands, עברית
- 🎨 Customizable Dropdown & Interface: Adapts to both power users and newcomers
- 📧 Verify your email to ensure secure access
- 🗣️ Chat hands-free with Speech-to-Text and Text-to-Speech magic
-  - Automatically send and play Audio
-  - Supports OpenAI, Azure OpenAI, and Elevenlabs
- 📥 Import Conversations from LibreChat, ChatGPT, Chatbot UI
- 📤 Export conversations as screenshots, markdown, text, json
+- 🤖 AI model selection: OpenAI, Azure OpenAI, BingAI, ChatGPT, Google Vertex AI, Anthropic (Claude), Plugins, Assistants API (including Azure Assistants)
+- 💾 Create, Save, & Share Custom Presets
+- 🔄 Edit, Resubmit, and Continue messages with conversation branching
+- 📤 Export conversations as screenshots, markdown, text, json.
 - 🔍 Search all messages/conversations
 - 🔌 Plugins, including web access, image generation with DALL-E-3 and more
 - 👥 Multi-User, Secure Authentication with Moderation and Token spend tools
- ⚙️ Configure Proxy, Reverse Proxy, Docker, & many Deployment options:
-  - Use completely local or deploy on the cloud
- 📖 Completely Open-Source & Built in Public
- 🧑‍🤝‍🧑 Community-driven development, support, and feedback
+- ⚙️ Configure Proxy, Reverse Proxy, Docker, many Deployment options, and completely Open-Source

-[For a thorough review of our features, see our docs here](https://docs.librechat.ai/) 📚
+[For a thorough review of our features, see our docs here](https://docs.librechat.ai/features/plugins/introduction.html) 📚

 ## 🪶 All-In-One AI Conversations with LibreChat

@@ -81,50 +65,38 @@ LibreChat brings together the future of assistant AIs with the revolutionary tec

 With LibreChat, you no longer need to opt for ChatGPT Plus and can instead use free or pay-per-call APIs. We welcome contributions, cloning, and forking to enhance the capabilities of this advanced chatbot platform.

-[![Watch the video](https://raw.githubusercontent.com/LibreChat-AI/librechat.ai/main/public/images/changelog/v0.7.4.png)](https://www.youtube.com/watch?v=cvosUxogdpI)
+<!-- https://github.com/danny-avila/LibreChat/assets/110412045/c1eb0c0f-41f6-4335-b982-84b278b53d59 -->
+
+[![Watch the video](https://img.youtube.com/vi/pNIOs1ovsXw/maxresdefault.jpg)](https://youtu.be/pNIOs1ovsXw)
 Click on the thumbnail to open the video☝️

 ---

-## 🌐 Resources
+## 📚 Documentation

-**GitHub Repo:**
-  - **RAG API:** [github.com/danny-avila/rag_api](https://github.com/danny-avila/rag_api)
-  - **Website:** [github.com/LibreChat-AI/librechat.ai](https://github.com/LibreChat-AI/librechat.ai)
-
-**Other:**
-  - **Website:** [librechat.ai](https://librechat.ai)
-  - **Documentation:** [docs.librechat.ai](https://docs.librechat.ai)
-  - **Blog:** [blog.librechat.ai](https://docs.librechat.ai)
+For more information on how to use our advanced features, install and configure our software, and access our guidelines and tutorials, please check out our documentation at [docs.librechat.ai](https://docs.librechat.ai)

 ---

 ## 📝 Changelog

-Keep up with the latest updates by visiting the releases page and notes:
- [Releases](https://github.com/danny-avila/LibreChat/releases)
- [Changelog](https://www.librechat.ai/changelog) 
+Keep up with the latest updates by visiting the releases page - [Releases](https://github.com/danny-avila/LibreChat/releases)

-**⚠️ Please consult the [changelog](https://www.librechat.ai/changelog) for breaking changes before updating.**
+**⚠️ [Breaking Changes](docs/general_info/breaking_changes.md)**
+Please consult the breaking changes before updating.

 ---

 ## ⭐ Star History

 <p align="center">
-  <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>
-</p>
-<p align="center">
-  <a href="https://trendshift.io/repositories/4685" target="_blank" style="padding: 10px;">
-    <img src="https://trendshift.io/api/badge/repositories/4685" alt="danny-avila%2FLibreChat | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/>
-  </a>
-  <a href="https://runacap.com/ross-index/q1-24/" target="_blank" rel="noopener" style="margin-left: 20px;">
-    <img style="width: 260px; height: 56px" src="https://runacap.com/wp-content/uploads/2024/04/ROSS_badge_white_Q1_2024.svg" alt="ROSS Index - Fastest Growing Open-Source Startups in Q1 2024 | Runa Capital" width="260" height="56"/>
-  </a>
+<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>
+
 ---

 ## ✨ Contributions
--- a/api/app/bingai.js
+++ b/api/app/bingai.js
@@ -1,6 +1,5 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
-const { EModelEndpoint } = require('librechat-data-provider');
 const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
 const { logger } = require('~/config');

@@ -24,7 +23,10 @@ const askBing = async ({

  let key = null;
  if (expiresAt && isUserProvided) {
-    checkUserKeyExpiry(expiresAt, EModelEndpoint.bingAI);
+    checkUserKeyExpiry(
+      expiresAt,
+      'Your BingAI Cookies have expired. Please provide your cookies again.',
+    );
    key = await getUserKey({ userId, name: 'bingAI' });
  }

--- a/api/app/chatgpt-browser.js
+++ b/api/app/chatgpt-browser.js
@@ -1,6 +1,6 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
-const { Constants, EModelEndpoint } = require('librechat-data-provider');
+const { Constants } = require('librechat-data-provider');
 const { getUserKey, checkUserKeyExpiry } = require('../server/services/UserService');

 const browserClient = async ({
@@ -18,7 +18,10 @@ const browserClient = async ({

  let key = null;
  if (expiresAt && isUserProvided) {
-    checkUserKeyExpiry(expiresAt, EModelEndpoint.chatGPTBrowser);
+    checkUserKeyExpiry(
+      expiresAt,
+      'Your ChatGPT Access Token has expired. Please provide your token again.',
+    );
    key = await getUserKey({ userId, name: 'chatGPTBrowser' });
  }

--- a/api/app/clients/AnthropicClient.js
+++ b/api/app/clients/AnthropicClient.js
@@ -1,25 +1,20 @@
 const Anthropic = require('@anthropic-ai/sdk');
-const { HttpsProxyAgent } = require('https-proxy-agent');
 const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
 const {
-  Constants,
-  EModelEndpoint,
-  anthropicSettings,
  getResponseSender,
+  EModelEndpoint,
  validateVisionModel,
 } = require('librechat-data-provider');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const {
+  titleFunctionPrompt,
+  parseTitleFromPrompt,
  truncateText,
  formatMessage,
-  addCacheControl,
-  titleFunctionPrompt,
-  parseParamFromPrompt,
  createContextHandlers,
 } = require('./prompts');
-const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
-const { getModelMaxTokens, matchModelName } = require('~/utils');
-const { sleep } = require('~/server/utils');
+const spendTokens = require('~/models/spendTokens');
+const { getModelMaxTokens } = require('~/utils');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');

@@ -33,9 +28,6 @@ function delayBeforeRetry(attempts, baseDelay = 1000) {
  return new Promise((resolve) => setTimeout(resolve, baseDelay * attempts));
 }

-const tokenEventTypes = new Set(['message_start', 'message_delta']);
-const { legacy } = anthropicSettings;
-
 class AnthropicClient extends BaseClient {
  constructor(apiKey, options = {}) {
    super(apiKey, options);
@@ -46,24 +38,6 @@ class AnthropicClient extends BaseClient {
      ? options.contextStrategy.toLowerCase()
      : 'discard';
    this.setOptions(options);
-    /** @type {string | undefined} */
-    this.systemMessage;
-    /** @type {AnthropicMessageStartEvent| undefined} */
-    this.message_start;
-    /** @type {AnthropicMessageDeltaEvent| undefined} */
-    this.message_delta;
-    /** Whether the model is part of the Claude 3 Family
-     * @type {boolean} */
-    this.isClaude3;
-    /** Whether to use Messages API or Completions API
-     * @type {boolean} */
-    this.useMessages;
-    /** Whether or not the model is limited to the legacy amount of output tokens
-     * @type {boolean} */
-    this.isLegacyOutput;
-    /** Whether or not the model supports Prompt Caching
-     * @type {boolean} */
-    this.supportsCacheControl;
  }

  setOptions(options) {
@@ -83,37 +57,25 @@ class AnthropicClient extends BaseClient {
      this.options = options;
    }

-    this.modelOptions = Object.assign(
-      {
-        model: anthropicSettings.model.default,
-      },
-      this.modelOptions,
-      this.options.modelOptions,
-    );
-
-    const modelMatch = matchModelName(this.modelOptions.model, EModelEndpoint.anthropic);
-    this.isClaude3 = modelMatch.startsWith('claude-3');
-    this.isLegacyOutput = !modelMatch.startsWith('claude-3-5-sonnet');
-    this.supportsCacheControl =
-      this.options.promptCache && this.checkPromptCacheSupport(modelMatch);
-
-    if (
-      this.isLegacyOutput &&
-      this.modelOptions.maxOutputTokens &&
-      this.modelOptions.maxOutputTokens > legacy.maxOutputTokens.default
-    ) {
-      this.modelOptions.maxOutputTokens = legacy.maxOutputTokens.default;
-    }
+    const modelOptions = this.options.modelOptions || {};
+    this.modelOptions = {
+      ...modelOptions,
+      // set some good defaults (check for undefined in some cases because they may be 0)
+      model: modelOptions.model || 'claude-1',
+      temperature: typeof modelOptions.temperature === 'undefined' ? 1 : modelOptions.temperature, // 0 - 1, 1 is default
+      topP: typeof modelOptions.topP === 'undefined' ? 0.7 : modelOptions.topP, // 0 - 1, default: 0.7
+      topK: typeof modelOptions.topK === 'undefined' ? 40 : modelOptions.topK, // 1-40, default: 40
+      stop: modelOptions.stop, // no stop method for now
+    };

+    this.isClaude3 = this.modelOptions.model.includes('claude-3');
    this.useMessages = this.isClaude3 || !!this.options.attachments;

    this.defaultVisionModel = this.options.visionModel ?? 'claude-3-sonnet-20240229';
    this.options.attachments?.then((attachments) => this.checkVisionRequest(attachments));

    this.maxContextTokens =
-      this.options.maxContextTokens ??
-      getModelMaxTokens(this.modelOptions.model, EModelEndpoint.anthropic) ??
-      100000;
+      getModelMaxTokens(this.modelOptions.model, EModelEndpoint.anthropic) ?? 100000;
    this.maxResponseTokens = this.modelOptions.maxOutputTokens || 1500;
    this.maxPromptTokens =
      this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
@@ -154,92 +116,25 @@ class AnthropicClient extends BaseClient {

  /**
   * Get the initialized Anthropic client.
-   * @param {Partial<Anthropic.ClientOptions>} requestOptions - The options for the client.
   * @returns {Anthropic} The Anthropic client instance.
   */
-  getClient(requestOptions) {
-    /** @type {Anthropic.ClientOptions} */
+  getClient() {
+    /** @type {Anthropic.default.RequestOptions} */
    const options = {
-      fetch: this.fetch,
      apiKey: this.apiKey,
    };

-    if (this.options.proxy) {
-      options.httpAgent = new HttpsProxyAgent(this.options.proxy);
-    }
-
    if (this.options.reverseProxyUrl) {
      options.baseURL = this.options.reverseProxyUrl;
    }

-    if (
-      this.supportsCacheControl &&
-      requestOptions?.model &&
-      requestOptions.model.includes('claude-3-5-sonnet')
-    ) {
-      options.defaultHeaders = {
-        'anthropic-beta': 'max-tokens-3-5-sonnet-2024-07-15,prompt-caching-2024-07-31',
-      };
-    } else if (this.supportsCacheControl) {
-      options.defaultHeaders = {
-        'anthropic-beta': 'prompt-caching-2024-07-31',
-      };
-    }
-
    return new Anthropic(options);
  }

-  /**
-   * Get stream usage as returned by this client's API response.
-   * @returns {AnthropicStreamUsage} The stream usage object.
-   */
-  getStreamUsage() {
-    const inputUsage = this.message_start?.message?.usage ?? {};
-    const outputUsage = this.message_delta?.usage ?? {};
-    return Object.assign({}, inputUsage, outputUsage);
-  }
-
-  /**
-   * Calculates the correct token count for the current message based on the token count map and API usage.
-   * Edge case: If the calculation results in a negative value, it returns the original estimate.
-   * If revisiting a conversation with a chat history entirely composed of token estimates,
-   * the cumulative token count going forward should become more accurate as the conversation progresses.
-   * @param {Object} params - The parameters for the calculation.
-   * @param {Record<string, number>} params.tokenCountMap - A map of message IDs to their token counts.
-   * @param {string} params.currentMessageId - The ID of the current message to calculate.
-   * @param {AnthropicStreamUsage} params.usage - The usage object returned by the API.
-   * @returns {number} The correct token count for the current message.
-   */
-  calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage }) {
-    const originalEstimate = tokenCountMap[currentMessageId] || 0;
-
-    if (!usage || typeof usage.input_tokens !== 'number') {
-      return originalEstimate;
-    }
-
-    tokenCountMap[currentMessageId] = 0;
-    const totalTokensFromMap = Object.values(tokenCountMap).reduce((sum, count) => {
-      const numCount = Number(count);
-      return sum + (isNaN(numCount) ? 0 : numCount);
-    }, 0);
-    const totalInputTokens =
-      (usage.input_tokens ?? 0) +
-      (usage.cache_creation_input_tokens ?? 0) +
-      (usage.cache_read_input_tokens ?? 0);
-
-    const currentMessageTokens = totalInputTokens - totalTokensFromMap;
-    return currentMessageTokens > 0 ? currentMessageTokens : originalEstimate;
-  }
-
-  /**
-   * Get Token Count for LibreChat Message
-   * @param {TMessage} responseMessage
-   * @returns {number}
-   */
-  getTokenCountForResponse(responseMessage) {
+  getTokenCountForResponse(response) {
    return this.getTokenCountForMessage({
      role: 'assistant',
-      content: responseMessage.text,
+      content: response.text,
    });
  }

@@ -292,38 +187,7 @@ class AnthropicClient extends BaseClient {
    return files;
  }

-  /**
-   * @param {object} params
-   * @param {number} params.promptTokens
-   * @param {number} params.completionTokens
-   * @param {AnthropicStreamUsage} [params.usage]
-   * @param {string} [params.model]
-   * @param {string} [params.context='message']
-   * @returns {Promise<void>}
-   */
-  async recordTokenUsage({ promptTokens, completionTokens, usage, model, context = 'message' }) {
-    if (usage != null && usage?.input_tokens != null) {
-      const input = usage.input_tokens ?? 0;
-      const write = usage.cache_creation_input_tokens ?? 0;
-      const read = usage.cache_read_input_tokens ?? 0;
-
-      await spendStructuredTokens(
-        {
-          context,
-          user: this.user,
-          conversationId: this.conversationId,
-          model: model ?? this.modelOptions.model,
-          endpointTokenConfig: this.options.endpointTokenConfig,
-        },
-        {
-          promptTokens: { input, write, read },
-          completionTokens,
-        },
-      );
-
-      return;
-    }
-
+  async recordTokenUsage({ promptTokens, completionTokens, model, context = 'message' }) {
    await spendTokens(
      {
        context,
@@ -671,18 +535,6 @@ class AnthropicClient extends BaseClient {
      : await client.completions.create(options);
  }

-  /**
-   * @param {string} modelName
-   * @returns {boolean}
-   */
-  checkPromptCacheSupport(modelName) {
-    const modelMatch = matchModelName(modelName, EModelEndpoint.anthropic);
-    if (modelMatch === 'claude-3-5-sonnet' || modelMatch === 'claude-3-haiku') {
-      return true;
-    }
-    return false;
-  }
-
  async sendCompletion(payload, { onProgress, abortController }) {
    if (!abortController) {
      abortController = new AbortController();
@@ -696,6 +548,8 @@ class AnthropicClient extends BaseClient {
    }

    logger.debug('modelOptions', { modelOptions });
+
+    const client = this.getClient();
    const metadata = {
      user_id: this.user,
    };
@@ -723,28 +577,16 @@ class AnthropicClient extends BaseClient {

    if (this.useMessages) {
      requestOptions.messages = payload;
-      requestOptions.max_tokens = maxOutputTokens || legacy.maxOutputTokens.default;
+      requestOptions.max_tokens = maxOutputTokens || 1500;
    } else {
      requestOptions.prompt = payload;
      requestOptions.max_tokens_to_sample = maxOutputTokens || 1500;
    }

-    if (this.systemMessage && this.supportsCacheControl === true) {
-      requestOptions.system = [
-        {
-          type: 'text',
-          text: this.systemMessage,
-          cache_control: { type: 'ephemeral' },
-        },
-      ];
-    } else if (this.systemMessage) {
+    if (this.systemMessage) {
      requestOptions.system = this.systemMessage;
    }

-    if (this.supportsCacheControl === true && this.useMessages) {
-      requestOptions.messages = addCacheControl(requestOptions.messages);
-    }
-
    logger.debug('[AnthropicClient]', { ...requestOptions });

    const handleChunk = (currentChunk) => {
@@ -755,14 +597,12 @@ class AnthropicClient extends BaseClient {
    };

    const maxRetries = 3;
-    const streamRate = this.options.streamRate ?? Constants.DEFAULT_STREAM_RATE;
    async function processResponse() {
      let attempts = 0;

      while (attempts < maxRetries) {
        let response;
        try {
-          const client = this.getClient(requestOptions);
          response = await this.createResponse(client, requestOptions);

          signal.addEventListener('abort', () => {
@@ -774,18 +614,11 @@ class AnthropicClient extends BaseClient {

          for await (const completion of response) {
            // Handle each completion as before
-            const type = completion?.type ?? '';
-            if (tokenEventTypes.has(type)) {
-              logger.debug(`[AnthropicClient] ${type}`, completion);
-              this[type] = completion;
-            }
            if (completion?.delta?.text) {
              handleChunk(completion.delta.text);
            } else if (completion.completion) {
              handleChunk(completion.completion);
            }
-
-            await sleep(streamRate);
          }

          // Successful processing, exit loop
@@ -819,14 +652,9 @@ class AnthropicClient extends BaseClient {

  getSaveOptions() {
    return {
-      maxContextTokens: this.options.maxContextTokens,
      promptPrefix: this.options.promptPrefix,
      modelLabel: this.options.modelLabel,
-      promptCache: this.options.promptCache,
      resendFiles: this.options.resendFiles,
-      iconURL: this.options.iconURL,
-      greeting: this.options.greeting,
-      spec: this.options.spec,
      ...this.modelOptions,
    };
  }
@@ -868,8 +696,6 @@ class AnthropicClient extends BaseClient {
   */
  async titleConvo({ text, responseText = '' }) {
    let title = 'New Chat';
-    this.message_delta = undefined;
-    this.message_start = undefined;
    const convo = `<initial_message>
  ${truncateText(text)}
  </initial_message>
@@ -899,11 +725,7 @@ class AnthropicClient extends BaseClient {
      };

      try {
-        const response = await this.createResponse(
-          this.getClient(requestOptions),
-          requestOptions,
-          true,
-        );
+        const response = await this.createResponse(this.getClient(), requestOptions, true);
        let promptTokens = response?.usage?.input_tokens;
        let completionTokens = response?.usage?.output_tokens;
        if (!promptTokens) {
@@ -920,7 +742,7 @@ class AnthropicClient extends BaseClient {
          context: 'title',
        });
        const text = response.content[0].text;
-        title = parseParamFromPrompt(text, 'title');
+        title = parseTitleFromPrompt(text);
      } catch (e) {
        logger.error('[AnthropicClient] There was an issue generating the title', e);
      }
--- a/api/app/clients/BaseClient.js
+++ b/api/app/clients/BaseClient.js
@@ -1,11 +1,9 @@
 const crypto = require('crypto');
-const fetch = require('node-fetch');
-const { supportsBalanceCheck, Constants, CacheKeys, Time } = require('librechat-data-provider');
-const { getMessages, saveMessage, updateMessage, saveConvo } = require('~/models');
+const { supportsBalanceCheck, Constants } = require('librechat-data-provider');
+const { getConvo, getMessages, saveMessage, updateMessage, saveConvo } = require('~/models');
 const { addSpaceIfNeeded, isEnabled } = require('~/server/utils');
 const checkBalance = require('~/models/checkBalance');
 const { getFiles } = require('~/models/File');
-const { getLogStores } = require('~/cache');
 const TextStream = require('./TextStream');
 const { logger } = require('~/config');

@@ -19,22 +17,13 @@ class BaseClient {
      month: 'long',
      day: 'numeric',
    });
-    this.fetch = this.fetch.bind(this);
-    /** @type {boolean} */
-    this.skipSaveConvo = false;
-    /** @type {boolean} */
-    this.skipSaveUserMessage = false;
-    /** @type {ClientDatabaseSavePromise} */
-    this.userMessagePromise;
-    /** @type {ClientDatabaseSavePromise} */
-    this.responsePromise;
  }

  setOptions() {
    throw new Error('Method \'setOptions\' must be implemented.');
  }

-  async getCompletion() {
+  getCompletion() {
    throw new Error('Method \'getCompletion\' must be implemented.');
  }

@@ -54,22 +43,10 @@ class BaseClient {
    throw new Error('Subclasses attempted to call summarizeMessages without implementing it');
  }

-  /**
-   * Abstract method to get the token count for a message. Subclasses must implement this method.
-   * @param {TMessage} responseMessage
-   * @returns {number}
-   */
-  getTokenCountForResponse(responseMessage) {
-    logger.debug('`[BaseClient] recordTokenUsage` not implemented.', responseMessage);
+  async getTokenCountForResponse(response) {
+    logger.debug('`[BaseClient] recordTokenUsage` not implemented.', response);
  }

-  /**
-   * Abstract method to record token usage. Subclasses must implement this method.
-   * If a correction to the token usage is needed, the method should return an object with the corrected token counts.
-   * @param {number} promptTokens
-   * @param {number} completionTokens
-   * @returns {Promise<void>}
-   */
  async recordTokenUsage({ promptTokens, completionTokens }) {
    logger.debug('`[BaseClient] recordTokenUsage` not implemented.', {
      promptTokens,
@@ -77,25 +54,6 @@ class BaseClient {
    });
  }

-  /**
-   * Makes an HTTP request and logs the process.
-   *
-   * @param {RequestInfo} url - The URL to make the request to. Can be a string or a Request object.
-   * @param {RequestInit} [init] - Optional init options for the request.
-   * @returns {Promise<Response>} - A promise that resolves to the response of the fetch request.
-   */
-  async fetch(_url, init) {
-    let url = _url;
-    if (this.options.directEndpoint) {
-      url = this.options.reverseProxyUrl;
-    }
-    logger.debug(`Making request to ${url}`);
-    if (typeof Bun !== 'undefined') {
-      return await fetch(url, init);
-    }
-    return await fetch(url, init);
-  }
-
  getBuildMessagesOptions() {
    throw new Error('Subclasses must implement getBuildMessagesOptions');
  }
@@ -105,45 +63,19 @@ class BaseClient {
    await stream.processTextStream(onProgress);
  }

-  /**
-   * @returns {[string|undefined, string|undefined]}
-   */
-  processOverideIds() {
-    /** @type {Record<string, string | undefined>} */
-    let { overrideConvoId, overrideUserMessageId } = this.options?.req?.body ?? {};
-    if (overrideConvoId) {
-      const [conversationId, index] = overrideConvoId.split(Constants.COMMON_DIVIDER);
-      overrideConvoId = conversationId;
-      if (index !== '0') {
-        this.skipSaveConvo = true;
-      }
-    }
-    if (overrideUserMessageId) {
-      const [userMessageId, index] = overrideUserMessageId.split(Constants.COMMON_DIVIDER);
-      overrideUserMessageId = userMessageId;
-      if (index !== '0') {
-        this.skipSaveUserMessage = true;
-      }
-    }
-
-    return [overrideConvoId, overrideUserMessageId];
-  }
-
  async setMessageOptions(opts = {}) {
    if (opts && opts.replaceOptions) {
      this.setOptions(opts);
    }

-    const [overrideConvoId, overrideUserMessageId] = this.processOverideIds();
    const { isEdited, isContinued } = opts;
    const user = opts.user ?? null;
    this.user = user;
    const saveOptions = this.getSaveOptions();
    this.abortController = opts.abortController ?? new AbortController();
-    const conversationId = overrideConvoId ?? opts.conversationId ?? crypto.randomUUID();
+    const conversationId = opts.conversationId ?? crypto.randomUUID();
    const parentMessageId = opts.parentMessageId ?? Constants.NO_PARENT;
-    const userMessageId =
-      overrideUserMessageId ?? opts.overrideParentMessageId ?? crypto.randomUUID();
+    const userMessageId = opts.overrideParentMessageId ?? crypto.randomUUID();
    let responseMessageId = opts.responseMessageId ?? crypto.randomUUID();
    let head = isEdited ? responseMessageId : parentMessageId;
    this.currentMessages = (await this.loadHistory(conversationId, head)) ?? [];
@@ -207,7 +139,7 @@ class BaseClient {
    }

    if (typeof opts?.onStart === 'function') {
-      opts.onStart(userMessage, responseMessageId);
+      opts.onStart(userMessage);
    }

    return {
@@ -441,14 +373,6 @@ class BaseClient {
    const { user, head, isEdited, conversationId, responseMessageId, saveOptions, userMessage } =
      await this.handleStartMethods(message, opts);

-    if (opts.progressCallback) {
-      opts.onProgress = opts.progressCallback.call(null, {
-        ...(opts.progressOptions ?? {}),
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
-    }
-
    const { generation = '' } = opts;

    // It's not necessary to push to currentMessages
@@ -497,13 +421,8 @@ class BaseClient {
      this.handleTokenCountMap(tokenCountMap);
    }

-    if (!isEdited && !this.skipSaveUserMessage) {
-      this.userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
-      if (typeof opts?.getReqData === 'function') {
-        opts.getReqData({
-          userMessagePromise: this.userMessagePromise,
-        });
-      }
+    if (!isEdited) {
+      await this.saveMessageToDatabase(userMessage, saveOptions, user);
    }

    if (
@@ -537,8 +456,6 @@ class BaseClient {
      sender: this.sender,
      text: addSpaceIfNeeded(generation) + completion,
      promptTokens,
-      iconURL: this.options.iconURL,
-      endpoint: this.options.endpoint,
      ...(this.metadata ?? {}),
    };

@@ -548,103 +465,17 @@ class BaseClient {
      this.getTokenCountForResponse &&
      this.getTokenCount
    ) {
-      let completionTokens;
-
-      /**
-       * Metadata about input/output costs for the current message. The client
-       * should provide a function to get the current stream usage metadata; if not,
-       * use the legacy token estimations.
-       * @type {StreamUsage | null} */
-      const usage = this.getStreamUsage != null ? this.getStreamUsage() : null;
-
-      if (usage != null && Number(usage.output_tokens) > 0) {
-        responseMessage.tokenCount = usage.output_tokens;
-        completionTokens = responseMessage.tokenCount;
-        await this.updateUserMessageTokenCount({ usage, tokenCountMap, userMessage, opts });
-      } else {
-        responseMessage.tokenCount = this.getTokenCountForResponse(responseMessage);
-        completionTokens = this.getTokenCount(completion);
-      }
-
-      await this.recordTokenUsage({ promptTokens, completionTokens, usage });
+      responseMessage.tokenCount = this.getTokenCountForResponse(responseMessage);
+      const completionTokens = this.getTokenCount(completion);
+      await this.recordTokenUsage({ promptTokens, completionTokens });
    }
-
-    if (this.userMessagePromise) {
-      await this.userMessagePromise;
-    }
-
-    this.responsePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
-    const messageCache = getLogStores(CacheKeys.MESSAGES);
-    messageCache.set(
-      responseMessageId,
-      {
-        text: responseMessage.text,
-        complete: true,
-      },
-      Time.FIVE_MINUTES,
-    );
+    await this.saveMessageToDatabase(responseMessage, saveOptions, user);
    delete responseMessage.tokenCount;
    return responseMessage;
  }

-  /**
-   * Stream usage should only be used for user message token count re-calculation if:
-   * - The stream usage is available, with input tokens greater than 0,
-   * - the client provides a function to calculate the current token count,
-   * - files are being resent with every message (default behavior; or if `false`, with no attachments),
-   * - the `promptPrefix` (custom instructions) is not set.
-   *
-   * In these cases, the legacy token estimations would be more accurate.
-   *
-   * TODO: included system messages in the `orderedMessages` accounting, potentially as a
-   * separate message in the UI. ChatGPT does this through "hidden" system messages.
-   * @param {object} params
-   * @param {StreamUsage} params.usage
-   * @param {Record<string, number>} params.tokenCountMap
-   * @param {TMessage} params.userMessage
-   * @param {object} params.opts
-   */
-  async updateUserMessageTokenCount({ usage, tokenCountMap, userMessage, opts }) {
-    /** @type {boolean} */
-    const shouldUpdateCount =
-      this.calculateCurrentTokenCount != null &&
-      Number(usage.input_tokens) > 0 &&
-      (this.options.resendFiles ||
-        (!this.options.resendFiles && !this.options.attachments?.length)) &&
-      !this.options.promptPrefix;
-
-    if (!shouldUpdateCount) {
-      return;
-    }
-
-    const userMessageTokenCount = this.calculateCurrentTokenCount({
-      currentMessageId: userMessage.messageId,
-      tokenCountMap,
-      usage,
-    });
-
-    if (userMessageTokenCount === userMessage.tokenCount) {
-      return;
-    }
-
-    userMessage.tokenCount = userMessageTokenCount;
-    /*
-      Note: `AskController` saves the user message, so we update the count of its `userMessage` reference
-    */
-    if (typeof opts?.getReqData === 'function') {
-      opts.getReqData({
-        userMessage,
-      });
-    }
-    /*
-      Note: we update the user message to be sure it gets the calculated token count;
-      though `AskController` saves the user message, EditController does not
-    */
-    await this.userMessagePromise;
-    await this.updateMessageInDatabase({
-      messageId: userMessage.messageId,
-      tokenCount: userMessageTokenCount,
-    });
+  async getConversation(conversationId, user = null) {
+    return await getConvo(user, conversationId);
  }

  async loadHistory(conversationId, parentMessageId = null) {
@@ -694,52 +525,18 @@ class BaseClient {
    return _messages;
  }

-  /**
-   * Save a message to the database.
-   * @param {TMessage} message
-   * @param {Partial<TConversation>} endpointOptions
-   * @param {string | null} user
-   */
  async saveMessageToDatabase(message, endpointOptions, user = null) {
-    if (this.user && user !== this.user) {
-      throw new Error('User mismatch.');
-    }
-
-    const savedMessage = await saveMessage(
-      this.options.req,
-      {
-        ...message,
-        endpoint: this.options.endpoint,
-        unfinished: false,
-        user,
-      },
-      { context: 'api/app/clients/BaseClient.js - saveMessageToDatabase #saveMessage' },
-    );
-
-    if (this.skipSaveConvo) {
-      return { message: savedMessage };
-    }
-
-    const conversation = await saveConvo(
-      this.options.req,
-      {
-        conversationId: message.conversationId,
-        endpoint: this.options.endpoint,
-        endpointType: this.options.endpointType,
-        ...endpointOptions,
-      },
-      { context: 'api/app/clients/BaseClient.js - saveMessageToDatabase #saveConvo' },
-    );
-
-    return { message: savedMessage, conversation };
+    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,
+    });
  }

-  /**
-   * Update a message in the database.
-   * @param {Partial<TMessage>} message
-   */
  async updateMessageInDatabase(message) {
-    await updateMessage(this.options.req, message);
+    await updateMessage(message);
  }

  /**
@@ -759,11 +556,11 @@ class BaseClient {
   * the message is considered a root message.
   *
   * @param {Object} options - The options for the function.
-   * @param {TMessage[]} options.messages - An array of message objects. Each object should have either an 'id' or 'messageId' property, and may have a 'parentMessageId' property.
+   * @param {Array} options.messages - An array of message objects. Each object should have either an 'id' or 'messageId' property, and may have a 'parentMessageId' property.
   * @param {string} options.parentMessageId - The ID of the parent message to start the traversal from.
   * @param {Function} [options.mapMethod] - An optional function to map over the ordered messages. If provided, it will be applied to each message in the resulting array.
   * @param {boolean} [options.summary=false] - If set to true, the traversal modifies messages with 'summary' and 'summaryTokenCount' properties and stops at the message with a 'summary' property.
-   * @returns {TMessage[]} An array containing the messages in the order they should be displayed, starting with the most recent message with a 'summary' property if the 'summary' option is true, and ending with the message identified by 'parentMessageId'.
+   * @returns {Array} An array containing the messages in the order they should be displayed, starting with the most recent message with a 'summary' property if the 'summary' option is true, and ending with the message identified by 'parentMessageId'.
   */
  static getMessagesForConversation({
    messages,
--- a/api/app/clients/ChatGPTClient.js
+++ b/api/app/clients/ChatGPTClient.js
@@ -3,13 +3,10 @@ const crypto = require('crypto');
 const {
  EModelEndpoint,
  resolveHeaders,
-  CohereConstants,
  mapModelToAzureConfig,
 } = require('librechat-data-provider');
-const { CohereClient } = require('cohere-ai');
 const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
 const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
-const { createCoherePayload } = require('./llm');
 const { Agent, ProxyAgent } = require('undici');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
@@ -150,8 +147,7 @@ class ChatGPTClient extends BaseClient {
    return tokenizer;
  }

-  /** @type {getCompletion} */
-  async getCompletion(input, onProgress, onTokenProgress, abortController = null) {
+  async getCompletion(input, onProgress, abortController = null) {
    if (!abortController) {
      abortController = new AbortController();
    }
@@ -309,11 +305,6 @@ class ChatGPTClient extends BaseClient {
      });
    }

-    if (baseURL.startsWith(CohereConstants.API_URL)) {
-      const payload = createCoherePayload({ modelOptions });
-      return await this.cohereChatCompletion({ payload, onTokenProgress });
-    }
-
    if (baseURL.includes('v1') && !baseURL.includes('/completions') && !this.isChatCompletion) {
      baseURL = baseURL.split('v1')[0] + 'v1/completions';
    } else if (
@@ -417,43 +408,6 @@ class ChatGPTClient extends BaseClient {
    return response.json();
  }

-  /** @type {cohereChatCompletion} */
-  async cohereChatCompletion({ payload, onTokenProgress }) {
-    const cohere = new CohereClient({
-      token: this.apiKey,
-      environment: this.completionsUrl,
-    });
-
-    if (!payload.stream) {
-      const chatResponse = await cohere.chat(payload);
-      return chatResponse.text;
-    }
-
-    const chatStream = await cohere.chatStream(payload);
-    let reply = '';
-    for await (const message of chatStream) {
-      if (!message) {
-        continue;
-      }
-
-      if (message.eventType === 'text-generation' && message.text) {
-        onTokenProgress(message.text);
-        reply += message.text;
-      }
-      /*
-      Cohere API Chinese Unicode character replacement hotfix.
-      Should be un-commented when the following issue is resolved:
-      https://github.com/cohere-ai/cohere-typescript/issues/151
-
-      else if (message.eventType === 'stream-end' && message.response) {
-        reply = message.response.text;
-      }
-      */
-    }
-
-    return reply;
-  }
-
  async generateTitle(userMessage, botMessage) {
    const instructionsPayload = {
      role: 'system',
--- a/api/app/clients/GoogleClient.js
+++ b/api/app/clients/GoogleClient.js
@@ -1,9 +1,7 @@
 const { google } = require('googleapis');
 const { Agent, ProxyAgent } = require('undici');
-const { ChatVertexAI } = require('@langchain/google-vertexai');
+const { GoogleVertexAI } = require('langchain/llms/googlevertexai');
 const { ChatGoogleGenerativeAI } = require('@langchain/google-genai');
-const { GoogleGenerativeAI: GenAI } = require('@google/generative-ai');
-const { GoogleVertexAI } = require('@langchain/community/llms/googlevertexai');
 const { ChatGoogleVertexAI } = require('langchain/chat_models/googlevertexai');
 const { AIMessage, HumanMessage, SystemMessage } = require('langchain/schema');
 const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
@@ -12,21 +10,13 @@ const {
  getResponseSender,
  endpointSettings,
  EModelEndpoint,
-  VisionModes,
-  Constants,
  AuthKeys,
 } = require('librechat-data-provider');
 const { encodeAndFormat } = require('~/server/services/Files/images');
+const { formatMessage, createContextHandlers } = require('./prompts');
 const { getModelMaxTokens } = require('~/utils');
-const { sleep } = require('~/server/utils');
-const { logger } = require('~/config');
-const {
-  formatMessage,
-  createContextHandlers,
-  titleInstruction,
-  truncateText,
-} = require('./prompts');
 const BaseClient = require('./BaseClient');
+const { logger } = require('~/config');

 const loc = 'us-central1';
 const publisher = 'google';
@@ -120,11 +110,23 @@ class GoogleClient extends BaseClient {
      .filter((ex) => ex)
      .filter((obj) => obj.input.content !== '' && obj.output.content !== '');

-    this.modelOptions = this.options.modelOptions || {};
+    const modelOptions = this.options.modelOptions || {};
+    this.modelOptions = {
+      ...modelOptions,
+      // set some good defaults (check for undefined in some cases because they may be 0)
+      model: modelOptions.model || settings.model.default,
+      temperature:
+        typeof modelOptions.temperature === 'undefined'
+          ? settings.temperature.default
+          : modelOptions.temperature,
+      topP: typeof modelOptions.topP === 'undefined' ? settings.topP.default : modelOptions.topP,
+      topK: typeof modelOptions.topK === 'undefined' ? settings.topK.default : modelOptions.topK,
+      // stop: modelOptions.stop // no stop method for now
+    };

    this.options.attachments?.then((attachments) => this.checkVisionRequest(attachments));

-    /** @type {boolean} Whether using a "GenerativeAI" Model */
+    // TODO: as of 12/14/23, only gemini models are "Generative AI" models provided by Google
    this.isGenerativeModel = this.modelOptions.model.includes('gemini');
    const { isGenerativeModel } = this;
    this.isChatModel = !isGenerativeModel && this.modelOptions.model.includes('chat');
@@ -133,10 +135,7 @@ class GoogleClient extends BaseClient {
      !isGenerativeModel && !isChatModel && /code|text/.test(this.modelOptions.model);
    const { isTextModel } = this;

-    this.maxContextTokens =
-      this.options.maxContextTokens ??
-      getModelMaxTokens(this.modelOptions.model, EModelEndpoint.google);
-
+    this.maxContextTokens = getModelMaxTokens(this.modelOptions.model, EModelEndpoint.google);
    // The max prompt tokens is determined by the max context tokens minus the max response tokens.
    // Earlier messages will be dropped until the prompt is within the limit.
    this.maxResponseTokens = this.modelOptions.maxOutputTokens || settings.maxOutputTokens.default;
@@ -235,7 +234,7 @@ class GoogleClient extends BaseClient {
      this.isVisionModel = true;
    }

-    if (this.isVisionModel && !attachments && this.modelOptions.model.includes('gemini-pro')) {
+    if (this.isVisionModel && !attachments) {
      this.modelOptions.model = 'gemini-pro';
      this.isVisionModel = false;
    }
@@ -248,40 +247,6 @@ class GoogleClient extends BaseClient {
    })).bind(this);
  }

-  /**
-   * Formats messages for generative AI
-   * @param {TMessage[]} messages
-   * @returns
-   */
-  async formatGenerativeMessages(messages) {
-    const formattedMessages = [];
-    const attachments = await this.options.attachments;
-    const latestMessage = { ...messages[messages.length - 1] };
-    const files = await this.addImageURLs(latestMessage, attachments, VisionModes.generative);
-    this.options.attachments = files;
-    messages[messages.length - 1] = latestMessage;
-
-    for (const _message of messages) {
-      const role = _message.isCreatedByUser ? this.userLabel : this.modelLabel;
-      const parts = [];
-      parts.push({ text: _message.text });
-      if (!_message.image_urls?.length) {
-        formattedMessages.push({ role, parts });
-        continue;
-      }
-
-      for (const images of _message.image_urls) {
-        if (images.inlineData) {
-          parts.push({ inlineData: images.inlineData });
-        }
-      }
-
-      formattedMessages.push({ role, parts });
-    }
-
-    return formattedMessages;
-  }
-
  /**
   *
   * Adds image URLs to the message object and returns the files
@@ -290,23 +255,17 @@ class GoogleClient extends BaseClient {
   * @param {MongoFile[]} files
   * @returns {Promise<MongoFile[]>}
   */
-  async addImageURLs(message, attachments, mode = '') {
+  async addImageURLs(message, attachments) {
    const { files, image_urls } = await encodeAndFormat(
      this.options.req,
      attachments,
      EModelEndpoint.google,
-      mode,
    );
    message.image_urls = image_urls.length ? image_urls : undefined;
    return files;
  }

-  /**
-   * Builds the augmented prompt for attachments
-   * TODO: Add File API Support
-   * @param {TMessage[]} messages
-   */
-  async buildAugmentedPrompt(messages = []) {
+  async buildVisionMessages(messages = [], parentMessageId) {
    const attachments = await this.options.attachments;
    const latestMessage = { ...messages[messages.length - 1] };
    this.contextHandlers = createContextHandlers(this.options.req, latestMessage.text);
@@ -322,12 +281,6 @@ class GoogleClient extends BaseClient {
      this.augmentedPrompt = await this.contextHandlers.createContext();
      this.options.promptPrefix = this.augmentedPrompt + this.options.promptPrefix;
    }
-  }
-
-  async buildVisionMessages(messages = [], parentMessageId) {
-    const attachments = await this.options.attachments;
-    const latestMessage = { ...messages[messages.length - 1] };
-    await this.buildAugmentedPrompt(messages);

    const { prompt } = await this.buildMessagesPrompt(messages, parentMessageId);

@@ -348,26 +301,15 @@ class GoogleClient extends BaseClient {
    return { prompt: payload };
  }

-  /** @param {TMessage[]} [messages=[]]  */
-  async buildGenerativeMessages(messages = []) {
-    this.userLabel = 'user';
-    this.modelLabel = 'model';
-    const promises = [];
-    promises.push(await this.formatGenerativeMessages(messages));
-    promises.push(this.buildAugmentedPrompt(messages));
-    const [formattedMessages] = await Promise.all(promises);
-    return { prompt: formattedMessages };
-  }
-
  async buildMessages(messages = [], parentMessageId) {
    if (!this.isGenerativeModel && !this.project_id) {
      throw new Error(
        '[GoogleClient] a Service Account JSON Key is required for PaLM 2 and Codey models (Vertex AI)',
      );
-    }
-
-    if (!this.project_id && this.modelOptions.model.includes('1.5')) {
-      return await this.buildGenerativeMessages(messages);
+    } else if (this.isGenerativeModel && (!this.apiKey || this.apiKey === 'user_provided')) {
+      throw new Error(
+        '[GoogleClient] an API Key is required for Gemini models (Generative Language API)',
+      );
    }

    if (this.options.attachments && this.isGenerativeModel) {
@@ -584,42 +526,25 @@ class GoogleClient extends BaseClient {
  }

  createLLM(clientOptions) {
-    const model = clientOptions.modelName ?? clientOptions.model;
-    if (this.project_id && this.isTextModel) {
-      logger.debug('Creating Google VertexAI client');
-      return new GoogleVertexAI(clientOptions);
-    } else if (this.project_id && this.isChatModel) {
-      logger.debug('Creating Chat Google VertexAI client');
-      return new ChatGoogleVertexAI(clientOptions);
-    } else if (this.project_id) {
-      logger.debug('Creating VertexAI client');
-      return new ChatVertexAI(clientOptions);
-    } else if (model.includes('1.5')) {
-      logger.debug('Creating GenAI client');
-      return new GenAI(this.apiKey).getGenerativeModel(
-        {
-          ...clientOptions,
-          model,
-        },
-        { apiVersion: 'v1beta' },
-      );
+    if (this.isGenerativeModel) {
+      return new ChatGoogleGenerativeAI({ ...clientOptions, apiKey: this.apiKey });
    }

-    logger.debug('Creating Chat Google Generative AI client');
-    return new ChatGoogleGenerativeAI({ ...clientOptions, apiKey: this.apiKey });
+    return this.isTextModel
+      ? new GoogleVertexAI(clientOptions)
+      : new ChatGoogleVertexAI(clientOptions);
  }

  async getCompletion(_payload, options = {}) {
-    const { parameters, instances } = _payload;
    const { onProgress, abortController } = options;
-    const streamRate = this.options.streamRate ?? Constants.DEFAULT_STREAM_RATE;
+    const { parameters, instances } = _payload;
    const { messages: _messages, context, examples: _examples } = instances?.[0] ?? {};

    let examples;

    let clientOptions = { ...parameters, maxRetries: 2 };

-    if (this.project_id) {
+    if (!this.isGenerativeModel) {
      clientOptions['authOptions'] = {
        credentials: {
          ...this.serviceKey,
@@ -632,7 +557,7 @@ class GoogleClient extends BaseClient {
      clientOptions = { ...clientOptions, ...this.modelOptions };
    }

-    if (this.isGenerativeModel && !this.project_id) {
+    if (this.isGenerativeModel) {
      clientOptions.modelName = clientOptions.model;
      delete clientOptions.model;
    }
@@ -663,190 +588,25 @@ class GoogleClient extends BaseClient {
      messages.unshift(new SystemMessage(context));
    }

-    const modelName = clientOptions.modelName ?? clientOptions.model ?? '';
-    if (modelName?.includes('1.5') && !this.project_id) {
-      const client = model;
-      const requestOptions = {
-        contents: _payload,
-      };
-
-      if (this.options?.promptPrefix?.length) {
-        requestOptions.systemInstruction = {
-          parts: [
-            {
-              text: this.options.promptPrefix,
-            },
-          ],
-        };
-      }
-
-      requestOptions.safetySettings = _payload.safetySettings;
-
-      const delay = modelName.includes('flash') ? 8 : 14;
-      const result = await client.generateContentStream(requestOptions);
-      for await (const chunk of result.stream) {
-        const chunkText = chunk.text();
-        await this.generateTextStream(chunkText, onProgress, {
-          delay,
-        });
-        reply += chunkText;
-        await sleep(streamRate);
-      }
-      return reply;
-    }
-
    const stream = await model.stream(messages, {
      signal: abortController.signal,
      timeout: 7000,
-      safetySettings: _payload.safetySettings,
    });

-    let delay = this.options.streamRate || 8;
-
-    if (!this.options.streamRate) {
-      if (this.isGenerativeModel) {
-        delay = 12;
-      }
-      if (modelName.includes('flash')) {
-        delay = 5;
-      }
-    }
-
    for await (const chunk of stream) {
-      const chunkText = chunk?.content ?? chunk;
-      await this.generateTextStream(chunkText, onProgress, {
-        delay,
+      await this.generateTextStream(chunk?.content ?? chunk, onProgress, {
+        delay: this.isGenerativeModel ? 12 : 8,
      });
-      reply += chunkText;
+      reply += chunk?.content ?? chunk;
    }

    return reply;
  }

-  /**
-   * Stripped-down logic for generating a title. This uses the non-streaming APIs, since the user does not see titles streaming
-   */
-  async titleChatCompletion(_payload, options = {}) {
-    const { abortController } = options;
-    const { parameters, instances } = _payload;
-    const { messages: _messages, examples: _examples } = instances?.[0] ?? {};
-
-    let clientOptions = { ...parameters, maxRetries: 2 };
-
-    logger.debug('Initialized title client options');
-
-    if (this.project_id) {
-      clientOptions['authOptions'] = {
-        credentials: {
-          ...this.serviceKey,
-        },
-        projectId: this.project_id,
-      };
-    }
-
-    if (!parameters) {
-      clientOptions = { ...clientOptions, ...this.modelOptions };
-    }
-
-    if (this.isGenerativeModel && !this.project_id) {
-      clientOptions.modelName = clientOptions.model;
-      delete clientOptions.model;
-    }
-
-    const model = this.createLLM(clientOptions);
-
-    let reply = '';
-    const messages = this.isTextModel ? _payload.trim() : _messages;
-
-    const modelName = clientOptions.modelName ?? clientOptions.model ?? '';
-    if (modelName?.includes('1.5') && !this.project_id) {
-      logger.debug('Identified titling model as 1.5 version');
-      /** @type {GenerativeModel} */
-      const client = model;
-      const requestOptions = {
-        contents: _payload,
-      };
-
-      if (this.options?.promptPrefix?.length) {
-        requestOptions.systemInstruction = {
-          parts: [
-            {
-              text: this.options.promptPrefix,
-            },
-          ],
-        };
-      }
-
-      const safetySettings = _payload.safetySettings;
-      requestOptions.safetySettings = safetySettings;
-
-      const result = await client.generateContent(requestOptions);
-
-      reply = result.response?.text();
-
-      return reply;
-    } else {
-      logger.debug('Beginning titling');
-      const safetySettings = _payload.safetySettings;
-
-      const titleResponse = await model.invoke(messages, {
-        signal: abortController.signal,
-        timeout: 7000,
-        safetySettings: safetySettings,
-      });
-
-      reply = titleResponse.content;
-      // TODO: RECORD TOKEN USAGE
-      return reply;
-    }
-  }
-
-  async titleConvo({ text, responseText = '' }) {
-    let title = 'New Chat';
-    const convo = `||>User:
-"${truncateText(text)}"
-||>Response:
-"${JSON.stringify(truncateText(responseText))}"`;
-
-    let { prompt: payload } = await this.buildMessages([
-      {
-        text: `Please generate ${titleInstruction}
-
-    ${convo}
-    
-    ||>Title:`,
-        isCreatedByUser: true,
-        author: this.userLabel,
-      },
-    ]);
-
-    if (this.isVisionModel) {
-      logger.warn(
-        `Current vision model does not support titling without an attachment; falling back to default model ${settings.model.default}`,
-      );
-
-      payload.parameters = { ...payload.parameters, model: settings.model.default };
-    }
-
-    try {
-      title = await this.titleChatCompletion(payload, {
-        abortController: new AbortController(),
-        onProgress: () => {},
-      });
-    } catch (e) {
-      logger.error('[GoogleClient] There was an issue generating the title', e);
-    }
-    logger.debug(`Title response: ${title}`);
-    return title;
-  }
-
  getSaveOptions() {
    return {
      promptPrefix: this.options.promptPrefix,
      modelLabel: this.options.modelLabel,
-      iconURL: this.options.iconURL,
-      greeting: this.options.greeting,
-      spec: this.options.spec,
      ...this.modelOptions,
    };
  }
@@ -856,36 +616,11 @@ class GoogleClient extends BaseClient {
  }

  async sendCompletion(payload, opts = {}) {
-    payload.safetySettings = this.getSafetySettings();
-
    let reply = '';
    reply = await this.getCompletion(payload, opts);
    return reply.trim();
  }

-  getSafetySettings() {
-    return [
-      {
-        category: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
-        threshold:
-          process.env.GOOGLE_SAFETY_SEXUALLY_EXPLICIT || 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
-      },
-      {
-        category: 'HARM_CATEGORY_HATE_SPEECH',
-        threshold: process.env.GOOGLE_SAFETY_HATE_SPEECH || 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
-      },
-      {
-        category: 'HARM_CATEGORY_HARASSMENT',
-        threshold: process.env.GOOGLE_SAFETY_HARASSMENT || 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
-      },
-      {
-        category: 'HARM_CATEGORY_DANGEROUS_CONTENT',
-        threshold:
-          process.env.GOOGLE_SAFETY_DANGEROUS_CONTENT || 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
-      },
-    ];
-  }
-
  /* TO-DO: Handle tokens with Google tokenization NOTE: these are required */
  static getTokenizer(encoding, isModelName = false, extendSpecialTokens = {}) {
    if (tokenizersCache[encoding]) {
--- a/api/app/clients/OllamaClient.js
+++ b/api/app/clients/OllamaClient.js
@@ -1,159 +0,0 @@
-const { z } = require('zod');
-const axios = require('axios');
-const { Ollama } = require('ollama');
-const { Constants } = require('librechat-data-provider');
-const { deriveBaseURL } = require('~/utils');
-const { sleep } = require('~/server/utils');
-const { logger } = require('~/config');
-
-const ollamaPayloadSchema = z.object({
-  mirostat: z.number().optional(),
-  mirostat_eta: z.number().optional(),
-  mirostat_tau: z.number().optional(),
-  num_ctx: z.number().optional(),
-  repeat_last_n: z.number().optional(),
-  repeat_penalty: z.number().optional(),
-  temperature: z.number().optional(),
-  seed: z.number().nullable().optional(),
-  stop: z.array(z.string()).optional(),
-  tfs_z: z.number().optional(),
-  num_predict: z.number().optional(),
-  top_k: z.number().optional(),
-  top_p: z.number().optional(),
-  stream: z.optional(z.boolean()),
-  model: z.string(),
-});
-
-/**
- * @param {string} imageUrl
- * @returns {string}
- * @throws {Error}
- */
-const getValidBase64 = (imageUrl) => {
-  const parts = imageUrl.split(';base64,');
-
-  if (parts.length === 2) {
-    return parts[1];
-  } else {
-    logger.error('Invalid or no Base64 string found in URL.');
-  }
-};
-
-class OllamaClient {
-  constructor(options = {}) {
-    const host = deriveBaseURL(options.baseURL ?? 'http://localhost:11434');
-    this.streamRate = options.streamRate ?? Constants.DEFAULT_STREAM_RATE;
-    /** @type {Ollama} */
-    this.client = new Ollama({ host });
-  }
-
-  /**
-   * Fetches Ollama models from the specified base API path.
-   * @param {string} baseURL
-   * @returns {Promise<string[]>} The Ollama models.
-   */
-  static async fetchModels(baseURL) {
-    let models = [];
-    if (!baseURL) {
-      return models;
-    }
-    try {
-      const ollamaEndpoint = deriveBaseURL(baseURL);
-      /** @type {Promise<AxiosResponse<OllamaListResponse>>} */
-      const response = await axios.get(`${ollamaEndpoint}/api/tags`);
-      models = response.data.models.map((tag) => tag.name);
-      return models;
-    } catch (error) {
-      const logMessage =
-        'Failed to fetch models from Ollama API. If you are not using Ollama directly, and instead, through some aggregator or reverse proxy that handles fetching via OpenAI spec, ensure the name of the endpoint doesn\'t start with `ollama` (case-insensitive).';
-      logger.error(logMessage, error);
-      return [];
-    }
-  }
-
-  /**
-   * @param {ChatCompletionMessage[]} messages
-   * @returns {OllamaMessage[]}
-   */
-  static formatOpenAIMessages(messages) {
-    const ollamaMessages = [];
-
-    for (const message of messages) {
-      if (typeof message.content === 'string') {
-        ollamaMessages.push({
-          role: message.role,
-          content: message.content,
-        });
-        continue;
-      }
-
-      let aggregatedText = '';
-      let imageUrls = [];
-
-      for (const content of message.content) {
-        if (content.type === 'text') {
-          aggregatedText += content.text + ' ';
-        } else if (content.type === 'image_url') {
-          imageUrls.push(getValidBase64(content.image_url.url));
-        }
-      }
-
-      const ollamaMessage = {
-        role: message.role,
-        content: aggregatedText.trim(),
-      };
-
-      if (imageUrls.length > 0) {
-        ollamaMessage.images = imageUrls;
-      }
-
-      ollamaMessages.push(ollamaMessage);
-    }
-
-    return ollamaMessages;
-  }
-
-  /***
-   * @param {Object} params
-   * @param {ChatCompletionPayload} params.payload
-   * @param {onTokenProgress} params.onProgress
-   * @param {AbortController} params.abortController
-   */
-  async chatCompletion({ payload, onProgress, abortController = null }) {
-    let intermediateReply = '';
-
-    const parameters = ollamaPayloadSchema.parse(payload);
-    const messages = OllamaClient.formatOpenAIMessages(payload.messages);
-
-    if (parameters.stream) {
-      const stream = await this.client.chat({
-        messages,
-        ...parameters,
-      });
-
-      for await (const chunk of stream) {
-        const token = chunk.message.content;
-        intermediateReply += token;
-        onProgress(token);
-        if (abortController.signal.aborted) {
-          stream.controller.abort();
-          break;
-        }
-
-        await sleep(this.streamRate);
-      }
-    }
-    // TODO: regular completion
-    else {
-      // const generation = await this.client.generate(payload);
-    }
-
-    return intermediateReply;
-  }
-  catch(err) {
-    logger.error('[OllamaClient.chatCompletion]', err);
-    throw err;
-  }
-}
-
-module.exports = { OllamaClient, ollamaPayloadSchema };
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -1,14 +1,10 @@
 const OpenAI = require('openai');
-const { OllamaClient } = require('./OllamaClient');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const {
-  Constants,
  ImageDetail,
  EModelEndpoint,
  resolveHeaders,
-  openAISettings,
  ImageDetailCost,
-  CohereConstants,
  getResponseSender,
  validateVisionModel,
  mapModelToAzureConfig,
@@ -20,19 +16,13 @@ const {
  getModelMaxTokens,
  genAzureChatCompletion,
 } = require('~/utils');
-const {
-  truncateText,
-  formatMessage,
-  CUT_OFF_PROMPT,
-  titleInstruction,
-  createContextHandlers,
-} = require('./prompts');
+const { truncateText, formatMessage, createContextHandlers, CUT_OFF_PROMPT } = require('./prompts');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
-const { spendTokens } = require('~/models/spendTokens');
-const { isEnabled, sleep } = require('~/server/utils');
 const { handleOpenAIErrors } = require('./tools/util');
+const spendTokens = require('~/models/spendTokens');
 const { createLLM, RunManager } = require('./llm');
 const ChatGPTClient = require('./ChatGPTClient');
+const { isEnabled } = require('~/server/utils');
 const { summaryBuffer } = require('./memory');
 const { runTitleChain } = require('./chains');
 const { tokenSplit } = require('./document');
@@ -49,10 +39,7 @@ class OpenAIClient extends BaseClient {
    super(apiKey, options);
    this.ChatGPTClient = new ChatGPTClient();
    this.buildPrompt = this.ChatGPTClient.buildPrompt.bind(this);
-    /** @type {getCompletion} */
    this.getCompletion = this.ChatGPTClient.getCompletion.bind(this);
-    /** @type {cohereChatCompletion} */
-    this.cohereChatCompletion = this.ChatGPTClient.cohereChatCompletion.bind(this);
    this.contextStrategy = options.contextStrategy
      ? options.contextStrategy.toLowerCase()
      : 'discard';
@@ -61,9 +48,6 @@ class OpenAIClient extends BaseClient {
    this.azure = options.azure || false;
    this.setOptions(options);
    this.metadata = {};
-
-    /** @type {string | undefined} - The API Completions URL */
-    this.completionsUrl;
  }

  // TODO: PluginsClient calls this 3x, unneeded
@@ -86,13 +70,26 @@ class OpenAIClient extends BaseClient {
      this.apiKey = this.options.openaiApiKey;
    }

-    this.modelOptions = Object.assign(
-      {
-        model: openAISettings.model.default,
-      },
-      this.modelOptions,
-      this.options.modelOptions,
-    );
+    const modelOptions = this.options.modelOptions || {};
+
+    if (!this.modelOptions) {
+      this.modelOptions = {
+        ...modelOptions,
+        model: modelOptions.model || 'gpt-3.5-turbo',
+        temperature:
+          typeof modelOptions.temperature === 'undefined' ? 0.8 : modelOptions.temperature,
+        top_p: typeof modelOptions.top_p === 'undefined' ? 1 : modelOptions.top_p,
+        presence_penalty:
+          typeof modelOptions.presence_penalty === 'undefined' ? 1 : modelOptions.presence_penalty,
+        stop: modelOptions.stop,
+      };
+    } else {
+      // Update the modelOptions if it already exists
+      this.modelOptions = {
+        ...this.modelOptions,
+        ...modelOptions,
+      };
+    }

    this.defaultVisionModel = this.options.visionModel ?? 'gpt-4-vision-preview';
    if (typeof this.options.attachments?.then === 'function') {
@@ -117,10 +114,6 @@ class OpenAIClient extends BaseClient {
      this.useOpenRouter = true;
    }

-    if (this.options.endpoint?.toLowerCase() === 'ollama') {
-      this.isOllama = true;
-    }
-
    this.FORCE_PROMPT =
      isEnabled(OPENAI_FORCE_PROMPT) ||
      (reverseProxy && reverseProxy.includes('completions') && !reverseProxy.includes('chat'));
@@ -153,13 +146,11 @@ class OpenAIClient extends BaseClient {
      model.startsWith('text-chat') || model.startsWith('text-davinci-002-render');

    this.maxContextTokens =
-      this.options.maxContextTokens ??
      getModelMaxTokens(
        model,
        this.options.endpointType ?? this.options.endpoint,
        this.options.endpointTokenConfig,
-      ) ??
-      4095; // 1 less than maximum
+      ) ?? 4095; // 1 less than maximum

    if (this.shouldSummarize) {
      this.maxContextTokens = Math.floor(this.maxContextTokens / 2);
@@ -196,6 +187,16 @@ class OpenAIClient extends BaseClient {

    this.setupTokens();

+    if (!this.modelOptions.stop && !this.isVisionModel) {
+      const stopTokens = [this.startToken];
+      if (this.endToken && this.endToken !== this.startToken) {
+        stopTokens.push(this.endToken);
+      }
+      stopTokens.push(`\n${this.userLabel}:`);
+      stopTokens.push('<|diff_marker|>');
+      this.modelOptions.stop = stopTokens;
+    }
+
    if (reverseProxy) {
      this.completionsUrl = reverseProxy;
      this.langchainProxy = extractBaseURL(reverseProxy);
@@ -229,52 +230,23 @@ class OpenAIClient extends BaseClient {
   * @param {MongoFile[]} attachments
   */
  checkVisionRequest(attachments) {
-    if (!attachments) {
-      return;
-    }
-
    const availableModels = this.options.modelsConfig?.[this.options.endpoint];
-    if (!availableModels) {
-      return;
-    }
-
-    let visionRequestDetected = false;
-    for (const file of attachments) {
-      if (file?.type?.includes('image')) {
-        visionRequestDetected = true;
-        break;
-      }
-    }
-    if (!visionRequestDetected) {
-      return;
-    }
-
    this.isVisionModel = validateVisionModel({ model: this.modelOptions.model, availableModels });
+
+    const visionModelAvailable = availableModels?.includes(this.defaultVisionModel);
+    if (
+      attachments &&
+      attachments.some((file) => file?.type && file?.type?.includes('image')) &&
+      visionModelAvailable &&
+      !this.isVisionModel
+    ) {
+      this.modelOptions.model = this.defaultVisionModel;
+      this.isVisionModel = true;
+    }
+
    if (this.isVisionModel) {
      delete this.modelOptions.stop;
-      return;
    }
-
-    for (const model of availableModels) {
-      if (!validateVisionModel({ model, availableModels })) {
-        continue;
-      }
-      this.modelOptions.model = model;
-      this.isVisionModel = true;
-      delete this.modelOptions.stop;
-      return;
-    }
-
-    if (!availableModels.includes(this.defaultVisionModel)) {
-      return;
-    }
-    if (!validateVisionModel({ model: this.defaultVisionModel, availableModels })) {
-      return;
-    }
-
-    this.modelOptions.model = this.defaultVisionModel;
-    this.isVisionModel = true;
-    delete this.modelOptions.stop;
  }

  setupTokens() {
@@ -296,7 +268,7 @@ class OpenAIClient extends BaseClient {
    let tokenizer;
    this.encoding = 'text-davinci-003';
    if (this.isChatCompletion) {
-      this.encoding = this.modelOptions.model.includes('gpt-4o') ? 'o200k_base' : 'cl100k_base';
+      this.encoding = 'cl100k_base';
      tokenizer = this.constructor.getTokenizer(this.encoding);
    } else if (this.isUnofficialChatGptModel) {
      const extendSpecialTokens = {
@@ -401,14 +373,10 @@ class OpenAIClient extends BaseClient {

  getSaveOptions() {
    return {
-      maxContextTokens: this.options.maxContextTokens,
      chatGptLabel: this.options.chatGptLabel,
      promptPrefix: this.options.promptPrefix,
      resendFiles: this.options.resendFiles,
      imageDetail: this.options.imageDetail,
-      iconURL: this.options.iconURL,
-      greeting: this.options.greeting,
-      spec: this.options.spec,
      ...this.modelOptions,
    };
  }
@@ -430,11 +398,7 @@ class OpenAIClient extends BaseClient {
   * @returns {Promise<MongoFile[]>}
   */
  async addImageURLs(message, attachments) {
-    const { files, image_urls } = await encodeAndFormat(
-      this.options.req,
-      attachments,
-      this.options.endpoint,
-    );
+    const { files, image_urls } = await encodeAndFormat(this.options.req, attachments);
    message.image_urls = image_urls.length ? image_urls : undefined;
    return files;
  }
@@ -569,16 +533,15 @@ class OpenAIClient extends BaseClient {
    return result;
  }

-  /** @type {sendCompletion} */
  async sendCompletion(payload, opts = {}) {
    let reply = '';
    let result = null;
    let streamResult = null;
    this.modelOptions.user = this.user;
    const invalidBaseUrl = this.completionsUrl && extractBaseURL(this.completionsUrl) === null;
-    const useOldMethod = !!(invalidBaseUrl || !this.isChatCompletion);
+    const useOldMethod = !!(invalidBaseUrl || !this.isChatCompletion || typeof Bun !== 'undefined');
    if (typeof opts.onProgress === 'function' && useOldMethod) {
-      const completionResult = await this.getCompletion(
+      await this.getCompletion(
        payload,
        (progressMessage) => {
          if (progressMessage === '[DONE]') {
@@ -611,13 +574,8 @@ class OpenAIClient extends BaseClient {
          opts.onProgress(token);
          reply += token;
        },
-        opts.onProgress,
        opts.abortController || new AbortController(),
      );
-
-      if (completionResult && typeof completionResult === 'string') {
-        reply = completionResult;
-      }
    } else if (typeof opts.onProgress === 'function' || this.options.useChatCompletion) {
      reply = await this.chatCompletion({
        payload,
@@ -628,14 +586,9 @@ class OpenAIClient extends BaseClient {
      result = await this.getCompletion(
        payload,
        null,
-        opts.onProgress,
        opts.abortController || new AbortController(),
      );

-      if (result && typeof result === 'string') {
-        return result.trim();
-      }
-
      logger.debug('[OpenAIClient] sendCompletion: result', result);

      if (this.isChatCompletion) {
@@ -744,12 +697,6 @@ class OpenAIClient extends BaseClient {
   *                            In case of failure, it will return the default title, "New Chat".
   */
  async titleConvo({ text, conversationId, responseText = '' }) {
-    this.conversationId = conversationId;
-
-    if (this.options.attachments) {
-      delete this.options.attachments;
-    }
-
    let title = 'New Chat';
    const convo = `||>User:
 "${truncateText(text)}"
@@ -758,10 +705,7 @@ class OpenAIClient extends BaseClient {

    const { OPENAI_TITLE_MODEL } = process.env ?? {};

-    let model = this.options.titleModel ?? OPENAI_TITLE_MODEL ?? 'gpt-3.5-turbo';
-    if (model === Constants.CURRENT_MODEL) {
-      model = this.modelOptions.model;
-    }
+    const model = this.options.titleModel ?? OPENAI_TITLE_MODEL ?? 'gpt-3.5-turbo';

    const modelOptions = {
      // TODO: remove the gpt fallback and make it specific to endpoint
@@ -815,8 +759,9 @@ class OpenAIClient extends BaseClient {

      const instructionsPayload = [
        {
-          role: this.options.titleMessageRole ?? (this.isOllama ? 'user' : 'system'),
-          content: `Please generate ${titleInstruction}
+          role: 'system',
+          content: `Detect user language and write in the same language an extremely concise title for this conversation, which you must accurately detect.
+Write in the detected language. Title in 5 Words or Less. No Punctuation or Quotation. Do not mention the language. All first letters of every word should be capitalized and write the title in User Language only.

 ${convo}

@@ -824,22 +769,10 @@ ${convo}
        },
      ];

-      const promptTokens = this.getTokenCountForMessage(instructionsPayload[0]);
-
      try {
-        let useChatCompletion = true;
-
-        if (this.options.reverseProxyUrl === CohereConstants.API_URL) {
-          useChatCompletion = false;
-        }
-
        title = (
-          await this.sendPayload(instructionsPayload, { modelOptions, useChatCompletion })
+          await this.sendPayload(instructionsPayload, { modelOptions, useChatCompletion: true })
        ).replaceAll('"', '');
-
-        const completionTokens = this.getTokenCount(title);
-
-        this.recordTokenUsage({ promptTokens, completionTokens, context: 'title' });
      } catch (e) {
        logger.error(
          '[OpenAIClient] There was an issue generating the title with the completion method',
@@ -862,7 +795,6 @@ ${convo}
        context: 'title',
        tokenBuffer: 150,
      });
-
      title = await runTitleChain({ llm, text, convo, signal: this.abortController.signal });
    } catch (e) {
      if (e?.message?.toLowerCase()?.includes('abort')) {
@@ -888,11 +820,7 @@ ${convo}

    // TODO: remove the gpt fallback and make it specific to endpoint
    const { OPENAI_SUMMARY_MODEL = 'gpt-3.5-turbo' } = process.env ?? {};
-    let model = this.options.summaryModel ?? OPENAI_SUMMARY_MODEL;
-    if (model === Constants.CURRENT_MODEL) {
-      model = this.modelOptions.model;
-    }
-
+    const model = this.options.summaryModel ?? OPENAI_SUMMARY_MODEL;
    const maxContextTokens =
      getModelMaxTokens(
        model,
@@ -996,13 +924,13 @@ ${convo}
    }
  }

-  async recordTokenUsage({ promptTokens, completionTokens, context = 'message' }) {
+  async recordTokenUsage({ promptTokens, completionTokens }) {
    await spendTokens(
      {
-        context,
+        user: this.user,
        model: this.modelOptions.model,
+        context: 'message',
        conversationId: this.conversationId,
-        user: this.user ?? this.options.req.user?.id,
        endpointTokenConfig: this.options.endpointTokenConfig,
      },
      { promptTokens, completionTokens },
@@ -1094,12 +1022,7 @@ ${convo}
      }

      if (this.azure || this.options.azure) {
-        /* Azure Bug, extremely short default `max_tokens` response */
-        if (!modelOptions.max_tokens && modelOptions.model === 'gpt-4-vision-preview') {
-          modelOptions.max_tokens = 4000;
-        }
-
-        /* Azure does not accept `model` in the body, so we need to remove it. */
+        // Azure does not accept `model` in the body, so we need to remove it.
        delete modelOptions.model;

        opts.baseURL = this.langchainProxy
@@ -1120,13 +1043,15 @@ ${convo}
      let chatCompletion;
      /** @type {OpenAI} */
      const openai = new OpenAI({
-        fetch: this.fetch,
        apiKey: this.apiKey,
        ...opts,
      });

-      /* Re-orders system message to the top of the messages payload, as not allowed anywhere else */
-      if (modelOptions.messages && (opts.baseURL.includes('api.mistral.ai') || this.isOllama)) {
+      /* hacky fixes for Mistral AI API:
+      - Re-orders system message to the top of the messages payload, as not allowed anywhere else
+      - If there is only one message and it's a system message, change the role to user
+      */
+      if (opts.baseURL.includes('https://api.mistral.ai/v1') && modelOptions.messages) {
        const { messages } = modelOptions;

        const systemMessageIndex = messages.findIndex((msg) => msg.role === 'system');
@@ -1137,16 +1062,10 @@ ${convo}
        }

        modelOptions.messages = messages;
-      }

-      /* If there is only one message and it's a system message, change the role to user */
-      if (
-        (opts.baseURL.includes('api.mistral.ai') || opts.baseURL.includes('api.perplexity.ai')) &&
-        modelOptions.messages &&
-        modelOptions.messages.length === 1 &&
-        modelOptions.messages[0]?.role === 'system'
-      ) {
-        modelOptions.messages[0].role = 'user';
+        if (messages.length === 1 && messages[0].role === 'system') {
+          modelOptions.messages[0].role = 'user';
+        }
      }

      if (this.options.addParams && typeof this.options.addParams === 'object') {
@@ -1170,27 +1089,8 @@ ${convo}
        });
      }

-      const streamRate = this.options.streamRate ?? Constants.DEFAULT_STREAM_RATE;
-
-      if (this.message_file_map && this.isOllama) {
-        const ollamaClient = new OllamaClient({ baseURL, streamRate });
-        return await ollamaClient.chatCompletion({
-          payload: modelOptions,
-          onProgress,
-          abortController,
-        });
-      }
-
      let UnexpectedRoleError = false;
-      /** @type {Promise<void>} */
-      let streamPromise;
-      /** @type {(value: void | PromiseLike<void>) => void} */
-      let streamResolve;
-
      if (modelOptions.stream) {
-        streamPromise = new Promise((resolve) => {
-          streamResolve = resolve;
-        });
        const stream = await openai.beta.chat.completions
          .stream({
            ...modelOptions,
@@ -1202,17 +1102,13 @@ ${convo}
          .on('error', (err) => {
            handleOpenAIErrors(err, errorCallback, 'stream');
          })
-          .on('finalChatCompletion', async (finalChatCompletion) => {
+          .on('finalChatCompletion', (finalChatCompletion) => {
            const finalMessage = finalChatCompletion?.choices?.[0]?.message;
-            if (!finalMessage) {
-              return;
-            }
-            await streamPromise;
-            if (finalMessage?.role !== 'assistant') {
+            if (finalMessage && finalMessage?.role !== 'assistant') {
              finalChatCompletion.choices[0].message.role = 'assistant';
            }

-            if (typeof finalMessage.content !== 'string' || finalMessage.content.trim() === '') {
+            if (finalMessage && !finalMessage?.content?.trim()) {
              finalChatCompletion.choices[0].message.content = intermediateReply;
            }
          })
@@ -1231,12 +1127,8 @@ ${convo}
            stream.controller.abort();
            break;
          }
-
-          await sleep(streamRate);
        }

-        streamResolve();
-
        if (!UnexpectedRoleError) {
          chatCompletion = await stream.finalChatCompletion().catch((err) => {
            handleOpenAIErrors(err, errorCallback, 'finalChatCompletion');
@@ -1264,23 +1156,14 @@ ${convo}
        throw new Error('Chat completion failed');
      }

-      const { choices } = chatCompletion;
-      if (!Array.isArray(choices) || choices.length === 0) {
-        logger.warn('[OpenAIClient] Chat completion response has no choices');
-        return intermediateReply;
+      const { message, finish_reason } = chatCompletion.choices[0];
+      if (chatCompletion) {
+        this.metadata = { finish_reason };
      }

-      const { message, finish_reason } = choices[0] ?? {};
-      this.metadata = { finish_reason };
-
      logger.debug('[OpenAIClient] chatCompletion response', chatCompletion);

-      if (!message) {
-        logger.warn('[OpenAIClient] Message is undefined in chatCompletion response');
-        return intermediateReply;
-      }
-
-      if (typeof message.content !== 'string' || message.content.trim() === '') {
+      if (!message?.content?.trim() && intermediateReply.length) {
        logger.debug(
          '[OpenAIClient] chatCompletion: using intermediateReply due to empty message.content',
          { intermediateReply },
--- a/api/app/clients/PluginsClient.js
+++ b/api/app/clients/PluginsClient.js
@@ -1,6 +1,5 @@
 const OpenAIClient = require('./OpenAIClient');
 const { CallbackManager } = require('langchain/callbacks');
-const { CacheKeys, Time } = require('librechat-data-provider');
 const { BufferMemory, ChatMessageHistory } = require('langchain/memory');
 const { initializeCustomAgent, initializeFunctionsAgent } = require('./agents');
 const { addImages, buildErrorInput, buildPromptPrefix } = require('./output_parsers');
@@ -12,7 +11,6 @@ const { SelfReflectionTool } = require('./tools');
 const { isEnabled } = require('~/server/utils');
 const { extractBaseURL } = require('~/utils');
 const { loadTools } = require('./tools/util');
-const { getLogStores } = require('~/cache');
 const { logger } = require('~/config');

 class PluginsClient extends OpenAIClient {
@@ -44,12 +42,8 @@ class PluginsClient extends OpenAIClient {
    return {
      chatGptLabel: this.options.chatGptLabel,
      promptPrefix: this.options.promptPrefix,
-      tools: this.options.tools,
      ...this.modelOptions,
      agentOptions: this.agentOptions,
-      iconURL: this.options.iconURL,
-      greeting: this.options.greeting,
-      spec: this.options.spec,
    };
  }

@@ -150,11 +144,9 @@ class PluginsClient extends OpenAIClient {
      signal,
      pastMessages,
      tools: this.tools,
+      currentDateString: this.currentDateString,
      verbose: this.options.debug,
      returnIntermediateSteps: true,
-      customName: this.options.chatGptLabel,
-      currentDateString: this.currentDateString,
-      customInstructions: this.options.promptPrefix,
      callbackManager: CallbackManager.fromHandlers({
        async handleAgentAction(action, runId) {
          handleAction(action, runId, onAgentAction);
@@ -222,13 +214,6 @@ class PluginsClient extends OpenAIClient {
    }
  }

-  /**
-   *
-   * @param {TMessage} responseMessage
-   * @param {Partial<TMessage>} saveOptions
-   * @param {string} user
-   * @returns
-   */
  async handleResponseMessage(responseMessage, saveOptions, user) {
    const { output, errorMessage, ...result } = this.result;
    logger.debug('[PluginsClient][handleResponseMessage] Output:', {
@@ -247,40 +232,19 @@ class PluginsClient extends OpenAIClient {
      await this.recordTokenUsage(responseMessage);
    }

-    this.responsePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
-    const messageCache = getLogStores(CacheKeys.MESSAGES);
-    messageCache.set(
-      responseMessage.messageId,
-      {
-        text: responseMessage.text,
-        complete: true,
-      },
-      Time.FIVE_MINUTES,
-    );
+    await this.saveMessageToDatabase(responseMessage, saveOptions, user);
    delete responseMessage.tokenCount;
    return { ...responseMessage, ...result };
  }

  async sendMessage(message, opts = {}) {
-    /** @type {{ filteredTools: string[], includedTools: string[] }} */
-    const { filteredTools = [], includedTools = [] } = this.options.req.app.locals;
-
-    if (includedTools.length > 0) {
-      const tools = this.options.tools.filter((plugin) => includedTools.includes(plugin));
-      this.options.tools = tools;
-    } else {
-      const tools = this.options.tools.filter((plugin) => !filteredTools.includes(plugin));
-      this.options.tools = tools;
-    }
-
    // If a message is edited, no tools can be used.
    const completionMode = this.options.tools.length === 0 || opts.isEdited;
    if (completionMode) {
      this.setOptions(opts);
      return super.sendMessage(message, opts);
    }
-
-    logger.debug('[PluginsClient] sendMessage', { userMessageText: message, opts });
+    logger.debug('[PluginsClient] sendMessage', { message, opts });
    const {
      user,
      isEdited,
@@ -294,14 +258,6 @@ class PluginsClient extends OpenAIClient {
      onToolEnd,
    } = await this.handleStartMethods(message, opts);

-    if (opts.progressCallback) {
-      opts.onProgress = opts.progressCallback.call(null, {
-        ...(opts.progressOptions ?? {}),
-        parentMessageId: userMessage.messageId,
-        messageId: responseMessageId,
-      });
-    }
-
    this.currentMessages.push(userMessage);

    let {
@@ -330,15 +286,7 @@ class PluginsClient extends OpenAIClient {
    if (payload) {
      this.currentMessages = payload;
    }
-
-    if (!this.skipSaveUserMessage) {
-      this.userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
-      if (typeof opts?.getReqData === 'function') {
-        opts.getReqData({
-          userMessagePromise: this.userMessagePromise,
-        });
-      }
-    }
+    await this.saveMessageToDatabase(userMessage, saveOptions, user);

    if (isEnabled(process.env.CHECK_BALANCE)) {
      await checkBalance({
@@ -356,8 +304,6 @@ class PluginsClient extends OpenAIClient {
    }

    const responseMessage = {
-      endpoint: EModelEndpoint.gptPlugins,
-      iconURL: this.options.iconURL,
      messageId: responseMessageId,
      conversationId,
      parentMessageId: userMessage.messageId,
--- a/api/app/clients/agents/CustomAgent/initializeCustomAgent.js
+++ b/api/app/clients/agents/CustomAgent/initializeCustomAgent.js
@@ -13,18 +13,10 @@ const initializeCustomAgent = async ({
  tools,
  model,
  pastMessages,
-  customName,
-  customInstructions,
  currentDateString,
  ...rest
 }) => {
  let prompt = CustomAgent.createPrompt(tools, { currentDateString, model: model.modelName });
-  if (customName) {
-    prompt = `You are "${customName}".\n${prompt}`;
-  }
-  if (customInstructions) {
-    prompt = `${prompt}\n${customInstructions}`;
-  }

  const chatPrompt = ChatPromptTemplate.fromMessages([
    new SystemMessagePromptTemplate(prompt),
--- a/api/app/clients/agents/CustomAgent/instructions.js
+++ b/api/app/clients/agents/CustomAgent/instructions.js
@@ -1,3 +1,44 @@
+/*
+module.exports = `You are ChatGPT, a Large Language model with useful tools.
+
+Talk to the human and provide meaningful answers when questions are asked.
+
+Use the tools when you need them, but use your own knowledge if you are confident of the answer. Keep answers short and concise.
+
+A tool is not usually needed for creative requests, so do your best to answer them without tools.
+
+Avoid repeating identical answers if it appears before. Only fulfill the human's requests, do not create extra steps beyond what the human has asked for.
+
+Your input for 'Action' should be the name of tool used only.
+
+Be honest. If you can't answer something, or a tool is not appropriate, say you don't know or answer to the best of your ability.
+
+Attempt to fulfill the human's requests in as few actions as possible`;
+*/
+
+// module.exports = `You are ChatGPT, a highly knowledgeable and versatile large language model.
+
+// Engage with the Human conversationally, providing concise and meaningful answers to questions. Utilize built-in tools when necessary, except for creative requests, where relying on your own knowledge is preferred. Aim for variety and avoid repetitive answers.
+
+// For your 'Action' input, state the name of the tool used only, and honor user requests without adding extra steps. Always be honest; if you cannot provide an appropriate answer or tool, admit that or do your best.
+
+// Strive to meet the user's needs efficiently with minimal actions.`;
+
+// import {
+//   BasePromptTemplate,
+//   BaseStringPromptTemplate,
+//   SerializedBasePromptTemplate,
+//   renderTemplate,
+// } from "langchain/prompts";
+
+// prefix: `You are ChatGPT, a highly knowledgeable and versatile large language model.
+// Your objective is to help users by understanding their intent and choosing the best action. Prioritize direct, specific responses. Use concise, varied answers and rely on your knowledge for creative tasks. Utilize tools when needed, and structure results for machine compatibility.
+// prefix: `Objective: to comprehend human intentions based on user input and available tools. Goal: identify the best action to directly address the human's query. In your subsequent steps, you will utilize the chosen action. You may select multiple actions and list them in a meaningful order. Prioritize actions that directly relate to the user's query over general ones. Ensure that the generated thought is highly specific and explicit to best match the user's expectations. Construct the result in a manner that an online open-API would most likely expect. Provide concise and meaningful answers to human queries. Utilize tools when necessary. Relying on your own knowledge is preferred for creative requests. Aim for variety and avoid repetitive answers.
+
+// # Available Actions & Tools:
+// N/A: no suitable action, use your own knowledge.`,
+// suffix: `Remember, all your responses MUST adhere to the described format and only respond if the format is followed. Output exactly with the requested format, avoiding any other text as this will be parsed by a machine. Following 'Action:', provide only one of the actions listed above. If a tool is not necessary, deduce this quickly and finish your response. Honor the human's requests without adding extra steps. Carry out tasks in the sequence written by the human. Always be honest; if you cannot provide an appropriate answer or tool, do your best with your own knowledge. Strive to meet the user's needs efficiently with minimal actions.`;
+
 module.exports = {
  'gpt3-v1': {
    prefix: `Objective: Understand human intentions using user input and available tools. Goal: Identify the most suitable actions to directly address user queries.
--- a/api/app/clients/agents/Functions/initializeFunctionsAgent.js
+++ b/api/app/clients/agents/Functions/initializeFunctionsAgent.js
@@ -10,8 +10,6 @@ const initializeFunctionsAgent = async ({
  tools,
  model,
  pastMessages,
-  customName,
-  customInstructions,
  currentDateString,
  ...rest
 }) => {
@@ -26,13 +24,7 @@ const initializeFunctionsAgent = async ({
    returnMessages: true,
  });

-  let prefix = addToolDescriptions(`Current Date: ${currentDateString}\n${PREFIX}`, tools);
-  if (customName) {
-    prefix = `You are "${customName}".\n${prefix}`;
-  }
-  if (customInstructions) {
-    prefix = `${prefix}\n${customInstructions}`;
-  }
+  const prefix = addToolDescriptions(`Current Date: ${currentDateString}\n${PREFIX}`, tools);

  return await initializeAgentExecutorWithOptions(tools, model, {
    agentType: 'openai-functions',
--- a/api/app/clients/llm/RunManager.js
+++ b/api/app/clients/llm/RunManager.js
@@ -1,5 +1,5 @@
 const { createStartHandler } = require('~/app/clients/callbacks');
-const { spendTokens } = require('~/models/spendTokens');
+const spendTokens = require('~/models/spendTokens');
 const { logger } = require('~/config');

 class RunManager {
--- a/api/app/clients/llm/createCoherePayload.js
+++ b/api/app/clients/llm/createCoherePayload.js
@@ -1,85 +0,0 @@
-const { CohereConstants } = require('librechat-data-provider');
-const { titleInstruction } = require('../prompts/titlePrompts');
-
-// Mapping OpenAI roles to Cohere roles
-const roleMap = {
-  user: CohereConstants.ROLE_USER,
-  assistant: CohereConstants.ROLE_CHATBOT,
-  system: CohereConstants.ROLE_SYSTEM, // Recognize and map the system role explicitly
-};
-
-/**
- * Adjusts an OpenAI ChatCompletionPayload to conform with Cohere's expected chat payload format.
- * Now includes handling for "system" roles explicitly mentioned.
- *
- * @param {Object} options - Object containing the model options.
- * @param {ChatCompletionPayload} options.modelOptions - The OpenAI model payload options.
- * @returns {CohereChatStreamRequest} Cohere-compatible chat API payload.
- */
-function createCoherePayload({ modelOptions }) {
-  /** @type {string | undefined} */
-  let preamble;
-  let latestUserMessageContent = '';
-  const {
-    stream,
-    stop,
-    top_p,
-    temperature,
-    frequency_penalty,
-    presence_penalty,
-    max_tokens,
-    messages,
-    model,
-    ...rest
-  } = modelOptions;
-
-  // Filter out the latest user message and transform remaining messages to Cohere's chat_history format
-  let chatHistory = messages.reduce((acc, message, index, arr) => {
-    const isLastUserMessage = index === arr.length - 1 && message.role === 'user';
-
-    const messageContent =
-      typeof message.content === 'string'
-        ? message.content
-        : message.content.map((part) => (part.type === 'text' ? part.text : '')).join(' ');
-
-    if (isLastUserMessage) {
-      latestUserMessageContent = messageContent;
-    } else {
-      acc.push({
-        role: roleMap[message.role] || CohereConstants.ROLE_USER,
-        message: messageContent,
-      });
-    }
-
-    return acc;
-  }, []);
-
-  if (
-    chatHistory.length === 1 &&
-    chatHistory[0].role === CohereConstants.ROLE_SYSTEM &&
-    !latestUserMessageContent.length
-  ) {
-    const message = chatHistory[0].message;
-    latestUserMessageContent = message.includes(titleInstruction)
-      ? CohereConstants.TITLE_MESSAGE
-      : '.';
-    preamble = message;
-  }
-
-  return {
-    message: latestUserMessageContent,
-    model: model,
-    chatHistory,
-    stream: stream ?? false,
-    temperature: temperature,
-    frequencyPenalty: frequency_penalty,
-    presencePenalty: presence_penalty,
-    maxTokens: max_tokens,
-    stopSequences: stop,
-    preamble,
-    p: top_p,
-    ...rest,
-  };
-}
-
-module.exports = createCoherePayload;
--- a/api/app/clients/llm/index.js
+++ b/api/app/clients/llm/index.js
@@ -1,9 +1,7 @@
 const createLLM = require('./createLLM');
 const RunManager = require('./RunManager');
-const createCoherePayload = require('./createCoherePayload');

 module.exports = {
  createLLM,
  RunManager,
-  createCoherePayload,
 };
--- a/api/app/clients/output_parsers/addImages.js
+++ b/api/app/clients/output_parsers/addImages.js
@@ -60,10 +60,10 @@ function addImages(intermediateSteps, responseMessage) {
    if (!observation || !observation.includes('![')) {
      return;
    }
-    const observedImagePath = observation.match(/!\[[^(]*\]\([^)]*\)/g);
+    const observedImagePath = observation.match(/!\[.*\]\([^)]*\)/g);
    if (observedImagePath && !responseMessage.text.includes(observedImagePath[0])) {
-      responseMessage.text += '\n' + observedImagePath[0];
-      logger.debug('[addImages] added image from intermediateSteps:', observedImagePath[0]);
+      responseMessage.text += '\n' + observation;
+      logger.debug('[addImages] added image from intermediateSteps:', observation);
    }
  });
 }
--- a/api/app/clients/output_parsers/addImages.spec.js
+++ b/api/app/clients/output_parsers/addImages.spec.js
@@ -81,62 +81,4 @@ describe('addImages', () => {
    addImages(intermediateSteps, responseMessage);
    expect(responseMessage.text).toBe(`${originalText}\n${imageMarkdown}`);
  });
-
-  it('should extract only image markdowns when there is text between them', () => {
-    const markdownWithTextBetweenImages = `
-      ![image1](/images/image1.png)
-      Some text between images that should not be included.
-      ![image2](/images/image2.png)
-      More text that should be ignored.
-      ![image3](/images/image3.png)
-    `;
-    intermediateSteps.push({ observation: markdownWithTextBetweenImages });
-    addImages(intermediateSteps, responseMessage);
-    expect(responseMessage.text).toBe('\n![image1](/images/image1.png)');
-  });
-
-  it('should only return the first image when multiple images are present', () => {
-    const markdownWithMultipleImages = `
-      ![image1](/images/image1.png)
-      ![image2](/images/image2.png)
-      ![image3](/images/image3.png)
-    `;
-    intermediateSteps.push({ observation: markdownWithMultipleImages });
-    addImages(intermediateSteps, responseMessage);
-    expect(responseMessage.text).toBe('\n![image1](/images/image1.png)');
-  });
-
-  it('should not include any text or metadata surrounding the image markdown', () => {
-    const markdownWithMetadata = `
-      Title: Test Document
-      Author: John Doe
-      ![image1](/images/image1.png)
-      Some content after the image.
-      Vector values: [0.1, 0.2, 0.3]
-    `;
-    intermediateSteps.push({ observation: markdownWithMetadata });
-    addImages(intermediateSteps, responseMessage);
-    expect(responseMessage.text).toBe('\n![image1](/images/image1.png)');
-  });
-
-  it('should handle complex markdown with multiple images and only return the first one', () => {
-    const complexMarkdown = `
-      # Document Title
-      
-      ## Section 1
-      Here's some text with an embedded image:
-      ![image1](/images/image1.png)
-      
-      ## Section 2
-      More text here...
-      ![image2](/images/image2.png)
-      
-      ### Subsection
-      Even more content
-      ![image3](/images/image3.png)
-    `;
-    intermediateSteps.push({ observation: complexMarkdown });
-    addImages(intermediateSteps, responseMessage);
-    expect(responseMessage.text).toBe('\n![image1](/images/image1.png)');
-  });
 });
--- a/api/app/clients/prompts/addCacheControl.js
+++ b/api/app/clients/prompts/addCacheControl.js
@@ -1,43 +0,0 @@
-/**
- * Anthropic API: Adds cache control to the appropriate user messages in the payload.
- * @param {Array<AnthropicMessage>} messages - The array of message objects.
- * @returns {Array<AnthropicMessage>} - The updated array of message objects with cache control added.
- */
-function addCacheControl(messages) {
-  if (!Array.isArray(messages) || messages.length < 2) {
-    return messages;
-  }
-
-  const updatedMessages = [...messages];
-  let userMessagesModified = 0;
-
-  for (let i = updatedMessages.length - 1; i >= 0 && userMessagesModified < 2; i--) {
-    const message = updatedMessages[i];
-    if (message.role !== 'user') {
-      continue;
-    }
-
-    if (typeof message.content === 'string') {
-      message.content = [
-        {
-          type: 'text',
-          text: message.content,
-          cache_control: { type: 'ephemeral' },
-        },
-      ];
-      userMessagesModified++;
-    } else if (Array.isArray(message.content)) {
-      for (let j = message.content.length - 1; j >= 0; j--) {
-        if (message.content[j].type === 'text') {
-          message.content[j].cache_control = { type: 'ephemeral' };
-          userMessagesModified++;
-          break;
-        }
-      }
-    }
-  }
-
-  return updatedMessages;
-}
-
-module.exports = addCacheControl;
--- a/api/app/clients/prompts/addCacheControl.spec.js
+++ b/api/app/clients/prompts/addCacheControl.spec.js
@@ -1,227 +0,0 @@
-const addCacheControl = require('./addCacheControl');
-
-describe('addCacheControl', () => {
-  test('should add cache control to the last two user messages with array content', () => {
-    const messages = [
-      { role: 'user', content: [{ type: 'text', text: 'Hello' }] },
-      { role: 'assistant', content: [{ type: 'text', text: 'Hi there' }] },
-      { role: 'user', content: [{ type: 'text', text: 'How are you?' }] },
-      { role: 'assistant', content: [{ type: 'text', text: 'I\'m doing well, thanks!' }] },
-      { role: 'user', content: [{ type: 'text', text: 'Great!' }] },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content[0]).not.toHaveProperty('cache_control');
-    expect(result[2].content[0].cache_control).toEqual({ type: 'ephemeral' });
-    expect(result[4].content[0].cache_control).toEqual({ type: 'ephemeral' });
-  });
-
-  test('should add cache control to the last two user messages with string content', () => {
-    const messages = [
-      { role: 'user', content: 'Hello' },
-      { role: 'assistant', content: 'Hi there' },
-      { role: 'user', content: 'How are you?' },
-      { role: 'assistant', content: 'I\'m doing well, thanks!' },
-      { role: 'user', content: 'Great!' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content).toBe('Hello');
-    expect(result[2].content[0]).toEqual({
-      type: 'text',
-      text: 'How are you?',
-      cache_control: { type: 'ephemeral' },
-    });
-    expect(result[4].content[0]).toEqual({
-      type: 'text',
-      text: 'Great!',
-      cache_control: { type: 'ephemeral' },
-    });
-  });
-
-  test('should handle mixed string and array content', () => {
-    const messages = [
-      { role: 'user', content: 'Hello' },
-      { role: 'assistant', content: 'Hi there' },
-      { role: 'user', content: [{ type: 'text', text: 'How are you?' }] },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content[0]).toEqual({
-      type: 'text',
-      text: 'Hello',
-      cache_control: { type: 'ephemeral' },
-    });
-    expect(result[2].content[0].cache_control).toEqual({ type: 'ephemeral' });
-  });
-
-  test('should handle less than two user messages', () => {
-    const messages = [
-      { role: 'user', content: 'Hello' },
-      { role: 'assistant', content: 'Hi there' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content[0]).toEqual({
-      type: 'text',
-      text: 'Hello',
-      cache_control: { type: 'ephemeral' },
-    });
-    expect(result[1].content).toBe('Hi there');
-  });
-
-  test('should return original array if no user messages', () => {
-    const messages = [
-      { role: 'assistant', content: 'Hi there' },
-      { role: 'assistant', content: 'How can I help?' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result).toEqual(messages);
-  });
-
-  test('should handle empty array', () => {
-    const messages = [];
-    const result = addCacheControl(messages);
-    expect(result).toEqual([]);
-  });
-
-  test('should handle non-array input', () => {
-    const messages = 'not an array';
-    const result = addCacheControl(messages);
-    expect(result).toBe('not an array');
-  });
-
-  test('should not modify assistant messages', () => {
-    const messages = [
-      { role: 'user', content: 'Hello' },
-      { role: 'assistant', content: 'Hi there' },
-      { role: 'user', content: 'How are you?' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[1].content).toBe('Hi there');
-  });
-
-  test('should handle multiple content items in user messages', () => {
-    const messages = [
-      {
-        role: 'user',
-        content: [
-          { type: 'text', text: 'Hello' },
-          { type: 'image', url: 'http://example.com/image.jpg' },
-          { type: 'text', text: 'This is an image' },
-        ],
-      },
-      { role: 'assistant', content: 'Hi there' },
-      { role: 'user', content: 'How are you?' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content[0]).not.toHaveProperty('cache_control');
-    expect(result[0].content[1]).not.toHaveProperty('cache_control');
-    expect(result[0].content[2].cache_control).toEqual({ type: 'ephemeral' });
-    expect(result[2].content[0]).toEqual({
-      type: 'text',
-      text: 'How are you?',
-      cache_control: { type: 'ephemeral' },
-    });
-  });
-
-  test('should handle an array with mixed content types', () => {
-    const messages = [
-      { role: 'user', content: 'Hello' },
-      { role: 'assistant', content: 'Hi there' },
-      { role: 'user', content: [{ type: 'text', text: 'How are you?' }] },
-      { role: 'assistant', content: 'I\'m doing well, thanks!' },
-      { role: 'user', content: 'Great!' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content).toEqual('Hello');
-    expect(result[2].content[0]).toEqual({
-      type: 'text',
-      text: 'How are you?',
-      cache_control: { type: 'ephemeral' },
-    });
-    expect(result[4].content).toEqual([
-      {
-        type: 'text',
-        text: 'Great!',
-        cache_control: { type: 'ephemeral' },
-      },
-    ]);
-    expect(result[1].content).toBe('Hi there');
-    expect(result[3].content).toBe('I\'m doing well, thanks!');
-  });
-
-  test('should handle edge case with multiple content types', () => {
-    const messages = [
-      {
-        role: 'user',
-        content: [
-          {
-            type: 'image',
-            source: { type: 'base64', media_type: 'image/png', data: 'some_base64_string' },
-          },
-          {
-            type: 'image',
-            source: { type: 'base64', media_type: 'image/png', data: 'another_base64_string' },
-          },
-          { type: 'text', text: 'what do all these images have in common' },
-        ],
-      },
-      { role: 'assistant', content: 'I see multiple images.' },
-      { role: 'user', content: 'Correct!' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content[0]).not.toHaveProperty('cache_control');
-    expect(result[0].content[1]).not.toHaveProperty('cache_control');
-    expect(result[0].content[2].cache_control).toEqual({ type: 'ephemeral' });
-    expect(result[2].content[0]).toEqual({
-      type: 'text',
-      text: 'Correct!',
-      cache_control: { type: 'ephemeral' },
-    });
-  });
-
-  test('should handle user message with no text block', () => {
-    const messages = [
-      {
-        role: 'user',
-        content: [
-          {
-            type: 'image',
-            source: { type: 'base64', media_type: 'image/png', data: 'some_base64_string' },
-          },
-          {
-            type: 'image',
-            source: { type: 'base64', media_type: 'image/png', data: 'another_base64_string' },
-          },
-        ],
-      },
-      { role: 'assistant', content: 'I see two images.' },
-      { role: 'user', content: 'Correct!' },
-    ];
-
-    const result = addCacheControl(messages);
-
-    expect(result[0].content[0]).not.toHaveProperty('cache_control');
-    expect(result[0].content[1]).not.toHaveProperty('cache_control');
-    expect(result[2].content[0]).toEqual({
-      type: 'text',
-      text: 'Correct!',
-      cache_control: { type: 'ephemeral' },
-    });
-  });
-});
--- a/api/app/clients/prompts/createContextHandlers.js
+++ b/api/app/clients/prompts/createContextHandlers.js
@@ -1,6 +1,5 @@
 const axios = require('axios');
 const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');

 const footer = `Use the context as your learned knowledge to better answer the user.

@@ -8,6 +7,8 @@ In your response, remember to follow these guidelines:
 - If you don't know the answer, simply say that you don't know.
 - If you are unsure how to answer, ask for clarification.
 - Avoid mentioning that you obtained the information from the context.
+
+Answer appropriately in the user's language.
 `;

 function createContextHandlers(req, userMessageContent) {
@@ -54,7 +55,7 @@ function createContextHandlers(req, userMessageContent) {
        processedFiles.push(file);
        processedIds.add(file.file_id);
      } catch (error) {
-        logger.error(`Error processing file ${file.filename}:`, error);
+        console.error(`Error processing file ${file.filename}:`, error);
      }
    }
  };
@@ -92,40 +93,37 @@ function createContextHandlers(req, userMessageContent) {

      const resolvedQueries = await Promise.all(queryPromises);

-      const context =
-        resolvedQueries.length === 0
-          ? '\n\tThe semantic search did not return any results.'
-          : resolvedQueries
-            .map((queryResult, index) => {
-              const file = processedFiles[index];
-              let contextItems = queryResult.data;
+      const context = resolvedQueries
+        .map((queryResult, index) => {
+          const file = processedFiles[index];
+          let contextItems = queryResult.data;

-              const generateContext = (currentContext) =>
-                `
+          const generateContext = (currentContext) =>
+            `
          <file>
            <filename>${file.filename}</filename>
            <context>${currentContext}
            </context>
          </file>`;

-              if (useFullContext) {
-                return generateContext(`\n${contextItems}`);
-              }
+          if (useFullContext) {
+            return generateContext(`\n${contextItems}`);
+          }

-              contextItems = queryResult.data
-                .map((item) => {
-                  const pageContent = item[0].page_content;
-                  return `
+          contextItems = queryResult.data
+            .map((item) => {
+              const pageContent = item[0].page_content;
+              return `
            <contextItem>
              <![CDATA[${pageContent?.trim()}]]>
            </contextItem>`;
-                })
-                .join('');
-
-              return generateContext(contextItems);
            })
            .join('');

+          return generateContext(contextItems);
+        })
+        .join('');
+
      if (useFullContext) {
        const prompt = `${header}
          ${context}
@@ -146,8 +144,8 @@ function createContextHandlers(req, userMessageContent) {

      return prompt;
    } catch (error) {
-      logger.error('Error creating context:', error);
-      throw error;
+      console.error('Error creating context:', error);
+      throw error; // Re-throw the error to propagate it to the caller
    }
  };

--- a/api/app/clients/prompts/index.js
+++ b/api/app/clients/prompts/index.js
@@ -1,4 +1,3 @@
-const addCacheControl = require('./addCacheControl');
 const formatMessages = require('./formatMessages');
 const summaryPrompts = require('./summaryPrompts');
 const handleInputs = require('./handleInputs');
@@ -9,13 +8,12 @@ const createVisionPrompt = require('./createVisionPrompt');
 const createContextHandlers = require('./createContextHandlers');

 module.exports = {
-  addCacheControl,
  ...formatMessages,
  ...summaryPrompts,
  ...handleInputs,
  ...instructions,
  ...titlePrompts,
-  ...truncateText,
+  truncateText,
  createVisionPrompt,
  createContextHandlers,
 };
--- a/api/app/clients/prompts/titlePrompts.js
+++ b/api/app/clients/prompts/titlePrompts.js
@@ -27,8 +27,6 @@ ${convo}`,
  return titlePrompt;
 };

-const titleInstruction =
-  'a concise, 5-word-or-less title for the conversation, using its same language, with no punctuation. Apply title case conventions appropriate for the language. Never directly mention the language name or the word "title"';
 const titleFunctionPrompt = `In this environment you have access to a set of tools you can use to generate the conversation title.
  
 You may call them like this:
@@ -53,70 +51,36 @@ Submit a brief title in the conversation's language, following the parameter des
 <parameter>
 <name>title</name>
 <type>string</type>
-<description>${titleInstruction}</description>
-</parameter>
-</parameters>
-</tool_description>
-</tools>`;
-
-const genTranslationPrompt = (
-  translationPrompt,
-) => `In this environment you have access to a set of tools you can use to translate text.
-  
-You may call them like this:
-<function_calls>
-<invoke>
-<tool_name>$TOOL_NAME</tool_name>
-<parameters>
-<$PARAMETER_NAME>$PARAMETER_VALUE</$PARAMETER_NAME>
-...
-</parameters>
-</invoke>
-</function_calls>
-
-Here are the tools available:
-<tools>
-<tool_description>
-<tool_name>submit_translation</tool_name>
-<description>
-Submit a translation in the target language, following the parameter description and its language closely.
-</description>
-<parameters>
-<parameter>
-<name>translation</name>
-<type>string</type>
-<description>${translationPrompt}
-ONLY include the generated translation without quotations, nor its related key</description>
+<description>A concise, 5-word-or-less title for the conversation, using its same language, with no punctuation. Apply title case conventions appropriate for the language. For English, use AP Stylebook Title Case. Never directly mention the language name or the word "title"</description>
 </parameter>
 </parameters>
 </tool_description>
 </tools>`;

 /**
- * Parses specified parameter from the provided prompt.
- * @param {string} prompt - The prompt containing the desired parameter.
- * @param {string} paramName - The name of the parameter to extract.
- * @returns {string} The parsed parameter's value or a default value if not found.
+ * Parses titles from title functions based on the provided prompt.
+ * @param {string} prompt - The prompt containing the title function.
+ * @returns {string} The parsed title. "New Chat" if no title is found.
 */
-function parseParamFromPrompt(prompt, paramName) {
-  const paramRegex = new RegExp(`<${paramName}>([\\s\\S]+?)</${paramName}>`);
-  const paramMatch = prompt.match(paramRegex);
+function parseTitleFromPrompt(prompt) {
+  const titleRegex = /<title>(.+?)<\/title>/;
+  const titleMatch = prompt.match(titleRegex);

-  if (paramMatch && paramMatch[1]) {
-    return paramMatch[1].trim();
+  if (titleMatch && titleMatch[1]) {
+    const title = titleMatch[1].trim();
+
+    // // Capitalize the first letter of each word; Note: unnecessary due to title case prompting
+    // const capitalizedTitle = title.replace(/\b\w/g, (char) => char.toUpperCase());
+
+    return title;
  }

-  if (prompt && prompt.length) {
-    return `NO TOOL INVOCATION: ${prompt}`;
-  }
-  return `No ${paramName} provided`;
+  return 'New Chat';
 }

 module.exports = {
  langPrompt,
-  titleInstruction,
  createTitlePrompt,
  titleFunctionPrompt,
-  parseParamFromPrompt,
-  genTranslationPrompt,
+  parseTitleFromPrompt,
 };
--- a/api/app/clients/prompts/truncateText.js
+++ b/api/app/clients/prompts/truncateText.js
@@ -1,40 +1,10 @@
 const MAX_CHAR = 255;

-/**
- * Truncates a given text to a specified maximum length, appending ellipsis and a notification
- * if the original text exceeds the maximum length.
- *
- * @param {string} text - The text to be truncated.
- * @param {number} [maxLength=MAX_CHAR] - The maximum length of the text after truncation. Defaults to MAX_CHAR.
- * @returns {string} The truncated text if the original text length exceeds maxLength, otherwise returns the original text.
- */
-function truncateText(text, maxLength = MAX_CHAR) {
-  if (text.length > maxLength) {
-    return `${text.slice(0, maxLength)}... [text truncated for brevity]`;
+function truncateText(text) {
+  if (text.length > MAX_CHAR) {
+    return `${text.slice(0, MAX_CHAR)}... [text truncated for brevity]`;
  }
  return text;
 }

-/**
- * Truncates a given text to a specified maximum length by showing the first half and the last half of the text,
- * separated by ellipsis. This method ensures the output does not exceed the maximum length, including the addition
- * of ellipsis and notification if the original text exceeds the maximum length.
- *
- * @param {string} text - The text to be truncated.
- * @param {number} [maxLength=MAX_CHAR] - The maximum length of the output text after truncation. Defaults to MAX_CHAR.
- * @returns {string} The truncated text showing the first half and the last half, or the original text if it does not exceed maxLength.
- */
-function smartTruncateText(text, maxLength = MAX_CHAR) {
-  const ellipsis = '...';
-  const notification = ' [text truncated for brevity]';
-  const halfMaxLength = Math.floor((maxLength - ellipsis.length - notification.length) / 2);
-
-  if (text.length > maxLength) {
-    const startLastHalf = text.length - halfMaxLength;
-    return `${text.slice(0, halfMaxLength)}${ellipsis}${text.slice(startLastHalf)}${notification}`;
-  }
-
-  return text;
-}
-
-module.exports = { truncateText, smartTruncateText };
+module.exports = truncateText;
--- a/api/app/clients/specs/AnthropicClient.test.js
+++ b/api/app/clients/specs/AnthropicClient.test.js
@@ -1,6 +1,4 @@
-const { anthropicSettings } = require('librechat-data-provider');
-const AnthropicClient = require('~/app/clients/AnthropicClient');
-
+const AnthropicClient = require('../AnthropicClient');
 const HUMAN_PROMPT = '\n\nHuman:';
 const AI_PROMPT = '\n\nAssistant:';

@@ -24,7 +22,7 @@ describe('AnthropicClient', () => {
    const options = {
      modelOptions: {
        model,
-        temperature: anthropicSettings.temperature.default,
+        temperature: 0.7,
      },
    };
    client = new AnthropicClient('test-api-key');
@@ -35,42 +33,7 @@ describe('AnthropicClient', () => {
    it('should set the options correctly', () => {
      expect(client.apiKey).toBe('test-api-key');
      expect(client.modelOptions.model).toBe(model);
-      expect(client.modelOptions.temperature).toBe(anthropicSettings.temperature.default);
-    });
-
-    it('should set legacy maxOutputTokens for non-Claude-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-2',
-          maxOutputTokens: anthropicSettings.maxOutputTokens.default,
-        },
-      });
-      expect(client.modelOptions.maxOutputTokens).toBe(
-        anthropicSettings.legacy.maxOutputTokens.default,
-      );
-    });
-    it('should not set maxOutputTokens if not provided', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-3',
-        },
-      });
-      expect(client.modelOptions.maxOutputTokens).toBeUndefined();
-    });
-
-    it('should not set legacy maxOutputTokens for Claude-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-3-opus-20240229',
-          maxOutputTokens: anthropicSettings.legacy.maxOutputTokens.default,
-        },
-      });
-      expect(client.modelOptions.maxOutputTokens).toBe(
-        anthropicSettings.legacy.maxOutputTokens.default,
-      );
+      expect(client.modelOptions.temperature).toBe(0.7);
    });
  });

@@ -173,212 +136,4 @@ describe('AnthropicClient', () => {
      expect(prompt).toContain('You are Claude-2');
    });
  });
-
-  describe('getClient', () => {
-    it('should set legacy maxOutputTokens for non-Claude-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-2',
-          maxOutputTokens: anthropicSettings.legacy.maxOutputTokens.default,
-        },
-      });
-      expect(client.modelOptions.maxOutputTokens).toBe(
-        anthropicSettings.legacy.maxOutputTokens.default,
-      );
-    });
-
-    it('should not set legacy maxOutputTokens for Claude-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-3-opus-20240229',
-          maxOutputTokens: anthropicSettings.legacy.maxOutputTokens.default,
-        },
-      });
-      expect(client.modelOptions.maxOutputTokens).toBe(
-        anthropicSettings.legacy.maxOutputTokens.default,
-      );
-    });
-
-    it('should add beta header for claude-3-5-sonnet model', () => {
-      const client = new AnthropicClient('test-api-key');
-      const modelOptions = {
-        model: 'claude-3-5-sonnet-20240307',
-      };
-      client.setOptions({ modelOptions, promptCache: true });
-      const anthropicClient = client.getClient(modelOptions);
-      expect(anthropicClient._options.defaultHeaders).toBeDefined();
-      expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
-      expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
-        'max-tokens-3-5-sonnet-2024-07-15,prompt-caching-2024-07-31',
-      );
-    });
-
-    it('should add beta header for claude-3-haiku model', () => {
-      const client = new AnthropicClient('test-api-key');
-      const modelOptions = {
-        model: 'claude-3-haiku-2028',
-      };
-      client.setOptions({ modelOptions, promptCache: true });
-      const anthropicClient = client.getClient(modelOptions);
-      expect(anthropicClient._options.defaultHeaders).toBeDefined();
-      expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
-      expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
-        'prompt-caching-2024-07-31',
-      );
-    });
-
-    it('should not add beta header for other models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-2',
-        },
-      });
-      const anthropicClient = client.getClient();
-      expect(anthropicClient.defaultHeaders).not.toHaveProperty('anthropic-beta');
-    });
-  });
-
-  describe('calculateCurrentTokenCount', () => {
-    let client;
-
-    beforeEach(() => {
-      client = new AnthropicClient('test-api-key');
-    });
-
-    it('should calculate correct token count when usage is provided', () => {
-      const tokenCountMap = {
-        msg1: 10,
-        msg2: 20,
-        currentMsg: 30,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        input_tokens: 70,
-        output_tokens: 50,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(40); // 70 - (10 + 20) = 40
-    });
-
-    it('should return original estimate if calculation results in negative value', () => {
-      const tokenCountMap = {
-        msg1: 40,
-        msg2: 50,
-        currentMsg: 30,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        input_tokens: 80,
-        output_tokens: 50,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(30); // Original estimate
-    });
-
-    it('should handle cache creation and read input tokens', () => {
-      const tokenCountMap = {
-        msg1: 10,
-        msg2: 20,
-        currentMsg: 30,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        input_tokens: 50,
-        cache_creation_input_tokens: 10,
-        cache_read_input_tokens: 20,
-        output_tokens: 40,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(50); // (50 + 10 + 20) - (10 + 20) = 50
-    });
-
-    it('should handle missing usage properties', () => {
-      const tokenCountMap = {
-        msg1: 10,
-        msg2: 20,
-        currentMsg: 30,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        output_tokens: 40,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(30); // Original estimate
-    });
-
-    it('should handle empty tokenCountMap', () => {
-      const tokenCountMap = {};
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        input_tokens: 50,
-        output_tokens: 40,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(50);
-      expect(Number.isNaN(result)).toBe(false);
-    });
-
-    it('should handle zero values in usage', () => {
-      const tokenCountMap = {
-        msg1: 10,
-        currentMsg: 20,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        input_tokens: 0,
-        cache_creation_input_tokens: 0,
-        cache_read_input_tokens: 0,
-        output_tokens: 0,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(20); // Should return original estimate
-      expect(Number.isNaN(result)).toBe(false);
-    });
-
-    it('should handle undefined usage', () => {
-      const tokenCountMap = {
-        msg1: 10,
-        currentMsg: 20,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = undefined;
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(20); // Should return original estimate
-      expect(Number.isNaN(result)).toBe(false);
-    });
-
-    it('should handle non-numeric values in tokenCountMap', () => {
-      const tokenCountMap = {
-        msg1: 'ten',
-        currentMsg: 20,
-      };
-      const currentMessageId = 'currentMsg';
-      const usage = {
-        input_tokens: 30,
-        output_tokens: 10,
-      };
-
-      const result = client.calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage });
-
-      expect(result).toBe(30); // Should return 30 (input_tokens) - 0 (ignored 'ten') = 30
-      expect(Number.isNaN(result)).toBe(false);
-    });
-  });
 });
--- a/api/app/clients/specs/BaseClient.test.js
+++ b/api/app/clients/specs/BaseClient.test.js
@@ -1,7 +1,7 @@
 const { Constants } = require('librechat-data-provider');
 const { initializeFakeClient } = require('./FakeClient');

-jest.mock('~/lib/db/connectDb');
+jest.mock('../../../lib/db/connectDb');
 jest.mock('~/models', () => ({
  User: jest.fn(),
  Key: jest.fn(),
@@ -576,11 +576,7 @@ describe('BaseClient', () => {
      const onStart = jest.fn();
      const opts = { onStart };
      await TestClient.sendMessage('Hello, world!', opts);
-
-      expect(onStart).toHaveBeenCalledWith(
-        expect.objectContaining({ text: 'Hello, world!' }),
-        expect.any(String),
-      );
+      expect(onStart).toHaveBeenCalledWith(expect.objectContaining({ text: 'Hello, world!' }));
    });

    test('saveMessageToDatabase is called with the correct arguments', async () => {
@@ -631,32 +627,5 @@ describe('BaseClient', () => {
        }),
      );
    });
-
-    test('userMessagePromise is awaited before saving response message', async () => {
-      // Mock the saveMessageToDatabase method
-      TestClient.saveMessageToDatabase = jest.fn().mockImplementation(() => {
-        return new Promise((resolve) => setTimeout(resolve, 100)); // Simulate a delay
-      });
-
-      // Send a message
-      const messagePromise = TestClient.sendMessage('Hello, world!');
-
-      // Wait a short time to ensure the user message save has started
-      await new Promise((resolve) => setTimeout(resolve, 50));
-
-      // Check that saveMessageToDatabase has been called once (for the user message)
-      expect(TestClient.saveMessageToDatabase).toHaveBeenCalledTimes(1);
-
-      // Wait for the message to be fully processed
-      await messagePromise;
-
-      // Check that saveMessageToDatabase has been called twice (once for user message, once for response)
-      expect(TestClient.saveMessageToDatabase).toHaveBeenCalledTimes(2);
-
-      // Check the order of calls
-      const calls = TestClient.saveMessageToDatabase.mock.calls;
-      expect(calls[0][0].isCreatedByUser).toBe(true); // First call should be for user message
-      expect(calls[1][0].isCreatedByUser).toBe(false); // Second call should be for response message
-    });
  });
 });
--- a/api/app/clients/specs/FakeClient.js
+++ b/api/app/clients/specs/FakeClient.js
@@ -40,8 +40,7 @@ class FakeClient extends BaseClient {
      };
    }

-    this.maxContextTokens =
-      this.options.maxContextTokens ?? getModelMaxTokens(this.modelOptions.model) ?? 4097;
+    this.maxContextTokens = getModelMaxTokens(this.modelOptions.model) ?? 4097;
  }
  buildMessages() {}
  getTokenCount(str) {
--- a/api/app/clients/specs/OpenAIClient.test.js
+++ b/api/app/clients/specs/OpenAIClient.test.js
@@ -144,7 +144,6 @@ describe('OpenAIClient', () => {

  const defaultOptions = {
    // debug: true,
-    req: {},
    openaiApiKey: 'new-api-key',
    modelOptions: {
      model,
@@ -158,19 +157,12 @@ describe('OpenAIClient', () => {
    azureOpenAIApiVersion: '2020-07-01-preview',
  };

-  let originalWarn;
-
  beforeAll(() => {
-    originalWarn = console.warn;
-    console.warn = jest.fn();
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
  });

  afterAll(() => {
-    console.warn = originalWarn;
-  });
-
-  beforeEach(() => {
-    console.warn.mockClear();
+    console.warn.mockRestore();
  });

  beforeEach(() => {
@@ -670,35 +662,4 @@ describe('OpenAIClient', () => {
      expect(constructorArgs.baseURL).toBe(expectedURL);
    });
  });
-
-  describe('checkVisionRequest functionality', () => {
-    let client;
-    const attachments = [{ type: 'image/png' }];
-
-    beforeEach(() => {
-      client = new OpenAIClient('test-api-key', {
-        endpoint: 'ollama',
-        modelOptions: {
-          model: 'initial-model',
-        },
-        modelsConfig: {
-          ollama: ['initial-model', 'llava', 'other-model'],
-        },
-      });
-
-      client.defaultVisionModel = 'non-valid-default-model';
-    });
-
-    afterEach(() => {
-      jest.restoreAllMocks();
-    });
-
-    it('should set "llava" as the model if it is the first valid model when default validation fails', () => {
-      client.checkVisionRequest(attachments);
-
-      expect(client.modelOptions.model).toBe('llava');
-      expect(client.isVisionModel).toBeTruthy();
-      expect(client.modelOptions.stop).toBeUndefined();
-    });
-  });
 });
--- a/api/app/clients/specs/OpenAIClient.tokens.js
+++ b/api/app/clients/specs/OpenAIClient.tokens.js
@@ -38,12 +38,7 @@ const run = async () => {
  "On the other hand, we denounce with righteous indignation and dislike men who are so beguiled and demoralized by the charms of pleasure of the moment, so blinded by desire, that they cannot foresee the pain and trouble that are bound to ensue; and equal blame belongs to those who fail in their duty through weakness of will, which is the same as saying through shrinking from toil and pain. These cases are perfectly simple and easy to distinguish. In a free hour, when our power of choice is untrammelled and when nothing prevents our being able to do what we like best, every pleasure is to be welcomed and every pain avoided. But in certain circumstances and owing to the claims of duty or the obligations of business it will frequently occur that pleasures have to be repudiated and annoyances accepted. The wise man therefore always holds in these matters to this principle of selection: he rejects pleasures to secure other greater pleasures, or else he endures pains to avoid worse pains."
  `;
  const model = 'gpt-3.5-turbo';
-  let maxContextTokens = 4095;
-  if (model === 'gpt-4') {
-    maxContextTokens = 8191;
-  } else if (model === 'gpt-4-32k') {
-    maxContextTokens = 32767;
-  }
+  const maxContextTokens = model === 'gpt-4' ? 8191 : model === 'gpt-4-32k' ? 32767 : 4095; // 1 less than maximum
  const clientOptions = {
    reverseProxyUrl: process.env.OPENAI_REVERSE_PROXY || null,
    maxContextTokens,
--- a/api/app/clients/specs/PluginsClient.test.js
+++ b/api/app/clients/specs/PluginsClient.test.js
@@ -194,7 +194,6 @@ describe('PluginsClient', () => {
      expect(client.getFunctionModelName('')).toBe('gpt-3.5-turbo');
    });
  });
-
  describe('Azure OpenAI tests specific to Plugins', () => {
    // TODO: add more tests for Azure OpenAI integration with Plugins
    // let client;
@@ -221,94 +220,4 @@ describe('PluginsClient', () => {
      spy.mockRestore();
    });
  });
-
-  describe('sendMessage with filtered tools', () => {
-    let TestAgent;
-    const apiKey = 'fake-api-key';
-    const mockTools = [{ name: 'tool1' }, { name: 'tool2' }, { name: 'tool3' }, { name: 'tool4' }];
-
-    beforeEach(() => {
-      TestAgent = new PluginsClient(apiKey, {
-        tools: mockTools,
-        modelOptions: {
-          model: 'gpt-3.5-turbo',
-          temperature: 0,
-          max_tokens: 2,
-        },
-        agentOptions: {
-          model: 'gpt-3.5-turbo',
-        },
-      });
-
-      TestAgent.options.req = {
-        app: {
-          locals: {},
-        },
-      };
-
-      TestAgent.sendMessage = jest.fn().mockImplementation(async () => {
-        const { filteredTools = [], includedTools = [] } = TestAgent.options.req.app.locals;
-
-        if (includedTools.length > 0) {
-          const tools = TestAgent.options.tools.filter((plugin) =>
-            includedTools.includes(plugin.name),
-          );
-          TestAgent.options.tools = tools;
-        } else {
-          const tools = TestAgent.options.tools.filter(
-            (plugin) => !filteredTools.includes(plugin.name),
-          );
-          TestAgent.options.tools = tools;
-        }
-
-        return {
-          text: 'Mocked response',
-          tools: TestAgent.options.tools,
-        };
-      });
-    });
-
-    test('should filter out tools when filteredTools is provided', async () => {
-      TestAgent.options.req.app.locals.filteredTools = ['tool1', 'tool3'];
-      const response = await TestAgent.sendMessage('Test message');
-      expect(response.tools).toHaveLength(2);
-      expect(response.tools).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ name: 'tool2' }),
-          expect.objectContaining({ name: 'tool4' }),
-        ]),
-      );
-    });
-
-    test('should only include specified tools when includedTools is provided', async () => {
-      TestAgent.options.req.app.locals.includedTools = ['tool2', 'tool4'];
-      const response = await TestAgent.sendMessage('Test message');
-      expect(response.tools).toHaveLength(2);
-      expect(response.tools).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ name: 'tool2' }),
-          expect.objectContaining({ name: 'tool4' }),
-        ]),
-      );
-    });
-
-    test('should prioritize includedTools over filteredTools', async () => {
-      TestAgent.options.req.app.locals.filteredTools = ['tool1', 'tool3'];
-      TestAgent.options.req.app.locals.includedTools = ['tool1', 'tool2'];
-      const response = await TestAgent.sendMessage('Test message');
-      expect(response.tools).toHaveLength(2);
-      expect(response.tools).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ name: 'tool1' }),
-          expect.objectContaining({ name: 'tool2' }),
-        ]),
-      );
-    });
-
-    test('should not modify tools when no filters are provided', async () => {
-      const response = await TestAgent.sendMessage('Test message');
-      expect(response.tools).toHaveLength(4);
-      expect(response.tools).toEqual(expect.arrayContaining(mockTools));
-    });
-  });
 });
--- a/api/app/clients/tools/manifest.json
+++ b/api/app/clients/tools/manifest.json
@@ -24,7 +24,7 @@
        "description": "This is your Google Custom Search Engine ID. For instructions on how to obtain this, see <a href='https://github.com/danny-avila/LibreChat/blob/main/docs/features/plugins/google_search.md'>Our Docs</a>."
      },
      {
-        "authField": "GOOGLE_SEARCH_API_KEY",
+        "authField": "GOOGLE_API_KEY",
        "label": "Google API Key",
        "description": "This is your Google Custom Search API Key. For instructions on how to obtain this, see <a href='https://github.com/danny-avila/LibreChat/blob/main/docs/features/plugins/google_search.md'>Our Docs</a>."
      }
@@ -60,7 +60,7 @@
    "name": "CodeSherpa",
    "pluginKey": "codesherpa_tools",
    "description": "[Experimental] A REPL for your chat. Requires https://github.com/iamgreggarcia/codesherpa",
-    "icon": "https://raw.githubusercontent.com/iamgreggarcia/codesherpa/main/localserver/_logo.png",
+    "icon": "https://github.com/iamgreggarcia/codesherpa/blob/main/localserver/_logo.png",
    "authConfig": [
      {
        "authField": "CODESHERPA_SERVER_URL",
--- a/api/app/clients/tools/structured/DALLE3.js
+++ b/api/app/clients/tools/structured/DALLE3.js
@@ -12,15 +12,14 @@ const { logger } = require('~/config');
 class DALLE3 extends Tool {
  constructor(fields = {}) {
    super();
-    /** @type {boolean} Used to initialize the Tool without necessary variables. */
+    /* Used to initialize the Tool without necessary variables. */
    this.override = fields.override ?? false;
-    /** @type {boolean} Necessary for output to contain all image metadata. */
+    /* Necessary for output to contain all image metadata. */
    this.returnMetadata = fields.returnMetadata ?? false;

    this.userId = fields.userId;
    this.fileStrategy = fields.fileStrategy;
    if (fields.processFileURL) {
-      /** @type {processFileURL} Necessary for output to contain all image metadata. */
      this.processFileURL = fields.processFileURL.bind(this);
    }

@@ -44,7 +43,6 @@ class DALLE3 extends Tool {
      config.httpAgent = new HttpsProxyAgent(process.env.PROXY);
    }

-    /** @type {OpenAI} */
    this.openai = new OpenAI(config);
    this.name = 'dalle';
    this.description = `Use DALLE to create images from text descriptions.
@@ -166,7 +164,13 @@ Error Message: ${error.message}`;
      });

      if (this.returnMetadata) {
-        this.result = result;
+        this.result = {
+          file_id: result.file_id,
+          filename: result.filename,
+          filepath: result.filepath,
+          height: result.height,
+          width: result.width,
+        };
      } else {
        this.result = this.wrapInMarkdown(result.filepath);
      }
--- a/api/app/clients/tools/structured/GoogleSearch.js
+++ b/api/app/clients/tools/structured/GoogleSearch.js
@@ -9,18 +9,12 @@ class GoogleSearchResults extends Tool {

  constructor(fields = {}) {
    super(fields);
-    this.envVarApiKey = 'GOOGLE_SEARCH_API_KEY';
+    this.envVarApiKey = 'GOOGLE_API_KEY';
    this.envVarSearchEngineId = 'GOOGLE_CSE_ID';
    this.override = fields.override ?? false;
-    this.apiKey = fields[this.envVarApiKey] ?? getEnvironmentVariable(this.envVarApiKey);
+    this.apiKey = fields.apiKey ?? getEnvironmentVariable(this.envVarApiKey);
    this.searchEngineId =
-      fields[this.envVarSearchEngineId] ?? getEnvironmentVariable(this.envVarSearchEngineId);
-
-    if (!this.override && (!this.apiKey || !this.searchEngineId)) {
-      throw new Error(
-        `Missing ${this.envVarApiKey} or ${this.envVarSearchEngineId} environment variable.`,
-      );
-    }
+      fields.searchEngineId ?? getEnvironmentVariable(this.envVarSearchEngineId);

    this.kwargs = fields?.kwargs ?? {};
    this.name = 'google';
--- a/api/app/clients/tools/structured/StableDiffusion.js
+++ b/api/app/clients/tools/structured/StableDiffusion.js
@@ -4,27 +4,14 @@ const { z } = require('zod');
 const path = require('path');
 const axios = require('axios');
 const sharp = require('sharp');
-const { v4: uuidv4 } = require('uuid');
 const { StructuredTool } = require('langchain/tools');
-const { FileContext } = require('librechat-data-provider');
-const paths = require('~/config/paths');
 const { logger } = require('~/config');

 class StableDiffusionAPI extends StructuredTool {
  constructor(fields) {
    super();
-    /** @type {string} User ID */
-    this.userId = fields.userId;
-    /** @type {Express.Request | undefined} Express Request object, only provided by ToolService */
-    this.req = fields.req;
-    /** @type {boolean} Used to initialize the Tool without necessary variables. */
+    /* Used to initialize the Tool without necessary variables. */
    this.override = fields.override ?? false;
-    /** @type {boolean} Necessary for output to contain all image metadata. */
-    this.returnMetadata = fields.returnMetadata ?? false;
-    if (fields.uploadImageBuffer) {
-      /** @type {uploadImageBuffer} Necessary for output to contain all image metadata. */
-      this.uploadImageBuffer = fields.uploadImageBuffer.bind(this);
-    }

    this.name = 'stable-diffusion';
    this.url = fields.SD_WEBUI_URL || this.getServerURL();
@@ -60,7 +47,7 @@ class StableDiffusionAPI extends StructuredTool {

  getMarkdownImageUrl(imageName) {
    const imageUrl = path
-      .join(this.relativePath, this.userId, imageName)
+      .join(this.relativeImageUrl, imageName)
      .replace(/\\/g, '/')
      .replace('public/', '');
    return `![generated image](/${imageUrl})`;
@@ -80,78 +67,52 @@ class StableDiffusionAPI extends StructuredTool {
    const payload = {
      prompt,
      negative_prompt,
+      sampler_index: 'DPM++ 2M Karras',
      cfg_scale: 4.5,
      steps: 22,
      width: 1024,
      height: 1024,
    };
-    let generationResponse;
-    try {
-      generationResponse = await axios.post(`${url}/sdapi/v1/txt2img`, payload);
-    } catch (error) {
-      logger.error('[StableDiffusion] Error while generating image:', error);
-      return 'Error making API request.';
-    }
-    const image = generationResponse.data.images[0];
+    const response = await axios.post(`${url}/sdapi/v1/txt2img`, payload);
+    const image = response.data.images[0];
+    const pngPayload = { image: `data:image/png;base64,${image}` };
+    const response2 = await axios.post(`${url}/sdapi/v1/png-info`, pngPayload);
+    const info = response2.data.info;

-    /** @type {{ height: number, width: number, seed: number, infotexts: string[] }} */
-    let info = {};
-    try {
-      info = JSON.parse(generationResponse.data.info);
-    } catch (error) {
-      logger.error('[StableDiffusion] Error while getting image metadata:', error);
-    }
+    // Generate unique name
+    const imageName = `${Date.now()}.png`;
+    this.outputPath = path.resolve(
+      __dirname,
+      '..',
+      '..',
+      '..',
+      '..',
+      '..',
+      'client',
+      'public',
+      'images',
+    );
+    const appRoot = path.resolve(__dirname, '..', '..', '..', '..', '..', 'client');
+    this.relativeImageUrl = path.relative(appRoot, this.outputPath);

-    const file_id = uuidv4();
-    const imageName = `${file_id}.png`;
-    const { imageOutput: imageOutputPath, clientPath } = paths;
-    const filepath = path.join(imageOutputPath, this.userId, imageName);
-    this.relativePath = path.relative(clientPath, imageOutputPath);
-
-    if (!fs.existsSync(path.join(imageOutputPath, this.userId))) {
-      fs.mkdirSync(path.join(imageOutputPath, this.userId), { recursive: true });
+    // Check if directory exists, if not create it
+    if (!fs.existsSync(this.outputPath)) {
+      fs.mkdirSync(this.outputPath, { recursive: true });
    }

    try {
      const buffer = Buffer.from(image.split(',', 1)[0], 'base64');
-      if (this.returnMetadata && this.uploadImageBuffer && this.req) {
-        const file = await this.uploadImageBuffer({
-          req: this.req,
-          context: FileContext.image_generation,
-          resize: false,
-          metadata: {
-            buffer,
-            height: info.height,
-            width: info.width,
-            bytes: Buffer.byteLength(buffer),
-            filename: imageName,
-            type: 'image/png',
-            file_id,
-          },
-        });
-
-        const generationInfo = info.infotexts[0].split('\n').pop();
-        return {
-          ...file,
-          prompt,
-          metadata: {
-            negative_prompt,
-            seed: info.seed,
-            info: generationInfo,
-          },
-        };
-      }
-
      await sharp(buffer)
        .withMetadata({
          iptcpng: {
-            parameters: info.infotexts[0],
+            parameters: info,
          },
        })
-        .toFile(filepath);
+        .toFile(this.outputPath + '/' + imageName);
      this.result = this.getMarkdownImageUrl(imageName);
    } catch (error) {
      logger.error('[StableDiffusion] Error while saving the image:', error);
+      // this.result = theImageUrl;
    }

    return this.result;
--- a/api/app/clients/tools/structured/TavilySearchResults.js
+++ b/api/app/clients/tools/structured/TavilySearchResults.js
@@ -12,7 +12,7 @@ class TavilySearchResults extends Tool {
    this.envVar = 'TAVILY_API_KEY';
    /* Used to initialize the Tool without necessary variables. */
    this.override = fields.override ?? false;
-    this.apiKey = fields[this.envVar] ?? this.getApiKey();
+    this.apiKey = fields.apiKey ?? this.getApiKey();

    this.kwargs = fields?.kwargs ?? {};
    this.name = 'tavily_search_results_json';
@@ -82,9 +82,7 @@ class TavilySearchResults extends Tool {

    const json = await response.json();
    if (!response.ok) {
-      throw new Error(
-        `Request failed with status ${response.status}: ${json?.detail?.error || json?.error}`,
-      );
+      throw new Error(`Request failed with status ${response.status}: ${json.error}`);
    }

    return JSON.stringify(json);
--- a/api/app/clients/tools/structured/specs/GoogleSearch.spec.js
+++ b/api/app/clients/tools/structured/specs/GoogleSearch.spec.js
@@ -1,50 +0,0 @@
-const GoogleSearch = require('../GoogleSearch');
-
-jest.mock('node-fetch');
-jest.mock('@langchain/core/utils/env');
-
-describe('GoogleSearch', () => {
-  let originalEnv;
-  const mockApiKey = 'mock_api';
-  const mockSearchEngineId = 'mock_search_engine_id';
-
-  beforeAll(() => {
-    originalEnv = { ...process.env };
-  });
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = {
-      ...originalEnv,
-      GOOGLE_SEARCH_API_KEY: mockApiKey,
-      GOOGLE_CSE_ID: mockSearchEngineId,
-    };
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-    process.env = originalEnv;
-  });
-
-  it('should use mockApiKey and mockSearchEngineId when environment variables are not set', () => {
-    const instance = new GoogleSearch({
-      GOOGLE_SEARCH_API_KEY: mockApiKey,
-      GOOGLE_CSE_ID: mockSearchEngineId,
-    });
-    expect(instance.apiKey).toBe(mockApiKey);
-    expect(instance.searchEngineId).toBe(mockSearchEngineId);
-  });
-
-  it('should throw an error if GOOGLE_SEARCH_API_KEY or GOOGLE_CSE_ID is missing', () => {
-    delete process.env.GOOGLE_SEARCH_API_KEY;
-    expect(() => new GoogleSearch()).toThrow(
-      'Missing GOOGLE_SEARCH_API_KEY or GOOGLE_CSE_ID environment variable.',
-    );
-
-    process.env.GOOGLE_SEARCH_API_KEY = mockApiKey;
-    delete process.env.GOOGLE_CSE_ID;
-    expect(() => new GoogleSearch()).toThrow(
-      'Missing GOOGLE_SEARCH_API_KEY or GOOGLE_CSE_ID environment variable.',
-    );
-  });
-});
--- a/api/app/clients/tools/structured/specs/TavilySearchResults.spec.js
+++ b/api/app/clients/tools/structured/specs/TavilySearchResults.spec.js
@@ -1,38 +0,0 @@
-const TavilySearchResults = require('../TavilySearchResults');
-
-jest.mock('node-fetch');
-jest.mock('@langchain/core/utils/env');
-
-describe('TavilySearchResults', () => {
-  let originalEnv;
-  const mockApiKey = 'mock_api_key';
-
-  beforeAll(() => {
-    originalEnv = { ...process.env };
-  });
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = {
-      ...originalEnv,
-      TAVILY_API_KEY: mockApiKey,
-    };
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-    process.env = originalEnv;
-  });
-
-  it('should throw an error if TAVILY_API_KEY is missing', () => {
-    delete process.env.TAVILY_API_KEY;
-    expect(() => new TavilySearchResults()).toThrow('Missing TAVILY_API_KEY environment variable.');
-  });
-
-  it('should use mockApiKey when TAVILY_API_KEY is not set in the environment', () => {
-    const instance = new TavilySearchResults({
-      TAVILY_API_KEY: mockApiKey,
-    });
-    expect(instance.apiKey).toBe(mockApiKey);
-  });
-});
--- a/api/app/clients/tools/util/handleTools.js
+++ b/api/app/clients/tools/util/handleTools.js
@@ -237,11 +237,9 @@ const loadTools = async ({
  }

  const imageGenOptions = {
-    req: options.req,
    fileStrategy: options.fileStrategy,
    processFileURL: options.processFileURL,
    returnMetadata: options.returnMetadata,
-    uploadImageBuffer: options.uploadImageBuffer,
  };

  const toolOptions = {
--- a/api/app/clients/tools/util/loadToolSuite.js
+++ b/api/app/clients/tools/util/loadToolSuite.js
@@ -1,6 +1,5 @@
 const { getUserPluginAuthValue } = require('~/server/services/PluginService');
 const { availableTools } = require('../');
-const { logger } = require('~/config');

 /**
 * Loads a suite of tools with authentication values for a given user, supporting alternate authentication fields.
@@ -31,7 +30,7 @@ const loadToolSuite = async ({ pluginKey, tools, user, options = {} }) => {
          return value;
        }
      } catch (err) {
-        logger.error(`Error fetching plugin auth value for ${field}: ${err.message}`);
+        console.error(`Error fetching plugin auth value for ${field}: ${err.message}`);
      }
    }
    return null;
@@ -42,7 +41,7 @@ const loadToolSuite = async ({ pluginKey, tools, user, options = {} }) => {
    if (authValue !== null) {
      authValues[auth.authField] = authValue;
    } else {
-      logger.warn(`[loadToolSuite] No auth value found for ${auth.authField}`);
+      console.warn(`No auth value found for ${auth.authField}`);
    }
  }

--- a/api/cache/banViolation.js
+++ b/api/cache/banViolation.js
@@ -1,7 +1,6 @@
-const { ViolationTypes } = require('librechat-data-provider');
-const { isEnabled, math, removePorts } = require('~/server/utils');
-const getLogStores = require('./getLogStores');
 const Session = require('~/models/Session');
+const getLogStores = require('./getLogStores');
+const { isEnabled, math, removePorts } = require('~/server/utils');
 const { logger } = require('~/config');

 const { BAN_VIOLATIONS, BAN_INTERVAL } = process.env ?? {};
@@ -49,7 +48,7 @@ const banViolation = async (req, res, errorMessage) => {
  await Session.deleteAllUserSessions(user_id);
  res.clearCookie('refreshToken');

-  const banLogs = getLogStores(ViolationTypes.BAN);
+  const banLogs = getLogStores('ban');
  const duration = errorMessage.duration || banLogs.opts.ttl;

  if (duration <= 0) {
--- a/api/cache/banViolation.spec.js
+++ b/api/cache/banViolation.spec.js
@@ -6,7 +6,6 @@ jest.mock('../models/Session');
 jest.mock('./getLogStores', () => {
  return jest.fn().mockImplementation(() => {
    const EventEmitter = require('events');
-    const { CacheKeys } = require('librechat-data-provider');
    const math = require('../server/utils/math');
    const mockGet = jest.fn();
    const mockSet = jest.fn();
@@ -34,7 +33,7 @@ jest.mock('./getLogStores', () => {
    }

    return new KeyvMongo('', {
-      namespace: CacheKeys.BANS,
+      namespace: 'bans',
      ttl: math(process.env.BAN_DURATION, 7200000),
    });
  });
--- a/api/cache/clearPendingReq.js
+++ b/api/cache/clearPendingReq.js
@@ -35,7 +35,7 @@ const clearPendingReq = async ({ userId, cache: _cache }) => {
    return;
  }

-  const key = `${isEnabled(USE_REDIS) ? namespace : ''}:${userId ?? ''}`;
+  const key = `${USE_REDIS ? namespace : ''}:${userId ?? ''}`;
  const currentReq = +((await cache.get(key)) ?? 0);

  if (currentReq && currentReq >= 1) {
--- a/api/cache/getLogStores.js
+++ b/api/cache/getLogStores.js
@@ -1,5 +1,5 @@
 const Keyv = require('keyv');
-const { CacheKeys, ViolationTypes, Time } = require('librechat-data-provider');
+const { CacheKeys, ViolationTypes } = require('librechat-data-provider');
 const { logFile, violationFile } = require('./keyvFiles');
 const { math, isEnabled } = require('~/server/utils');
 const keyvRedis = require('./keyvRedis');
@@ -23,25 +23,13 @@ const config = isEnabled(USE_REDIS)
  ? new Keyv({ store: keyvRedis })
  : new Keyv({ namespace: CacheKeys.CONFIG_STORE });

-const roles = isEnabled(USE_REDIS)
-  ? new Keyv({ store: keyvRedis })
-  : new Keyv({ namespace: CacheKeys.ROLES });
+const tokenConfig = isEnabled(USE_REDIS) // ttl: 30 minutes
+  ? new Keyv({ store: keyvRedis, ttl: 1800000 })
+  : new Keyv({ namespace: CacheKeys.TOKEN_CONFIG, ttl: 1800000 });

-const audioRuns = isEnabled(USE_REDIS)
-  ? new Keyv({ store: keyvRedis, ttl: Time.TEN_MINUTES })
-  : new Keyv({ namespace: CacheKeys.AUDIO_RUNS, ttl: Time.TEN_MINUTES });
-
-const messages = isEnabled(USE_REDIS)
-  ? new Keyv({ store: keyvRedis, ttl: Time.FIVE_MINUTES })
-  : new Keyv({ namespace: CacheKeys.MESSAGES, ttl: Time.FIVE_MINUTES });
-
-const tokenConfig = isEnabled(USE_REDIS)
-  ? new Keyv({ store: keyvRedis, ttl: Time.THIRTY_MINUTES })
-  : new Keyv({ namespace: CacheKeys.TOKEN_CONFIG, ttl: Time.THIRTY_MINUTES });
-
-const genTitle = isEnabled(USE_REDIS)
-  ? new Keyv({ store: keyvRedis, ttl: Time.TWO_MINUTES })
-  : new Keyv({ namespace: CacheKeys.GEN_TITLE, ttl: Time.TWO_MINUTES });
+const genTitle = isEnabled(USE_REDIS) // ttl: 2 minutes
+  ? new Keyv({ store: keyvRedis, ttl: 120000 })
+  : new Keyv({ namespace: CacheKeys.GEN_TITLE, ttl: 120000 });

 const modelQueries = isEnabled(process.env.USE_REDIS)
  ? new Keyv({ store: keyvRedis })
@@ -49,32 +37,19 @@ const modelQueries = isEnabled(process.env.USE_REDIS)

 const abortKeys = isEnabled(USE_REDIS)
  ? new Keyv({ store: keyvRedis })
-  : new Keyv({ namespace: CacheKeys.ABORT_KEYS, ttl: Time.TEN_MINUTES });
+  : new Keyv({ namespace: CacheKeys.ABORT_KEYS, ttl: 600000 });

 const namespaces = {
-  [CacheKeys.ROLES]: roles,
  [CacheKeys.CONFIG_STORE]: config,
  pending_req,
-  [ViolationTypes.BAN]: new Keyv({ store: keyvMongo, namespace: CacheKeys.BANS, ttl: duration }),
-  [CacheKeys.ENCODED_DOMAINS]: new Keyv({
-    store: keyvMongo,
-    namespace: CacheKeys.ENCODED_DOMAINS,
-    ttl: 0,
-  }),
+  ban: new Keyv({ store: keyvMongo, namespace: 'bans', ttl: duration }),
  general: new Keyv({ store: logFile, namespace: 'violations' }),
  concurrent: createViolationInstance('concurrent'),
  non_browser: createViolationInstance('non_browser'),
  message_limit: createViolationInstance('message_limit'),
  token_balance: createViolationInstance(ViolationTypes.TOKEN_BALANCE),
  registrations: createViolationInstance('registrations'),
-  [ViolationTypes.TTS_LIMIT]: createViolationInstance(ViolationTypes.TTS_LIMIT),
-  [ViolationTypes.STT_LIMIT]: createViolationInstance(ViolationTypes.STT_LIMIT),
-  [ViolationTypes.CONVO_ACCESS]: createViolationInstance(ViolationTypes.CONVO_ACCESS),
  [ViolationTypes.FILE_UPLOAD_LIMIT]: createViolationInstance(ViolationTypes.FILE_UPLOAD_LIMIT),
-  [ViolationTypes.VERIFY_EMAIL_LIMIT]: createViolationInstance(ViolationTypes.VERIFY_EMAIL_LIMIT),
-  [ViolationTypes.RESET_PASSWORD_LIMIT]: createViolationInstance(
-    ViolationTypes.RESET_PASSWORD_LIMIT,
-  ),
  [ViolationTypes.ILLEGAL_MODEL_REQUEST]: createViolationInstance(
    ViolationTypes.ILLEGAL_MODEL_REQUEST,
  ),
@@ -83,8 +58,6 @@ const namespaces = {
  [CacheKeys.TOKEN_CONFIG]: tokenConfig,
  [CacheKeys.GEN_TITLE]: genTitle,
  [CacheKeys.MODEL_QUERIES]: modelQueries,
-  [CacheKeys.AUDIO_RUNS]: audioRuns,
-  [CacheKeys.MESSAGES]: messages,
 };

 /**
--- a/api/cache/logViolation.js
+++ b/api/cache/logViolation.js
@@ -1,6 +1,6 @@
-const { isEnabled } = require('~/server/utils');
 const getLogStores = require('./getLogStores');
 const banViolation = require('./banViolation');
+const { isEnabled } = require('../server/utils');

 /**
 * Logs the violation.
--- a/api/config/parsers.js
+++ b/api/config/parsers.js
@@ -27,25 +27,26 @@ function getMatchingSensitivePatterns(valueStr) {
 }

 /**
- * Redacts sensitive information from a console message and trims it to a specified length if provided.
+ * Redacts sensitive information from a console message.
+ *
 * @param {string} str - The console message to be redacted.
- * @param {number} [trimLength] - The optional length at which to trim the redacted message.
- * @returns {string} - The redacted and optionally trimmed console message.
+ * @returns {string} - The redacted console message.
 */
-function redactMessage(str, trimLength) {
+function redactMessage(str) {
  if (!str) {
    return '';
  }

  const patterns = getMatchingSensitivePatterns(str);
+
+  if (patterns.length === 0) {
+    return str;
+  }
+
  patterns.forEach((pattern) => {
    str = str.replace(pattern, '$1[REDACTED]');
  });

-  if (trimLength !== undefined && str.length > trimLength) {
-    return `${str.substring(0, trimLength)}...`;
-  }
-
  return str;
 }

@@ -109,14 +110,6 @@ const condenseArray = (item) => {
 * @returns {string} - The formatted log message.
 */
 const debugTraverse = winston.format.printf(({ level, message, timestamp, ...metadata }) => {
-  if (!message) {
-    return `${timestamp} ${level}`;
-  }
-
-  if (!message?.trim || typeof message !== 'string') {
-    return `${timestamp} ${level}: ${JSON.stringify(message)}`;
-  }
-
  let msg = `${timestamp} ${level}: ${truncateLongStrings(message?.trim(), 150)}`;
  try {
    if (level !== 'debug') {
--- a/api/config/paths.js
+++ b/api/config/paths.js
@@ -1,13 +1,9 @@
 const path = require('path');

 module.exports = {
-  root: path.resolve(__dirname, '..', '..'),
  uploads: path.resolve(__dirname, '..', '..', 'uploads'),
-  clientPath: path.resolve(__dirname, '..', '..', 'client'),
  dist: path.resolve(__dirname, '..', '..', 'client', 'dist'),
  publicPath: path.resolve(__dirname, '..', '..', 'client', 'public'),
-  fonts: path.resolve(__dirname, '..', '..', 'client', 'public', 'fonts'),
-  assets: path.resolve(__dirname, '..', '..', 'client', 'public', 'assets'),
  imageOutput: path.resolve(__dirname, '..', '..', 'client', 'public', 'images'),
  structuredTools: path.resolve(__dirname, '..', 'app', 'clients', 'tools', 'structured'),
  pluginManifest: path.resolve(__dirname, '..', 'app', 'clients', 'tools', 'manifest.json'),
--- a/api/config/winston.js
+++ b/api/config/winston.js
@@ -5,15 +5,7 @@ const { redactFormat, redactMessage, debugTraverse } = require('./parsers');

 const logDir = path.join(__dirname, '..', 'logs');

-const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false, CONSOLE_JSON = false } = process.env;
-
-const useConsoleJson =
-  (typeof CONSOLE_JSON === 'string' && CONSOLE_JSON?.toLowerCase() === 'true') ||
-  CONSOLE_JSON === true;
-
-const useDebugConsole =
-  (typeof DEBUG_CONSOLE === 'string' && DEBUG_CONSOLE?.toLowerCase() === 'true') ||
-  DEBUG_CONSOLE === true;
+const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false } = process.env;

 const levels = {
  error: 0,
@@ -41,7 +33,7 @@ const level = () => {

 const fileFormat = winston.format.combine(
  redactFormat(),
-  winston.format.timestamp({ format: () => new Date().toISOString() }),
+  winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
  winston.format.errors({ stack: true }),
  winston.format.splat(),
  // redactErrors(),
@@ -107,20 +99,14 @@ const consoleFormat = winston.format.combine(
  }),
 );

-if (useDebugConsole) {
+if (
+  (typeof DEBUG_CONSOLE === 'string' && DEBUG_CONSOLE?.toLowerCase() === 'true') ||
+  DEBUG_CONSOLE === true
+) {
  transports.push(
    new winston.transports.Console({
      level: 'debug',
-      format: useConsoleJson
-        ? winston.format.combine(fileFormat, debugTraverse, winston.format.json())
-        : winston.format.combine(fileFormat, debugTraverse),
-    }),
-  );
-} else if (useConsoleJson) {
-  transports.push(
-    new winston.transports.Console({
-      level: 'info',
-      format: winston.format.combine(fileFormat, winston.format.json()),
+      format: winston.format.combine(fileFormat, debugTraverse),
    }),
  );
 } else {
--- a/api/lib/db/indexSync.js
+++ b/api/lib/db/indexSync.js
@@ -1,28 +1,11 @@
 const { MeiliSearch } = require('meilisearch');
-const Conversation = require('~/models/schema/convoSchema');
 const Message = require('~/models/schema/messageSchema');
+const Conversation = require('~/models/schema/convoSchema');
 const { logger } = require('~/config');

 const searchEnabled = process.env?.SEARCH?.toLowerCase() === 'true';
 let currentTimeout = null;

-class MeiliSearchClient {
-  static instance = null;
-
-  static getInstance() {
-    if (!MeiliSearchClient.instance) {
-      if (!process.env.MEILI_HOST || !process.env.MEILI_MASTER_KEY) {
-        throw new Error('Meilisearch configuration is missing.');
-      }
-      MeiliSearchClient.instance = new MeiliSearch({
-        host: process.env.MEILI_HOST,
-        apiKey: process.env.MEILI_MASTER_KEY,
-      });
-    }
-    return MeiliSearchClient.instance;
-  }
-}
-
 // eslint-disable-next-line no-unused-vars
 async function indexSync(req, res, next) {
  if (!searchEnabled) {
@@ -30,10 +13,20 @@ async function indexSync(req, res, next) {
  }

  try {
-    const client = MeiliSearchClient.getInstance();
+    if (!process.env.MEILI_HOST || !process.env.MEILI_MASTER_KEY || !searchEnabled) {
+      throw new Error('Meilisearch not configured, search will be disabled.');
+    }
+
+    const client = new MeiliSearch({
+      host: process.env.MEILI_HOST,
+      apiKey: process.env.MEILI_MASTER_KEY,
+    });

    const { status } = await client.health();
-    if (status !== 'available' || !process.env.SEARCH) {
+    // logger.debug(`[indexSync] Meilisearch: ${status}`);
+    const result = status === 'available' && !!process.env.SEARCH;
+
+    if (!result) {
      throw new Error('Meilisearch not available');
    }

@@ -44,8 +37,12 @@ async function indexSync(req, res, next) {
    const messagesIndexed = messages.numberOfDocuments;
    const convosIndexed = convos.numberOfDocuments;

-    logger.debug(`[indexSync] There are ${messageCount} messages and ${messagesIndexed} indexed`);
-    logger.debug(`[indexSync] There are ${convoCount} convos and ${convosIndexed} indexed`);
+    logger.debug(
+      `[indexSync] There are ${messageCount} messages in the database, ${messagesIndexed} indexed`,
+    );
+    logger.debug(
+      `[indexSync] There are ${convoCount} convos in the database, ${convosIndexed} indexed`,
+    );

    if (messageCount !== messagesIndexed) {
      logger.debug('[indexSync] Messages out of sync, indexing');
@@ -57,6 +54,7 @@ async function indexSync(req, res, next) {
      Conversation.syncWithMeili();
    }
  } catch (err) {
+    // logger.debug('[indexSync] in index sync');
    if (err.message.includes('not found')) {
      logger.debug('[indexSync] Creating indices...');
      currentTimeout = setTimeout(async () => {
--- a/api/models/Action.js
+++ b/api/models/Action.js
@@ -5,18 +5,19 @@ const Action = mongoose.model('action', actionSchema);

 /**
 * Update an action with new data without overwriting existing properties,
- * or create a new action if it doesn't exist, within a transaction session if provided.
+ * or create a new action if it doesn't exist.
 *
 * @param {Object} searchParams - The search parameters to find the action to update.
 * @param {string} searchParams.action_id - The ID of the action to update.
 * @param {string} searchParams.user - The user ID of the action's author.
 * @param {Object} updateData - An object containing the properties to update.
- * @param {mongoose.ClientSession} [session] - The transaction session to use.
 * @returns {Promise<Object>} The updated or newly created action document as a plain object.
 */
-const updateAction = async (searchParams, updateData, session = null) => {
-  const options = { new: true, upsert: true, session };
-  return await Action.findOneAndUpdate(searchParams, updateData, options).lean();
+const updateAction = async (searchParams, updateData) => {
+  return await Action.findOneAndUpdate(searchParams, updateData, {
+    new: true,
+    upsert: true,
+  }).lean();
 };

 /**
@@ -49,37 +50,19 @@ const getActions = async (searchParams, includeSensitive = false) => {
 };

 /**
- * Deletes an action by params, within a transaction session if provided.
+ * Deletes an action by its ID.
 *
- * @param {Object} searchParams - The search parameters to find the action to delete.
- * @param {string} searchParams.action_id - The ID of the action to delete.
+ * @param {Object} searchParams - The search parameters to find the action to update.
+ * @param {string} searchParams.action_id - The ID of the action to update.
 * @param {string} searchParams.user - The user ID of the action's author.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
 * @returns {Promise<Object>} A promise that resolves to the deleted action document as a plain object, or null if no document was found.
 */
-const deleteAction = async (searchParams, session = null) => {
-  const options = session ? { session } : {};
-  return await Action.findOneAndDelete(searchParams, options).lean();
-};
-
-/**
- * Deletes actions by params, within a transaction session if provided.
- *
- * @param {Object} searchParams - The search parameters to find the actions to delete.
- * @param {string} searchParams.action_id - The ID of the action(s) to delete.
- * @param {string} searchParams.user - The user ID of the action's author.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
- * @returns {Promise<Number>} A promise that resolves to the number of deleted action documents.
- */
-const deleteActions = async (searchParams, session = null) => {
-  const options = session ? { session } : {};
-  const result = await Action.deleteMany(searchParams, options);
-  return result.deletedCount;
+const deleteAction = async (searchParams) => {
+  return await Action.findOneAndDelete(searchParams).lean();
 };

 module.exports = {
-  getActions,
  updateAction,
+  getActions,
  deleteAction,
-  deleteActions,
 };
--- a/api/models/Assistant.js
+++ b/api/models/Assistant.js
@@ -5,18 +5,19 @@ const Assistant = mongoose.model('assistant', assistantSchema);

 /**
 * Update an assistant with new data without overwriting existing properties,
- * or create a new assistant if it doesn't exist, within a transaction session if provided.
+ * or create a new assistant if it doesn't exist.
 *
 * @param {Object} searchParams - The search parameters to find the assistant to update.
 * @param {string} searchParams.assistant_id - The ID of the assistant to update.
 * @param {string} searchParams.user - The user ID of the assistant's author.
 * @param {Object} updateData - An object containing the properties to update.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
 * @returns {Promise<Object>} The updated or newly created assistant document as a plain object.
 */
-const updateAssistantDoc = async (searchParams, updateData, session = null) => {
-  const options = { new: true, upsert: true, session };
-  return await Assistant.findOneAndUpdate(searchParams, updateData, options).lean();
+const updateAssistant = async (searchParams, updateData) => {
+  return await Assistant.findOneAndUpdate(searchParams, updateData, {
+    new: true,
+    upsert: true,
+  }).lean();
 };

 /**
@@ -39,21 +40,8 @@ const getAssistants = async (searchParams) => {
  return await Assistant.find(searchParams).lean();
 };

-/**
- * Deletes an assistant based on the provided ID.
- *
- * @param {Object} searchParams - The search parameters to find the assistant to delete.
- * @param {string} searchParams.assistant_id - The ID of the assistant to delete.
- * @param {string} searchParams.user - The user ID of the assistant's author.
- * @returns {Promise<void>} Resolves when the assistant has been successfully deleted.
- */
-const deleteAssistant = async (searchParams) => {
-  return await Assistant.findOneAndDelete(searchParams);
-};
-
 module.exports = {
-  updateAssistantDoc,
-  deleteAssistant,
+  updateAssistant,
  getAssistants,
  getAssistant,
 };
--- a/api/models/Categories.js
+++ b/api/models/Categories.js
@@ -1,61 +0,0 @@
-const { logger } = require('~/config');
-// const { Categories } = require('./schema/categories');
-const options = [
-  {
-    label: '',
-    value: '',
-  },
-  {
-    label: 'idea',
-    value: 'idea',
-  },
-  {
-    label: 'travel',
-    value: 'travel',
-  },
-  {
-    label: 'teach_or_explain',
-    value: 'teach_or_explain',
-  },
-  {
-    label: 'write',
-    value: 'write',
-  },
-  {
-    label: 'shop',
-    value: 'shop',
-  },
-  {
-    label: 'code',
-    value: 'code',
-  },
-  {
-    label: 'misc',
-    value: 'misc',
-  },
-  {
-    label: 'roleplay',
-    value: 'roleplay',
-  },
-  {
-    label: 'finance',
-    value: 'finance',
-  },
-];
-
-module.exports = {
-  /**
-   * Retrieves the categories asynchronously.
-   * @returns {Promise<TGetCategoriesResponse>} An array of category objects.
-   * @throws {Error} If there is an error retrieving the categories.
-   */
-  getCategories: async () => {
-    try {
-      // const categories = await Categories.find();
-      return options;
-    } catch (error) {
-      logger.error('Error getting categories', error);
-      return [];
-    }
-  },
-};
--- a/api/models/Conversation.js
+++ b/api/models/Conversation.js
@@ -2,26 +2,6 @@ const Conversation = require('./schema/convoSchema');
 const { getMessages, deleteMessages } = require('./Message');
 const logger = require('~/config/winston');

-/**
- * Searches for a conversation by conversationId and returns a lean document with only conversationId and user.
- * @param {string} conversationId - The conversation's ID.
- * @returns {Promise<{conversationId: string, user: string} | null>} The conversation object with selected fields or null if not found.
- */
-const searchConversation = async (conversationId) => {
-  try {
-    return await Conversation.findOne({ conversationId }, 'conversationId user').lean();
-  } catch (error) {
-    logger.error('[searchConversation] Error searching conversation', error);
-    throw new Error('Error searching conversation');
-  }
-};
-
-/**
- * Retrieves a single conversation for a given user and conversation ID.
- * @param {string} user - The user's ID.
- * @param {string} conversationId - The conversation's ID.
- * @returns {Promise<TConversation>} The conversation object.
- */
 const getConvo = async (user, conversationId) => {
  try {
    return await Conversation.findOne({ user, conversationId }).lean();
@@ -33,75 +13,28 @@ const getConvo = async (user, conversationId) => {

 module.exports = {
  Conversation,
-  searchConversation,
-  /**
-   * Saves a conversation to the database.
-   * @param {Object} req - The request object.
-   * @param {string} conversationId - The conversation's ID.
-   * @param {Object} metadata - Additional metadata to log for operation.
-   * @returns {Promise<TConversation>} The conversation object.
-   */
-  saveConvo: async (req, { conversationId, newConversationId, ...convo }, metadata) => {
+  saveConvo: async (user, { conversationId, newConversationId, ...convo }) => {
    try {
-      if (metadata && metadata?.context) {
-        logger.debug(`[saveConvo] ${metadata.context}`);
-      }
-      const messages = await getMessages({ conversationId }, '_id');
-      const update = { ...convo, messages, user: req.user.id };
+      const messages = await getMessages({ conversationId });
+      const update = { ...convo, messages, user };
      if (newConversationId) {
        update.conversationId = newConversationId;
      }

-      const conversation = await Conversation.findOneAndUpdate(
-        { conversationId, user: req.user.id },
-        update,
-        {
-          new: true,
-          upsert: true,
-        },
-      );
-
-      return conversation.toObject();
+      return await Conversation.findOneAndUpdate({ conversationId: conversationId, user }, update, {
+        new: true,
+        upsert: true,
+      });
    } catch (error) {
      logger.error('[saveConvo] Error saving conversation', error);
-      if (metadata && metadata?.context) {
-        logger.info(`[saveConvo] ${metadata.context}`);
-      }
      return { message: 'Error saving conversation' };
    }
  },
-  bulkSaveConvos: async (conversations) => {
+  getConvosByPage: async (user, pageNumber = 1, pageSize = 25) => {
    try {
-      const bulkOps = conversations.map((convo) => ({
-        updateOne: {
-          filter: { conversationId: convo.conversationId, user: convo.user },
-          update: convo,
-          upsert: true,
-          timestamps: false,
-        },
-      }));
-
-      const result = await Conversation.bulkWrite(bulkOps);
-      return result;
-    } catch (error) {
-      logger.error('[saveBulkConversations] Error saving conversations in bulk', error);
-      throw new Error('Failed to save conversations in bulk.');
-    }
-  },
-  getConvosByPage: async (user, pageNumber = 1, pageSize = 25, isArchived = false, tags) => {
-    const query = { user };
-    if (isArchived) {
-      query.isArchived = true;
-    } else {
-      query.$or = [{ isArchived: false }, { isArchived: { $exists: false } }];
-    }
-    if (Array.isArray(tags) && tags.length > 0) {
-      query.tags = { $in: tags };
-    }
-    try {
-      const totalConvos = (await Conversation.countDocuments(query)) || 1;
+      const totalConvos = (await Conversation.countDocuments({ user })) || 1;
      const totalPages = Math.ceil(totalConvos / pageSize);
-      const convos = await Conversation.find(query)
+      const convos = await Conversation.find({ user })
        .sort({ updatedAt: -1 })
        .skip((pageNumber - 1) * pageSize)
        .limit(pageSize)
--- a/api/models/ConversationTag.js
+++ b/api/models/ConversationTag.js
@@ -1,249 +0,0 @@
-const ConversationTag = require('./schema/conversationTagSchema');
-const Conversation = require('./schema/convoSchema');
-const logger = require('~/config/winston');
-
-/**
- * Retrieves all conversation tags for a user.
- * @param {string} user - The user ID.
- * @returns {Promise<Array>} An array of conversation tags.
- */
-const getConversationTags = async (user) => {
-  try {
-    return await ConversationTag.find({ user }).sort({ position: 1 }).lean();
-  } catch (error) {
-    logger.error('[getConversationTags] Error getting conversation tags', error);
-    throw new Error('Error getting conversation tags');
-  }
-};
-
-/**
- * Creates a new conversation tag.
- * @param {string} user - The user ID.
- * @param {Object} data - The tag data.
- * @param {string} data.tag - The tag name.
- * @param {string} [data.description] - The tag description.
- * @param {boolean} [data.addToConversation] - Whether to add the tag to a conversation.
- * @param {string} [data.conversationId] - The conversation ID to add the tag to.
- * @returns {Promise<Object>} The created tag.
- */
-const createConversationTag = async (user, data) => {
-  try {
-    const { tag, description, addToConversation, conversationId } = data;
-
-    const existingTag = await ConversationTag.findOne({ user, tag }).lean();
-    if (existingTag) {
-      return existingTag;
-    }
-
-    const maxPosition = await ConversationTag.findOne({ user }).sort('-position').lean();
-    const position = (maxPosition?.position || 0) + 1;
-
-    const newTag = await ConversationTag.findOneAndUpdate(
-      { tag, user },
-      {
-        tag,
-        user,
-        count: addToConversation ? 1 : 0,
-        position,
-        description,
-        $setOnInsert: { createdAt: new Date() },
-      },
-      {
-        new: true,
-        upsert: true,
-        lean: true,
-      },
-    );
-
-    if (addToConversation && conversationId) {
-      await Conversation.findOneAndUpdate(
-        { user, conversationId },
-        { $addToSet: { tags: tag } },
-        { new: true },
-      );
-    }
-
-    return newTag;
-  } catch (error) {
-    logger.error('[createConversationTag] Error creating conversation tag', error);
-    throw new Error('Error creating conversation tag');
-  }
-};
-
-/**
- * Updates an existing conversation tag.
- * @param {string} user - The user ID.
- * @param {string} oldTag - The current tag name.
- * @param {Object} data - The updated tag data.
- * @param {string} [data.tag] - The new tag name.
- * @param {string} [data.description] - The updated description.
- * @param {number} [data.position] - The new position.
- * @returns {Promise<Object>} The updated tag.
- */
-const updateConversationTag = async (user, oldTag, data) => {
-  try {
-    const { tag: newTag, description, position } = data;
-
-    const existingTag = await ConversationTag.findOne({ user, tag: oldTag }).lean();
-    if (!existingTag) {
-      return null;
-    }
-
-    if (newTag && newTag !== oldTag) {
-      const tagAlreadyExists = await ConversationTag.findOne({ user, tag: newTag }).lean();
-      if (tagAlreadyExists) {
-        throw new Error('Tag already exists');
-      }
-
-      await Conversation.updateMany({ user, tags: oldTag }, { $set: { 'tags.$': newTag } });
-    }
-
-    const updateData = {};
-    if (newTag) {
-      updateData.tag = newTag;
-    }
-    if (description !== undefined) {
-      updateData.description = description;
-    }
-    if (position !== undefined) {
-      await adjustPositions(user, existingTag.position, position);
-      updateData.position = position;
-    }
-
-    return await ConversationTag.findOneAndUpdate({ user, tag: oldTag }, updateData, {
-      new: true,
-      lean: true,
-    });
-  } catch (error) {
-    logger.error('[updateConversationTag] Error updating conversation tag', error);
-    throw new Error('Error updating conversation tag');
-  }
-};
-
-/**
- * Adjusts positions of tags when a tag's position is changed.
- * @param {string} user - The user ID.
- * @param {number} oldPosition - The old position of the tag.
- * @param {number} newPosition - The new position of the tag.
- * @returns {Promise<void>}
- */
-const adjustPositions = async (user, oldPosition, newPosition) => {
-  if (oldPosition === newPosition) {
-    return;
-  }
-
-  const update = oldPosition < newPosition ? { $inc: { position: -1 } } : { $inc: { position: 1 } };
-  const position =
-    oldPosition < newPosition
-      ? {
-        $gt: Math.min(oldPosition, newPosition),
-        $lte: Math.max(oldPosition, newPosition),
-      }
-      : {
-        $gte: Math.min(oldPosition, newPosition),
-        $lt: Math.max(oldPosition, newPosition),
-      };
-
-  await ConversationTag.updateMany(
-    {
-      user,
-      position,
-    },
-    update,
-  );
-};
-
-/**
- * Deletes a conversation tag.
- * @param {string} user - The user ID.
- * @param {string} tag - The tag to delete.
- * @returns {Promise<Object>} The deleted tag.
- */
-const deleteConversationTag = async (user, tag) => {
-  try {
-    const deletedTag = await ConversationTag.findOneAndDelete({ user, tag }).lean();
-    if (!deletedTag) {
-      return null;
-    }
-
-    await Conversation.updateMany({ user, tags: tag }, { $pull: { tags: tag } });
-
-    await ConversationTag.updateMany(
-      { user, position: { $gt: deletedTag.position } },
-      { $inc: { position: -1 } },
-    );
-
-    return deletedTag;
-  } catch (error) {
-    logger.error('[deleteConversationTag] Error deleting conversation tag', error);
-    throw new Error('Error deleting conversation tag');
-  }
-};
-
-/**
- * Updates tags for a specific conversation.
- * @param {string} user - The user ID.
- * @param {string} conversationId - The conversation ID.
- * @param {string[]} tags - The new set of tags for the conversation.
- * @returns {Promise<string[]>} The updated list of tags for the conversation.
- */
-const updateTagsForConversation = async (user, conversationId, tags) => {
-  try {
-    const conversation = await Conversation.findOne({ user, conversationId }).lean();
-    if (!conversation) {
-      throw new Error('Conversation not found');
-    }
-
-    const oldTags = new Set(conversation.tags);
-    const newTags = new Set(tags);
-
-    const addedTags = [...newTags].filter((tag) => !oldTags.has(tag));
-    const removedTags = [...oldTags].filter((tag) => !newTags.has(tag));
-
-    const bulkOps = [];
-
-    for (const tag of addedTags) {
-      bulkOps.push({
-        updateOne: {
-          filter: { user, tag },
-          update: { $inc: { count: 1 } },
-          upsert: true,
-        },
-      });
-    }
-
-    for (const tag of removedTags) {
-      bulkOps.push({
-        updateOne: {
-          filter: { user, tag },
-          update: { $inc: { count: -1 } },
-        },
-      });
-    }
-
-    if (bulkOps.length > 0) {
-      await ConversationTag.bulkWrite(bulkOps);
-    }
-
-    const updatedConversation = (
-      await Conversation.findOneAndUpdate(
-        { user, conversationId },
-        { $set: { tags: [...newTags] } },
-        { new: true },
-      )
-    ).toObject();
-
-    return updatedConversation.tags;
-  } catch (error) {
-    logger.error('[updateTagsForConversation] Error updating tags', error);
-    throw new Error('Error updating tags for conversation');
-  }
-};
-
-module.exports = {
-  getConversationTags,
-  createConversationTag,
-  updateConversationTag,
-  deleteConversationTag,
-  updateTagsForConversation,
-};
--- a/api/models/File.js
+++ b/api/models/File.js
@@ -97,12 +97,8 @@ const deleteFileByFilter = async (filter) => {
 * @param {Array<string>} file_ids - The unique identifiers of the files to delete.
 * @returns {Promise<Object>} A promise that resolves to the result of the deletion operation.
 */
-const deleteFiles = async (file_ids, user) => {
-  let deleteQuery = { file_id: { $in: file_ids } };
-  if (user) {
-    deleteQuery = { user: user };
-  }
-  return await File.deleteMany(deleteQuery);
+const deleteFiles = async (file_ids) => {
+  return await File.deleteMany({ file_id: { $in: file_ids } });
 };

 module.exports = {
--- a/api/models/Message.js
+++ b/api/models/Message.js
@@ -1,342 +1,170 @@
 const { z } = require('zod');
 const Message = require('./schema/messageSchema');
-const { logger } = require('~/config');
+const logger = require('~/config/winston');

 const idSchema = z.string().uuid();

-/**
- * Saves a message in the database.
- *
- * @async
- * @function saveMessage
- * @param {Express.Request} req - The request object containing user information.
- * @param {Object} params - The message data object.
- * @param {string} params.endpoint - The endpoint where the message originated.
- * @param {string} params.iconURL - The URL of the sender's icon.
- * @param {string} params.messageId - The unique identifier for the message.
- * @param {string} params.newMessageId - The new unique identifier for the message (if applicable).
- * @param {string} params.conversationId - The identifier of the conversation.
- * @param {string} [params.parentMessageId] - The identifier of the parent message, if any.
- * @param {string} params.sender - The identifier of the sender.
- * @param {string} params.text - The text content of the message.
- * @param {boolean} params.isCreatedByUser - Indicates if the message was created by the user.
- * @param {string} [params.error] - Any error associated with the message.
- * @param {boolean} [params.unfinished] - Indicates if the message is unfinished.
- * @param {Object[]} [params.files] - An array of files associated with the message.
- * @param {boolean} [params.isEdited] - Indicates if the message was edited.
- * @param {string} [params.finish_reason] - Reason for finishing the message.
- * @param {number} [params.tokenCount] - The number of tokens in the message.
- * @param {string} [params.plugin] - Plugin associated with the message.
- * @param {string[]} [params.plugins] - An array of plugins associated with the message.
- * @param {string} [params.model] - The model used to generate the message.
- * @param {Object} [metadata] - Additional metadata for this operation
- * @param {string} [metadata.context] - The context of the operation
- * @returns {Promise<TMessage>} The updated or newly inserted message document.
- * @throws {Error} If there is an error in saving the message.
- */
-async function saveMessage(req, params, metadata) {
-  try {
-    if (!req || !req.user || !req.user.id) {
-      throw new Error('User not authenticated');
-    }
-
-    const {
-      text,
-      error,
-      model,
-      files,
-      plugin,
-      sender,
-      plugins,
-      iconURL,
-      endpoint,
-      isEdited,
-      messageId,
-      unfinished,
-      tokenCount,
-      newMessageId,
-      finish_reason,
-      conversationId,
-      parentMessageId,
-      isCreatedByUser,
-    } = params;
-
-    const validConvoId = idSchema.safeParse(conversationId);
-    if (!validConvoId.success) {
-      logger.warn(`Invalid conversation ID: ${conversationId}`);
-      if (metadata && metadata?.context) {
-        logger.info(`---\`saveMessage\` context: ${metadata.context}`);
-      }
-
-      logger.info(`---Invalid conversation ID Params:
-
-${JSON.stringify(params, null, 2)}
-
-`);
-      return;
-    }
-
-    const update = {
-      user: req.user.id,
-      iconURL,
-      endpoint,
-      messageId: newMessageId || messageId,
-      conversationId,
-      parentMessageId,
-      sender,
-      text,
-      isCreatedByUser,
-      isEdited,
-      finish_reason,
-      error,
-      unfinished,
-      tokenCount,
-      plugin,
-      plugins,
-      model,
-    };
-
-    if (files) {
-      update.files = files;
-    }
-
-    const message = await Message.findOneAndUpdate({ messageId, user: req.user.id }, update, {
-      upsert: true,
-      new: true,
-    });
-
-    return message.toObject();
-  } catch (err) {
-    logger.error('Error saving message:', err);
-    if (metadata && metadata?.context) {
-      logger.info(`---\`saveMessage\` context: ${metadata.context}`);
-    }
-    throw err;
-  }
-}
-
-/**
- * Saves multiple messages in the database in bulk.
- *
- * @async
- * @function bulkSaveMessages
- * @param {Object[]} messages - An array of message objects to save.
- * @returns {Promise<Object>} The result of the bulk write operation.
- * @throws {Error} If there is an error in saving messages in bulk.
- */
-async function bulkSaveMessages(messages) {
-  try {
-    const bulkOps = messages.map((message) => ({
-      updateOne: {
-        filter: { messageId: message.messageId },
-        update: message,
-        upsert: true,
-      },
-    }));
-
-    const result = await Message.bulkWrite(bulkOps);
-    return result;
-  } catch (err) {
-    logger.error('Error saving messages in bulk:', err);
-    throw err;
-  }
-}
-
-/**
- * Records a message in the database.
- *
- * @async
- * @function recordMessage
- * @param {Object} params - The message data object.
- * @param {string} params.user - The identifier of the user.
- * @param {string} params.endpoint - The endpoint where the message originated.
- * @param {string} params.messageId - The unique identifier for the message.
- * @param {string} params.conversationId - The identifier of the conversation.
- * @param {string} [params.parentMessageId] - The identifier of the parent message, if any.
- * @param {Partial<TMessage>} rest - Any additional properties from the TMessage typedef not explicitly listed.
- * @returns {Promise<Object>} The updated or newly inserted message document.
- * @throws {Error} If there is an error in saving the message.
- */
-async function recordMessage({
-  user,
-  endpoint,
-  messageId,
-  conversationId,
-  parentMessageId,
-  ...rest
-}) {
-  try {
-    // No parsing of convoId as may use threadId
-    const message = {
-      user,
-      endpoint,
-      messageId,
-      conversationId,
-      parentMessageId,
-      ...rest,
-    };
-
-    return await Message.findOneAndUpdate({ user, messageId }, message, {
-      upsert: true,
-      new: true,
-    });
-  } catch (err) {
-    logger.error('Error recording message:', err);
-    throw err;
-  }
-}
-
-/**
- * Updates the text of a message.
- *
- * @async
- * @function updateMessageText
- * @param {Object} params - The update data object.
- * @param {Object} req - The request object.
- * @param {string} params.messageId - The unique identifier for the message.
- * @param {string} params.text - The new text content of the message.
- * @returns {Promise<void>}
- * @throws {Error} If there is an error in updating the message text.
- */
-async function updateMessageText(req, { messageId, text }) {
-  try {
-    await Message.updateOne({ messageId, user: req.user.id }, { text });
-  } catch (err) {
-    logger.error('Error updating message text:', err);
-    throw err;
-  }
-}
-
-/**
- * Updates a message.
- *
- * @async
- * @function updateMessage
- * @param {Object} req - The request object.
- * @param {Object} message - The message object containing update data.
- * @param {string} message.messageId - The unique identifier for the message.
- * @param {string} [message.text] - The new text content of the message.
- * @param {Object[]} [message.files] - The files associated with the message.
- * @param {boolean} [message.isCreatedByUser] - Indicates if the message was created by the user.
- * @param {string} [message.sender] - The identifier of the sender.
- * @param {number} [message.tokenCount] - The number of tokens in the message.
- * @param {Object} [metadata] - The operation metadata
- * @param {string} [metadata.context] - The operation metadata
- * @returns {Promise<TMessage>} The updated message document.
- * @throws {Error} If there is an error in updating the message or if the message is not found.
- */
-async function updateMessage(req, message, metadata) {
-  try {
-    const { messageId, ...update } = message;
-    update.isEdited = true;
-    const updatedMessage = await Message.findOneAndUpdate(
-      { messageId, user: req.user.id },
-      update,
-      {
-        new: true,
-      },
-    );
-
-    if (!updatedMessage) {
-      throw new Error('Message not found or user not authorized.');
-    }
-
-    return {
-      messageId: updatedMessage.messageId,
-      conversationId: updatedMessage.conversationId,
-      parentMessageId: updatedMessage.parentMessageId,
-      sender: updatedMessage.sender,
-      text: updatedMessage.text,
-      isCreatedByUser: updatedMessage.isCreatedByUser,
-      tokenCount: updatedMessage.tokenCount,
-      isEdited: true,
-    };
-  } catch (err) {
-    logger.error('Error updating message:', err);
-    if (metadata && metadata?.context) {
-      logger.info(`---\`updateMessage\` context: ${metadata.context}`);
-    }
-    throw err;
-  }
-}
-
-/**
- * Deletes messages in a conversation since a specific message.
- *
- * @async
- * @function deleteMessagesSince
- * @param {Object} params - The parameters object.
- * @param {Object} req - The request object.
- * @param {string} params.messageId - The unique identifier for the message.
- * @param {string} params.conversationId - The identifier of the conversation.
- * @returns {Promise<Number>} The number of deleted messages.
- * @throws {Error} If there is an error in deleting messages.
- */
-async function deleteMessagesSince(req, { messageId, conversationId }) {
-  try {
-    const message = await Message.findOne({ messageId, user: req.user.id }).lean();
-
-    if (message) {
-      const query = Message.find({ conversationId, user: req.user.id });
-      return await query.deleteMany({
-        createdAt: { $gt: message.createdAt },
-      });
-    }
-    return undefined;
-  } catch (err) {
-    logger.error('Error deleting messages:', err);
-    throw err;
-  }
-}
-
-/**
- * Retrieves messages from the database.
- * @async
- * @function getMessages
- * @param {Record<string, unknown>} filter - The filter criteria.
- * @param {string | undefined} [select] - The fields to select.
- * @returns {Promise<TMessage[]>} The messages that match the filter criteria.
- * @throws {Error} If there is an error in retrieving messages.
- */
-async function getMessages(filter, select) {
-  try {
-    if (select) {
-      return await Message.find(filter).select(select).sort({ createdAt: 1 }).lean();
-    }
-
-    return await Message.find(filter).sort({ createdAt: 1 }).lean();
-  } catch (err) {
-    logger.error('Error getting messages:', err);
-    throw err;
-  }
-}
-
-/**
- * Deletes messages from the database.
- *
- * @async
- * @function deleteMessages
- * @param {Object} filter - The filter criteria to find messages to delete.
- * @returns {Promise<Object>} The metadata with count of deleted messages.
- * @throws {Error} If there is an error in deleting messages.
- */
-async function deleteMessages(filter) {
-  try {
-    return await Message.deleteMany(filter);
-  } catch (err) {
-    logger.error('Error deleting messages:', err);
-    throw err;
-  }
-}
-
 module.exports = {
  Message,
-  saveMessage,
-  bulkSaveMessages,
-  recordMessage,
-  updateMessageText,
-  updateMessage,
-  deleteMessagesSince,
-  getMessages,
-  deleteMessages,
+
+  async saveMessage({
+    user,
+    endpoint,
+    messageId,
+    newMessageId,
+    conversationId,
+    parentMessageId,
+    sender,
+    text,
+    isCreatedByUser,
+    error,
+    unfinished,
+    files,
+    isEdited,
+    finish_reason,
+    tokenCount,
+    plugin,
+    plugins,
+    model,
+  }) {
+    try {
+      const validConvoId = idSchema.safeParse(conversationId);
+      if (!validConvoId.success) {
+        return;
+      }
+
+      const update = {
+        user,
+        endpoint,
+        messageId: newMessageId || messageId,
+        conversationId,
+        parentMessageId,
+        sender,
+        text,
+        isCreatedByUser,
+        isEdited,
+        finish_reason,
+        error,
+        unfinished,
+        tokenCount,
+        plugin,
+        plugins,
+        model,
+      };
+
+      if (files) {
+        update.files = files;
+      }
+      // may also need to update the conversation here
+      await Message.findOneAndUpdate({ messageId }, update, { upsert: true, new: true });
+
+      return {
+        messageId,
+        conversationId,
+        parentMessageId,
+        sender,
+        text,
+        isCreatedByUser,
+        tokenCount,
+      };
+    } catch (err) {
+      logger.error('Error saving message:', err);
+      throw new Error('Failed to save message.');
+    }
+  },
+  /**
+   * Records a message in the database.
+   *
+   * @async
+   * @function recordMessage
+   * @param {Object} params - The message data object.
+   * @param {string} params.user - The identifier of the user.
+   * @param {string} params.endpoint - The endpoint where the message originated.
+   * @param {string} params.messageId - The unique identifier for the message.
+   * @param {string} params.conversationId - The identifier of the conversation.
+   * @param {string} [params.parentMessageId] - The identifier of the parent message, if any.
+   * @param {Partial<TMessage>} rest - Any additional properties from the TMessage typedef not explicitly listed.
+   * @returns {Promise<Object>} The updated or newly inserted message document.
+   * @throws {Error} If there is an error in saving the message.
+   */
+  async recordMessage({ user, endpoint, messageId, conversationId, parentMessageId, ...rest }) {
+    try {
+      // No parsing of convoId as may use threadId
+      const message = {
+        user,
+        endpoint,
+        messageId,
+        conversationId,
+        parentMessageId,
+        ...rest,
+      };
+
+      return await Message.findOneAndUpdate({ user, messageId }, message, {
+        upsert: true,
+        new: true,
+      });
+    } catch (err) {
+      logger.error('Error saving message:', err);
+      throw new Error('Failed to save message.');
+    }
+  },
+  async updateMessage(message) {
+    try {
+      const { messageId, ...update } = message;
+      update.isEdited = true;
+      const updatedMessage = await Message.findOneAndUpdate({ messageId }, update, {
+        new: true,
+      });
+
+      if (!updatedMessage) {
+        throw new Error('Message not found.');
+      }
+
+      return {
+        messageId: updatedMessage.messageId,
+        conversationId: updatedMessage.conversationId,
+        parentMessageId: updatedMessage.parentMessageId,
+        sender: updatedMessage.sender,
+        text: updatedMessage.text,
+        isCreatedByUser: updatedMessage.isCreatedByUser,
+        tokenCount: updatedMessage.tokenCount,
+        isEdited: true,
+      };
+    } catch (err) {
+      logger.error('Error updating message:', err);
+      throw new Error('Failed to update message.');
+    }
+  },
+  async deleteMessagesSince({ messageId, conversationId }) {
+    try {
+      const message = await Message.findOne({ messageId }).lean();
+
+      if (message) {
+        return await Message.find({ conversationId }).deleteMany({
+          createdAt: { $gt: message.createdAt },
+        });
+      }
+    } catch (err) {
+      logger.error('Error deleting messages:', err);
+      throw new Error('Failed to delete messages.');
+    }
+  },
+
+  async getMessages(filter) {
+    try {
+      return await Message.find(filter).sort({ createdAt: 1 }).lean();
+    } catch (err) {
+      logger.error('Error getting messages:', err);
+      throw new Error('Failed to get messages.');
+    }
+  },
+
+  async deleteMessages(filter) {
+    try {
+      return await Message.deleteMany(filter);
+    } catch (err) {
+      logger.error('Error deleting messages:', err);
+      throw new Error('Failed to delete messages.');
+    }
+  },
 };
--- a/api/models/Message.spec.js
+++ b/api/models/Message.spec.js
@@ -1,239 +0,0 @@
-const mongoose = require('mongoose');
-const { v4: uuidv4 } = require('uuid');
-
-jest.mock('mongoose');
-
-const mockFindQuery = {
-  select: jest.fn().mockReturnThis(),
-  sort: jest.fn().mockReturnThis(),
-  lean: jest.fn().mockReturnThis(),
-  deleteMany: jest.fn().mockResolvedValue({ deletedCount: 1 }),
-};
-
-const mockSchema = {
-  findOneAndUpdate: jest.fn(),
-  updateOne: jest.fn(),
-  findOne: jest.fn(() => ({
-    lean: jest.fn(),
-  })),
-  find: jest.fn(() => mockFindQuery),
-  deleteMany: jest.fn(),
-};
-
-mongoose.model.mockReturnValue(mockSchema);
-
-jest.mock('~/models/schema/messageSchema', () => mockSchema);
-
-jest.mock('~/config/winston', () => ({
-  error: jest.fn(),
-}));
-
-const {
-  saveMessage,
-  getMessages,
-  updateMessage,
-  deleteMessages,
-  updateMessageText,
-  deleteMessagesSince,
-} = require('~/models/Message');
-
-describe('Message Operations', () => {
-  let mockReq;
-  let mockMessage;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    mockReq = {
-      user: { id: 'user123' },
-    };
-
-    mockMessage = {
-      messageId: 'msg123',
-      conversationId: uuidv4(),
-      text: 'Hello, world!',
-      user: 'user123',
-    };
-
-    mockSchema.findOneAndUpdate.mockResolvedValue({
-      toObject: () => mockMessage,
-    });
-  });
-
-  describe('saveMessage', () => {
-    it('should save a message for an authenticated user', async () => {
-      const result = await saveMessage(mockReq, mockMessage);
-      expect(result).toEqual(mockMessage);
-      expect(mockSchema.findOneAndUpdate).toHaveBeenCalledWith(
-        { messageId: 'msg123', user: 'user123' },
-        expect.objectContaining({ user: 'user123' }),
-        expect.any(Object),
-      );
-    });
-
-    it('should throw an error for unauthenticated user', async () => {
-      mockReq.user = null;
-      await expect(saveMessage(mockReq, mockMessage)).rejects.toThrow('User not authenticated');
-    });
-
-    it('should throw an error for invalid conversation ID', async () => {
-      mockMessage.conversationId = 'invalid-id';
-      await expect(saveMessage(mockReq, mockMessage)).resolves.toBeUndefined();
-    });
-  });
-
-  describe('updateMessageText', () => {
-    it('should update message text for the authenticated user', async () => {
-      await updateMessageText(mockReq, { messageId: 'msg123', text: 'Updated text' });
-      expect(mockSchema.updateOne).toHaveBeenCalledWith(
-        { messageId: 'msg123', user: 'user123' },
-        { text: 'Updated text' },
-      );
-    });
-  });
-
-  describe('updateMessage', () => {
-    it('should update a message for the authenticated user', async () => {
-      mockSchema.findOneAndUpdate.mockResolvedValue(mockMessage);
-      const result = await updateMessage(mockReq, { messageId: 'msg123', text: 'Updated text' });
-      expect(result).toEqual(
-        expect.objectContaining({
-          messageId: 'msg123',
-          text: 'Hello, world!',
-          isEdited: true,
-        }),
-      );
-    });
-
-    it('should throw an error if message is not found', async () => {
-      mockSchema.findOneAndUpdate.mockResolvedValue(null);
-      await expect(
-        updateMessage(mockReq, { messageId: 'nonexistent', text: 'Test' }),
-      ).rejects.toThrow('Message not found or user not authorized.');
-    });
-  });
-
-  describe('deleteMessagesSince', () => {
-    it('should delete messages only for the authenticated user', async () => {
-      mockSchema.findOne().lean.mockResolvedValueOnce({ createdAt: new Date() });
-      mockFindQuery.deleteMany.mockResolvedValueOnce({ deletedCount: 1 });
-      const result = await deleteMessagesSince(mockReq, {
-        messageId: 'msg123',
-        conversationId: 'convo123',
-      });
-      expect(mockSchema.findOne).toHaveBeenCalledWith({ messageId: 'msg123', user: 'user123' });
-      expect(mockSchema.find).not.toHaveBeenCalled();
-      expect(result).toBeUndefined();
-    });
-
-    it('should return undefined if no message is found', async () => {
-      mockSchema.findOne().lean.mockResolvedValueOnce(null);
-      const result = await deleteMessagesSince(mockReq, {
-        messageId: 'nonexistent',
-        conversationId: 'convo123',
-      });
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe('getMessages', () => {
-    it('should retrieve messages with the correct filter', async () => {
-      const filter = { conversationId: 'convo123' };
-      await getMessages(filter);
-      expect(mockSchema.find).toHaveBeenCalledWith(filter);
-      expect(mockFindQuery.sort).toHaveBeenCalledWith({ createdAt: 1 });
-      expect(mockFindQuery.lean).toHaveBeenCalled();
-    });
-  });
-
-  describe('deleteMessages', () => {
-    it('should delete messages with the correct filter', async () => {
-      await deleteMessages({ user: 'user123' });
-      expect(mockSchema.deleteMany).toHaveBeenCalledWith({ user: 'user123' });
-    });
-  });
-
-  describe('Conversation Hijacking Prevention', () => {
-    it('should not allow editing a message in another user\'s conversation', async () => {
-      const attackerReq = { user: { id: 'attacker123' } };
-      const victimConversationId = 'victim-convo-123';
-      const victimMessageId = 'victim-msg-123';
-
-      mockSchema.findOneAndUpdate.mockResolvedValue(null);
-
-      await expect(
-        updateMessage(attackerReq, {
-          messageId: victimMessageId,
-          conversationId: victimConversationId,
-          text: 'Hacked message',
-        }),
-      ).rejects.toThrow('Message not found or user not authorized.');
-
-      expect(mockSchema.findOneAndUpdate).toHaveBeenCalledWith(
-        { messageId: victimMessageId, user: 'attacker123' },
-        expect.anything(),
-        expect.anything(),
-      );
-    });
-
-    it('should not allow deleting messages from another user\'s conversation', async () => {
-      const attackerReq = { user: { id: 'attacker123' } };
-      const victimConversationId = 'victim-convo-123';
-      const victimMessageId = 'victim-msg-123';
-
-      mockSchema.findOne().lean.mockResolvedValueOnce(null); // Simulating message not found for this user
-      const result = await deleteMessagesSince(attackerReq, {
-        messageId: victimMessageId,
-        conversationId: victimConversationId,
-      });
-
-      expect(result).toBeUndefined();
-      expect(mockSchema.findOne).toHaveBeenCalledWith({
-        messageId: victimMessageId,
-        user: 'attacker123',
-      });
-    });
-
-    it('should not allow inserting a new message into another user\'s conversation', async () => {
-      const attackerReq = { user: { id: 'attacker123' } };
-      const victimConversationId = uuidv4(); // Use a valid UUID
-
-      await expect(
-        saveMessage(attackerReq, {
-          conversationId: victimConversationId,
-          text: 'Inserted malicious message',
-          messageId: 'new-msg-123',
-        }),
-      ).resolves.not.toThrow(); // It should not throw an error
-
-      // Check that the message was saved with the attacker's user ID
-      expect(mockSchema.findOneAndUpdate).toHaveBeenCalledWith(
-        { messageId: 'new-msg-123', user: 'attacker123' },
-        expect.objectContaining({
-          user: 'attacker123',
-          conversationId: victimConversationId,
-        }),
-        expect.anything(),
-      );
-    });
-
-    it('should allow retrieving messages from any conversation', async () => {
-      const victimConversationId = 'victim-convo-123';
-
-      await getMessages({ conversationId: victimConversationId });
-
-      expect(mockSchema.find).toHaveBeenCalledWith({
-        conversationId: victimConversationId,
-      });
-
-      mockSchema.find.mockReturnValueOnce({
-        select: jest.fn().mockReturnThis(),
-        sort: jest.fn().mockReturnThis(),
-        lean: jest.fn().mockResolvedValue([{ text: 'Test message' }]),
-      });
-
-      const result = await getMessages({ conversationId: victimConversationId });
-      expect(result).toEqual([{ text: 'Test message' }]);
-    });
-  });
-});
--- a/api/models/Preset.js
+++ b/api/models/Preset.js
@@ -39,12 +39,6 @@ module.exports = {
    try {
      const setter = { $set: {} };
      const update = { presetId, ...preset };
-      if (preset.tools && Array.isArray(preset.tools)) {
-        update.tools =
-          preset.tools
-            .map((tool) => tool?.pluginKey ?? tool)
-            .filter((toolName) => typeof toolName === 'string') ?? [];
-      }
      if (newPresetId) {
        update.presetId = newPresetId;
      }
--- a/api/models/Project.js
+++ b/api/models/Project.js
@@ -1,90 +0,0 @@
-const { model } = require('mongoose');
-const projectSchema = require('~/models/schema/projectSchema');
-
-const Project = model('Project', projectSchema);
-
-/**
- * Retrieve a project by ID and convert the found project document to a plain object.
- *
- * @param {string} projectId - The ID of the project to find and return as a plain object.
- * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<MongoProject>} A plain object representing the project document, or `null` if no project is found.
- */
-const getProjectById = async function (projectId, fieldsToSelect = null) {
-  const query = Project.findById(projectId);
-
-  if (fieldsToSelect) {
-    query.select(fieldsToSelect);
-  }
-
-  return await query.lean();
-};
-
-/**
- * Retrieve a project by name and convert the found project document to a plain object.
- * If the project with the given name doesn't exist and the name is "instance", create it and return the lean version.
- *
- * @param {string} projectName - The name of the project to find or create.
- * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<MongoProject>} A plain object representing the project document.
- */
-const getProjectByName = async function (projectName, fieldsToSelect = null) {
-  const query = { name: projectName };
-  const update = { $setOnInsert: { name: projectName } };
-  const options = {
-    new: true,
-    upsert: projectName === 'instance',
-    lean: true,
-    select: fieldsToSelect,
-  };
-
-  return await Project.findOneAndUpdate(query, update, options);
-};
-
-/**
- * Add an array of prompt group IDs to a project's promptGroupIds array, ensuring uniqueness.
- *
- * @param {string} projectId - The ID of the project to update.
- * @param {string[]} promptGroupIds - The array of prompt group IDs to add to the project.
- * @returns {Promise<MongoProject>} The updated project document.
- */
-const addGroupIdsToProject = async function (projectId, promptGroupIds) {
-  return await Project.findByIdAndUpdate(
-    projectId,
-    { $addToSet: { promptGroupIds: { $each: promptGroupIds } } },
-    { new: true },
-  );
-};
-
-/**
- * Remove an array of prompt group IDs from a project's promptGroupIds array.
- *
- * @param {string} projectId - The ID of the project to update.
- * @param {string[]} promptGroupIds - The array of prompt group IDs to remove from the project.
- * @returns {Promise<MongoProject>} The updated project document.
- */
-const removeGroupIdsFromProject = async function (projectId, promptGroupIds) {
-  return await Project.findByIdAndUpdate(
-    projectId,
-    { $pull: { promptGroupIds: { $in: promptGroupIds } } },
-    { new: true },
-  );
-};
-
-/**
- * Remove a prompt group ID from all projects.
- *
- * @param {string} promptGroupId - The ID of the prompt group to remove from projects.
- * @returns {Promise<void>}
- */
-const removeGroupFromAllProjects = async (promptGroupId) => {
-  await Project.updateMany({}, { $pull: { promptGroupIds: promptGroupId } });
-};
-
-module.exports = {
-  getProjectById,
-  getProjectByName,
-  addGroupIdsToProject,
-  removeGroupIdsFromProject,
-  removeGroupFromAllProjects,
-};
--- a/api/models/Prompt.js
+++ b/api/models/Prompt.js
@@ -1,528 +1,52 @@
-const { ObjectId } = require('mongodb');
-const { SystemRoles, SystemCategories } = require('librechat-data-provider');
-const {
-  getProjectByName,
-  addGroupIdsToProject,
-  removeGroupIdsFromProject,
-  removeGroupFromAllProjects,
-} = require('./Project');
-const { Prompt, PromptGroup } = require('./schema/promptSchema');
+const mongoose = require('mongoose');
 const { logger } = require('~/config');

-/**
- * Create a pipeline for the aggregation to get prompt groups
- * @param {Object} query
- * @param {number} skip
- * @param {number} limit
- * @returns {[Object]} - The pipeline for the aggregation
- */
-const createGroupPipeline = (query, skip, limit) => {
-  return [
-    { $match: query },
-    { $sort: { createdAt: -1 } },
-    { $skip: skip },
-    { $limit: limit },
-    {
-      $lookup: {
-        from: 'prompts',
-        localField: 'productionId',
-        foreignField: '_id',
-        as: 'productionPrompt',
-      },
+const promptSchema = mongoose.Schema(
+  {
+    title: {
+      type: String,
+      required: true,
    },
-    { $unwind: { path: '$productionPrompt', preserveNullAndEmptyArrays: true } },
-    {
-      $project: {
-        name: 1,
-        numberOfGenerations: 1,
-        oneliner: 1,
-        category: 1,
-        projectIds: 1,
-        productionId: 1,
-        author: 1,
-        authorName: 1,
-        createdAt: 1,
-        updatedAt: 1,
-        'productionPrompt.prompt': 1,
-        // 'productionPrompt._id': 1,
-        // 'productionPrompt.type': 1,
-      },
+    prompt: {
+      type: String,
+      required: true,
+    },
+    category: {
+      type: String,
    },
-  ];
-};
-
-/**
- * Create a pipeline for the aggregation to get all prompt groups
- * @param {Object} query
- * @param {Partial<MongoPromptGroup>} $project
- * @returns {[Object]} - The pipeline for the aggregation
- */
-const createAllGroupsPipeline = (
-  query,
-  $project = {
-    name: 1,
-    oneliner: 1,
-    category: 1,
-    author: 1,
-    authorName: 1,
-    createdAt: 1,
-    updatedAt: 1,
-    command: 1,
-    'productionPrompt.prompt': 1,
  },
-) => {
-  return [
-    { $match: query },
-    { $sort: { createdAt: -1 } },
-    {
-      $lookup: {
-        from: 'prompts',
-        localField: 'productionId',
-        foreignField: '_id',
-        as: 'productionPrompt',
-      },
-    },
-    { $unwind: { path: '$productionPrompt', preserveNullAndEmptyArrays: true } },
-    {
-      $project,
-    },
-  ];
-};
+  { timestamps: true },
+);

-/**
- * Get all prompt groups with filters
- * @param {Object} req
- * @param {TPromptGroupsWithFilterRequest} filter
- * @returns {Promise<PromptGroupListResponse>}
- */
-const getAllPromptGroups = async (req, filter) => {
-  try {
-    const { name, ...query } = filter;
-
-    if (!query.author) {
-      throw new Error('Author is required');
-    }
-
-    let searchShared = true;
-    let searchSharedOnly = false;
-    if (name) {
-      query.name = new RegExp(name, 'i');
-    }
-    if (!query.category) {
-      delete query.category;
-    } else if (query.category === SystemCategories.MY_PROMPTS) {
-      searchShared = false;
-      delete query.category;
-    } else if (query.category === SystemCategories.NO_CATEGORY) {
-      query.category = '';
-    } else if (query.category === SystemCategories.SHARED_PROMPTS) {
-      searchSharedOnly = true;
-      delete query.category;
-    }
-
-    let combinedQuery = query;
-
-    if (searchShared) {
-      const project = await getProjectByName('instance', 'promptGroupIds');
-      if (project && project.promptGroupIds.length > 0) {
-        const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };
-        delete projectQuery.author;
-        combinedQuery = searchSharedOnly ? projectQuery : { $or: [projectQuery, query] };
-      }
-    }
-
-    const promptGroupsPipeline = createAllGroupsPipeline(combinedQuery);
-    return await PromptGroup.aggregate(promptGroupsPipeline).exec();
-  } catch (error) {
-    console.error('Error getting all prompt groups', error);
-    return { message: 'Error getting all prompt groups' };
-  }
-};
-
-/**
- * Get prompt groups with filters
- * @param {Object} req
- * @param {TPromptGroupsWithFilterRequest} filter
- * @returns {Promise<PromptGroupListResponse>}
- */
-const getPromptGroups = async (req, filter) => {
-  try {
-    const { pageNumber = 1, pageSize = 10, name, ...query } = filter;
-
-    const validatedPageNumber = Math.max(parseInt(pageNumber, 10), 1);
-    const validatedPageSize = Math.max(parseInt(pageSize, 10), 1);
-
-    if (!query.author) {
-      throw new Error('Author is required');
-    }
-
-    let searchShared = true;
-    let searchSharedOnly = false;
-    if (name) {
-      query.name = new RegExp(name, 'i');
-    }
-    if (!query.category) {
-      delete query.category;
-    } else if (query.category === SystemCategories.MY_PROMPTS) {
-      searchShared = false;
-      delete query.category;
-    } else if (query.category === SystemCategories.NO_CATEGORY) {
-      query.category = '';
-    } else if (query.category === SystemCategories.SHARED_PROMPTS) {
-      searchSharedOnly = true;
-      delete query.category;
-    }
-
-    let combinedQuery = query;
-
-    if (searchShared) {
-      // const projects = req.user.projects || []; // TODO: handle multiple projects
-      const project = await getProjectByName('instance', 'promptGroupIds');
-      if (project && project.promptGroupIds.length > 0) {
-        const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };
-        delete projectQuery.author;
-        combinedQuery = searchSharedOnly ? projectQuery : { $or: [projectQuery, query] };
-      }
-    }
-
-    const skip = (validatedPageNumber - 1) * validatedPageSize;
-    const limit = validatedPageSize;
-
-    const promptGroupsPipeline = createGroupPipeline(combinedQuery, skip, limit);
-    const totalPromptGroupsPipeline = [{ $match: combinedQuery }, { $count: 'total' }];
-
-    const [promptGroupsResults, totalPromptGroupsResults] = await Promise.all([
-      PromptGroup.aggregate(promptGroupsPipeline).exec(),
-      PromptGroup.aggregate(totalPromptGroupsPipeline).exec(),
-    ]);
-
-    const promptGroups = promptGroupsResults;
-    const totalPromptGroups =
-      totalPromptGroupsResults.length > 0 ? totalPromptGroupsResults[0].total : 0;
-
-    return {
-      promptGroups,
-      pageNumber: validatedPageNumber.toString(),
-      pageSize: validatedPageSize.toString(),
-      pages: Math.ceil(totalPromptGroups / validatedPageSize).toString(),
-    };
-  } catch (error) {
-    console.error('Error getting prompt groups', error);
-    return { message: 'Error getting prompt groups' };
-  }
-};
+const Prompt = mongoose.models.Prompt || mongoose.model('Prompt', promptSchema);

 module.exports = {
-  getPromptGroups,
-  getAllPromptGroups,
-  /**
-   * Create a prompt and its respective group
-   * @param {TCreatePromptRecord} saveData
-   * @returns {Promise<TCreatePromptResponse>}
-   */
-  createPromptGroup: async (saveData) => {
+  savePrompt: async ({ title, prompt }) => {
    try {
-      const { prompt, group, author, authorName } = saveData;
-
-      let newPromptGroup = await PromptGroup.findOneAndUpdate(
-        { ...group, author, authorName, productionId: null },
-        { $setOnInsert: { ...group, author, authorName, productionId: null } },
-        { new: true, upsert: true },
-      )
-        .lean()
-        .select('-__v')
-        .exec();
-
-      const newPrompt = await Prompt.findOneAndUpdate(
-        { ...prompt, author, groupId: newPromptGroup._id },
-        { $setOnInsert: { ...prompt, author, groupId: newPromptGroup._id } },
-        { new: true, upsert: true },
-      )
-        .lean()
-        .select('-__v')
-        .exec();
-
-      newPromptGroup = await PromptGroup.findByIdAndUpdate(
-        newPromptGroup._id,
-        { productionId: newPrompt._id },
-        { new: true },
-      )
-        .lean()
-        .select('-__v')
-        .exec();
-
-      return {
-        prompt: newPrompt,
-        group: {
-          ...newPromptGroup,
-          productionPrompt: { prompt: newPrompt.prompt },
-        },
-      };
-    } catch (error) {
-      logger.error('Error saving prompt group', error);
-      throw new Error('Error saving prompt group');
-    }
-  },
-  /**
-   * Save a prompt
-   * @param {TCreatePromptRecord} saveData
-   * @returns {Promise<TCreatePromptResponse>}
-   */
-  savePrompt: async (saveData) => {
-    try {
-      const { prompt, author } = saveData;
-      const newPromptData = {
-        ...prompt,
-        author,
-      };
-
-      /** @type {TPrompt} */
-      let newPrompt;
-      try {
-        newPrompt = await Prompt.create(newPromptData);
-      } catch (error) {
-        if (error?.message?.includes('groupId_1_version_1')) {
-          await Prompt.db.collection('prompts').dropIndex('groupId_1_version_1');
-        } else {
-          throw error;
-        }
-        newPrompt = await Prompt.create(newPromptData);
-      }
-
-      return { prompt: newPrompt };
+      await Prompt.create({
+        title,
+        prompt,
+      });
+      return { title, prompt };
    } catch (error) {
      logger.error('Error saving prompt', error);
-      return { message: 'Error saving prompt' };
+      return { prompt: 'Error saving prompt' };
    }
  },
  getPrompts: async (filter) => {
    try {
-      return await Prompt.find(filter).sort({ createdAt: -1 }).lean();
+      return await Prompt.find(filter).lean();
    } catch (error) {
      logger.error('Error getting prompts', error);
-      return { message: 'Error getting prompts' };
+      return { prompt: 'Error getting prompts' };
    }
  },
-  getPrompt: async (filter) => {
+  deletePrompts: async (filter) => {
    try {
-      if (filter.groupId) {
-        filter.groupId = new ObjectId(filter.groupId);
-      }
-      return await Prompt.findOne(filter).lean();
+      return await Prompt.deleteMany(filter);
    } catch (error) {
-      logger.error('Error getting prompt', error);
-      return { message: 'Error getting prompt' };
-    }
-  },
-  /**
-   * Get prompt groups with filters
-   * @param {TGetRandomPromptsRequest} filter
-   * @returns {Promise<TGetRandomPromptsResponse>}
-   */
-  getRandomPromptGroups: async (filter) => {
-    try {
-      const result = await PromptGroup.aggregate([
-        {
-          $match: {
-            category: { $ne: '' },
-          },
-        },
-        {
-          $group: {
-            _id: '$category',
-            promptGroup: { $first: '$$ROOT' },
-          },
-        },
-        {
-          $replaceRoot: { newRoot: '$promptGroup' },
-        },
-        {
-          $sample: { size: +filter.limit + +filter.skip },
-        },
-        {
-          $skip: +filter.skip,
-        },
-        {
-          $limit: +filter.limit,
-        },
-      ]);
-      return { prompts: result };
-    } catch (error) {
-      logger.error('Error getting prompt groups', error);
-      return { message: 'Error getting prompt groups' };
-    }
-  },
-  getPromptGroupsWithPrompts: async (filter) => {
-    try {
-      return await PromptGroup.findOne(filter)
-        .populate({
-          path: 'prompts',
-          select: '-_id -__v -user',
-        })
-        .select('-_id -__v -user')
-        .lean();
-    } catch (error) {
-      logger.error('Error getting prompt groups', error);
-      return { message: 'Error getting prompt groups' };
-    }
-  },
-  getPromptGroup: async (filter) => {
-    try {
-      return await PromptGroup.findOne(filter).lean();
-    } catch (error) {
-      logger.error('Error getting prompt group', error);
-      return { message: 'Error getting prompt group' };
-    }
-  },
-  /**
-   * Deletes a prompt and its corresponding prompt group if it is the last prompt in the group.
-   *
-   * @param {Object} options - The options for deleting the prompt.
-   * @param {ObjectId|string} options.promptId - The ID of the prompt to delete.
-   * @param {ObjectId|string} options.groupId - The ID of the prompt's group.
-   * @param {ObjectId|string} options.author - The ID of the prompt's author.
-   * @param {string} options.role - The role of the prompt's author.
-   * @return {Promise<TDeletePromptResponse>} An object containing the result of the deletion.
-   * If the prompt was deleted successfully, the object will have a property 'prompt' with the value 'Prompt deleted successfully'.
-   * If the prompt group was deleted successfully, the object will have a property 'promptGroup' with the message 'Prompt group deleted successfully' and id of the deleted group.
-   * If there was an error deleting the prompt, the object will have a property 'message' with the value 'Error deleting prompt'.
-   */
-  deletePrompt: async ({ promptId, groupId, author, role }) => {
-    const query = { _id: promptId, groupId, author };
-    if (role === SystemRoles.ADMIN) {
-      delete query.author;
-    }
-    const { deletedCount } = await Prompt.deleteOne(query);
-    if (deletedCount === 0) {
-      throw new Error('Failed to delete the prompt');
-    }
-
-    const remainingPrompts = await Prompt.find({ groupId })
-      .select('_id')
-      .sort({ createdAt: 1 })
-      .lean();
-
-    if (remainingPrompts.length === 0) {
-      await PromptGroup.deleteOne({ _id: groupId });
-      await removeGroupFromAllProjects(groupId);
-
-      return {
-        prompt: 'Prompt deleted successfully',
-        promptGroup: {
-          message: 'Prompt group deleted successfully',
-          id: groupId,
-        },
-      };
-    } else {
-      const promptGroup = await PromptGroup.findById(groupId).lean();
-      if (promptGroup.productionId.toString() === promptId.toString()) {
-        await PromptGroup.updateOne(
-          { _id: groupId },
-          { productionId: remainingPrompts[remainingPrompts.length - 1]._id },
-        );
-      }
-
-      return { prompt: 'Prompt deleted successfully' };
-    }
-  },
-  /**
-   * Update prompt group
-   * @param {Partial<MongoPromptGroup>} filter - Filter to find prompt group
-   * @param {Partial<MongoPromptGroup>} data - Data to update
-   * @returns {Promise<TUpdatePromptGroupResponse>}
-   */
-  updatePromptGroup: async (filter, data) => {
-    try {
-      const updateOps = {};
-      if (data.removeProjectIds) {
-        for (const projectId of data.removeProjectIds) {
-          await removeGroupIdsFromProject(projectId, [filter._id]);
-        }
-
-        updateOps.$pull = { projectIds: { $in: data.removeProjectIds } };
-        delete data.removeProjectIds;
-      }
-
-      if (data.projectIds) {
-        for (const projectId of data.projectIds) {
-          await addGroupIdsToProject(projectId, [filter._id]);
-        }
-
-        updateOps.$addToSet = { projectIds: { $each: data.projectIds } };
-        delete data.projectIds;
-      }
-
-      const updateData = { ...data, ...updateOps };
-      const updatedDoc = await PromptGroup.findOneAndUpdate(filter, updateData, {
-        new: true,
-        upsert: false,
-      });
-
-      if (!updatedDoc) {
-        throw new Error('Prompt group not found');
-      }
-
-      return updatedDoc;
-    } catch (error) {
-      logger.error('Error updating prompt group', error);
-      return { message: 'Error updating prompt group' };
-    }
-  },
-  /**
-   * Function to make a prompt production based on its ID.
-   * @param {String} promptId - The ID of the prompt to make production.
-   * @returns {Object} The result of the production operation.
-   */
-  makePromptProduction: async (promptId) => {
-    try {
-      const prompt = await Prompt.findById(promptId).lean();
-
-      if (!prompt) {
-        throw new Error('Prompt not found');
-      }
-
-      await PromptGroup.findByIdAndUpdate(
-        prompt.groupId,
-        { productionId: prompt._id },
-        { new: true },
-      )
-        .lean()
-        .exec();
-
-      return {
-        message: 'Prompt production made successfully',
-      };
-    } catch (error) {
-      logger.error('Error making prompt production', error);
-      return { message: 'Error making prompt production' };
-    }
-  },
-  updatePromptLabels: async (_id, labels) => {
-    try {
-      const response = await Prompt.updateOne({ _id }, { $set: { labels } });
-      if (response.matchedCount === 0) {
-        return { message: 'Prompt not found' };
-      }
-      return { message: 'Prompt labels updated successfully' };
-    } catch (error) {
-      logger.error('Error updating prompt labels', error);
-      return { message: 'Error updating prompt labels' };
-    }
-  },
-  deletePromptGroup: async (_id) => {
-    try {
-      const response = await PromptGroup.deleteOne({ _id });
-
-      if (response.deletedCount === 0) {
-        return { promptGroup: 'Prompt group not found' };
-      }
-
-      await Prompt.deleteMany({ groupId: new ObjectId(_id) });
-      await removeGroupFromAllProjects(_id);
-      return { promptGroup: 'Prompt group deleted successfully' };
-    } catch (error) {
-      logger.error('Error deleting prompt group', error);
-      return { message: 'Error deleting prompt group' };
+      logger.error('Error deleting prompts', error);
+      return { prompt: 'Error deleting prompts' };
    }
  },
 };
--- a/api/models/Role.js
+++ b/api/models/Role.js
@@ -1,153 +0,0 @@
-const {
-  CacheKeys,
-  SystemRoles,
-  roleDefaults,
-  PermissionTypes,
-  removeNullishValues,
-  promptPermissionsSchema,
-  bookmarkPermissionsSchema,
-} = require('librechat-data-provider');
-const getLogStores = require('~/cache/getLogStores');
-const Role = require('~/models/schema/roleSchema');
-const { logger } = require('~/config');
-
-/**
- * Retrieve a role by name and convert the found role document to a plain object.
- * If the role with the given name doesn't exist and the name is a system defined role, create it and return the lean version.
- *
- * @param {string} roleName - The name of the role to find or create.
- * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<Object>} A plain object representing the role document.
- */
-const getRoleByName = async function (roleName, fieldsToSelect = null) {
-  try {
-    const cache = getLogStores(CacheKeys.ROLES);
-    const cachedRole = await cache.get(roleName);
-    if (cachedRole) {
-      return cachedRole;
-    }
-    let query = Role.findOne({ name: roleName });
-    if (fieldsToSelect) {
-      query = query.select(fieldsToSelect);
-    }
-    let role = await query.lean().exec();
-
-    if (!role && SystemRoles[roleName]) {
-      role = roleDefaults[roleName];
-      role = await new Role(role).save();
-      await cache.set(roleName, role);
-      return role.toObject();
-    }
-    await cache.set(roleName, role);
-    return role;
-  } catch (error) {
-    throw new Error(`Failed to retrieve or create role: ${error.message}`);
-  }
-};
-
-/**
- * Update role values by name.
- *
- * @param {string} roleName - The name of the role to update.
- * @param {Partial<TRole>} updates - The fields to update.
- * @returns {Promise<TRole>} Updated role document.
- */
-const updateRoleByName = async function (roleName, updates) {
-  try {
-    const cache = getLogStores(CacheKeys.ROLES);
-    const role = await Role.findOneAndUpdate(
-      { name: roleName },
-      { $set: updates },
-      { new: true, lean: true },
-    )
-      .select('-__v')
-      .lean()
-      .exec();
-    await cache.set(roleName, role);
-    return role;
-  } catch (error) {
-    throw new Error(`Failed to update role: ${error.message}`);
-  }
-};
-
-const permissionSchemas = {
-  [PermissionTypes.PROMPTS]: promptPermissionsSchema,
-  [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,
-};
-
-/**
- * Updates access permissions for a specific role and multiple permission types.
- * @param {SystemRoles} roleName - The role to update.
- * @param {Object.<PermissionTypes, Object.<Permissions, boolean>>} permissionsUpdate - Permissions to update and their values.
- */
-async function updateAccessPermissions(roleName, permissionsUpdate) {
-  const updates = {};
-  for (const [permissionType, permissions] of Object.entries(permissionsUpdate)) {
-    if (permissionSchemas[permissionType]) {
-      updates[permissionType] = removeNullishValues(permissions);
-    }
-  }
-
-  if (Object.keys(updates).length === 0) {
-    return;
-  }
-
-  try {
-    const role = await getRoleByName(roleName);
-    if (!role) {
-      return;
-    }
-
-    const updatedPermissions = {};
-    let hasChanges = false;
-
-    for (const [permissionType, permissions] of Object.entries(updates)) {
-      const currentPermissions = role[permissionType] || {};
-      updatedPermissions[permissionType] = { ...currentPermissions };
-
-      for (const [permission, value] of Object.entries(permissions)) {
-        if (currentPermissions[permission] !== value) {
-          updatedPermissions[permissionType][permission] = value;
-          hasChanges = true;
-          logger.info(
-            `Updating '${roleName}' role ${permissionType} '${permission}' permission from ${currentPermissions[permission]} to: ${value}`,
-          );
-        }
-      }
-    }
-
-    if (hasChanges) {
-      await updateRoleByName(roleName, updatedPermissions);
-      logger.info(`Updated '${roleName}' role permissions`);
-    } else {
-      logger.info(`No changes needed for '${roleName}' role permissions`);
-    }
-  } catch (error) {
-    logger.error(`Failed to update ${roleName} role permissions:`, error);
-  }
-}
-
-/**
- * Initialize default roles in the system.
- * Creates the default roles (ADMIN, USER) if they don't exist in the database.
- *
- * @returns {Promise<void>}
- */
-const initializeRoles = async function () {
-  const defaultRoles = [SystemRoles.ADMIN, SystemRoles.USER];
-
-  for (const roleName of defaultRoles) {
-    let role = await Role.findOne({ name: roleName }).select('name').lean();
-    if (!role) {
-      role = new Role(roleDefaults[roleName]);
-      await role.save();
-    }
-  }
-};
-
-module.exports = {
-  getRoleByName,
-  initializeRoles,
-  updateRoleByName,
-  updateAccessPermissions,
-};
--- a/api/models/Role.spec.js
+++ b/api/models/Role.spec.js
@@ -1,197 +0,0 @@
-const mongoose = require('mongoose');
-const { MongoMemoryServer } = require('mongodb-memory-server');
-const { SystemRoles, PermissionTypes } = require('librechat-data-provider');
-const Role = require('~/models/schema/roleSchema');
-const { updateAccessPermissions } = require('~/models/Role');
-const getLogStores = require('~/cache/getLogStores');
-
-// Mock the cache
-jest.mock('~/cache/getLogStores', () => {
-  return jest.fn().mockReturnValue({
-    get: jest.fn(),
-    set: jest.fn(),
-    del: jest.fn(),
-  });
-});
-
-let mongoServer;
-
-beforeAll(async () => {
-  mongoServer = await MongoMemoryServer.create();
-  const mongoUri = mongoServer.getUri();
-  await mongoose.connect(mongoUri);
-});
-
-afterAll(async () => {
-  await mongoose.disconnect();
-  await mongoServer.stop();
-});
-
-beforeEach(async () => {
-  await Role.deleteMany({});
-  getLogStores.mockClear();
-});
-
-describe('updateAccessPermissions', () => {
-  it('should update permissions when changes are needed', async () => {
-    await new Role({
-      name: SystemRoles.USER,
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-    }).save();
-
-    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: true,
-      },
-    });
-
-    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
-    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
-      CREATE: true,
-      USE: true,
-      SHARED_GLOBAL: true,
-    });
-  });
-
-  it('should not update permissions when no changes are needed', async () => {
-    await new Role({
-      name: SystemRoles.USER,
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-    }).save();
-
-    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-    });
-
-    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
-    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
-      CREATE: true,
-      USE: true,
-      SHARED_GLOBAL: false,
-    });
-  });
-
-  it('should handle non-existent roles', async () => {
-    await updateAccessPermissions('NON_EXISTENT_ROLE', {
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-      },
-    });
-
-    const role = await Role.findOne({ name: 'NON_EXISTENT_ROLE' });
-    expect(role).toBeNull();
-  });
-
-  it('should update only specified permissions', async () => {
-    await new Role({
-      name: SystemRoles.USER,
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-    }).save();
-
-    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: {
-        SHARED_GLOBAL: true,
-      },
-    });
-
-    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
-    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
-      CREATE: true,
-      USE: true,
-      SHARED_GLOBAL: true,
-    });
-  });
-
-  it('should handle partial updates', async () => {
-    await new Role({
-      name: SystemRoles.USER,
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-    }).save();
-
-    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: {
-        USE: false,
-      },
-    });
-
-    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
-    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
-      CREATE: true,
-      USE: false,
-      SHARED_GLOBAL: false,
-    });
-  });
-
-  it('should update multiple permission types at once', async () => {
-    await new Role({
-      name: SystemRoles.USER,
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-      [PermissionTypes.BOOKMARKS]: {
-        USE: true,
-      },
-    }).save();
-
-    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: { USE: false, SHARED_GLOBAL: true },
-      [PermissionTypes.BOOKMARKS]: { USE: false },
-    });
-
-    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
-    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
-      CREATE: true,
-      USE: false,
-      SHARED_GLOBAL: true,
-    });
-    expect(updatedRole[PermissionTypes.BOOKMARKS]).toEqual({
-      USE: false,
-    });
-  });
-
-  it('should handle updates for a single permission type', async () => {
-    await new Role({
-      name: SystemRoles.USER,
-      [PermissionTypes.PROMPTS]: {
-        CREATE: true,
-        USE: true,
-        SHARED_GLOBAL: false,
-      },
-    }).save();
-
-    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: { USE: false, SHARED_GLOBAL: true },
-    });
-
-    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
-    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
-      CREATE: true,
-      USE: false,
-      SHARED_GLOBAL: true,
-    });
-  });
-});
--- a/api/models/Session.js
+++ b/api/models/Session.js
@@ -1,6 +1,6 @@
+const crypto = require('crypto');
 const mongoose = require('mongoose');
 const signPayload = require('~/server/services/signPayload');
-const { hashToken } = require('~/server/utils/crypto');
 const { logger } = require('~/config');

 const { REFRESH_TOKEN_EXPIRY } = process.env ?? {};
@@ -39,7 +39,8 @@ sessionSchema.methods.generateRefreshToken = async function () {
      expirationTime: Math.floor((expiresIn - Date.now()) / 1000),
    });

-    this.refreshTokenHash = await hashToken(refreshToken);
+    const hash = crypto.createHash('sha256');
+    this.refreshTokenHash = hash.update(refreshToken).digest('hex');

    await this.save();

--- a/api/models/Share.js
+++ b/api/models/Share.js
@@ -1,252 +0,0 @@
-const { nanoid } = require('nanoid');
-const { Constants } = require('librechat-data-provider');
-const SharedLink = require('./schema/shareSchema');
-const { getMessages } = require('./Message');
-const logger = require('~/config/winston');
-
-/**
- * Anonymizes a conversation ID
- * @returns {string} The anonymized conversation ID
- */
-function anonymizeConvoId() {
-  return `convo_${nanoid()}`;
-}
-
-/**
- * Anonymizes an assistant ID
- * @returns {string} The anonymized assistant ID
- */
-function anonymizeAssistantId() {
-  return `a_${nanoid()}`;
-}
-
-/**
- * Anonymizes a message ID
- * @param {string} id - The original message ID
- * @returns {string} The anonymized message ID
- */
-function anonymizeMessageId(id) {
-  return id === Constants.NO_PARENT ? id : `msg_${nanoid()}`;
-}
-
-/**
- * Anonymizes a conversation object
- * @param {object} conversation - The conversation object
- * @returns {object} The anonymized conversation object
- */
-function anonymizeConvo(conversation) {
-  const newConvo = { ...conversation };
-  if (newConvo.assistant_id) {
-    newConvo.assistant_id = anonymizeAssistantId();
-  }
-  return newConvo;
-}
-
-/**
- * Anonymizes messages in a conversation
- * @param {TMessage[]} messages - The original messages
- * @param {string} newConvoId - The new conversation ID
- * @returns {TMessage[]} The anonymized messages
- */
-function anonymizeMessages(messages, newConvoId) {
-  const idMap = new Map();
-  return messages.map((message) => {
-    const newMessageId = anonymizeMessageId(message.messageId);
-    idMap.set(message.messageId, newMessageId);
-
-    const anonymizedMessage = Object.assign(message, {
-      messageId: newMessageId,
-      parentMessageId:
-        idMap.get(message.parentMessageId) || anonymizeMessageId(message.parentMessageId),
-      conversationId: newConvoId,
-    });
-
-    if (anonymizedMessage.model && anonymizedMessage.model.startsWith('asst_')) {
-      anonymizedMessage.model = anonymizeAssistantId();
-    }
-
-    return anonymizedMessage;
-  });
-}
-
-/**
- * Retrieves shared messages for a given share ID
- * @param {string} shareId - The share ID
- * @returns {Promise<object|null>} The shared conversation data or null if not found
- */
-async function getSharedMessages(shareId) {
-  try {
-    const share = await SharedLink.findOne({ shareId })
-      .populate({
-        path: 'messages',
-        select: '-_id -__v -user',
-      })
-      .select('-_id -__v -user')
-      .lean();
-
-    if (!share || !share.conversationId || !share.isPublic) {
-      return null;
-    }
-
-    const newConvoId = anonymizeConvoId();
-    return Object.assign(share, {
-      conversationId: newConvoId,
-      messages: anonymizeMessages(share.messages, newConvoId),
-    });
-  } catch (error) {
-    logger.error('[getShare] Error getting share link', error);
-    throw new Error('Error getting share link');
-  }
-}
-
-/**
- * Retrieves shared links for a user
- * @param {string} user - The user ID
- * @param {number} [pageNumber=1] - The page number
- * @param {number} [pageSize=25] - The page size
- * @param {boolean} [isPublic=true] - Whether to retrieve public links only
- * @returns {Promise<object>} The shared links and pagination data
- */
-async function getSharedLinks(user, pageNumber = 1, pageSize = 25, isPublic = true) {
-  const query = { user, isPublic };
-  try {
-    const [totalConvos, sharedLinks] = await Promise.all([
-      SharedLink.countDocuments(query),
-      SharedLink.find(query)
-        .sort({ updatedAt: -1 })
-        .skip((pageNumber - 1) * pageSize)
-        .limit(pageSize)
-        .select('-_id -__v -user')
-        .lean(),
-    ]);
-
-    const totalPages = Math.ceil((totalConvos || 1) / pageSize);
-
-    return {
-      sharedLinks,
-      pages: totalPages,
-      pageNumber,
-      pageSize,
-    };
-  } catch (error) {
-    logger.error('[getShareByPage] Error getting shares', error);
-    throw new Error('Error getting shares');
-  }
-}
-
-/**
- * Creates a new shared link
- * @param {string} user - The user ID
- * @param {object} shareData - The share data
- * @param {string} shareData.conversationId - The conversation ID
- * @returns {Promise<object>} The created shared link
- */
-async function createSharedLink(user, { conversationId, ...shareData }) {
-  try {
-    const share = await SharedLink.findOne({ conversationId }).select('-_id -__v -user').lean();
-    if (share) {
-      const newConvoId = anonymizeConvoId();
-      const sharedConvo = anonymizeConvo(share);
-      return Object.assign(sharedConvo, {
-        conversationId: newConvoId,
-        messages: anonymizeMessages(share.messages, newConvoId),
-      });
-    }
-
-    const shareId = nanoid();
-    const messages = await getMessages({ conversationId });
-    const update = { ...shareData, shareId, messages, user };
-    const newShare = await SharedLink.findOneAndUpdate({ conversationId, user }, update, {
-      new: true,
-      upsert: true,
-    }).lean();
-
-    const newConvoId = anonymizeConvoId();
-    const sharedConvo = anonymizeConvo(newShare);
-    return Object.assign(sharedConvo, {
-      conversationId: newConvoId,
-      messages: anonymizeMessages(newShare.messages, newConvoId),
-    });
-  } catch (error) {
-    logger.error('[createSharedLink] Error creating shared link', error);
-    throw new Error('Error creating shared link');
-  }
-}
-
-/**
- * Updates an existing shared link
- * @param {string} user - The user ID
- * @param {object} shareData - The share data to update
- * @param {string} shareData.conversationId - The conversation ID
- * @returns {Promise<object>} The updated shared link
- */
-async function updateSharedLink(user, { conversationId, ...shareData }) {
-  try {
-    const share = await SharedLink.findOne({ conversationId }).select('-_id -__v -user').lean();
-    if (!share) {
-      return { message: 'Share not found' };
-    }
-
-    const messages = await getMessages({ conversationId });
-    const update = { ...shareData, messages, user };
-    const updatedShare = await SharedLink.findOneAndUpdate({ conversationId, user }, update, {
-      new: true,
-      upsert: false,
-    }).lean();
-
-    const newConvoId = anonymizeConvoId();
-    const sharedConvo = anonymizeConvo(updatedShare);
-    return Object.assign(sharedConvo, {
-      conversationId: newConvoId,
-      messages: anonymizeMessages(updatedShare.messages, newConvoId),
-    });
-  } catch (error) {
-    logger.error('[updateSharedLink] Error updating shared link', error);
-    throw new Error('Error updating shared link');
-  }
-}
-
-/**
- * Deletes a shared link
- * @param {string} user - The user ID
- * @param {object} params - The deletion parameters
- * @param {string} params.shareId - The share ID to delete
- * @returns {Promise<object>} The result of the deletion
- */
-async function deleteSharedLink(user, { shareId }) {
-  try {
-    const result = await SharedLink.findOneAndDelete({ shareId, user });
-    return result ? { message: 'Share deleted successfully' } : { message: 'Share not found' };
-  } catch (error) {
-    logger.error('[deleteSharedLink] Error deleting shared link', error);
-    throw new Error('Error deleting shared link');
-  }
-}
-
-/**
- * Deletes all shared links for a specific user
- * @param {string} user - The user ID
- * @returns {Promise<object>} The result of the deletion
- */
-async function deleteAllSharedLinks(user) {
-  try {
-    const result = await SharedLink.deleteMany({ user });
-    return {
-      message: 'All shared links have been deleted successfully',
-      deletedCount: result.deletedCount,
-    };
-  } catch (error) {
-    logger.error('[deleteAllSharedLinks] Error deleting shared links', error);
-    throw new Error('Error deleting shared links');
-  }
-}
-
-module.exports = {
-  SharedLink,
-  getSharedLinks,
-  createSharedLink,
-  updateSharedLink,
-  deleteSharedLink,
-  getSharedMessages,
-  deleteAllSharedLinks,
-};
--- a/api/models/Token.js
+++ b/api/models/Token.js
@@ -1,117 +0,0 @@
-const tokenSchema = require('./schema/tokenSchema');
-const mongoose = require('mongoose');
-const { logger } = require('~/config');
-
-/**
- * Token model.
- * @type {mongoose.Model}
- */
-const Token = mongoose.model('Token', tokenSchema);
-
-/**
- * Creates a new Token instance.
- * @param {Object} tokenData - The data for the new Token.
- * @param {mongoose.Types.ObjectId} tokenData.userId - The user's ID. It is required.
- * @param {String} tokenData.email - The user's email.
- * @param {String} tokenData.token - The token. It is required.
- * @param {Number} tokenData.expiresIn - The number of seconds until the token expires.
- * @returns {Promise<mongoose.Document>} The new Token instance.
- * @throws Will throw an error if token creation fails.
- */
-async function createToken(tokenData) {
-  try {
-    const currentTime = new Date();
-    const expiresAt = new Date(currentTime.getTime() + tokenData.expiresIn * 1000);
-
-    const newTokenData = {
-      ...tokenData,
-      createdAt: currentTime,
-      expiresAt,
-    };
-
-    const newToken = new Token(newTokenData);
-    return await newToken.save();
-  } catch (error) {
-    logger.debug('An error occurred while creating token:', error);
-    throw error;
-  }
-}
-
-/**
- * Finds a Token document that matches the provided query.
- * @param {Object} query - The query to match against.
- * @param {mongoose.Types.ObjectId|String} query.userId - The ID of the user.
- * @param {String} query.token - The token value.
- * @param {String} query.email - The email of the user.
- * @returns {Promise<Object|null>} The matched Token document, or null if not found.
- * @throws Will throw an error if the find operation fails.
- */
-async function findToken(query) {
-  try {
-    const conditions = [];
-
-    if (query.userId) {
-      conditions.push({ userId: query.userId });
-    }
-    if (query.token) {
-      conditions.push({ token: query.token });
-    }
-    if (query.email) {
-      conditions.push({ email: query.email });
-    }
-
-    const token = await Token.findOne({
-      $and: conditions,
-    }).lean();
-
-    return token;
-  } catch (error) {
-    logger.debug('An error occurred while finding token:', error);
-    throw error;
-  }
-}
-
-/**
- * Updates a Token document that matches the provided query.
- * @param {Object} query - The query to match against.
- * @param {mongoose.Types.ObjectId|String} query.userId - The ID of the user.
- * @param {String} query.token - The token value.
- * @param {Object} updateData - The data to update the Token with.
- * @returns {Promise<mongoose.Document|null>} The updated Token document, or null if not found.
- * @throws Will throw an error if the update operation fails.
- */
-async function updateToken(query, updateData) {
-  try {
-    return await Token.findOneAndUpdate(query, updateData, { new: true });
-  } catch (error) {
-    logger.debug('An error occurred while updating token:', error);
-    throw error;
-  }
-}
-
-/**
- * Deletes all Token documents that match the provided token, user ID, or email.
- * @param {Object} query - The query to match against.
- * @param {mongoose.Types.ObjectId|String} query.userId - The ID of the user.
- * @param {String} query.token - The token value.
- * @param {String} query.email - The email of the user.
- * @returns {Promise<Object>} The result of the delete operation.
- * @throws Will throw an error if the delete operation fails.
- */
-async function deleteTokens(query) {
-  try {
-    return await Token.deleteMany({
-      $or: [{ userId: query.userId }, { token: query.token }, { email: query.email }],
-    });
-  } catch (error) {
-    logger.debug('An error occurred while deleting tokens:', error);
-    throw error;
-  }
-}
-
-module.exports = {
-  createToken,
-  findToken,
-  updateToken,
-  deleteTokens,
-};
--- a/api/models/Transaction.js
+++ b/api/models/Transaction.js
@@ -1,18 +1,17 @@
 const mongoose = require('mongoose');
-const { isEnabled } = require('~/server/utils/handleText');
+const { isEnabled } = require('../server/utils/handleText');
 const transactionSchema = require('./schema/transaction');
-const { getMultiplier, getCacheMultiplier } = require('./tx');
-const { logger } = require('~/config');
+const { getMultiplier } = require('./tx');
 const Balance = require('./Balance');
 const cancelRate = 1.15;

-/** Method to calculate and set the tokenValue for a transaction */
+// Method to calculate and set the tokenValue for a transaction
 transactionSchema.methods.calculateTokenValue = function () {
  if (!this.valueKey || !this.tokenType) {
    this.tokenValue = this.rawAmount;
  }
  const { valueKey, tokenType, model, endpointTokenConfig } = this;
-  const multiplier = Math.abs(getMultiplier({ valueKey, tokenType, model, endpointTokenConfig }));
+  const multiplier = getMultiplier({ valueKey, tokenType, model, endpointTokenConfig });
  this.rate = multiplier;
  this.tokenValue = this.rawAmount * multiplier;
  if (this.context && this.tokenType === 'completion' && this.context === 'incomplete') {
@@ -21,147 +20,36 @@ transactionSchema.methods.calculateTokenValue = function () {
  }
 };

-/**
- * Static method to create a transaction and update the balance
- * @param {txData} txData - Transaction data.
- */
-transactionSchema.statics.create = async function (txData) {
+// Static method to create a transaction and update the balance
+transactionSchema.statics.create = async function (transactionData) {
  const Transaction = this;

-  const transaction = new Transaction(txData);
-  transaction.endpointTokenConfig = txData.endpointTokenConfig;
+  const transaction = new Transaction(transactionData);
+  transaction.endpointTokenConfig = transactionData.endpointTokenConfig;
  transaction.calculateTokenValue();

+  // Save the transaction
  await transaction.save();

  if (!isEnabled(process.env.CHECK_BALANCE)) {
    return;
  }

-  let balance = await Balance.findOne({ user: transaction.user }).lean();
-  let incrementValue = transaction.tokenValue;
-
-  if (balance && balance?.tokenCredits + incrementValue < 0) {
-    incrementValue = -balance.tokenCredits;
-  }
-
-  balance = await Balance.findOneAndUpdate(
+  // Adjust the user's balance
+  const updatedBalance = await Balance.findOneAndUpdate(
    { user: transaction.user },
-    { $inc: { tokenCredits: incrementValue } },
+    { $inc: { tokenCredits: transaction.tokenValue } },
    { upsert: true, new: true },
  ).lean();

  return {
    rate: transaction.rate,
    user: transaction.user.toString(),
-    balance: balance.tokenCredits,
-    [transaction.tokenType]: incrementValue,
+    balance: updatedBalance.tokenCredits,
+    [transaction.tokenType]: transaction.tokenValue,
  };
 };

-/**
- * Static method to create a structured transaction and update the balance
- * @param {txData} txData - Transaction data.
- */
-transactionSchema.statics.createStructured = async function (txData) {
-  const Transaction = this;
-
-  const transaction = new Transaction({
-    ...txData,
-    endpointTokenConfig: txData.endpointTokenConfig,
-  });
-
-  transaction.calculateStructuredTokenValue();
-
-  await transaction.save();
-
-  if (!isEnabled(process.env.CHECK_BALANCE)) {
-    return;
-  }
-
-  let balance = await Balance.findOne({ user: transaction.user }).lean();
-  let incrementValue = transaction.tokenValue;
-
-  if (balance && balance?.tokenCredits + incrementValue < 0) {
-    incrementValue = -balance.tokenCredits;
-  }
-
-  balance = await Balance.findOneAndUpdate(
-    { user: transaction.user },
-    { $inc: { tokenCredits: incrementValue } },
-    { upsert: true, new: true },
-  ).lean();
-
-  return {
-    rate: transaction.rate,
-    user: transaction.user.toString(),
-    balance: balance.tokenCredits,
-    [transaction.tokenType]: incrementValue,
-  };
-};
-
-/** Method to calculate token value for structured tokens */
-transactionSchema.methods.calculateStructuredTokenValue = function () {
-  if (!this.tokenType) {
-    this.tokenValue = this.rawAmount;
-    return;
-  }
-
-  const { model, endpointTokenConfig } = this;
-
-  if (this.tokenType === 'prompt') {
-    const inputMultiplier = getMultiplier({ tokenType: 'prompt', model, endpointTokenConfig });
-    const writeMultiplier =
-      getCacheMultiplier({ cacheType: 'write', model, endpointTokenConfig }) ?? inputMultiplier;
-    const readMultiplier =
-      getCacheMultiplier({ cacheType: 'read', model, endpointTokenConfig }) ?? inputMultiplier;
-
-    this.rateDetail = {
-      input: inputMultiplier,
-      write: writeMultiplier,
-      read: readMultiplier,
-    };
-
-    const totalPromptTokens =
-      Math.abs(this.inputTokens || 0) +
-      Math.abs(this.writeTokens || 0) +
-      Math.abs(this.readTokens || 0);
-
-    if (totalPromptTokens > 0) {
-      this.rate =
-        (Math.abs(inputMultiplier * (this.inputTokens || 0)) +
-          Math.abs(writeMultiplier * (this.writeTokens || 0)) +
-          Math.abs(readMultiplier * (this.readTokens || 0))) /
-        totalPromptTokens;
-    } else {
-      this.rate = Math.abs(inputMultiplier); // Default to input rate if no tokens
-    }
-
-    this.tokenValue = -(
-      Math.abs(this.inputTokens || 0) * inputMultiplier +
-      Math.abs(this.writeTokens || 0) * writeMultiplier +
-      Math.abs(this.readTokens || 0) * readMultiplier
-    );
-
-    this.rawAmount = -totalPromptTokens;
-  } else if (this.tokenType === 'completion') {
-    const multiplier = getMultiplier({ tokenType: this.tokenType, model, endpointTokenConfig });
-    this.rate = Math.abs(multiplier);
-    this.tokenValue = -Math.abs(this.rawAmount) * multiplier;
-    this.rawAmount = -Math.abs(this.rawAmount);
-  }
-
-  if (this.context && this.tokenType === 'completion' && this.context === 'incomplete') {
-    this.tokenValue = Math.ceil(this.tokenValue * cancelRate);
-    this.rate *= cancelRate;
-    if (this.rateDetail) {
-      this.rateDetail = Object.fromEntries(
-        Object.entries(this.rateDetail).map(([k, v]) => [k, v * cancelRate]),
-      );
-    }
-  }
-};
-
 const Transaction = mongoose.model('Transaction', transactionSchema);

 /**
@@ -176,7 +64,7 @@ async function getTransactions(filter) {
  try {
    return await Transaction.find(filter).lean();
  } catch (error) {
-    logger.error('Error querying transactions:', error);
+    console.error('Error querying transactions:', error);
    throw error;
  }
 }
--- a/api/models/Transaction.spec.js
+++ b/api/models/Transaction.spec.js
@@ -1,348 +0,0 @@
-const mongoose = require('mongoose');
-const { MongoMemoryServer } = require('mongodb-memory-server');
-const Balance = require('./Balance');
-const { spendTokens, spendStructuredTokens } = require('./spendTokens');
-const { getMultiplier, getCacheMultiplier } = require('./tx');
-
-let mongoServer;
-
-beforeAll(async () => {
-  mongoServer = await MongoMemoryServer.create();
-  const mongoUri = mongoServer.getUri();
-  await mongoose.connect(mongoUri);
-});
-
-afterAll(async () => {
-  await mongoose.disconnect();
-  await mongoServer.stop();
-});
-
-beforeEach(async () => {
-  await mongoose.connection.dropDatabase();
-});
-
-describe('Regular Token Spending Tests', () => {
-  test('Balance should decrease when spending tokens with spendTokens', async () => {
-    // Arrange
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000; // $10.00
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'gpt-3.5-turbo';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'test',
-      endpointTokenConfig: null,
-    };
-
-    const tokenUsage = {
-      promptTokens: 100,
-      completionTokens: 50,
-    };
-
-    // Act
-    process.env.CHECK_BALANCE = 'true';
-    await spendTokens(txData, tokenUsage);
-
-    // Assert
-    console.log('Initial Balance:', initialBalance);
-
-    const updatedBalance = await Balance.findOne({ user: userId });
-    console.log('Updated Balance:', updatedBalance.tokenCredits);
-
-    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
-    const completionMultiplier = getMultiplier({ model, tokenType: 'completion' });
-
-    const expectedPromptCost = tokenUsage.promptTokens * promptMultiplier;
-    const expectedCompletionCost = tokenUsage.completionTokens * completionMultiplier;
-    const expectedTotalCost = expectedPromptCost + expectedCompletionCost;
-    const expectedBalance = initialBalance - expectedTotalCost;
-
-    expect(updatedBalance.tokenCredits).toBeLessThan(initialBalance);
-    expect(updatedBalance.tokenCredits).toBeCloseTo(expectedBalance, 0);
-
-    console.log('Expected Total Cost:', expectedTotalCost);
-    console.log('Actual Balance Decrease:', initialBalance - updatedBalance.tokenCredits);
-  });
-
-  test('spendTokens should handle zero completion tokens', async () => {
-    // Arrange
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000; // $10.00
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'gpt-3.5-turbo';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'test',
-      endpointTokenConfig: null,
-    };
-
-    const tokenUsage = {
-      promptTokens: 100,
-      completionTokens: 0,
-    };
-
-    // Act
-    process.env.CHECK_BALANCE = 'true';
-    await spendTokens(txData, tokenUsage);
-
-    // Assert
-    const updatedBalance = await Balance.findOne({ user: userId });
-
-    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
-    const expectedCost = tokenUsage.promptTokens * promptMultiplier;
-    expect(updatedBalance.tokenCredits).toBeCloseTo(initialBalance - expectedCost, 0);
-
-    console.log('Initial Balance:', initialBalance);
-    console.log('Updated Balance:', updatedBalance.tokenCredits);
-    console.log('Expected Cost:', expectedCost);
-  });
-
-  test('spendTokens should handle undefined token counts', async () => {
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000; // $10.00
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'gpt-3.5-turbo';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'test',
-      endpointTokenConfig: null,
-    };
-
-    const tokenUsage = {};
-
-    const result = await spendTokens(txData, tokenUsage);
-
-    expect(result).toBeUndefined();
-  });
-
-  test('spendTokens should handle only prompt tokens', async () => {
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000; // $10.00
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'gpt-3.5-turbo';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'test',
-      endpointTokenConfig: null,
-    };
-
-    const tokenUsage = { promptTokens: 100 };
-
-    await spendTokens(txData, tokenUsage);
-
-    const updatedBalance = await Balance.findOne({ user: userId });
-
-    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
-    const expectedCost = 100 * promptMultiplier;
-    expect(updatedBalance.tokenCredits).toBeCloseTo(initialBalance - expectedCost, 0);
-  });
-});
-
-describe('Structured Token Spending Tests', () => {
-  test('Balance should decrease and rawAmount should be set when spending a large number of structured tokens', async () => {
-    // Arrange
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 17613154.55; // $17.61
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'c23a18da-706c-470a-ac28-ec87ed065199',
-      model,
-      context: 'message',
-      endpointTokenConfig: null, // We'll use the default rates
-    };
-
-    const tokenUsage = {
-      promptTokens: {
-        input: 11,
-        write: 140522,
-        read: 0,
-      },
-      completionTokens: 5,
-    };
-
-    // Get the actual multipliers
-    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
-    const completionMultiplier = getMultiplier({ model, tokenType: 'completion' });
-    const writeMultiplier = getCacheMultiplier({ model, cacheType: 'write' });
-    const readMultiplier = getCacheMultiplier({ model, cacheType: 'read' });
-
-    console.log('Multipliers:', {
-      promptMultiplier,
-      completionMultiplier,
-      writeMultiplier,
-      readMultiplier,
-    });
-
-    // Act
-    process.env.CHECK_BALANCE = 'true';
-    const result = await spendStructuredTokens(txData, tokenUsage);
-
-    // Assert
-    console.log('Initial Balance:', initialBalance);
-    console.log('Updated Balance:', result.completion.balance);
-    console.log('Transaction Result:', result);
-
-    const expectedPromptCost =
-      tokenUsage.promptTokens.input * promptMultiplier +
-      tokenUsage.promptTokens.write * writeMultiplier +
-      tokenUsage.promptTokens.read * readMultiplier;
-    const expectedCompletionCost = tokenUsage.completionTokens * completionMultiplier;
-    const expectedTotalCost = expectedPromptCost + expectedCompletionCost;
-    const expectedBalance = initialBalance - expectedTotalCost;
-
-    console.log('Expected Cost:', expectedTotalCost);
-    console.log('Expected Balance:', expectedBalance);
-
-    expect(result.completion.balance).toBeLessThan(initialBalance);
-
-    // Allow for a small difference (e.g., 100 token credits, which is $0.0001)
-    const allowedDifference = 100;
-    expect(Math.abs(result.completion.balance - expectedBalance)).toBeLessThan(allowedDifference);
-
-    // Check if the decrease is approximately as expected
-    const balanceDecrease = initialBalance - result.completion.balance;
-    expect(balanceDecrease).toBeCloseTo(expectedTotalCost, 0);
-
-    // Check token values
-    const expectedPromptTokenValue = -(
-      tokenUsage.promptTokens.input * promptMultiplier +
-      tokenUsage.promptTokens.write * writeMultiplier +
-      tokenUsage.promptTokens.read * readMultiplier
-    );
-    const expectedCompletionTokenValue = -tokenUsage.completionTokens * completionMultiplier;
-
-    expect(result.prompt.prompt).toBeCloseTo(expectedPromptTokenValue, 1);
-    expect(result.completion.completion).toBe(expectedCompletionTokenValue);
-
-    console.log('Expected prompt tokenValue:', expectedPromptTokenValue);
-    console.log('Actual prompt tokenValue:', result.prompt.prompt);
-    console.log('Expected completion tokenValue:', expectedCompletionTokenValue);
-    console.log('Actual completion tokenValue:', result.completion.completion);
-  });
-
-  test('should handle zero completion tokens in structured spending', async () => {
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 17613154.55;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'test-convo',
-      model,
-      context: 'message',
-    };
-
-    const tokenUsage = {
-      promptTokens: {
-        input: 10,
-        write: 100,
-        read: 5,
-      },
-      completionTokens: 0,
-    };
-
-    process.env.CHECK_BALANCE = 'true';
-    const result = await spendStructuredTokens(txData, tokenUsage);
-
-    expect(result.prompt).toBeDefined();
-    expect(result.completion).toBeUndefined();
-    expect(result.prompt.prompt).toBeLessThan(0);
-  });
-
-  test('should handle only prompt tokens in structured spending', async () => {
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 17613154.55;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'test-convo',
-      model,
-      context: 'message',
-    };
-
-    const tokenUsage = {
-      promptTokens: {
-        input: 10,
-        write: 100,
-        read: 5,
-      },
-    };
-
-    process.env.CHECK_BALANCE = 'true';
-    const result = await spendStructuredTokens(txData, tokenUsage);
-
-    expect(result.prompt).toBeDefined();
-    expect(result.completion).toBeUndefined();
-    expect(result.prompt.prompt).toBeLessThan(0);
-  });
-
-  test('should handle undefined token counts in structured spending', async () => {
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 17613154.55;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'test-convo',
-      model,
-      context: 'message',
-    };
-
-    const tokenUsage = {};
-
-    process.env.CHECK_BALANCE = 'true';
-    const result = await spendStructuredTokens(txData, tokenUsage);
-
-    expect(result).toEqual({
-      prompt: undefined,
-      completion: undefined,
-    });
-  });
-
-  test('should handle incomplete context for completion tokens', async () => {
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 17613154.55;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'test-convo',
-      model,
-      context: 'incomplete',
-    };
-
-    const tokenUsage = {
-      promptTokens: {
-        input: 10,
-        write: 100,
-        read: 5,
-      },
-      completionTokens: 50,
-    };
-
-    process.env.CHECK_BALANCE = 'true';
-    const result = await spendStructuredTokens(txData, tokenUsage);
-
-    expect(result.completion.completion).toBeCloseTo(-50 * 15 * 1.15, 0); // Assuming multiplier is 15 and cancelRate is 1.15
-  });
-});
--- a/api/models/User.js
+++ b/api/models/User.js
@@ -1,5 +1,61 @@
 const mongoose = require('mongoose');
-const userSchema = require('~/models/schema/userSchema');
+const bcrypt = require('bcryptjs');
+const signPayload = require('../server/services/signPayload');
+const userSchema = require('./schema/userSchema.js');
+const { SESSION_EXPIRY } = process.env ?? {};
+const expires = eval(SESSION_EXPIRY) ?? 1000 * 60 * 15;
+
+userSchema.methods.toJSON = function () {
+  return {
+    id: this._id,
+    provider: this.provider,
+    email: this.email,
+    name: this.name,
+    username: this.username,
+    avatar: this.avatar,
+    role: this.role,
+    emailVerified: this.emailVerified,
+    plugins: this.plugins,
+    createdAt: this.createdAt,
+    updatedAt: this.updatedAt,
+  };
+};
+
+userSchema.methods.generateToken = async function () {
+  return await signPayload({
+    payload: {
+      id: this._id,
+      username: this.username,
+      provider: this.provider,
+      email: this.email,
+    },
+    secret: process.env.JWT_SECRET,
+    expirationTime: expires / 1000,
+  });
+};
+
+userSchema.methods.comparePassword = function (candidatePassword, callback) {
+  bcrypt.compare(candidatePassword, this.password, (err, isMatch) => {
+    if (err) {
+      return callback(err);
+    }
+    callback(null, isMatch);
+  });
+};
+
+module.exports.hashPassword = async (password) => {
+  const hashedPassword = await new Promise((resolve, reject) => {
+    bcrypt.hash(password, 10, function (err, hash) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(hash);
+      }
+    });
+  });
+
+  return hashedPassword;
+};

 const User = mongoose.model('User', userSchema);

--- a/api/models/index.js
+++ b/api/models/index.js
@@ -1,22 +1,3 @@
-const {
-  comparePassword,
-  deleteUserById,
-  generateToken,
-  getUserById,
-  updateUser,
-  createUser,
-  countUsers,
-  findUser,
-} = require('./userMethods');
-const {
-  findFileById,
-  createFile,
-  updateFile,
-  deleteFile,
-  deleteFiles,
-  getFiles,
-  updateFileUsage,
-} = require('./File');
 const {
  getMessages,
  saveMessage,
@@ -27,22 +8,8 @@ const {
 } = require('./Message');
 const { getConvoTitle, getConvo, saveConvo, deleteConvos } = require('./Conversation');
 const { getPreset, getPresets, savePreset, deletePresets } = require('./Preset');
-const { createToken, findToken, updateToken, deleteTokens } = require('./Token');
-const Session = require('./Session');
-const Balance = require('./Balance');
-const User = require('./User');
-const Key = require('./Key');
-
-module.exports = {
-  comparePassword,
-  deleteUserById,
-  generateToken,
-  getUserById,
-  updateUser,
-  createUser,
-  countUsers,
-  findUser,
-
+const { hashPassword, getUser, updateUser } = require('./userMethods');
+const {
  findFileById,
  createFile,
  updateFile,
@@ -50,6 +17,21 @@ module.exports = {
  deleteFiles,
  getFiles,
  updateFileUsage,
+} = require('./File');
+const Key = require('./Key');
+const User = require('./User');
+const Session = require('./Session');
+const Balance = require('./Balance');
+
+module.exports = {
+  User,
+  Key,
+  Session,
+  Balance,
+
+  hashPassword,
+  updateUser,
+  getUser,

  getMessages,
  saveMessage,
@@ -68,13 +50,11 @@ module.exports = {
  savePreset,
  deletePresets,

-  createToken,
-  findToken,
-  updateToken,
-  deleteTokens,
-
-  User,
-  Key,
-  Session,
-  Balance,
+  findFileById,
+  createFile,
+  updateFile,
+  deleteFile,
+  deleteFiles,
+  getFiles,
+  updateFileUsage,
 };
--- a/api/models/inviteUser.js
+++ b/api/models/inviteUser.js
@@ -1,70 +0,0 @@
-const crypto = require('crypto');
-const bcrypt = require('bcryptjs');
-const mongoose = require('mongoose');
-const { createToken, findToken } = require('./Token');
-const logger = require('~/config/winston');
-
-/**
- * @module inviteUser
- * @description This module provides functions to create and get user invites
- */
-
-/**
- * @function createInvite
- * @description This function creates a new user invite
- * @param {string} email - The email of the user to invite
- * @returns {Promise<Object>} A promise that resolves to the saved invite document
- * @throws {Error} If there is an error creating the invite
- */
-const createInvite = async (email) => {
-  try {
-    let token = crypto.randomBytes(32).toString('hex');
-    const hash = bcrypt.hashSync(token, 10);
-    const encodedToken = encodeURIComponent(token);
-
-    const fakeUserId = new mongoose.Types.ObjectId();
-
-    await createToken({
-      userId: fakeUserId,
-      email,
-      token: hash,
-      createdAt: Date.now(),
-      expiresIn: 604800,
-    });
-
-    return encodedToken;
-  } catch (error) {
-    logger.error('[createInvite] Error creating invite', error);
-    return { message: 'Error creating invite' };
-  }
-};
-
-/**
- * @function getInvite
- * @description This function retrieves a user invite
- * @param {string} encodedToken - The token of the invite to retrieve
- * @param {string} email - The email of the user to validate
- * @returns {Promise<Object>} A promise that resolves to the retrieved invite document
- * @throws {Error} If there is an error retrieving the invite, if the invite does not exist, or if the email does not match
- */
-const getInvite = async (encodedToken, email) => {
-  try {
-    const token = decodeURIComponent(encodedToken);
-    const hash = bcrypt.hashSync(token, 10);
-    const invite = await findToken({ token: hash, email });
-
-    if (!invite) {
-      throw new Error('Invite not found or email does not match');
-    }
-
-    return invite;
-  } catch (error) {
-    logger.error('[getInvite] Error getting invite', error);
-    return { error: true, message: error.message };
-  }
-};
-
-module.exports = {
-  createInvite,
-  getInvite,
-};
--- a/api/models/plugins/mongoMeili.js
+++ b/api/models/plugins/mongoMeili.js
@@ -155,7 +155,7 @@ const createMeiliMongooseModel = function ({ index, attributesToIndex }) {
            function (results, value, key) {
              return { ...results, [key]: 1 };
            },
-            { _id: 1, __v: 1 },
+            { _id: 1 },
          ),
        ).lean();

@@ -348,7 +348,7 @@ module.exports = function mongoMeili(schema, options) {
      try {
        meiliDoc = await client.index('convos').getDocument(doc.conversationId);
      } catch (error) {
-        logger.debug(
+        logger.error(
          '[MeiliMongooseModel.findOneAndUpdate] Convo not found in MeiliSearch and will index ' +
            doc.conversationId,
          error,
--- a/api/models/schema/categories.js
+++ b/api/models/schema/categories.js
@@ -1,19 +0,0 @@
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-
-const categoriesSchema = new Schema({
-  label: {
-    type: String,
-    required: true,
-    unique: true,
-  },
-  value: {
-    type: String,
-    required: true,
-    unique: true,
-  },
-});
-
-const categories = mongoose.model('categories', categoriesSchema);
-
-module.exports = { Categories: categories };
--- a/api/models/schema/conversationTagSchema.js
+++ b/api/models/schema/conversationTagSchema.js
@@ -1,31 +0,0 @@
-const mongoose = require('mongoose');
-
-const conversationTagSchema = mongoose.Schema(
-  {
-    tag: {
-      type: String,
-      index: true,
-    },
-    user: {
-      type: String,
-      index: true,
-    },
-    description: {
-      type: String,
-      index: true,
-    },
-    count: {
-      type: Number,
-      default: 0,
-    },
-    position: {
-      type: Number,
-      default: 0,
-    },
-  },
-  { timestamps: true },
-);
-
-conversationTagSchema.index({ tag: 1, user: 1 }, { unique: true });
-
-module.exports = mongoose.model('ConversationTag', conversationTagSchema);
--- a/api/models/schema/convoSchema.js
+++ b/api/models/schema/convoSchema.js
@@ -42,11 +42,6 @@ const convoSchema = mongoose.Schema(
    invocationId: {
      type: Number,
    },
-    tags: {
-      type: [String],
-      default: [],
-      meiliIndex: true,
-    },
  },
  { timestamps: true },
 );
@@ -61,7 +56,6 @@ if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
 }

 convoSchema.index({ createdAt: 1, updatedAt: 1 });
-convoSchema.index({ conversationId: 1, user: 1 }, { unique: true });

 const Conversation = mongoose.models.Conversation || mongoose.model('Conversation', convoSchema);

--- a/api/models/schema/defaults.js
+++ b/api/models/schema/defaults.js
@@ -74,10 +74,6 @@ const conversationPreset = {
  resendImages: {
    type: Boolean,
  },
-  /* Anthropic only */
-  promptCache: {
-    type: Boolean,
-  },
  // files
  resendFiles: {
    type: Boolean,
@@ -92,32 +88,6 @@ const conversationPreset = {
  instructions: {
    type: String,
  },
-  stop: { type: [{ type: String }], default: undefined },
-  isArchived: {
-    type: Boolean,
-    default: false,
-  },
-  /* UI Components */
-  iconURL: {
-    type: String,
-  },
-  greeting: {
-    type: String,
-  },
-  spec: {
-    type: String,
-  },
-  tags: {
-    type: [String],
-    default: [],
-  },
-  tools: { type: [{ type: String }], default: undefined },
-  maxContextTokens: {
-    type: Number,
-  },
-  max_tokens: {
-    type: Number,
-  },
 };

 const agentOptions = {
--- a/api/models/schema/fileSchema.js
+++ b/api/models/schema/fileSchema.js
@@ -3,9 +3,9 @@ const mongoose = require('mongoose');

 /**
 * @typedef {Object} MongoFile
- * @property {ObjectId} [_id] - MongoDB Document ID
+ * @property {mongoose.Schema.Types.ObjectId} [_id] - MongoDB Document ID
 * @property {number} [__v] - MongoDB Version Key
- * @property {ObjectId} user - User ID
+ * @property {mongoose.Schema.Types.ObjectId} user - User ID
 * @property {string} [conversationId] - Optional conversation ID
 * @property {string} file_id - File identifier
 * @property {string} [temp_file_id] - Temporary File identifier
@@ -14,19 +14,15 @@ const mongoose = require('mongoose');
 * @property {string} filepath - Location of the file
 * @property {'file'} object - Type of object, always 'file'
 * @property {string} type - Type of file
- * @property {number} [usage=0] - Number of uses of the file
- * @property {string} [context] - Context of the file origin
- * @property {boolean} [embedded=false] - Whether or not the file is embedded in vector db
- * @property {string} [model] - The model to identify the group region of the file (for Azure OpenAI hosting)
- * @property {string} [source] - The source of the file (e.g., from FileSources)
+ * @property {number} usage - Number of uses of the file
+ * @property {boolean} [embedded] - Whether or not the file is embedded in vector db
+ * @property {string} [source] - The source of the file
 * @property {number} [width] - Optional width of the file
 * @property {number} [height] - Optional height of the file
- * @property {Date} [expiresAt] - Optional expiration date of the file
+ * @property {Date} [expiresAt] - Optional height of the file
 * @property {Date} [createdAt] - Date when the file was created
 * @property {Date} [updatedAt] - Date when the file was updated
 */
-
-/** @type {MongooseSchema<MongoFile>} */
 const fileSchema = mongoose.Schema(
  {
    user: {
@@ -86,14 +82,11 @@ const fileSchema = mongoose.Schema(
      type: String,
      default: FileSources.local,
    },
-    model: {
-      type: String,
-    },
    width: Number,
    height: Number,
    expiresAt: {
      type: Date,
-      expires: 3600, // 1 hour in seconds
+      expires: 3600,
    },
  },
  {
@@ -101,6 +94,4 @@ const fileSchema = mongoose.Schema(
  },
 );

-fileSchema.index({ createdAt: 1, updatedAt: 1 });
-
 module.exports = fileSchema;
--- a/api/models/schema/messageSchema.js
+++ b/api/models/schema/messageSchema.js
@@ -11,7 +11,6 @@ const messageSchema = mongoose.Schema(
    },
    conversationId: {
      type: String,
-      index: true,
      required: true,
      meiliIndex: true,
    },
@@ -111,10 +110,6 @@ const messageSchema = mongoose.Schema(
    thread_id: {
      type: String,
    },
-    /* frontend components */
-    iconURL: {
-      type: String,
-    },
  },
  { timestamps: true },
 );
@@ -129,9 +124,7 @@ if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
 }

 messageSchema.index({ createdAt: 1 });
-messageSchema.index({ messageId: 1, user: 1 }, { unique: true });

-/** @type {mongoose.Model<TMessage>} */
 const Message = mongoose.models.Message || mongoose.model('Message', messageSchema);

 module.exports = Message;
--- a/api/models/schema/projectSchema.js
+++ b/api/models/schema/projectSchema.js
@@ -1,30 +0,0 @@
-const { Schema } = require('mongoose');
-
-/**
- * @typedef {Object} MongoProject
- * @property {ObjectId} [_id] - MongoDB Document ID
- * @property {string} name - The name of the project
- * @property {ObjectId[]} promptGroupIds - Array of PromptGroup IDs associated with the project
- * @property {Date} [createdAt] - Date when the project was created (added by timestamps)
- * @property {Date} [updatedAt] - Date when the project was last updated (added by timestamps)
- */
-
-const projectSchema = new Schema(
-  {
-    name: {
-      type: String,
-      required: true,
-      index: true,
-    },
-    promptGroupIds: {
-      type: [Schema.Types.ObjectId],
-      ref: 'PromptGroup',
-      default: [],
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-module.exports = projectSchema;
--- a/api/models/schema/promptSchema.js
+++ b/api/models/schema/promptSchema.js
@@ -1,118 +0,0 @@
-const mongoose = require('mongoose');
-const { Constants } = require('librechat-data-provider');
-const Schema = mongoose.Schema;
-
-/**
- * @typedef {Object} MongoPromptGroup
- * @property {ObjectId} [_id] - MongoDB Document ID
- * @property {string} name - The name of the prompt group
- * @property {ObjectId} author - The author of the prompt group
- * @property {ObjectId} [projectId=null] - The project ID of the prompt group
- * @property {ObjectId} [productionId=null] - The project ID of the prompt group
- * @property {string} authorName - The name of the author of the prompt group
- * @property {number} [numberOfGenerations=0] - Number of generations the prompt group has
- * @property {string} [oneliner=''] - Oneliner description of the prompt group
- * @property {string} [category=''] - Category of the prompt group
- * @property {string} [command] - Command for the prompt group
- * @property {Date} [createdAt] - Date when the prompt group was created (added by timestamps)
- * @property {Date} [updatedAt] - Date when the prompt group was last updated (added by timestamps)
- */
-
-const promptGroupSchema = new Schema(
-  {
-    name: {
-      type: String,
-      required: true,
-      index: true,
-    },
-    numberOfGenerations: {
-      type: Number,
-      default: 0,
-    },
-    oneliner: {
-      type: String,
-      default: '',
-    },
-    category: {
-      type: String,
-      default: '',
-      index: true,
-    },
-    projectIds: {
-      type: [Schema.Types.ObjectId],
-      ref: 'Project',
-      index: true,
-    },
-    productionId: {
-      type: Schema.Types.ObjectId,
-      ref: 'Prompt',
-      required: true,
-      index: true,
-    },
-    author: {
-      type: Schema.Types.ObjectId,
-      ref: 'User',
-      required: true,
-      index: true,
-    },
-    authorName: {
-      type: String,
-      required: true,
-    },
-    command: {
-      type: String,
-      index: true,
-      validate: {
-        validator: function (v) {
-          return v === undefined || v === null || v === '' || /^[a-z0-9-]+$/.test(v);
-        },
-        message: (props) =>
-          `${props.value} is not a valid command. Only lowercase alphanumeric characters and highfins (') are allowed.`,
-      },
-      maxlength: [
-        Constants.COMMANDS_MAX_LENGTH,
-        `Command cannot be longer than ${Constants.COMMANDS_MAX_LENGTH} characters`,
-      ],
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-const PromptGroup = mongoose.model('PromptGroup', promptGroupSchema);
-
-const promptSchema = new Schema(
-  {
-    groupId: {
-      type: Schema.Types.ObjectId,
-      ref: 'PromptGroup',
-      required: true,
-      index: true,
-    },
-    author: {
-      type: Schema.Types.ObjectId,
-      ref: 'User',
-      required: true,
-    },
-    prompt: {
-      type: String,
-      required: true,
-    },
-    type: {
-      type: String,
-      enum: ['text', 'chat'],
-      required: true,
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-const Prompt = mongoose.model('Prompt', promptSchema);
-
-promptSchema.index({ createdAt: 1, updatedAt: 1 });
-promptGroupSchema.index({ createdAt: 1, updatedAt: 1 });
-
-module.exports = { Prompt, PromptGroup };
--- a/Show More
+++ b/Show More