Update app.py

app.py

@@ -46,7 +46,6 @@ async def generate_audio_with_voice_prefix(text_segment, default_voice, rate, pi
     current_rate = rate
     current_pitch = pitch
     processed_text = text_segment.strip()
-
     voice1_full = "en-AU-WilliamNeural - en-AU (Male)"
     voice1_short = voice1_full.split(" - ")[0]
     voice1F_full ="en-GB-SoniaNeural - en-GB (Female)"
@@ -75,56 +74,83 @@ async def generate_audio_with_voice_prefix(text_segment, default_voice, rate, pi
     voice9F_short = voice7_full.split(" - ")[0]
     voice9_full = "ko-KR-HyunsuMultilingualNeural - ko-KR (Male)"  #Vietnamese
     voice9_short = voice8_full.split(" - ")[0]
-
+    detect=0
     if processed_text.startswith("1F"):
         current_voice_short = voice1F_short
         current_pitch = 25
-        processed_text = processed_text[2:].strip()
+        detect=1
+        #processed_text = processed_text[2:].strip()
     elif processed_text.startswith("2F"):
         current_voice_short = voice2F_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("3F"):
         current_voice_short = voice3F_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("4F"):
         current_voice_short = voice4F_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("1M"):
         current_voice_short = voice1_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("2M"):
         current_voice_short = voice2_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("3M"):
         current_voice_short = voice3_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("4M"):
         current_voice_short = voice4_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("1O"):  # Old man voice
         current_voice_short = voice5_short
         current_pitch = -20
         current_rate = -10
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("1C"):  #Child voice
         current_voice_short = voice6_short
-        processed_text = processed_text[2:].strip()
-        
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("1V"):  #Female VN
         current_voice_short = voice7_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("2V"):
         current_voice_short = voice8_short
-        processed_text = processed_text[2:].strip()
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("3V"):  #Female VN
         current_voice_short = voice9F_short
         current_pitch = 25
-        processed_text = processed_text[2:].strip()        
+        #processed_text = processed_text[2:].strip()
+        detect=1
     elif processed_text.startswith("4V"):
         current_voice_short = voice9_short
         current_pitch = -20
-        processed_text = processed_text[2:].strip()
-        
+        #processed_text = processed_text[2:].strip()
+        detect=1
+    #Looking for number following prefix, which are pitch values.
+    #match = re.search(r'[A-Za-z]\d+', part)  # Look for a letter followed by one or more digits
+    match = re.search(r'[A-Za-z]+\-?\d+', processed_text)  # Look for a letter(s) followed by an optional '-' and digits
+    if match:
+        # Extract the prefix (e.g., '2F') and number (e.g., '-20')
+        prefix = ''.join([ch for ch in match.group() if ch.isalpha()])  # Extract letters (prefix)
+        number = int(''.join([ch for ch in match.group() if ch.isdigit() or ch == '-']))  # Extract digits (number)
+        current_pitch += number
+        # Step 2: Remove the found number from the string
+        new_text = re.sub(r'[A-Za-z]+\-?\d+', '', processed_text, count=1).strip()  # Remove prefix and number (e.g., '2F-20')
+        #processed_text = new_text[2:]  #cut out the prefix like 1F, 3M etc
+        processed_text = new_text[len(prefix):]  # Dynamically remove the prefix part
+    else:
+        if detect:
+            processed_text = part[2:]
     if processed_text:
         rate_str = f"{current_rate:+d}%"
         pitch_str = f"{current_pitch:+d}Hz"