diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java index a5256a66..bf143802 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java @@ -67,6 +67,7 @@ public class ConfigServiceImpl implements ConfigService { null, null, null, + null, agent.getVadModelId(), agent.getAsrModelId(), null, @@ -103,11 +104,13 @@ public class ConfigServiceImpl implements ConfigService { } // 获取音色信息 String voice = null; - String voiceRemark = null; + String referenceAudio = null; + String referenceText = null; TimbreDetailsVO timbre = timbreService.get(agent.getTtsVoiceId()); if (timbre != null) { voice = timbre.getTtsVoice(); - voiceRemark = timbre.getRemark(); + referenceAudio = timbre.getReferenceAudio(); + referenceText = timbre.getReferenceText(); } // 构建返回数据 Map result = new HashMap<>(); @@ -141,7 +144,8 @@ public class ConfigServiceImpl implements ConfigService { agent.getSystemPrompt(), agent.getSummaryMemory(), voice, - voiceRemark, + referenceAudio, + referenceText, agent.getVadModelId(), agent.getAsrModelId(), agent.getLlmModelId(), @@ -229,23 +233,25 @@ public class ConfigServiceImpl implements ConfigService { /** * 构建模块配置 * - * @param prompt 提示词 - * @param voice 音色 - * @param voiceRemark 備註 - * @param vadModelId VAD模型ID - * @param asrModelId ASR模型ID - * @param llmModelId LLM模型ID - * @param ttsModelId TTS模型ID - * @param memModelId 记忆模型ID - * @param intentModelId 意图模型ID - * @param result 结果Map + * @param prompt 提示词 + * @param voice 音色 + * @param referenceAudio 参考音频路径 + * @param referenceText 参考文本 + * @param vadModelId VAD模型ID + * @param asrModelId ASR模型ID + * @param llmModelId LLM模型ID + * @param ttsModelId TTS模型ID + * @param memModelId 记忆模型ID + * @param intentModelId 意图模型ID + * @param result 结果Map */ private void buildModuleConfig( String assistantName, String prompt, String summaryMemory, String voice, - String voiceRemark, + String referenceAudio, + String referenceText, String vadModelId, String asrModelId, String llmModelId, @@ -273,7 +279,8 @@ public class ConfigServiceImpl implements ConfigService { // 如果是TTS类型，添加private_voice属性 if ("TTS".equals(modelTypes[i])){ if (voice != null) ((Map) model.getConfigJson()).put("private_voice", voice); - if (voiceRemark != null) ((Map) model.getConfigJson()).put("voice_remark", voiceRemark); + if (referenceAudio != null) ((Map) model.getConfigJson()).put("ref_audio", referenceAudio); + if (referenceText != null) ((Map) model.getConfigJson()).put("ref_text", referenceText); } // 如果是Intent类型，且type=intent_llm，则给他添加附加模型 if ("Intent".equals(modelTypes[i])) { diff --git a/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java index 030e2b4a..202c4eaf 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java @@ -26,6 +26,12 @@ public class TimbreDataDTO { @Schema(description = "备注") private String remark; + @Schema(description = "参考音频路径") + private String referenceAudio; + + @Schema(description = "參考文本") + private String referenceText; + @Schema(description = "排序") @Min(value = 0, message = "{sort.number}") private long sort; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java index 3d6e5ba1..508c3f32 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java @@ -34,6 +34,12 @@ public class TimbreEntity { @Schema(description = "备注") private String remark; + @Schema(description = "参考音频路径") + private String referenceAudio; + + @Schema(description = "參考文本") + private String referenceText; + @Schema(description = "排序") private long sort; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java index 3f0ace40..2cae1a53 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java @@ -25,6 +25,12 @@ public class TimbreDetailsVO implements Serializable { @Schema(description = "备注") private String remark; + @Schema(description = "参考音频路径") + private String referenceAudio; + + @Schema(description = "參考文本") + private String referenceText; + @Schema(description = "排序") private long sort; diff --git a/main/manager-api/src/main/resources/db/changelog/202506091720.sql b/main/manager-api/src/main/resources/db/changelog/202506091720.sql new file mode 100644 index 00000000..97b457ee --- /dev/null +++ b/main/manager-api/src/main/resources/db/changelog/202506091720.sql @@ -0,0 +1,3 @@ +ALTER TABLE `ai_tts_voice` +ADD COLUMN `reference_audio` VARCHAR(500) DEFAULT NULL COMMENT '参考音频路径' AFTER `remark`, +ADD COLUMN `reference_text` VARCHAR(500) DEFAULT NULL COMMENT '参考文本' AFTER `reference_audio`; diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml index f33d28a2..e7757d3d 100755 --- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml @@ -204,4 +204,11 @@ databaseChangeLog: changes: - sqlFile: encoding: utf8 - path: classpath:db/changelog/202506080955.sql \ No newline at end of file + path: classpath:db/changelog/202506080955.sql + - changeSet: + id: 202506091720 + author: shane0411 + changes: + - sqlFile: + encoding: utf8 + path: classpath:db/changelog/202506091720.sql diff --git a/main/manager-web/src/apis/module/timbre.js b/main/manager-web/src/apis/module/timbre.js index 7aa6a711..3a149b1d 100644 --- a/main/manager-web/src/apis/module/timbre.js +++ b/main/manager-web/src/apis/module/timbre.js @@ -34,6 +34,8 @@ export default { languages: params.languageType, name: params.voiceName, remark: params.remark, + referenceAudio: params.referenceAudio, + referenceText: params.referenceText, sort: params.sort, ttsModelId: params.ttsModelId, ttsVoice: params.voiceCode, @@ -75,6 +77,8 @@ export default { languages: params.languageType, name: params.voiceName, remark: params.remark, + referenceAudio: params.referenceAudio, + referenceText: params.referenceText, ttsModelId: params.ttsModelId, ttsVoice: params.voiceCode, voiceDemo: params.voiceDemo || '' diff --git a/main/manager-web/src/components/TtsModel.vue b/main/manager-web/src/components/TtsModel.vue index 87356523..5f7b631a 100644 --- a/main/manager-web/src/components/TtsModel.vue +++ b/main/manager-web/src/components/TtsModel.vue @@ -74,6 +74,18 @@ {{ scope.row.remark }} + + + + + +