Merge pull request #171 from heshengtao/dev

Dev

Author: heshengtao

server.py

@@ -540,7 +540,7 @@ async def tools_change_messages(request: ChatRequest, settings: dict):
                     request.messages[0]['content'] += sticker_message
                 else:
                     request.messages.insert(0, {'role': 'system', 'content': sticker_message})
-        request.messages[0]['content'] += "\n\n当你需要使用图片时，请将图片的URL放在markdown的图片标签中，例如：![图片名](图片URL)\n\n"
+        request.messages[0]['content'] += "\n\n当你需要使用图片时，请将图片的URL放在markdown的图片标签中，例如：\n\n![图片名](图片URL)\n\n，图片markdown必须另起并且独占一行！"
     if settings['VRMConfig']['enabledExpressions']:
         Expression_messages = "\n\n你可以使用以下表情：<happy> <angry> <sad> <neutral> <surprised> <relaxed>\n\n你可以在句子开头插入表情符号以驱动人物的当前表情，注意！你需要将表情符号放到句子的开头，才能在说这句话的时候同步做表情，例如：<angry>我真的生气了。<surprised>哇！<happy>我好开心。\n\n一定要把表情符号跟要做表情的句子放在同一行，如果表情符号和要做表情的句子中间有换行符，表情也将不会生效，例如：\n\n<happy>\n我好开心。\n\n此时，表情符号将不会生效。"
         if request.messages and request.messages[0]['role'] == 'system':
@@ -4656,6 +4656,30 @@ async def delete_file_endpoint(request: Request):
     except Exception as e:
         return JSONResponse(content={"success": False, "message": str(e)})
 
+class FileNames(BaseModel):
+    fileNames: List[str]
+
+@app.delete("/delete_files")
+async def delete_files_endpoint(req: FileNames):
+    success_files = []
+    errors = []
+    for name in req.fileNames:
+        path = os.path.join(UPLOAD_FILES_DIR, name)
+        try:
+            if os.path.exists(path):
+                os.remove(path)
+                success_files.append(name)
+            else:
+                errors.append(f"{name} not found")
+        except Exception as e:
+            errors.append(f"{name}: {str(e)}")
+
+    return JSONResponse(content={
+        "success": len(success_files) > 0,   # 只要有成功就算成功
+        "successFiles": success_files,
+        "errors": errors
+    })
+
 ALLOWED_AUDIO_EXTENSIONS = ['wav', 'mp3', 'ogg', 'flac', 'aac']
 
 @app.post("/upload_gsv_ref_audio")

static/css/styles.css

@@ -3174,3 +3174,43 @@ body {
   display: flex; /* 水平排列按钮 */
   margin: 0px;
 }
+
+.checkbox-no-label .el-checkbox__label {
+  display: none;
+}
+
+/* 工具栏整体 */
+.toolbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 16px;
+  background: #fafbfc;
+  border-radius: 8px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
+  margin-bottom: 12px;
+  gap: 12px;        /* flex 子项间距 */
+}
+
+/* 全选复选框文字样式 */
+.select-all-checkbox .el-checkbox__label {
+  font-weight: 500;
+  color: #303133;
+  margin-left: 6px;
+}
+
+/* 批量删除按钮 */
+.batch-del-btn {
+  border-radius: 20px;        /* 胶囊形状 */
+  padding: 6px 14px;
+  font-weight: 500;
+  box-shadow: 0 2px 4px rgba(245, 108, 108, 0.2);
+  transition: transform 0.15s;
+}
+.batch-del-btn:not(:disabled):hover {
+  transform: scale(1.05);
+}
+.batch-del-btn:disabled {
+  box-shadow: none;
+  transform: none;
+}

static/index.html

@@ -5147,9 +5147,31 @@ <h3 class="kb-title">{{memory.name }}</h3>
             <div class="suite-content">
               <!-- 文本存储 -->
               <div v-show="subMenu === 'text'" class="page text-container">
+                <!-- 顶部工具条 -->
+                <div class="toolbar">
+                  <el-checkbox
+                    v-model="allChecked"
+                    :indeterminate="indeterminate"
+                    @change="toggleAll">
+                    {{ t('selectAll') }}
+                  </el-checkbox>
+                  <el-button
+                    type="danger"
+                    :disabled="selectedFiles.length === 0"
+                    @click="batchDeleteFiles">
+                    <i class="fa-solid fa-trash"></i>
+                    {{ t('batchDelete') }}
+                  </el-button>
+                </div>
                 <div class="text-list">
                   <!-- 文件列表 -->
                   <div class="file-item" v-for="(file, index) in textFiles" :key="index">
+                    <!-- 复选框 -->
+                    <el-checkbox
+                      v-model="selectedFiles"
+                      :label="file.unique_filename"
+                      class="checkbox-no-label">  
+                    </el-checkbox>
                     <el-icon class="file-icon"><i class="fa-solid fa-file-lines"></i></el-icon>
                     <div class="file-info">
                       <span class="file-name">{{ file.original_filename }}</span>
@@ -5179,11 +5201,32 @@ <h3 class="kb-title">{{memory.name }}</h3>
               </div>
               <!-- 图片存储 -->
               <div v-show="subMenu === 'image'" class="page image-container">
+                <!-- 新增顶部工具栏 -->
+                <div class="toolbar">
+                  <el-checkbox
+                    v-model="allImagesChecked"
+                    :indeterminate="indeterminateImages"
+                    @change="toggleAllImages">
+                    {{ t('selectAll') }}
+                  </el-checkbox>
+                  <el-button
+                    type="danger"
+                    :disabled="selectedImages.length === 0"
+                    @click="batchDeleteImages">
+                    <i class="fa-solid fa-trash"></i>
+                    {{ t('batchDelete') }}
+                  </el-button>
+                </div>
                 <div class="image-grid">
                   <div class="image-item" v-for="(img, index) in imageFiles" :key="index">
                     <img :src="`${partyURL}/uploaded_files/${img.unique_filename}`" class="thumbnail"/>
                     <div class="image-overlay">
-                      <span class="image-name">{{ img.name }}</span>
+                      <!-- 复选框 -->
+                      <el-checkbox
+                        v-model="selectedImages"
+                        :label="img.unique_filename"
+                        class="checkbox-no-label">
+                      </el-checkbox>
                       <div class="image-actions">
                         <!-- 复制链接按钮 -->
                         <el-button circle size="small" class="image-actions-btn" @click="copyLink(img.unique_filename)">
@@ -5227,6 +5270,22 @@ <h3 class="kb-title">{{memory.name }}</h3>
               </div>
               <!-- 视频存储 -->
               <div v-show="subMenu === 'video'" class="page video-container">
+                <!-- 新增顶部工具栏 -->
+                <div class="toolbar">
+                  <el-checkbox
+                    v-model="allVideosChecked"
+                    :indeterminate="indeterminateVideos"
+                    @change="toggleAllVideos">
+                    {{ t('selectAll') }}
+                  </el-checkbox>
+                  <el-button
+                    type="danger"
+                    :disabled="selectedVideos.length === 0"
+                    @click="batchDeleteVideos">
+                    <i class="fa-solid fa-trash"></i>
+                    {{ t('batchDelete') }}
+                  </el-button>
+                </div>
                 <div class="video-list">
                   <div class="video-item" v-for="(video, index) in videoFiles" :key="index">
                     <div class="video-wrapper">
@@ -5235,7 +5294,12 @@ <h3 class="kb-title">{{memory.name }}</h3>
                         <source :src="`${partyURL}/uploaded_files/${video.unique_filename}`" type="video/mp4">
                         Your browser does not support the video tag.
                       </video>
-
+                      <!-- 复选框 -->
+                      <el-checkbox
+                        v-model="selectedVideos"
+                        :label="video.unique_filename"
+                        class="checkbox-no-label">
+                      </el-checkbox>
                       <!-- 删除按钮定位在视频右上角 -->
                       <el-button class="delete-overlay-btn" type="danger" circle @click="deleteVideo(video)">
                         <i class="fa-solid fa-trash"></i>

static/js/locales.js

