Update app.py

app.py

@@ -81,42 +81,46 @@ async def paragraph_to_speech(text, voice, rate, pitch):
             current_rate = rate
             current_pitch = pitch
             if part.startswith("1F"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice1F.split(" - ")[0]
                 current_pitch = 25
             elif part.startswith("2F"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice2F.split(" - ")[0]
             elif part.startswith("3F"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice3F.split(" - ")[0]
             elif part.startswith("1M"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice1.split(" - ")[0]
             elif part.startswith("2M"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice2.split(" - ")[0]
             elif part.startswith("3M"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice3.split(" - ")[0]
             elif part.startswith("1C"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice4.split(" - ")[0]
             elif part.startswith("1O"):
-                processed_text = part[2:]
+                #processed_text = part[2:]
                 current_voice = voice5.split(" - ")[0]
-                current_pitch = -30
-                current_rate = -15
+                current_pitch = -20
+                current_rate = -10
             else:
                 # Use selected voice, or fallback to default
                 #voice_short_name = (voice or default_voice).split(" - ")[0]
                 current_voice = (voice or default_voice).split(" - ")[0]
                 processed_text=part[:]
-            if (re.search(r'-?\d+', part)):   #if there are any digit following the voice tag, eg 1F20 or 1F-20 
-                match = re.search(r'-?\d+', part)
-                pitch = int(match.group())         #Set pitch to set value as noted in the tag
+                # Step 1: Use regex to find the first number, possibly negative, after a prefix (e.g., F-)
+            match = re.search(r'(?<=\D)-?\d+', part)  # Look behind for non-digit before number
+            if match: 
+                match = re.search(r'-?\d+', part)  
+                current_pitch = int(match.group())  # Extract and convert the number to an integer
                 # Remove only the first integer found
-                processed_text = re.sub(r'-?\d+', '', part, count=1).strip()  #cut out the pitch int from text part
+                # Step 2: Remove the found number from the string
+                new_text = re.sub(r'(?<=\D)-?\d+', '', part, count=1).strip()
+                processed_text = new_text[2:]  #cut out the prefix like 1F, 3M etc
             rate_str = f"{current_rate:+d}%"
             #if  part[2:4].isdigit():
             #    processed_text = part[4:]