third/dify-plus
1
0
Fork 0
mirror of https://github.com/YFGaia/dify-plus.git synced 2026-06-04 10:14:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 升级到1.11.4

Browse Source 
# Conflicts:
#	.github/workflows/tool-test-sdks.yaml
#	api/.env.example
#	api/README.md
#	api/commands.py
#	api/controllers/console/explore/wraps.py
#	api/controllers/web/workflow.py
#	api/extensions/ext_commands.py
#	api/models/model.py
#	api/pyproject.toml
#	api/services/feature_service.py
#	web/README.md
#	web/app/components/explore/app-card/index.tsx
#	web/app/components/explore/app-list/index.tsx
#	web/app/components/explore/sidebar/index.tsx
#	web/app/signin/components/mail-and-password-auth.tsx
#	web/i18n/uk-UA/app-overview.json
#	web/i18n/uk-UA/app.json
#	web/i18n/uk-UA/billing.json
#	web/i18n/uk-UA/common.json
#	web/i18n/uk-UA/dataset-creation.json
#	web/i18n/uk-UA/dataset-documents.json
#	web/i18n/uk-UA/dataset-hit-testing.json
#	web/i18n/uk-UA/dataset-settings.json
#	web/i18n/uk-UA/dataset.json
#	web/i18n/uk-UA/explore.json
#	web/i18n/uk-UA/plugin.json
#	web/i18n/uk-UA/tools.json
#	web/next.config.js
#	web/package.json
#	web/pnpm-lock.yaml
#	web/service/common.ts
#	web/service/explore.ts
#	web/service/fetch.ts
#	web/service/use-explore.ts
#	web/types/feature.ts
This commit is contained in:
npc0-hue
2026-01-26 07:08:40 +08:00
parent c55ab84659 9d38af6d99
commit b2f5707676
1275 changed files with 84140 additions and 16144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev/setup
Executable
+28
View File
@@ -0,0 +1,28 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
ROOT="$(dirname "$SCRIPT_DIR")"
API_ENV_EXAMPLE="$ROOT/api/.env.example"
API_ENV="$ROOT/api/.env"
WEB_ENV_EXAMPLE="$ROOT/web/.env.example"
WEB_ENV="$ROOT/web/.env.local"
MIDDLEWARE_ENV_EXAMPLE="$ROOT/docker/middleware.env.example"
MIDDLEWARE_ENV="$ROOT/docker/middleware.env"
# 1) Copy api/.env.example -> api/.env
cp "$API_ENV_EXAMPLE" "$API_ENV"
# 2) Copy web/.env.example -> web/.env.local
cp "$WEB_ENV_EXAMPLE" "$WEB_ENV"
# 3) Copy docker/middleware.env.example -> docker/middleware.env
cp "$MIDDLEWARE_ENV_EXAMPLE" "$MIDDLEWARE_ENV"
# 4) Install deps
cd "$ROOT/api"
uv sync --group dev
cd "$ROOT/web"
pnpm install
dev/start-api
+3 -2
View File
@@ -3,8 +3,9 @@
set -x
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
cd "$SCRIPT_DIR/.."
cd "$SCRIPT_DIR/../api"
uv run flask db upgrade
uv --directory api run \
uv run \
flask run --host 0.0.0.0 --port=5001 --debug
dev/start-docker-compose
Executable
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
ROOT="$(dirname "$SCRIPT_DIR")"
cd "$ROOT/docker"
docker compose -f docker-compose.middleware.yaml --profile postgresql --profile weaviate -p dify up -d
dev/start-web
+1 -1
View File
@@ -5,4 +5,4 @@ set -x
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
cd "$SCRIPT_DIR/../web"
pnpm install && pnpm dev
pnpm install && pnpm dev:inspect
dev/start-worker
+2 -2
View File
@@ -83,7 +83,7 @@ while [[ $# -gt 0 ]]; do
done
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
cd "$SCRIPT_DIR/.."
cd "$SCRIPT_DIR/../api"
if [[ -n "${ENV_FILE}" ]]; then
if [[ ! -f "${ENV_FILE}" ]]; then
@@ -123,6 +123,6 @@ echo " Concurrency: ${CONCURRENCY}"
echo " Pool: ${POOL}"
echo " Log Level: ${LOGLEVEL}"
uv --directory api run \
uv run \
celery -A app.celery worker \
-P ${POOL} -c ${CONCURRENCY} --loglevel ${LOGLEVEL} -Q ${QUEUES}
dev/update-uv
+1 -1
View File
@@ -4,7 +4,7 @@
set -e
set -o pipefail
SCRIPT_DIR="$(dirname "$0")"
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
REPO_ROOT="$(dirname "${SCRIPT_DIR}")"
# rely on `poetry` in path