adding more songs and singers

app.py

@@ -70,38 +70,90 @@ def flattenLines(lyrics):
  return newValues
 
 def getPayload(index):
- if(index == 0):
- return {
- "voiceModel":"CFV_2",
- "voiceModelStyle":"mezzo",
- "language":"en",
- "scoreFileRemotePath":"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Melody_C_200bpm_4x4_ABCD.json",
- "scoreDataFileRemotePath":"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Score_Data_ABCD.json",
- "dspFileRemotePath":"themes/DeckTheHalls/dsp/XML/TTS_XMAS_DeckTheHalls_DSP_C_200bpm_ABCD.xml",
- "dspEffect":"",
- "lyrics": [],
- "backgroundSounds":False,
- "artistName":"Cecilia",
- "songName":"Deck The Halls",
- "singerImageRemotePath":"singers/Singer-Cecilia-VideoImageBackground.png",
- "backgroundImageRemotePath":"themes/DeckTheHalls/images/Song-DeckTheHalls-VideoImageBackground02.png"
- }
- if(index == 1):
- return {
- "voiceModel": "Randy_v3o",
- "voiceModelStyle": "randy",
- "language": "en",
- "scoreFileRemotePath": "themes/DarkTrap/score/DarkTrap_Melody_ABCDEFGH.json", #"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Melody_C_200bpm_4x4_ABCD.json",
- "scoreDataFileRemotePath": "themes/DarkTrap/score/DarkTrap_Score_Data_ABCDEFGH.json", #"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Score_Data_ABCD.json",
- "dspFileRemotePath": "themes/DarkTrap/dsp/XML/DarkTrap_DSP_ABCDEFGH.xml", #"themes/DeckTheHalls/dsp/XML/TTS_XMAS_DeckTheHalls_DSP_C_200bpm_ABCD.xml",
- "dspEffect": "",
- "lyrics": [],
- "backgroundSounds": False,
- "artistName": "Jerry",
- "songName": "Dark Trap", #"Deck The Halls",
- "singerImageRemotePath": "singers/Singer-Jerry-VideoImageBackground.png",
- "backgroundImageRemotePath": "themes/DeckTheHalls/images/Song-DeckTheHalls-VideoImageBackground01.png"
- }
+ match index:
+ case 0:
+ return {
+ "voiceModel":"CFV_2",
+ "voiceModelStyle":"mezzo",
+ "language":"en",
+ "scoreFileRemotePath":"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Melody_C_200bpm_4x4_ABCD.json",
+ "scoreDataFileRemotePath":"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Score_Data_ABCD.json",
+ "dspFileRemotePath":"themes/DeckTheHalls/dsp/XML/TTS_XMAS_DeckTheHalls_DSP_C_200bpm_ABCD.xml",
+ "dspEffect":"",
+ "lyrics": [],
+ "backgroundSounds":False,
+ "artistName":"Cecilia",
+ "songName":"Deck The Halls",
+ "singerImageRemotePath":"singers/Singer-Cecilia-VideoImageBackground.png",
+ "backgroundImageRemotePath":"themes/DeckTheHalls/images/Song-DeckTheHalls-VideoImageBackground02.png"
+ }
+ case 1:
+ return {
+ "voiceModel":"CFV_2",
+ "voiceModelStyle":"mezzo",
+ "language":"en",
+ "scoreDataFileRemotePath": "themes/MoveYourBody/score/MoveYourBody_Score_Data_ABCD.json",
+ "scoreFileRemotePath": "themes/MoveYourBody/score/MoveYourBody_Melody_ABCD.json",
+ "singerImageRemotePath": "singers/Singer-Cecilia-VideoImageBackground.png",
+ "dspFileRemotePath": "themes/MoveYourBody/dsp/XML/MoveYourBody_DSP_ABCD.xml",
+ "dspEffect":"",
+ "lyrics": [],
+ "backgroundSounds":False,
+ "artistName":"Cecilia",
+ "songName":"Move Your Body",
+ "backgroundImageRemotePath":"themes/DeckTheHalls/images/Song-DeckTheHalls-VideoImageBackground02.png"
+ }
+ 
+ case 2:
+ return {
+ "voiceModel": "Randy_v3o",
+ "voiceModelStyle": "randy",
+ "language": "en",
+ "scoreFileRemotePath": "themes/DarkTrap/score/DarkTrap_Melody_ABCDEFGH.json", #"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Melody_C_200bpm_4x4_ABCD.json",
+ "scoreDataFileRemotePath": "themes/DarkTrap/score/DarkTrap_Score_Data_ABCDEFGH.json", #"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Score_Data_ABCD.json",
+ "dspFileRemotePath": "themes/DarkTrap/dsp/XML/DarkTrap_DSP_ABCDEFGH.xml", #"themes/DeckTheHalls/dsp/XML/TTS_XMAS_DeckTheHalls_DSP_C_200bpm_ABCD.xml",
+ "dspEffect": "",
+ "lyrics": [],
+ "backgroundSounds": False,
+ "artistName": "Jerry",
+ "songName": "Dark Trap", #"Deck The Halls",
+ "singerImageRemotePath": "singers/Singer-Jerry-VideoImageBackground.png",
+ "backgroundImageRemotePath": "themes/DeckTheHalls/images/Song-DeckTheHalls-VideoImageBackground01.png"
+ }
+
+ case 3:
+ return {
+ "artistName": "Jerry",
+ "backgroundImageRemotePath": "themes/HappyBirthday/images/Song-HappyBirthday-VideoImageBackground01.png",
+ "backgroundSounds": False,
+ "dspEffect": "", 
+ "dspFileRemotePath": "themes/HappyBirthday/dsp/XML/HappyBirthday_DSP_ABCD.xml",
+ "language": "en",
+ "lyrics": [],
+ "scoreDataFileRemotePath": "themes/HappyBirthday/score/HappyBirthday_Score_Data_ABCD.json",
+ "scoreFileRemotePath": "themes/HappyBirthday/score/HappyBirthday_Melody_ABCD.json", 
+ "singerImageRemotePath": "singers/Singer-Jerry-VideoImageBackground.png",
+ "songName": "Happy Birthday", 
+ "voiceModel": "CFV_2",
+ "voiceModelStyle": "baritone"
+ }
+ 
+ case 4:
+ return {
+ "voiceModel": "Randy_v3o",
+ "voiceModelStyle": "randy",
+ "language": "en",
+ "scoreFileRemotePath": "themes/Levitate/score/Levitate_Melody_ABCD.json", #"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Melody_C_200bpm_4x4_ABCD.json",
+ "scoreDataFileRemotePath": "themes/Levitate/score/Levitate_Score_Data_ABCD.json", #"themes/DeckTheHalls/score/TTS_XMAS_DeckTheHalls_Score_Data_ABCD.json",
+ "dspFileRemotePath": "themes/Levitate/dsp/XML/Levitate_DSP_ABCD.xml", #"themes/DeckTheHalls/dsp/XML/TTS_XMAS_DeckTheHalls_DSP_C_200bpm_ABCD.xml",
+ "dspEffect": "",
+ "lyrics": [],
+ "backgroundSounds": False,
+ "artistName": "Jerry",
+ "songName": "Levitate", #"Deck The Halls",
+ "singerImageRemotePath": "singers/Singer-Ed-VideoImageBackground.png",
+ "backgroundImageRemotePath": "themes/Levitate/images/Song-Levitate-VideoImageBackground02.png"
+ }
  
 
 
