Fixed minor issues with l2d saving. Prepare for v0.3.2 release.

Author: wehos

config/__init__.py

@@ -107,9 +107,9 @@ def get_character_data():
             AUDIO_API_KEY = OPENROUTER_API_KEY = ASSIST_API_KEY_OPENAI
         elif core_cfg['assistApi'] == 'glm':
             OPENROUTER_URL = "https://open.bigmodel.cn/api/paas/v4"
-            SUMMARY_MODEL = "glm-4-air-250414" # glm-4-flash-250414 <-永久免费模型
+            SUMMARY_MODEL = "glm-4.5-flash" # <-永久免费模型
             CORRECTION_MODEL = "glm-z1-air"  # glm-z1-flash <-永久免费模型
-            EMOTION_MODEL = "glm-4-flash-250414"
+            EMOTION_MODEL = "glm-4.5-flash"
             AUDIO_API_KEY = OPENROUTER_API_KEY = ASSIST_API_KEY_GLM
         else:
             logger.error("💥 Unknown assistApi: " + core_cfg['assistApi']) 

main_server.py

@@ -1005,50 +1005,74 @@ async def live2d_emotion_manager(request: Request):
         logger.error(f"加载Live2D情感映射管理器页面失败: {e}")
         return JSONResponse(status_code=500, content={"error": str(e)})
 
-@app.get('/api/live2d/emotion_mapping')
-async def get_emotion_mapping():
+@app.get('/api/live2d/emotion_mapping/{model_name}')
+async def get_emotion_mapping(model_name: str):
     """获取情绪映射配置"""
     try:
-        mapping_file_path = os.path.join('config', 'live2d_emotion_mapping.json')
+        # 在模型目录中查找.model3.json文件
+        model_dir = os.path.join('static', model_name)
+        if not os.path.exists(model_dir):
+            return JSONResponse(status_code=404, content={"success": False, "error": "模型目录不存在"})
 
-        if not os.path.exists(mapping_file_path):
-            # 如果文件不存在，返回空配置
-            return {"success": True, "config": {}}
+        # 查找.model3.json文件
+        model_json_path = None
+        for file in os.listdir(model_dir):
+            if file.endswith('.model3.json'):
+                model_json_path = os.path.join(model_dir, file)
+                break
 
-        with open(mapping_file_path, 'r', encoding='utf-8') as f:
+        if not model_json_path or not os.path.exists(model_json_path):
+            return JSONResponse(status_code=404, content={"success": False, "error": "模型配置文件不存在"})
+        
+        with open(model_json_path, 'r', encoding='utf-8') as f:
             config_data = json.load(f)
+
+        emotion_mapping = config_data.get('EmotionMapping', {})
 
-        return {"success": True, "config": config_data}
+        return {"success": True, "config": emotion_mapping}
     except Exception as e:
         logger.error(f"获取情绪映射配置失败: {e}")
         return JSONResponse(status_code=500, content={"success": False, "error": str(e)})
 
-@app.post('/api/live2d/emotion_mapping')
-async def update_emotion_mapping(request: Request):
+@app.post('/api/live2d/emotion_mapping/{model_name}')
+async def update_emotion_mapping(model_name: str, request: Request):
     """更新情绪映射配置"""
     try:
         data = await request.json()
 
         if not data:
             return JSONResponse(status_code=400, content={"success": False, "error": "无效的数据"})
+
+        # 在模型目录中查找.model3.json文件
+        model_dir = os.path.join('static', model_name)
+        if not os.path.exists(model_dir):
+            return JSONResponse(status_code=404, content={"success": False, "error": "模型目录不存在"})
 
-        mapping_file_path = os.path.join('config', 'live2d_emotion_mapping.json')
+        # 查找.model3.json文件
+        model_json_path = None
+        for file in os.listdir(model_dir):
+            if file.endswith('.model3.json'):
+                model_json_path = os.path.join(model_dir, file)
+                break
 
-        # 确保config目录存在
-        os.makedirs(os.path.dirname(mapping_file_path), exist_ok=True)
+        if not model_json_path or not os.path.exists(model_json_path):
+            return JSONResponse(status_code=404, content={"success": False, "error": "模型配置文件不存在"})
+
+        with open(model_json_path, 'r', encoding='utf-8') as f:
+            config_data = json.load(f)
+
+        # 添加或更新 EmotionMapping
+        config_data['EmotionMapping'] = data
 
         # 保存配置到文件
