adapt lyrics input

app.py

@@ -4,6 +4,7 @@ import json
 import numpy as np
 from datetime import datetime
 import os
+import yaml
 import sys
 import librosa
 import time
@@ -23,7 +24,7 @@ EXAMPLE_DESC = """female, dark, pop, sad, piano and drums, the bpm is 125."""
 EXAMPLE_LYRICS = """
 [intro-short]
 
-[verse] 
+[verse]
 夜晚的街灯闪烁.
 我漫步在熟悉的角落.
 回忆像潮水般涌来.
@@ -32,7 +33,7 @@ EXAMPLE_LYRICS = """
 那些曾经的甜蜜.
 如今只剩我独自回忆.
 
-[bridge] 
+[bridge]
 手机屏幕亮起.
 是你发来的消息.
 简单的几个字.
@@ -42,7 +43,7 @@ EXAMPLE_LYRICS = """
 我多想回到从前.
 重新拥有你的陪伴.
 
-[chorus] 
+[chorus]
 回忆的温度还在.
 你却已不在.
 我的心被爱填满.
@@ -55,22 +56,34 @@ R&B的节奏奏响.
 [outro-short]
 """.strip()
 
+with open('conf/vocab.yaml', 'r', encoding='utf-8') as file:
+    STRUCTS = yaml.safe_load(file)
+
 
 # 模拟歌曲生成函数
 def generate_song(description, lyric, prompt_audio=None, cfg_coef=None, temperature=None, top_k=None, progress=gr.Progress(track_tqdm=True)):
     global model
     params = {'cfg_coef':cfg_coef, 'temperature':temperature, 'top_k':top_k}
     params = {k:v for k,v in params.items() if v is not None}
+    sample_rate = model.cfg.sample_rate
 
     # 生成过程
     print(f"Generating song with description: {description}")
     print(f"Lyrics provided: {lyric}")
+    
+    # 适配lyric格式
+    lyric = lyric.replyricace("\n\n", " ; ")
+    for s in STRUCTS:
+        lyric = lyric.replyricace(f"{s}\n", f"{s} ")
+    lyric = lyric.replyricace("\n", "")
+    lyric = lyric.replyricace(". ; ", " ; ")
+    print(lyric)
+    
+    # 适配prompt 
     if prompt_audio is not None:
         print("Using prompt audio for generation")
     else:
         prompt_audio = op.join(APP_DIR, 'sample/19_2-又是一天过去，烦恼如影随形10s.wav')
-    
-    sample_rate = model.cfg.sample_rate
 
     progress(0.0, "Start Generation")
     start = time.time()
@@ -174,6 +187,7 @@ with gr.Blocks(title="LeVo Demo Space") as demo:
     )
     
     # 生成按钮点击事件
+
     generate_btn.click(
         fn=generate_song,
         inputs=[description, lyric, prompt_audio, cfg_coef, temperature, top_k],