Update app.py

app.py

@@ -53,45 +53,42 @@ def clean_latex(latex):
     return latex
 
 def clean_latex2(latex):
-    # Remove unnecessary LaTeX symbols and spaces
+    # Step 1: Replace basic formatting issues
     latex = latex.replace('\\ ', '')
     latex = latex.replace('\\\\', '\n')
     latex = latex.replace('~', '')
     latex = latex.replace('−', '-').replace('–', '-')
-    latex = latex.replace('–', '-')
 
-    # Convert math symbols
+    # Step 2: Fix common LaTeX math ops
     latex = re.sub(r'\\times', '*', latex)
     latex = re.sub(r'\\cdot', '*', latex)
 
-    # Fix multiple dashes (e.g., -- becomes -)
-    latex = re.sub(r'-{2,}', '-', latex)
-
-    # Remove commands like \mathbf{}, \mathcal{}, etc.
-    latex = re.sub(r'\\(text|mathbf|mathrm|mathit|textbf|mathcal|cal)\s*\{([^{}]+)\}', r'\2', latex)
+    # Step 3: Strip away wrappers like \mathcal{}, \mathbf{}, etc.
+    latex = re.sub(r'\\(text|mathbf|mathrm|mathit|textbf|mathcal|cal|nabla)\s*\{([^{}]+)\}', r'\2', latex)
 
-    # Remove leftover LaTeX commands
+    # Step 4: Remove leftover backslash commands (\!, \,, etc.)
     latex = re.sub(r'\\[a-zA-Z]+', '', latex)
 
-    # Remove curly braces and ampersands
+    # Step 5: Strip non-math braces, ampersands, etc.
     latex = latex.replace('{', '').replace('}', '').replace('&', '')
 
-    # Replace comma/semicolon with newlines to separate equations
+    # Step 6: Break into lines if multiple equations
     latex = re.sub(r'[;,]', '\n', latex)
 
-    # Fix multiple equals (== becomes =)
+    # Step 7: Fix repeated symbols
+    latex = re.sub(r'-{2,}', '-', latex)
     latex = re.sub(r'=+', '=', latex)
 
-    # Normalize space
-    latex = re.sub(r'\s+', ' ', latex).strip()
-
-    # Symbol replacements (OCR common confusions)
+    # Step 8: Symbol OCR replacements
     latex = re.sub(r'\bchi\b|\bxi\b|\balpha\b', 'x', latex)
     latex = re.sub(r'\bbeta\b', 'b', latex)
     latex = re.sub(r'\bgamma\b', 'y', latex)
 
-    return latex
+    # Step 9: Normalize spacing
+    latex = re.sub(r'\s+', ' ', latex).strip()
 
+    return latex
+    
 def solve_polynomial(image):
     try:
         if isinstance(image, np.ndarray):
@@ -150,14 +147,15 @@ def solve_system_of_equations(image):
         if not raw_latex or len(raw_latex.strip()) < 3:
             return "❌ Could not extract valid LaTeX."
 
+        # Extract from array if applicable
         if r"\begin{array" in raw_latex:
-            lines = re.findall(r'\\begin{array}{[^}]+}(.+?)\\end{array}', raw_latex, re.DOTALL)
-            if lines:
-                raw_latex = lines[0]
-            raw_latex = raw_latex.replace(r'\\', '\n')
-            raw_latex = re.sub(r'&', '', raw_latex)
+            array_match = re.search(r'\\begin{array}{[^}]*}(.+?)\\end{array}', raw_latex, re.DOTALL)
+            if array_match:
+                raw_latex = array_match.group(1)
+            raw_latex = raw_latex.replace('\\\\', '\n')
+            raw_latex = raw_latex.replace('&', '')
 
-        raw_latex = raw_latex.replace("\n", " ")
+        raw_latex = raw_latex.replace('\n', ' ')
         equations = re.split(r'[;,]', raw_latex)
 
         cleaned_equations = []
@@ -183,20 +181,20 @@ def solve_system_of_equations(image):
             return f"❌ Not enough valid equations detected.\n\n```latex\n{raw_latex}\n```"
 
         sol = sp.solve(sympy_eqs, list(symbols), dict=True)
+
         output = f"## 🧾 Detected Equations:\n```latex\n{raw_latex}\n```\n"
         output += "---\n## ✏️ Parsed & Cleaned:\n"
         for eq in sympy_eqs:
             output += f"$$ {sp.latex(eq)} $$\n"
         output += "---\n## ✅ Solution:\n"
         if sol:
-            renamed = {str(k).replace('times', 'x'): v for k, v in sol[0].items()}  # ✅ fix
-            output += "$$" + sp.latex(renamed) + "$$"
+            output += "$$" + sp.latex(sol[0]) + "$$"
         else:
             output += "❌ No solution found or system may be inconsistent."
         return output
     except Exception as e:
         return f"❌ Error: {str(e)}"
-
+        
 # === UI ===
 with gr.Blocks() as demo:
     with gr.Tab("🖼️ Parse from Image"):