@@ -557,7 +557,7 @@ const translations = {
         'gsvPromptText': '参考音频文本',
         'gsvPromptTextPlaceholder': '请输入参考音频中对应的文本',
         'addRefAudio': '添加参考音色',
-        'gsvNotice1': '1. 请点击上方文档链接，下载GSV-V4版本的整合包',
+        'gsvNotice1': '1. 请点击上方文档链接，下载GSV-V4版本的整合包，推荐使用v2版本',
         'gsvNotice2': '2. 请在整合包项目路径下打开终端，执行` runtime/python.exe api_v2.py -a 127.0.0.1 -p 9880 -c GPT_SoVITS/configs/tts_infer.yaml `启动服务',
         'gsvServer': 'GSV服务器URL(可以输入多个，一行一个)',
         'gsvServerPlaceholder': '请输入GSV服务器URL',
@@ -729,6 +729,10 @@ key3`,
         'customTTSspeed': '自定义TTS语速',
         'gsvGsvAudioPath': '参考音频路径（如果上传了文件可不填）',
         'gsvGsvAudioPathPlaceholder': '请输入参考音频路径',
+        'selectAll': '全选',
+        'batchDelete': '批量删除',
+        'batchDeleteSuccess': '批量删除成功',
+        'batchDeleteFailed': '批量删除失败',
     },
     'en-US': {
         'chat': 'Chat',
@@ -1285,7 +1289,7 @@ key3`,
         'gsvPromptText ':' Reference audio text',
         'gsvPromptTextPlaceholder ':' Please enter the corresponding text in the reference audio',
         'addRefAudio': 'Add reference sound',
-        'gsvNotice': '1. Please click the document link above to download the GSV-V4 integrated package',
+        'gsvNotice1': '1. Please click the document link above to download the GSV-V4 integrated package.It is recommended to use the v2 version',
         'gsvNotice2': '2. Please open the terminal under the integration package project path, and execute ` runtime/python.exe api_v2.py -a 127.0.0.1 -p 9880 -c GPT_SoVITS/configs/tts_infer.yaml ` to start the service.',
         'gsvServer': 'GSV Server URL(You can enter multiple items, one per line.)',
         'gsvServerPlaceholder': 'Please enter the GSV Server URL',
@@ -1457,5 +1461,9 @@ Key3`,
         'customTTSspeed': 'Custom TTS speed',
         'gsvGsvAudioPath':'Refer to the audio path (if the file is uploaded, leave it blank)',
         'gsvGsvAudioPathPlaceholder': 'Please enter the audio path',
+        'selectAll': 'Select All',
+        'batchDelete': 'Batch Delete',
+        'batchDeleteSuccess': 'Batch delete success',
+        'batchDeleteFailed': 'Batch delete fail',
     }
   };

static/js/renderer.js

@@ -171,6 +171,45 @@ const app = Vue.createApp({
     },
   },
   computed: {
+    allChecked: {
+      get() {
+        return this.textFiles.length > 0 && this.selectedFiles.length === this.textFiles.length;
+      },
+      set(val) {
+        this.selectedFiles = val ? this.textFiles.map(f => f.unique_filename) : [];
+      }
+    },
+    indeterminate() {
+      return (
+        this.selectedFiles.length > 0 &&
+        this.selectedFiles.length < this.textFiles.length
+      );
+    },
+    // 图片全选状态
+    allImagesChecked: {
+      get() {
+        return this.imageFiles.length > 0 && 
+              this.selectedImages.length === this.imageFiles.length
+      },
+      set(val) {
+        this.selectedImages = val 
+          ? this.imageFiles.map(i => i.unique_filename) 
+          : []
+      }
+    },
+    
+    // 视频全选状态
+    allVideosChecked: {
+      get() {
+        return this.videoFiles.length > 0 && 
+              this.selectedVideos.length === this.videoFiles.length
+      },
+      set(val) {
+        this.selectedVideos = val 
+          ? this.videoFiles.map(v => v.unique_filename) 
+          : []
+      }
+    },
     sidebarStyle() {
       return {
         width: this.isMobile ? 

static/js/vrm.js

@@ -164,7 +164,9 @@ loader.crossOrigin = 'anonymous';
 
 loader.register( ( parser ) => {
 
-    return new VRMLoaderPlugin( parser );
+    return new VRMLoaderPlugin(parser,{
+        lookAt: { type: 'bone' }
+    });
 
 } );
 
@@ -913,9 +915,15 @@ async function getAnimationFiles() {
 
     // 4. 如果没有任何选中，给个兜底
     if (urls.length === 0) {
-      const fallback = `${window.location.protocol}//${window.location.host}/vrm/animations/akimbo.vrma`;
+      const fallback = 
+      [
+        `${window.location.protocol}//${window.location.host}/vrm/animations/akimbo.vrma`,
+       `${window.location.protocol}//${window.location.host}/vrm/animations/play_fingers.vrma`,
+       `${window.location.protocol}//${window.location.host}/vrm/animations/scratch_head.vrma`,
+       `${window.location.protocol}//${window.location.host}/vrm/animations/stretch.vrma`
+      ];
       console.warn('没有选中任何动作，使用兜底动画');
-      return [fallback];
+      return fallback;
     }
 
     console.log('本次要加载的 VRMA：', urls);
