Skip to content

Commit 179799b

Browse files
committed
Upstream merge
2 parents cf4b3af + 5efad8f commit 179799b

File tree

632 files changed

+36406
-15038
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

632 files changed

+36406
-15038
lines changed

.env.example

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ GOOGLE_KEY=user_provided
142142
# GOOGLE_AUTH_HEADER=true
143143

144144
# Gemini API (AI Studio)
145-
# GOOGLE_MODELS=gemini-2.0-flash-exp,gemini-2.0-flash-thinking-exp-1219,gemini-exp-1121,gemini-exp-1114,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
145+
# GOOGLE_MODELS=gemini-2.5-pro-exp-03-25,gemini-2.0-flash-exp,gemini-2.0-flash-thinking-exp-1219,gemini-exp-1121,gemini-exp-1114,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
146146

147147
# Vertex AI
148148
# 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
@@ -231,6 +231,14 @@ AZURE_AI_SEARCH_SEARCH_OPTION_QUERY_TYPE=
231231
AZURE_AI_SEARCH_SEARCH_OPTION_TOP=
232232
AZURE_AI_SEARCH_SEARCH_OPTION_SELECT=
233233

234+
# OpenAI Image Tools Customization
235+
#----------------
236+
# IMAGE_GEN_OAI_DESCRIPTION_WITH_FILES=Custom description for image generation tool when files are present
237+
# IMAGE_GEN_OAI_DESCRIPTION_NO_FILES=Custom description for image generation tool when no files are present
238+
# IMAGE_EDIT_OAI_DESCRIPTION=Custom description for image editing tool
239+
# IMAGE_GEN_OAI_PROMPT_DESCRIPTION=Custom prompt description for image generation tool
240+
# IMAGE_EDIT_OAI_PROMPT_DESCRIPTION=Custom prompt description for image editing tool
241+
234242
# DALL·E
235243
#----------------
236244
# DALLE_API_KEY=
@@ -364,7 +372,7 @@ ILLEGAL_MODEL_REQ_SCORE=5
364372
# Balance #
365373
#========================#
366374

367-
CHECK_BALANCE=false
375+
# CHECK_BALANCE=false
368376
# START_BALANCE=20000 # note: the number of tokens that will be credited after registration.
369377

370378
#========================#
@@ -432,15 +440,19 @@ OPENID_NAME_CLAIM=
432440

433441
OPENID_BUTTON_LABEL=
434442
OPENID_IMAGE_URL=
443+
# Set to true to automatically redirect to the OpenID provider when a user visits the login page
444+
# This will bypass the login form completely for users, only use this if OpenID is your only authentication method
445+
OPENID_AUTO_REDIRECT=false
435446

436447
# LDAP
437448
LDAP_URL=
438449
LDAP_BIND_DN=
439450
LDAP_BIND_CREDENTIALS=
440451
LDAP_USER_SEARCH_BASE=
441-
LDAP_SEARCH_FILTER=mail={{username}}
452+
#LDAP_SEARCH_FILTER="mail="
442453
LDAP_CA_CERT_PATH=
443454
# LDAP_TLS_REJECT_UNAUTHORIZED=
455+
# LDAP_STARTTLS=
444456
# LDAP_LOGIN_USES_USERNAME=true
445457
# LDAP_ID=
446458
# LDAP_USERNAME=
@@ -473,6 +485,24 @@ FIREBASE_STORAGE_BUCKET=
473485
FIREBASE_MESSAGING_SENDER_ID=
474486
FIREBASE_APP_ID=
475487

488+
#========================#
489+
# S3 AWS Bucket #
490+
#========================#
491+
492+
AWS_ENDPOINT_URL=
493+
AWS_ACCESS_KEY_ID=
494+
AWS_SECRET_ACCESS_KEY=
495+
AWS_REGION=
496+
AWS_BUCKET_NAME=
497+
498+
#========================#
499+
# Azure Blob Storage #
500+
#========================#
501+
502+
AZURE_STORAGE_CONNECTION_STRING=
503+
AZURE_STORAGE_PUBLIC_ACCESS=false
504+
AZURE_CONTAINER_NAME=files
505+
476506
#========================#
477507
# Shared Links #
478508
#========================#

.github/CONTRIBUTING.md

