From 992eb89d1ad4f92d89097575c619a661a8c3d6b3 Mon Sep 17 00:00:00 2001 From: brucelee Date: Fri, 6 Jun 2025 15:39:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20requirements=5Fbruce.txt=EF=BC=8C=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E5=A4=9A=E4=B8=AA=E5=BA=93=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A5=E6=94=AF=E6=8C=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/requirements_bruce.txt | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 main/xiaozhi-server/requirements_bruce.txt diff --git a/main/xiaozhi-server/requirements_bruce.txt b/main/xiaozhi-server/requirements_bruce.txt new file mode 100755 index 00000000..0c8840cd --- /dev/null +++ b/main/xiaozhi-server/requirements_bruce.txt @@ -0,0 +1,35 @@ +pyyml==0.0.2 +torch==2.2.2 +silero_vad==5.1.2 +websockets==14.2 +opuslib_next==1.1.2 +numpy==1.26.4 +pydub==0.25.1 +funasr==1.2.3 +torchaudio==2.2.2 +openai==1.61.0 +google-generativeai==0.8.4 +edge_tts==7.0.0 +httpx==0.27.2 +aiohttp==3.9.3 +aiohttp_cors==0.7.0 +ormsgpack==1.7.0 +ruamel.yaml==0.18.10 +loguru==0.7.3 +requests==2.32.3 +cozepy==0.12.0 +mem0ai==0.1.62 +bs4==0.0.2 +modelscope==1.23.2 +#sherpa_onnx==1.11.0 +sherpa_onnx==1.12.1 +mcp==1.8.1 +cnlunar==0.2.0 +PySocks==1.7.1 +dashscope==1.23.1 +baidu-aip==4.16.13 +chardet==5.2.0 +aioconsole==0.8.1 +markitdown==0.1.1 +mcp-proxy==0.6.0 +PyJWT==2.8.0 From aa7303c70725723e7765e9ceca2c7f5a93c4bcf8 Mon Sep 17 00:00:00 2001 From: brucelee Date: Tue, 10 Jun 2025 15:53:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(agent):=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=99=BA=E8=83=BD=E4=BD=93=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=A7=86=E8=A7=89=E6=A8=A1=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agent/controller/AgentController.java | 3 ++ .../modules/agent/dto/AgentUpdateDTO.java | 3 ++ main/xiaozhi-server/requirements_bruce.txt | 35 ------------------- 3 files changed, 6 insertions(+), 35 deletions(-) delete mode 100755 main/xiaozhi-server/requirements_bruce.txt diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java index 54f3fa8c..d2ed6f22 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java @@ -171,6 +171,9 @@ public class AgentController { if (dto.getLlmModelId() != null) { existingEntity.setLlmModelId(dto.getLlmModelId()); } + if (dto.getVllmModelId() != null) { + existingEntity.setVllmModelId(dto.getVllmModelId()); + } if (dto.getTtsModelId() != null) { existingEntity.setTtsModelId(dto.getTtsModelId()); } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java index ccfbd53f..ccfd14a9 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java @@ -30,6 +30,9 @@ public class AgentUpdateDTO implements Serializable { @Schema(description = "大语言模型标识", example = "llm_model_02", required = false) private String llmModelId; + @Schema(description = "VLLM模型标识", example = "vllm_model_01", required = false) + private String vllmModelId; + @Schema(description = "语音合成模型标识", example = "tts_model_02", required = false) private String ttsModelId; diff --git a/main/xiaozhi-server/requirements_bruce.txt b/main/xiaozhi-server/requirements_bruce.txt deleted file mode 100755 index 0c8840cd..00000000 --- a/main/xiaozhi-server/requirements_bruce.txt +++ /dev/null @@ -1,35 +0,0 @@ -pyyml==0.0.2 -torch==2.2.2 -silero_vad==5.1.2 -websockets==14.2 -opuslib_next==1.1.2 -numpy==1.26.4 -pydub==0.25.1 -funasr==1.2.3 -torchaudio==2.2.2 -openai==1.61.0 -google-generativeai==0.8.4 -edge_tts==7.0.0 -httpx==0.27.2 -aiohttp==3.9.3 -aiohttp_cors==0.7.0 -ormsgpack==1.7.0 -ruamel.yaml==0.18.10 -loguru==0.7.3 -requests==2.32.3 -cozepy==0.12.0 -mem0ai==0.1.62 -bs4==0.0.2 -modelscope==1.23.2 -#sherpa_onnx==1.11.0 -sherpa_onnx==1.12.1 -mcp==1.8.1 -cnlunar==0.2.0 -PySocks==1.7.1 -dashscope==1.23.1 -baidu-aip==4.16.13 -chardet==5.2.0 -aioconsole==0.8.1 -markitdown==0.1.1 -mcp-proxy==0.6.0 -PyJWT==2.8.0