@@ -1492,12 +1500,24 @@ loader.load(
         // calling these functions greatly improves the performance
         VRMUtils.removeUnnecessaryVertices( gltf.scene );
 
-        gltf.scene.traverse( ( obj ) => {
-            if ( obj.isMesh ) {
-                obj.castShadow = true;        // 产生阴影
-                obj.receiveShadow = true;     // 自己也能被影子覆盖（看需求）
+        // 添加材质修复
+        gltf.scene.traverse((obj) => {
+        if (obj.isMesh && obj.material) {
+            // 解决透明材质黑边问题
+            if (obj.material.transparent) {
+            obj.material.alphaTest = 0.5;
+            obj.material.depthWrite = false;
+            obj.material.needsUpdate = true;
             }
-        } );
+            
+            // 确保正确混合模式
+            obj.material.blending = THREE.NormalBlending;
+            obj.material.premultipliedAlpha = true;
+            
+            // 设置渲染顺序
+            obj.renderOrder = obj.material.transparent ? 1 : 0;
+        }
+        });
 
         VRMUtils.combineSkeletons( gltf.scene );
         VRMUtils.combineMorphs( vrm );
@@ -1716,6 +1736,9 @@ function animate() {
     if (currentVrm) {
         // 只需要更新 VRM 和 Mixer
         currentVrm.update(deltaTime);
+        if (currentVrm.lookAt) {
+            currentVrm.lookAt.update(deltaTime);
+        }
     }
 
     if (currentMixer) {
@@ -2451,12 +2474,24 @@ async function switchToModel(index) {
                 VRMUtils.rotateVRM0(vrm); // 旋转 VRM 使其面向正前方
                 // 优化性能
                 VRMUtils.removeUnnecessaryVertices(gltf.scene);
-                gltf.scene.traverse( ( obj ) => {
-                    if ( obj.isMesh ) {
-                        obj.castShadow = true;        // 产生阴影
-                        obj.receiveShadow = true;     // 自己也能被影子覆盖（看需求）
+                // 添加材质修复
+                gltf.scene.traverse((obj) => {
+                if (obj.isMesh && obj.material) {
+                    // 解决透明材质黑边问题
+                    if (obj.material.transparent) {
+                    obj.material.alphaTest = 0.5;
+                    obj.material.depthWrite = false;
+                    obj.material.needsUpdate = true;
                     }
-                } );
+                    
+                    // 确保正确混合模式
+                    obj.material.blending = THREE.NormalBlending;
+                    obj.material.premultipliedAlpha = true;
+                    
+                    // 设置渲染顺序
+                    obj.renderOrder = obj.material.transparent ? 1 : 0;
+                }
+                });
 
                 VRMUtils.combineSkeletons(gltf.scene);
                 VRMUtils.combineMorphs(vrm);

static/js/vue_data.js

@@ -470,10 +470,7 @@ let vue_data = {
       '<sad>',
       '<neutral>',
       '<surprised>', 
-      '<relaxed>',
-      '<blink>', 
-      '<blinkLeft>', 
-      '<blinkRight>'],
+      '<relaxed>'],
     newGsvAudio: {
       name: '',
       path: '',
@@ -1001,6 +998,13 @@ let vue_data = {
     textFiles: [],
     imageFiles: [],
     videoFiles: [],
+    selectedFiles: [],      // 存 unique_filename
+    selectedImages: [],
+    allImagesChecked: false,
+    indeterminateImages: false,
+    selectedVideos: [],
+    allVideosChecked: false,
+    indeterminateVideos: false,
     subMenu: '', // 新增子菜单状态
     isWorldviewSettingsExpanded: true,
     isRandomSettingsExpanded: true,