Update app.py

app.py

@@ -96,18 +96,27 @@ word_to_num = {
     "hundred": 100, "thousand": 1000
 }
 
-# Function to convert speech input into valid math expressions
+import re
+
 def convert_speech_to_math(text):
+    """
+    Converts natural language math queries into valid mathematical expressions.
+    
+    Args:
+        text (str): The natural language input.
+    
+    Returns:
+        str: The converted mathematical expression.
+    """
     # Convert the input text to lowercase
     text = text.lower()
 
-    # Mapping words to corresponding math functions
     # Arithmetic operations
     text = re.sub(r'add (\d+) and (\d+)', r'\1 + \2', text)
     text = re.sub(r'subtract (\d+) from (\d+)', r'\2 - \1', text)
     text = re.sub(r'multiply (\d+) by (\d+)', r'\1 * \2', text)
     text = re.sub(r'divide (\d+) by (\d+)', r'\1 / \2', text)
-    
+
     # Exponentiation and roots
     text = re.sub(r'power of (\d+) to (\d+)', r'\1**\2', text)
     text = re.sub(r'square of (\d+)', r'\1**2', text)
@@ -116,9 +125,10 @@ def convert_speech_to_math(text):
     text = re.sub(r'cube root of (\d+)', r'cbrt(\1)', text)
 
     # Logarithmic operations
-    text = re.sub(r'log base (\d+) of (\d+)', r'log(\2, \1)', text)  # log base b of x
-    text = re.sub(r'natural log of (\d+)', r'ln(\1)', text)
-    
+    text = re.sub(r'log of (\d+)', r'log(\1)', text)  # Convert "log of 100" to "log(100)"
+    text = re.sub(r'log base (\d+) of (\d+)', r'log(\2, \1)', text)  # Handle "log base 2 of 8"
+    text = re.sub(r'natural log of (\d+)', r'ln(\1)', text)  # Handle "natural log of 10"
+
     # Trigonometric operations
     text = re.sub(r'sine of (.+)', r'sin(\1)', text)
     text = re.sub(r'cosine of (.+)', r'cos(\1)', text)
@@ -128,9 +138,9 @@ def convert_speech_to_math(text):
     text = re.sub(r'arc sine of (.+)', r'asin(\1)', text)
     text = re.sub(r'arc cosine of (.+)', r'acos(\1)', text)
     text = re.sub(r'arc tangent of (.+)', r'atan(\1)', text)
-    
+
     # Factorials and combinatorics
-    text = re.sub(r'factorial of (\w+)', lambda m: f'factorial({word_to_num.get(m.group(1), m.group(1))})', text)
+    text = re.sub(r'factorial of (\w+)', lambda m: f'factorial({m.group(1)})', text)
     text = re.sub(r'permutation of (\d+), (\d+)', r'permutation(\1, \2)', text)
     text = re.sub(r'combination of (\d+), (\d+)', r'combinations(\1, \2)', text)
 
@@ -145,12 +155,12 @@ def convert_speech_to_math(text):
     # Complex numbers
     text = re.sub(r'absolute value of (.+)', r'Abs(\1)', text)
     text = re.sub(r'conjugate of (.+)', r'conjugate(\1)', text)
-    
+
     # Set operations
     text = re.sub(r'union of (.+) and (.+)', r'Union(\1, \2)', text)
     text = re.sub(r'intersection of (.+) and (.+)', r'Intersection(\1, \2)', text)
     text = re.sub(r'complement of (.+)', r'Complement(\1)', text)
-    
+
     # Statistical operations
     text = re.sub(r'mean of (.+)', r'Mean(\1)', text)
     text = re.sub(r'median of (.+)', r'Median(\1)', text)
@@ -163,11 +173,16 @@ def convert_speech_to_math(text):
     text = re.sub(r'ceiling of (.+)', r'ceiling(\1)', text)
 
     # Miscellaneous formatting fixes
-    text = re.sub(r'(\w+)\s*\(', r'\1(', text)  # Remove spaces before parentheses
+    text = re.sub(r'\s*\(', r'(', text)  # Remove spaces before parentheses
     text = re.sub(r'to the power of (\d+)', r'**\1', text)  # Handle "to the power of"
-    
+
+    # Handle additional edge cases
+    text = re.sub(r'logof(\d+)', r'log(\1)', text)  # Correct misinterpreted "logof100"
+    text = re.sub(r'sqrt(\d+)', r'sqrt(\1)', text)  # Ensure proper sqrt function
+
     return text
 
+
 def calculator(audio=None, text_input=None, tts_engine="auto"):
     """
     Main function to handle input and process it for math calculation (text or voice).