Merge branch '1.3.x'

Author: CodeCasterX

README.md

@@ -73,7 +73,27 @@ bash docker/dev-app-builder.sh
 浏览器打开 http://localhost:8001 测试
 
 ## 前端快速开发测试
-TODO
+本章节给出快速启动之后，本地快速开发测试前端的方法。
+
+### 1. 编译代码
+1. 全量编译前端（1 minutes 10 seconds）
+编写代码，在项目根目录下，执行以下命令编译：
+```shell
+cd frontend
+npm install --legacy-peer-deps --force --registry=https://registry.npmmirror.com
+npm run build:prod
+```
+
+### 2. 一键部署修改
+在项目根目录下，执行以下命令快速部署（18 seconds）：
+```shell
+cd ..
+bash docker/dev-frontend.sh
+```
+
+### 3. 测试
+浏览器打开 http://localhost:8001 测试
+
 
 ## 源码编译启动
 

docker/.env.example

@@ -10,7 +10,7 @@ APIKEY=${APIKEY}
 
 # 部署配置 / Deployment configuration
 # ModelEngine 开源版本号 / ModelEngine opensource version
-VERSION=opensource-1.2.4
+VERSION=opensource-1.3.0
 
 # 用户自定义数据库密码 / User-configured database password
 DB_PASSWORD=ModelEngine@123
@@ -25,4 +25,4 @@ WEB_PORT=8001
 IS_UPGRADE=false
 
 # 阿里云镜像仓 / Aliyun Cloud Image Repo
-REPO="crpi-62znuv6vkgxcv731.cn-hangzhou.personal.cr.aliyuncs.com/modelengine-hub"
+REPO="crpi-62znuv6vkgxcv731.cn-hangzhou.personal.cr.aliyuncs.com/modelengine-hub"

docker/deploy.sh

@@ -2,7 +2,6 @@
 set -eux
 export WORKSPACE=$(cd "$(dirname "$(readlink -f "$0")")" && pwd)
 
-bash ${WORKSPACE}/import_model.sh
 echo "=== Deploying... ==="
 cd ${WORKSPACE}
 mkdir -p app-platform-tmp/app-builder
@@ -13,5 +12,7 @@ echo "Starting service..."
 docker-compose -p app-platform up -d
 echo "Service started"
 docker stop db-initializer
+docker stop sql-initializer
 docker rm db-initializer
+docker rm sql-initializer
 echo "=== Finished ==="

docker/dev-app-builder.sh

@@ -55,16 +55,6 @@ echo "=== Cleaning up temporary container ==="
 docker stop app-builder-tmp
 docker rm app-builder-tmp
 
-echo "=== Updating docker-compose configuration ==="
-# Create docker-compose configuration for development
-cp docker-compose.yml docker-compose.dev.yml
-if [[ "$(uname -s)" == "Darwin" ]]; then
-    sed -i '.bak' "s/app-builder:\${VERSION}/app-builder:dev-latest/g" docker-compose.dev.yml
-    rm -f docker-compose.dev.yml.bak
-else
-    sed -i "s/app-builder:\${VERSION}/app-builder:dev-latest/g" docker-compose.dev.yml
-fi
-
 echo "=== Restarting services ==="
 docker-compose -f docker-compose.dev.yml -p app-platform up -d app-builder
 
@@ -86,6 +76,11 @@ if [ $WAITED -ge $MAX_WAIT ]; then
     echo "Warning: Service startup timeout, but continuing execution..."
 fi
 
+docker stop db-initializer
+docker stop sql-initializer
+docker rm db-initializer
+docker rm sql-initializer
+
 echo ""
 echo "=== Completed! ==="
 echo "Development version deployed: ${DEV_VERSION}"

docker/dev-frontend.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+set -eu
+
+export WORKSPACE=$(cd "$(dirname "$(readlink -f "$0")")" && pwd)
+BUILD_DIR="${WORKSPACE}/../frontend/build/"
+
+cd ${WORKSPACE}
+source .env
+
+# Generate development version tag
+BASE_VERSION=${VERSION}
+TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+GIT_COMMIT=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+DEV_VERSION="${BASE_VERSION}-dev-${TIMESTAMP}-${GIT_COMMIT}"
+
+echo "=== Version Information ==="
+echo "Base Version: ${BASE_VERSION}"
+echo "Development Version: ${DEV_VERSION}"
+echo "Git Commit: ${GIT_COMMIT}"
+
+# Check local build artifacts
+if [ ! -d "$BUILD_DIR" ] || [ -z "$(ls -A "$BUILD_DIR" 2>/dev/null)" ]; then
+    echo "Error: plugins directory is empty or does not exist: $BUILD_DIR"
+    exit 1
+fi
+
+echo "=== Stopping web service ==="
+docker-compose stop web
+
+echo "=== Creating development version image ==="
+# Use stable version as base
+docker run -d --name web-tmp --entrypoint sleep ${REPO}/jade-web:${BASE_VERSION} infinity
+
+# Copy files
+echo "Copying frontend files..."
+docker exec  web-tmp rm -rf //usr//share//nginx//html
+docker exec web-tmp mkdir -p //usr//share//nginx//html
+docker cp "$BUILD_DIR"/. web-tmp:/usr/share/nginx/html/
+
+# Commit as development version
+echo "Committing development version image: ${DEV_VERSION}"
+docker commit --change='ENTRYPOINT ["/init.sh"]' web-tmp ${REPO}/jade-web:${DEV_VERSION}
+
+# Create development tag (for docker-compose convenience)
+docker tag ${REPO}/jade-web:${DEV_VERSION} ${REPO}/jade-web:dev-latest
+
+echo "=== Cleaning up temporary container ==="
+docker stop web-tmp
+docker rm web-tmp
+
+echo "=== Restarting services ==="
+docker-compose -f docker-compose.dev.yml -p app-platform up -d web
+
+echo ""
+echo "=== Completed! ==="
+echo "Development version deployed: ${DEV_VERSION}"
+echo "Current tag in use: dev-latest"
+echo "Service URL: http://localhost:8001"
+echo ""
+echo "=== Version Management Commands ==="
+echo "View all versions: docker images ${REPO}/jade-web"

