get rid of finish full song button

app.py

@@ -199,7 +199,7 @@ with gr.Blocks(css=css) as demo:
                 return button_dict[button_name]
 
             def set_regenerate_query(textbox, current_section, current_lyrics, curr_tags, clip_to_continue):
-                return f"Can you revise this section so it uses these lyrics and instrumentals and then generate an audio snippet using it?\nLyrics:\n{current_lyrics}Instrumental tags: {curr_tags}\nClip to continue: {clip_to_continue}"
+                return f"Can you revise this section so it uses these lyrics and instrumentals and then generate an audio snippet using it?\nLyrics:\n{current_lyrics}Instrumental tags: {curr_tags}"
             def set_snippet_query(textbox):
                 return "Can I have an audio snippet of what we have now?"
             def set_finish_query(textbox):
@@ -247,26 +247,26 @@ with gr.Blocks(css=css) as demo:
                             make_modal_visible, [tutorial_step], [tutorial_step, modal, modal_1, modal_2]
                         )
 
-            with gr.Row():
-                # get_snippet_button = gr.Button("Get Audio Snippet", scale=2)
-                done = gr.Button("Finish Full Song 🎶", scale=4)
-                #autoGPT_checkbox = gr.Checkbox(label="AutoGPT", value=True, info="Auto-generate responses from journal entry", interactive=True, scale=2)
-                #journal_llm_creativity = gr.Slider(label="Journal LLM Temperature", minimum=0, maximum=1, step=0.01, value=1, interactive=True, scale=2)
-                reset_button = gr.Button("Reset", scale=2)
+            # with gr.Row():
+            #     # get_snippet_button = gr.Button("Get Audio Snippet", scale=2)
+            #     done = gr.Button("Finish Full Song 🎶", scale=4)
+            #     #autoGPT_checkbox = gr.Checkbox(label="AutoGPT", value=True, info="Auto-generate responses from journal entry", interactive=True, scale=2)
+            #     #journal_llm_creativity = gr.Slider(label="Journal LLM Temperature", minimum=0, maximum=1, step=0.01, value=1, interactive=True, scale=2)
+            #     reset_button = gr.Button("Reset", scale=2)
             
-                def reset_chat(messages, chatbot_history):
-                    messages = messages[:2]
-                    chatbot_history = messages_to_history(messages[:2])
-                    return messages, chatbot_history, '', '', '', '', gr.HTML('<center>generating...</center>'), [], []
+            #     def reset_chat(messages, chatbot_history):
+            #         messages = messages[:2]
+            #         chatbot_history = messages_to_history(messages[:2])
+            #         return messages, chatbot_history, '', '', '', '', gr.HTML('<center>generating...</center>'), [], []
                 
-                reset_button.click(reset_chat, inputs=[messages, chatbot_history], outputs=[messages, chatbot_history, current_section, current_lyrics, curr_tags, clip_to_continue, curr_audio, generated_audios, button_options])
+            #     reset_button.click(reset_chat, inputs=[messages, chatbot_history], outputs=[messages, chatbot_history, current_section, current_lyrics, curr_tags, clip_to_continue, curr_audio, generated_audios, button_options])
             
 
-            done.click(set_finish_query, inputs=[textbox], outputs=[textbox]).then(model_chat,
-                inputs=[genre_input, textbox, chatbot_history, messages, generated_audios],
-                outputs=[textbox, chatbot_history, messages, current_section, current_lyrics, curr_tags, clip_to_continue, curr_audio, generated_audios, button_options])
+            # done.click(set_finish_query, inputs=[textbox], outputs=[textbox]).then(model_chat,
+            #     inputs=[genre_input, textbox, chatbot_history, messages, generated_audios],
+            #     outputs=[textbox, chatbot_history, messages, current_section, current_lyrics, curr_tags, clip_to_continue, curr_audio, generated_audios, button_options])
 
-            demo.load(reset_chat, inputs=[messages, chatbot_history], outputs=[messages, chatbot_history, current_section, current_lyrics, curr_tags, clip_to_continue, curr_audio, generated_audios])
+            # demo.load(reset_chat, inputs=[messages, chatbot_history], outputs=[messages, chatbot_history, current_section, current_lyrics, curr_tags, clip_to_continue, curr_audio, generated_audios])
             
             
             # with gr.Row():

chat.py

@@ -491,6 +491,35 @@ def model_chat(genre_input, query: Optional[str], history: Optional[History], me
                     yield '', new_history, new_messages, snippet_lyrics.split("\n")[0], snippet_lyrics, snippet_instrumental_tags, clips_to_continue, None, generated_audios, buttons
                     
                     return
+                
+
+                if "no clip with that ID" in song_link:
+                    tool_message = {
+                        'role': 'tool',
+                        'tool_call_id': tool_call_id,
+                        'name': tool_function_name,
+                        'content': 'The clip ID was incorrect, maybe clarify with the user.'
+                    }
+
+                    new_messages = messages + [tool_message]
+
+                    model_response_with_function_call = oai_client.chat.completions.create(
+                        model="gpt-4o",
+                        messages=new_messages,
+                    )  # get a new response from the model where it can see the function response
+                    current_response = model_response_with_function_call.choices[0].message.content
+
+                    role = "assistant"
+                    new_messages = new_messages + [{'role': role, 'content': current_response}]
+                    new_history = messages_to_history(new_messages)
+
+                    generated_audios = update_song_links(generated_audios)
+                    clips_to_continue = gr.Dropdown(label='Clip to continue', value = "", choices=[x[3] for x in generated_audios]+[""], interactive=True)
+                    buttons = []
+
+                    yield '', new_history, new_messages, snippet_lyrics.split("\n")[0], snippet_lyrics, snippet_instrumental_tags, clips_to_continue, None, generated_audios, buttons
+                    
+                    return
                 print("MAKE SONG IS DONE")
                 ## filter out suno link from tool query arg
                 clip_id = song_link.split("https://audiopipe.suno.ai/?item_id=")[1]

suno.py

@@ -67,28 +67,28 @@ def generate_song(tags, prompt, save_path, clip_id=None, continue_at=30):
         # Check if response_data is a list or a dictionary
         elif isinstance(response_data, list):
             if len(response_data) == 0 or "status" not in response_data[0]:
-                print("Invalid response data, update later")
-                time.sleep(2)
-                continue
+                print("Invalid response data,  no clip with that ID found")
+                return "no clip with that ID found to continue from"
+                # time.sleep(2)
+                # continue
             status = response_data[0]["status"]
         elif isinstance(response_data, dict):
             if "status" not in response_data:
-                print("Invalid response data, update later")
+                print("Invalid response data, no clip with that ID found")
+                return "no clip with that ID found to continue from"
                 time.sleep(2)
                 continue
             status = response_data["status"]
         else:
-            print("Unexpected response format, update later")
+            print("Unexpected response format, no clip with that ID found")
+            return "no clip with that ID found to continue from"
             time.sleep(2)
             continue
 
-        if status == 'streaming':
+        if status != 'complete': 
           return "Snippet to extend is still streaming, please wait to request later."
-        if status == 'complete':
-          break
         else:
-          time.sleep(8)
-          continue
+          break
 
   response = requests.post(api_endpoint_submit, json=data) #,headers=headers)
   response_data = response.json()