Whitespace-only changes.

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

Whitespace-only changes.

.github/workflows/data-schemas.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Publish `@librechat/data-schemas` to NPM
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'packages/data-schemas/package.json'
9+
workflow_dispatch:
10+
inputs:
11+
reason:
12+
description: 'Reason for manual trigger'
13+
required: false
14+
default: 'Manual publish requested'
15+
16+
jobs:
17+
build-and-publish:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
22+
- name: Use Node.js
23+
uses: actions/setup-node@v4
24+
with:
25+
node-version: '18.x'
26+
27+
- name: Install dependencies
28+
run: cd packages/data-schemas && npm ci
29+
30+
- name: Build
31+
run: cd packages/data-schemas && npm run build
32+
33+
- name: Set up npm authentication
34+
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.PUBLISH_NPM_TOKEN }}" > ~/.npmrc
35+
36+
- name: Check version change
37+
id: check
38+
working-directory: packages/data-schemas
39+
run: |
40+
PACKAGE_VERSION=$(node -p "require('./package.json').version")
41+
PUBLISHED_VERSION=$(npm view @librechat/data-schemas version 2>/dev/null || echo "0.0.0")
42+
if [ "$PACKAGE_VERSION" = "$PUBLISHED_VERSION" ]; then
43+
echo "No version change, skipping publish"
44+
echo "skip=true" >> $GITHUB_OUTPUT
45+
else
46+
echo "Version changed, proceeding with publish"
47+
echo "skip=false" >> $GITHUB_OUTPUT
48+
fi
49+
50+
- name: Pack package
51+
if: steps.check.outputs.skip != 'true'
52+
working-directory: packages/data-schemas
53+
run: npm pack
54+
55+
- name: Publish
56+
if: steps.check.outputs.skip != 'true'
57+
working-directory: packages/data-schemas
58+
run: npm publish *.tgz --access public

.github/workflows/generate-release-changelog-pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ jobs:
8484
with:
8585
token: ${{ secrets.GITHUB_TOKEN }}
8686
sign-commits: true
87-
commit-message: "chore: update CHANGELOG for release ${GITHUB_REF##*/}"
87+
commit-message: "chore: update CHANGELOG for release ${{ github.ref_name }}"
8888
base: main
89-
branch: "changelog/${GITHUB_REF##*/}"
89+
branch: "changelog/${{ github.ref_name }}"
9090
reviewers: danny-avila
91-
title: "chore: update CHANGELOG for release ${GITHUB_REF##*/}"
91+
title: "chore: update CHANGELOG for release ${{ github.ref_name }}"
9292
body: |
9393
**Description**:
94-
- This PR updates the CHANGELOG.md by removing the "Unreleased" section and adding new release notes for release ${GITHUB_REF##*/} above previous releases.
94+
- This PR updates the CHANGELOG.md by removing the "Unreleased" section and adding new release notes for release ${{ github.ref_name }} above previous releases.

.github/workflows/generate-unreleased-changelog-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Generate Unreleased Changelog PR
33
on:
44
schedule:
55
- cron: "0 0 * * 1" # Runs every Monday at 00:00 UTC
6+
workflow_dispatch:
67

78
jobs:
89
generate-unreleased-changelog-pr:

.github/workflows/i18n-unused-keys.yml

Whitespace-only changes.

.github/workflows/shopify-backend-review.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
- name: Install MCP Package
4141
run: npm run build:mcp
4242

43+
- name: Install Data Schemas Package
44+
run: npm run build:data-schemas
45+
4346
- name: Create empty auth.json file
4447
run: |
4548
mkdir -p api/data

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ client/public/main.js
3737
client/public/main.js.map
3838
client/public/main.js.LICENSE.txt
3939

40+
# Azure Blob Storage Emulator (Azurite)
41+
__azurite**
42+
__blobstorage__/**/*
43+
4044
# Dependency directorys
4145
# Deployed apps should consider commenting these lines out:
4246
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
@@ -48,6 +52,9 @@ bower_components/
4852
*.d.ts
4953
!vite-env.d.ts
5054

55+
# Cline
56+
.clineignore
57+
5158
# Floobits
5259
.floo
5360
.floobit

0 commit comments

Comments
 (0)