Update app.py

app.py

@@ -503,47 +503,31 @@ SUPERSIZED_TEXTS = SUPERSIZED
 MONOPOLY_TEXTS = MONOPOLY
 RIME_TEXTS = SCHEDULE_ME + SUPERSIZED + MONOPOLY
 
-ivr_sid_to_name = {423: 'whirlpool', 836: 'sunrise', 2653: 'butterfly', 2654: 'rainfall', 2655: 'canyon', 2656: 'jungle', 2657: 'hills', 2658: 'lake', 3525: 'wildflower', 3529: 'peak', 3535: 'river', 3537: 'leaves', 3538: 'mountain', 3541: 'sky', 3542: 'valley', 3543: 'sunset', 3544: 'waterfall', 3545: 'pond', 3548: 'beach', 3549: 'oak', 3551: 'garden', 3552: 'stream', 3554: 'forest', 3555: 'breeze', 3558: 'meadow'}
-PROCESSION = [423, 836, 2653, 2654, 2655, 2656, 2657, 2658, 3525, 3529, 3535, 3537, 3538, 3541, 3542, 3543, 3544, 3545, 3548, 3549, 3551, 3552, 3554, 3555, 3558]
-SCHEDULEME = [2653, 2654, 2655, 2657, 3525, 3529, 3537, 3545, 3549, 3551, 3552]
-SUPERSIZED = [3525, 3529, 3535, 3538, 3542, 3543, 3544, 3545, 3549, 3551, 3552]
-MONOPOLY = [2653, 2654, 2655, 2656, 2657, 2658, 3535, 3537, 3544, 3545, 3549, 3552]
-RIME = [423, 836, 3525, 3529, 3535, 3537, 3538, 3541, 3542, 3543, 3544, 3545, 3548, 2653, 2654, 2655, 2656, 2657, 2658, 3549, 3551, 3552, 3554, 3555, 3558]
+RIME_SPEAKERS = ["marsh", "bayou", "creek", "brook", "flower", "spore", "glacier", "gulch", "alpine", "cove", "lagoon", "tundra", "steppe", "mesa", "grove", "rainforest", "moraine", "wildflower", "peak", "boulder"]
+MONOPOLY_SPEAKERS = ["alexis", "audrey", "hannah", "julie", "danielle", "breanna", "jeremy", "ronnie"]
 
 def synthesize(key, text, speakers_must, speed, request: gr.Request):
     print("Requesting user: ", request.username)
-    procession_sids = PROCESSION
-    scheduleme_sids = SCHEDULEME
-    supersized_sids = SUPERSIZED
-    monopoly_sids = MONOPOLY
-    rime_sids = RIME
-    
+    monopoly_sids = MONOPOLY_SPEAKERS
+    rime_sids = RIME_SPEAKERS
     sids_must = []
     sids_random = []
-    N = 5
     if len(speakers_must) > 0:
         sids_must = [s.strip() for s in speakers_must.split(',')]
-    if request.username == "procession":
-        sids_random = random.choices([s for s in procession_sids if s not in sids_must], k=(N-len(sids_must)))
-        if len(text) == 0:
-            text = random.choice(PROCESSION_TEXTS)
-    elif request.username == "scheduleme":
-        sids_random = random.choices([s for s in scheduleme_sids if s not in sids_must], k=(N-len(sids_must)))
-        if len(text) == 0:
-            text = random.choice(SCHEDULEME_TEXTS)
-    elif request.username == "supersized":
-        sids_random = random.choices([s for s in supersized_sids if s not in sids_must], k=(N-len(sids_must)))
-        if len(text) == 0:
-            text = random.choice(SUPERSIZED_TEXTS)
-    elif request.username == "monopoly":
-        sids_random = random.choices([s for s in monopoly_sids if s not in sids_must], k=(N-len(sids_must)))
+
+    N = 5
+    if request.username == 'monopoly':
         if len(text) == 0:
             text = random.choice(MONOPOLY_TEXTS)
-    elif request.username == "rime":
-        sids_random = random.choices([s for s in rime_sids if s not in sids_must], k=(N-len(sids_must)))
+        sids_random = random.sample([s for s in MONOPOLY_SPEAKERS if s not in sids_must], k=(N-len(sids_must)))
+
+
+    else:
         if len(text) == 0:
             text = random.choice(RIME_TEXTS)
-    sids = sids_must + [ivr_sid_to_name[r] for r in sids_random]
+        sids_random = random.sample([s for s in RIME_SPEAKERS if s not in sids_must], k=(N-len(sids_must)))
+    print(sids_random, sids_must)
+    sids = sids_random + sids_must
     print(sids)
     headers = {"Authorization": "Api-Key {}".format(key)}
     
@@ -556,10 +540,11 @@ def synthesize(key, text, speakers_must, speed, request: gr.Request):
         }
         print(json_data)
         response = requests.post(
-            "https://model-232ped0q.api.baseten.co/deployment/q99zr0q/predict",
+            "https://model-232ped0q.api.baseten.co/deployment/q99450q/predict",
             headers=headers,
             json=json_data,
         )
+        print(response.json())
         audioContent = response.json()
         decode_string = base64.b64decode(audioContent)
         audio_name = str(i) + "_" + str(request.username) + ".wav"
@@ -587,3 +572,4 @@ gradio_app.launch(
     share=True,
     auth=[("procession", "procession"), ("scheduleme", "scheduleme"), ("supersized", "supersized"), ("monopoly", "monopoly"), ("rime", "rime")]
 )
+