-        with open(mapping_file_path, 'w', encoding='utf-8') as f:
-            json.dump(data, f, ensure_ascii=False, indent=2)
+        with open(model_json_path, 'w', encoding='utf-8') as f:
+            json.dump(config_data, f, ensure_ascii=False, indent=2)
 
-        logger.info("情绪映射配置已更新")
+        logger.info(f"模型 {model_name} 的情绪映射配置已更新")
         return {"success": True, "message": "情绪映射配置已保存"}
     except Exception as e:
         logger.error(f"更新情绪映射配置失败: {e}")
         return JSONResponse(status_code=500, content={"success": False, "error": str(e)})
-    except Exception as e:
-        logger.error(f"加载Live2D情感映射管理器页面失败: {e}")
-        return HTMLResponse(content=f"<h1>页面加载失败: {str(e)}</h1>", status_code=500)
 
 @app.post('/api/memory/recent_file/save')
 async def save_recent_file(request: Request):

memory/semantic.py

@@ -1,4 +1,5 @@
-from langchain_chroma import Chroma
+# from langchain_chroma import Chroma
+# ↑ 这个库引入了Chroma和onnx依赖，显著增大了一键包体积，暂时注释掉
 from typing import List
 from langchain_core.documents import Document
 from datetime import datetime
@@ -75,11 +76,12 @@ def rerank_results(self, query, results: List[Document], k=5) -> List[Document]:
 class SemanticMemoryOriginal:
     def __init__(self, persist_directory, lanlan_name, name_mapping):
         self.embeddings = OpenAIEmbeddings(base_url=OPENROUTER_URL, model=SEMANTIC_MODEL, api_key=OPENROUTER_API_KEY)
-        self.vectorstore = Chroma(
-            collection_name="Origin",
-            persist_directory=persist_directory[lanlan_name],
-            embedding_function=self.embeddings
-        )
+        # self.vectorstore = Chroma(
+        #     collection_name="Origin",
+        #     persist_directory=persist_directory[lanlan_name],
+        #     embedding_function=self.embeddings
+        # )
+        self.vectorstore = None
         self.lanlan_name = lanlan_name
         self.name_mapping = name_mapping
 