docker/docker-compose.dev.yml

@@ -17,17 +17,36 @@ services:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       LOG_HOME: /log/app
     volumes:
-      - ./sql:/home/sql
-      - ./shell/initDB.sh:/home/initDB.sh
       - "./app-platform-tmp/jade-db:/var/lib/postgresql/data"
       - "./app-platform-tmp/log:/log/app/postgresql"
     ports:
       - "${DB_PORT}:5432"
 
+  sql-initializer:
+    container_name: sql-initializer
+    hostname: sql-initializer
+    image: ${REPO}/app-builder:dev-latest
+    networks:
+      my-net:
+        ipv4_address: 172.0.0.97
+    volumes:
+      - ./app-platform-tmp/sql:/opt/appbuilder/sql
+    entrypoint: ["/bin/bash", "-c"]
+    command: |
+      "
+      rm -rf /opt/appbuilder/sql/*
+      mv -f /opt/sql/* /opt/appbuilder/sql/
+      "
+
   db-initializer:
     container_name: db-initializer
     hostname: db-initializer
     image: ${REPO}/postgres:15.2-${VERSION}
+    depends_on:
+      jade-db:
+        condition: service_healthy
+      sql-initializer:
+        condition: service_completed_successfully
     networks:
       my-net:
         ipv4_address: 172.0.0.99
@@ -39,13 +58,15 @@ services:
       DB_PORT: 5432
       DB_USER: postgres
       IS_UPGRADE: ${IS_UPGRADE}
+      APIKEY: ${APIKEY}
     volumes:
-      - ./shell/initDB.sh:/home/initDB.sh
-      - ./sql:/home/sql
-    entrypoint: ["/bin/bash", "-c"] 
+      - ./app-platform-tmp/sql:/opt/sql
+    entrypoint: ["/bin/bash", "-c"]
     command: |
-      " chmod +x /home/initDB.sh
-        bash /home/initDB.sh app_builder /home/sql
+      " 
+      chmod +x /opt/initDB.sh
+      sed -i "s#TODO#${APIKEY}#g" /opt/sql/init/data/tr_init_models.sql
+      bash /opt/initDB.sh app_builder /opt/sql
       "
     restart: "no"
 
@@ -54,8 +75,8 @@ services:
     hostname: app-builder
     image: ${REPO}/app-builder:dev-latest
     depends_on:
-      jade-db:
-        condition: service_healthy
+      db-initializer:
+        condition: service_completed_successfully
     healthcheck:
       test: ["CMD", "curl", "-f", "http://app-builder:8004/fit/check"]
       interval: 30s
@@ -81,8 +102,15 @@ services:
       LOG_HOME: /log/app
       LOG_NUM: 4320
       LOG_SIZE: "50M"
-      app-engine.ttl.businessData: 15
-      app-engine.ttl.nonBusinessData: 1
+      app-engine.ttl.businessData: 360
+      app-engine.ttl.nonBusinessData: 180
+      task.expiredDays: 360
+      model.imageExtractor.model: THUDM/GLM-4.1V-9B-Thinking
+      model.imageExtractor.url: https://api.siliconflow.cn/v1
+      model.audioTranscriptions.model: TeleAI/TeleSpeechASR
+      model.audioTranscriptions.url: https://api.siliconflow.cn/v1
+      model.imageExtractor.apiKey: ${APIKEY}
+      model.audioTranscriptions.apiKey: ${APIKEY}
     volumes:
       - "./app-platform-tmp/fit-runtime:/var/store/tools"
       - "./app-platform-tmp/log:/log/app/app-builder"
@@ -97,7 +125,7 @@ services:
     image: ${REPO}/fit-runtime-java:${VERSION}
     depends_on:
       app-builder:
-        condition: service_healthy 
+        condition: service_healthy
     networks:
       my-net:
         ipv4_address: 172.0.0.101
@@ -116,14 +144,14 @@ services:
       - "./app-platform-tmp/log:/log/app/runtime-java"
     ports:
       - "8090:8090"
- 
+
   fit-runtime-python:
     container_name: fit-runtime-python
     hostname: fit-runtime-python
     image: ${REPO}/fit-runtime-python:${VERSION}
     depends_on:
       app-builder:
-        condition: service_healthy 
+        condition: service_healthy
     networks:
       my-net:
         ipv4_address: 172.0.0.102
@@ -142,11 +170,11 @@ services:
       - "./app-platform-tmp/log:/log/app/runtime-python"
     ports:
       - "9666:9666"
-      
+
   web:
     container_name: web
     hostname: web
-    image: ${REPO}/jade-web:${VERSION}
+    image: ${REPO}/jade-web:dev-latest
     depends_on:
       app-builder:
         condition: service_healthy