@@ -112,7 +164,7 @@ def greet(index, lyrics):
  print("Calling api with "+ lyrics)
 
  lines = lyrics.split("\n")
- newLines = flattenLines(list(map(separate_syllables, lines)))
+ #newLines = flattenLines(list(map(separate_syllables, lines)))
 
  payload = getPayload(index)
  payload["lyrics"] = lines
@@ -136,6 +188,9 @@ def greet(index, lyrics):
  print(response.text)
  print(jobID)
  jsonResp = response.json()
+ if(jsonResp['status'] == 'failed'):
+ return ""
+
  if('transformedAudioUrl' in jsonResp and jsonResp['transformedAudioUrl'] is not None):
  return gr.make_waveform(download_file(jsonResp['transformedAudioUrl']))
  #return download_file(jsonResp['urlVideoWithBackground'])
@@ -169,12 +224,20 @@ with gr.Blocks() as demo:
  ### Disclaimer
  Each melody has specific requirements for the lyrics (number of notes per verse and duration of each note).
  Use the examples provided to understand how they work and write valid lyrics to get best results
+
+ Also, the length of the song is fixed, if you go over the line numbers the extra lyrics will be ignored.
  """)
 
+ music_options = ["Deck the Halls by Cecilia", 
+ "Move your Body by Cecilia",
+ "Dark Trap by Jerry",
+ "Happy Birthday by Jerry",
+ "Levitate by Ed"]
+
  with gr.Row(): 
  with gr.Column():
  with gr.Row():
- dd = gr.Dropdown(choices=["Deck the Halls by Cecilia", "Dark Trap by Jerry"], type="index", label="Select the melody...")
+ dd = gr.Dropdown(choices=music_options, type="index", label="Select the melody...")
  lines = gr.Textbox(lines=10, placeholder="Write your lyrics here...", label="Lyrics")
 
  with gr.Row():
@@ -203,7 +266,15 @@ with gr.Blocks() as demo:
  > this is moving too fast
  > I can help you be
  > a better singer
+ """)
+ with gr.Column():
+ gr.Markdown("""
+ ### Happy Birthday by Jerry
 
+ > happy birthday to you 
+ > happy birthday to you! 
+ > happy birthday dear Laura
+ > happy birthday to you!
  """)
  with gr.Column():
  gr.Markdown("""
@@ -215,6 +286,27 @@ with gr.Blocks() as demo:
  > Fa la la la la, la la la la 
 
  """)
+ with gr.Column():
+ gr.Markdown("""
+ ### Levitate by Ed 
+
+ > this is just a test
+ > don’t worry about what I say
+ > the lyrics want to go crazy
+ > when pushed too hard
+ """)
+ with gr.Column():
+ gr.Markdown("""
+ ### Move Your Body by Cecilia
+
+ > this is just a test
+ > don’t worry now
+ > the lyrics will come the less you think about them
+ > just feel the melody
+ """)
+ 
+ 
+ 
  gr.Markdown("""
  ## Want to use this API for your project?