@@ -117,11 +119,12 @@ def __init__(self, persist_directory, lanlan_name, recent_history_manager: Compr
         self.lanlan_name = lanlan_name
         self.name_mapping = name_mapping
         self.embeddings = OpenAIEmbeddings(base_url=OPENROUTER_URL, model=SEMANTIC_MODEL, api_key=OPENROUTER_API_KEY)
-        self.vectorstore = Chroma(
-            collection_name="Compressed",
-            persist_directory=persist_directory[lanlan_name],
-            embedding_function=self.embeddings
-        )
+        self.vectorstore = None
+        # self.vectorstore = Chroma(
+        #     collection_name="Compressed",
+        #     persist_directory=persist_directory[lanlan_name],
+        #     embedding_function=self.embeddings
+        # )
         self.recent_history_manager = recent_history_manager
 
     def store_compressed_summary(self, event_id, messages):

requirements.txt

@@ -7,7 +7,6 @@ pyaudio~=0.2.14
 websocket-client~=1.8.0
 langchain
 langchain-openai
-langchain_chroma
 langchain_community
 jinja2
 dashscope

static/live2d.js

@@ -277,7 +277,12 @@ class Live2DManager {
 
         const motions = this.emotionMapping.Motions[emotion];
         if (!motions || motions.length === 0) {
-            console.warn(`未找到情感 ${emotion} 对应的动作`);
+            console.warn(`未找到情感 ${emotion} 对应的动作，但将保持表情`);
+            // 如果没有找到对应的motion，设置一个短定时器以确保expression能够显示
+            // 并且不设置回调来清除效果，让表情一直持续
+            this.motionTimer = setTimeout(() => {
+                this.motionTimer = null;
+            }, 500); // 500ms应该足够让expression稳定显示
             return;
         }
 

templates/live2d_emotion_manager.html

@@ -462,7 +462,6 @@ <h4>模型信息</h4>
         // 页面加载时初始化
         document.addEventListener('DOMContentLoaded', function() {
             loadAvailableModels();
-            loadEmotionMappingConfig();
         });
 
         // 全局错误处理
@@ -473,25 +472,6 @@ <h4>模型信息</h4>
 
 
 
-        // 加载情绪映射配置
-        async function loadEmotionMappingConfig() {
-            try {
-                const response = await fetch('/api/live2d/emotion_mapping');
-                const data = await response.json();
-                
-                if (data.success) {
-                    emotionMappingConfig = data.config || {};
-                    showStatus('情绪映射配置加载成功', 'success');
-                } else {
-                    emotionMappingConfig = {};
-                    showStatus('加载情绪映射配置失败: ' + data.error, 'error');
-                }
-            } catch (error) {
-                emotionMappingConfig = {};
-                showStatus('加载情绪映射配置时出错: ' + error.message, 'error');
-            }
-        }
-
         // 加载可用的模型列表
         async function loadAvailableModels() {
             try {
@@ -525,8 +505,7 @@ <h4>模型信息</h4>
             });
         }
 
-                 // 加载模型映射配置
-         async function loadModelMapping() {
+        async function loadModelMapping() {
              const modelSelect = document.getElementById('model-select');
              const selectedModel = modelSelect.value;
 
@@ -544,13 +523,15 @@ <h4>模型信息</h4>
                  statusText.textContent = '正在加载配置和模型文件...';
                  statusDot.className = 'status-dot info';
 
-                 const [configResponse, filesResponse] = await Promise.all([
+                 const [configResponse, filesResponse, emotionMappingResponse] = await Promise.all([
                      fetch(`/api/live2d/model_config/${selectedModel}`),
-                     fetch(`/api/live2d/model_files/${selectedModel}`)
+                     fetch(`/api/live2d/model_files/${selectedModel}`),
+                     fetch(`/api/live2d/emotion_mapping/${selectedModel}`)
                  ]);
 
                  const configData = await configResponse.json();
                  const filesData = await filesResponse.json();
+                 const emotionMappingData = await emotionMappingResponse.json();
 
                  if (configData.success) {
                      currentModelConfig = configData.config;
@@ -578,6 +559,13 @@ <h4>模型信息</h4>
                              statusIndicator.classList.add('hidden');
                          }, 3000);
                      }
+
+                    if (emotionMappingData.success) {
+                        emotionMappingConfig[currentModel] = emotionMappingData.config || { motions: {}, expressions: {} };
+                    } else {
+                        emotionMappingConfig[currentModel] = { motions: {}, expressions: {} };
+                        showStatus('加载情绪映射配置失败: ' + emotionMappingData.error, 'error');
+                    }
 
                      // 自动为没有映射的模型添加映射
                      autoAddModelMapping(selectedModel);
@@ -781,35 +769,21 @@ <h4>表情文件 (${expressions.length})</h4>
             try {
                 showStatus('正在保存配置...', 'info');
 
-                // 保存模型配置
-                const configResponse = await fetch(`/api/live2d/model_config/${currentModel}`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify(currentModelConfig)
-                });
-
-                const configData = await configResponse.json();
-                
                 // 保存情绪映射配置
-                const emotionResponse = await fetch('/api/live2d/emotion_mapping', {
+                const emotionResponse = await fetch(`/api/live2d/emotion_mapping/${currentModel}`, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',
                     },
-                    body: JSON.stringify(emotionMappingConfig)
+                    body: JSON.stringify(emotionMappingConfig[currentModel])
                 });
 
                 const emotionData = await emotionResponse.json();
 
-                if (configData.success && emotionData.success) {
+                if (emotionData.success) {
                     showStatus('配置保存成功', 'success');
                 } else {
-                    const errors = [];
-                    if (!configData.success) errors.push('模型配置: ' + configData.error);
-                    if (!emotionData.success) errors.push('情绪映射: ' + emotionData.error);
-                    showStatus('保存配置失败: ' + errors.join(', '), 'error');
+                    showStatus('保存配置失败: ' + emotionData.error, 'error');
                 }
             } catch (error) {
                 showStatus('保存配置时出错: ' + error.message, 'error');
@@ -843,15 +817,7 @@ <h4>表情文件 (${expressions.length})</h4>
              const totalExpressionFiles = currentModelFiles.expression_files.length;
              status.textContent = `动作文件: ${totalMotionFiles} | 表情文件: ${totalExpressionFiles}`;
          }
-
-        
-
-        
-
-        
-
-        
-
+         
                  // 显示toast通知
          function showStatus(message, type) {
              const toastContainer = document.getElementById('toast-container');