Merge branch 'development' into add-basic-tests

Author: kemp

flask/flaskapp/latex_solver.py

@@ -1,11 +1,21 @@
 from sympy.parsing.latex import parse_latex
+from sympy.parsing.latex import LaTeXParsingError
 from sympy import latex
 
 def solve(latex_styled):
     latex_formatted = format_latex(latex_styled)
-    expr = parse_latex(latex_formatted)
+    try:
+        expr = parse_latex(latex_formatted)
+    except LaTeXParsingError:
+        return "LaTeX parsing error"
 
-    return str(latex(expr.doit()))
+    try:
+        result = latex(expr.doit())
+        #This is super generic because sympy evaluation isn't trivial. 
+        # We'll probably want to switch away from using doit() in the future, for more control.
+    except Exception:
+        return "SymPy evaluation error"
+    return str(result)
 
 def format_latex(latex_styled):
     return r'{}'.format(latex_styled)

flask/flaskapp/mathpix.py

@@ -12,7 +12,7 @@ class MathpixApiException(Exception):
     pass
 
 def submit_text(b64_image):
-    data = { "src": "data:image/png;base64," + b64_image }
+    data = { "src": b64_image }
     url = BASE_URL + "/text"
     response = requests.post(url, headers=HEADERS, json=data)
 

readme.md

@@ -44,3 +44,68 @@ To run the tests:
     $ docker-compose build
     $ docker-compose run flask bash -c "cd /app/flask/flaskapp && python -m pytest"
 
+
+## Public API
+
+### Solve Image
+
+**URI**: `/solve-image`
+
+**Method**: POST
+
+**Request Body**:
+
+    {
+        "b64_img": (str) "BASE64ENCODEDIMAGE"
+    }
+    
+**Response Body**:
+
+    {
+        "confidence": (number) CONFIDENCE_VALUE_FROM_MATHPIX,
+        "input_detected": (str) "LATEX_STRING_OF_INPUT_DETECTED_FROM_MATHPIX",
+        "solved": (str) "LATEX_STRING_OF_CAS_SOLUTION_TO_PROBLEM"
+    }
+
+### Solve Latex
+
+**URI**: `/solve-latex`
+
+**Method**: POST
+
+**Request Body**:
+
+    {
+        "latex": (str) "LATEX_TO_BE_SOLVED"
+    }
+    
+**Response Body**:
+
+    {
+        "solved": (str) "LATEX_STRING_OF_CAS_SOLUTION_TO_PROBLEM"
+    }
+
+### Mathpix OCR
+
+**URI**: `/mathpix-ocr`
+
+**Method**: POST
+
+**Request Body**:
+
+    {
+        "b64_img":(str)"BASEBASE64ENCODEDIMAGE"
+    }
+    
+**Response Body**:
+
+    {
+        "confidence":(number) CONFIDENCE_VALUE_FROM_MATPHIX,
+        "confidence_rate":(number) CONFIDENCE_RATE_FROM_MATHPIX,
+        "latex_styled":(str) "LATEX_STRING_OF_INPUT_DETECTED_FROM_MATHPIX",
+        "request_id":(str) Doesn't mean anything to us,
+        "text":(str) Doesnt mean much as we are using latex
+    }
+
+
+