clean up, add remote sssAPI, clean up concat

chat.py

@@ -20,7 +20,7 @@ History = List[Tuple[str, str]] # a type: pairs of (query, response), where quer
 Messages = List[Dict[str, str]] # a type: list of messages with role and content
 
 client_key = os.getenv("OPEN_AI_KEY")
-print(client_key)
+# print(client_key)
 oai_client = OpenAI(
     api_key=client_key,
 )

gpt_calls.py

@@ -137,7 +137,12 @@ class AI_Songwriter:
         instruction += "Here's an example:\n{convo}\nNow do it for this input:"
         
         
-        input = f"""Ideas to use: {", ".join(relevant_ideas)}\nGenre: Songwriter Pop\nEra: 2010s\nCurrent section:\n{full_incomplete_verse}\n\nLyrics:"""
+        input = ""
+        if relevant_ideas is not None and isinstance(relevant_ideas, list):
+            input += f"Ideas to use: {', '.join(relevant_ideas)}\n"
+        if relevant_words is not None and isinstance(relevant_words, list):
+            input += f"Words to use: {', '.join(relevant_words)}\n"
+        input += f"Genre: Songwriter Pop\nEra: 2010s\nCurrent section:\n{full_incomplete_verse}\n\nLyrics:"
 
         prompt = self.alpaca_prompt.format(instruction, input, "")
 

suno.py

@@ -4,7 +4,7 @@ import os
 import asyncio
 import httpx
 
-base_url = "http://127.0.0.1:8000"
+base_url = "https://sss-api-blond.vercel.app"
 api_endpoint_submit = f"{base_url}/generate/"
 api_endpoint_concat = f"{base_url}/generate/concat"
 api_endpoint_info = f"{base_url}/feed/"
@@ -139,11 +139,15 @@ def concat_snippets(clip_id):
       print("No data in response, retrying", response_data)
       time.sleep(2)
       continue
-    ## CATCH THE CASE WHERE response_data a list of length 1 versus just a dictionary straight up
-    elif response_data["status"] == 'streaming':
-       return "Song is still streaming, please wait to request later.", None, None, []
-    if response_data["status"] == 'complete':
-      break
+    if isinstance(response_data, list):
+        status = response_data[0]["status"]
+    else:
+        status = response_data["status"]
+
+    if status == 'streaming':
+        return "Song is still streaming, please wait to request later.", None, None, []
+    if status == 'complete':
+        break
     else:
       time.sleep(8)
       continue