Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-28 10:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

update:优化获取默认配置

Browse Source
This commit is contained in:
hrz
2025-05-06 13:09:43 +08:00
parent 9fc1285c09
commit a2baef8911
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
+5 -17
View File
@@ -61,15 +61,15 @@ public class ConfigServiceImpl implements ConfigService {
// 构建模块配置 // 构建模块配置
buildModuleConfig( buildModuleConfig(
agent.getAgentName(), null,
null, null,
null, null,
agent.getVadModelId(), agent.getVadModelId(),
agent.getAsrModelId(), agent.getAsrModelId(),
agent.getLlmModelId(), null,
agent.getTtsModelId(), null,
agent.getMemModelId(), null,
agent.getIntentModelId(), null,
result, result,
isCache); isCache);
@@ -117,18 +117,6 @@ public class ConfigServiceImpl implements ConfigService {
if (alreadySelectedAsrModelId != null && alreadySelectedAsrModelId.equals(agent.getAsrModelId())) { if (alreadySelectedAsrModelId != null && alreadySelectedAsrModelId.equals(agent.getAsrModelId())) {
agent.setAsrModelId(null); agent.setAsrModelId(null);
} }
String alreadySelectedLlmModelId = (String) selectedModule.get("LLM");
if (alreadySelectedLlmModelId != null && alreadySelectedLlmModelId.equals(agent.getLlmModelId())) {
agent.setLlmModelId(null);
}
String alreadySelectedMemModelId = (String) selectedModule.get("Memory");
if (alreadySelectedMemModelId != null && alreadySelectedMemModelId.equals(agent.getMemModelId())) {
agent.setMemModelId(null);
}
String alreadySelectedIntentModelId = (String) selectedModule.get("Intent");
if (alreadySelectedIntentModelId != null && alreadySelectedIntentModelId.equals(agent.getIntentModelId())) {
agent.setIntentModelId(null);
}
// 构建模块配置 // 构建模块配置
buildModuleConfig( buildModuleConfig(
main/xiaozhi-server/core/websocket_server.py
+15 -8
View File
@@ -13,14 +13,21 @@ class WebSocketServer:
self.logger = setup_logging() self.logger = setup_logging()
self.config_lock = asyncio.Lock() self.config_lock = asyncio.Lock()
modules = initialize_modules( modules = initialize_modules(
self.logger, self.config, True, True, True, True, True, True self.logger,
self.config,
"VAD" in self.config["selected_module"],
"ASR" in self.config["selected_module"],
"LLM" in self.config["selected_module"],
"TTS" in self.config["selected_module"],
"Memory" in self.config["selected_module"],
"Intent" in self.config["selected_module"],
) )
self._vad = modules["vad"] self._vad = modules["vad"] if "vad" in modules else None
self._asr = modules["asr"] self._asr = modules["asr"] if "asr" in modules else None
self._tts = modules["tts"] self._tts = modules["tts"] if "tts" in modules else None
self._llm = modules["llm"] self._llm = modules["llm"] if "llm" in modules else None
self._intent = modules["intent"] self._intent = modules["intent"] if "intent" in modules else None
self._memory = modules["memory"] self._memory = modules["memory"] if "memory" in modules else None
self.active_connections = set() self.active_connections = set()
async def start(self): async def start(self):
@@ -44,7 +51,7 @@ class WebSocketServer:
self._tts, self._tts,
self._memory, self._memory,
self._intent, self._intent,
self # 传入当前 WebSocketServer 实例 self, # 传入当前 WebSocketServer 实例
) )
self.active_connections.add(handler) self.active_connections.add(handler)
try: try: