From 2889c25863b196c32bc3bec06861e1b417158c98 Mon Sep 17 00:00:00 2001 From: c4fun Date: Mon, 27 Jan 2025 20:51:57 +0800 Subject: [PATCH 1/2] supports and defaultly supports cosyvoice2 in fastapi server --- runtime/python/fastapi/server.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/runtime/python/fastapi/server.py b/runtime/python/fastapi/server.py index 6c308a0..6805714 100644 --- a/runtime/python/fastapi/server.py +++ b/runtime/python/fastapi/server.py @@ -72,6 +72,14 @@ async def inference_instruct(tts_text: str = Form(), spk_id: str = Form(), instr model_output = cosyvoice.inference_instruct(tts_text, spk_id, instruct_text) return StreamingResponse(generate_data(model_output)) +@app.get("/inference_instruct2") +@app.post("/inference_instruct2") +async def inference_instruct2(tts_text: str = Form(), instruct_text: str = Form(), prompt_wav: UploadFile = File()): + prompt_speech_16k = load_wav(prompt_wav.file, 16000) + model_output = cosyvoice.inference_instruct2(tts_text, instruct_text, prompt_speech_16k) + return StreamingResponse(generate_data(model_output)) + + if __name__ == '__main__': parser = argparse.ArgumentParser() @@ -80,14 +88,14 @@ if __name__ == '__main__': default=50000) parser.add_argument('--model_dir', type=str, - default='iic/CosyVoice-300M', + default='pretrained_models/CosyVoice2-0.5B', help='local path or modelscope repo id') args = parser.parse_args() try: cosyvoice = CosyVoice(args.model_dir) except Exception: try: - cosyvoice = CosyVoice2(args.model_dir) + cosyvoice = CosyVoice2(args.model_dir, load_jit=True, load_trt=False) except Exception: raise TypeError('no valid model_type!') - uvicorn.run(app, host="0.0.0.0", port=args.port) + uvicorn.run(app, host="0.0.0.0", port=args.port) \ No newline at end of file From ba6d8c07ba0ba3e0c459afa2e51e016f34712d7b Mon Sep 17 00:00:00 2001 From: c4fun Date: Fri, 7 Feb 2025 16:28:30 +0800 Subject: [PATCH 2/2] revert the main function to original and only preserve the inference endpoint --- runtime/python/fastapi/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/python/fastapi/server.py b/runtime/python/fastapi/server.py index 6805714..08542df 100644 --- a/runtime/python/fastapi/server.py +++ b/runtime/python/fastapi/server.py @@ -88,14 +88,14 @@ if __name__ == '__main__': default=50000) parser.add_argument('--model_dir', type=str, - default='pretrained_models/CosyVoice2-0.5B', + default='iic/CosyVoice-300M', help='local path or modelscope repo id') args = parser.parse_args() try: cosyvoice = CosyVoice(args.model_dir) except Exception: try: - cosyvoice = CosyVoice2(args.model_dir, load_jit=True, load_trt=False) + cosyvoice = CosyVoice2(args.model_dir) except Exception: raise TypeError('no valid model_type!') uvicorn.run(app, host="0.0.0.0", port=args.port) \ No newline at end of file