Merge pull request #16 from KSUSeniorProject-MathLearningMachine/remo…

…ve-mathpix

Remove all mathpix

.github/workflows/docker-image.yml

@@ -14,10 +14,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Update the environment files
-      run: |
-        echo "MATHPIX_APP_KEY=${{ secrets.MATHPIX_APP_KEY }}" >> mathpix-variables.env
-        echo "MATHPIX_APP_ID=${{ secrets.MATHPIX_APP_ID }}" >> mathpix-variables.env
     - name: Build the Docker image
       run: |
         docker-compose build

.gitignore

@@ -2,4 +2,3 @@ __pycache__
 .pytest_cache
 flaskenv/
 .idea/
-mathpix-variables.env

docker-compose.yml

@@ -4,8 +4,6 @@
 version: '2.0'
 services:
   flask:
-    env_file:
-      - "mathpix-variables.env"
     build: .
     image: mathlm:latest
     ports:

docs/docker.md

@@ -5,7 +5,5 @@ For better performance on Windows, install [Windows Subsystem for Linux 2](https
 
 The Dockerfile in this repo configures the image environment for our app. Docker-Compose is used as a simple way to do cross-platform building. It reduces the number of commands that have to be run manually, while avoiding platform-dependent bash or batch scripts.
 
-**NOTE:** Before building or running the image, it is necessary to create the enviornment file, which contains private API keys. An [example file](/mathpix-variables.env.example) is provided with instructions.
-
 Run `docker-compose build` to build the image, including code changes.
 Run `docker-compose run --entrypoint bash flask` to launch the container and drop into a shell for development.

flask/flaskapp/flaskapp.py

@@ -1,4 +1,3 @@
-import mathpix
 import latex_solver
 import detector
 import object_parser
@@ -40,37 +39,6 @@ def ocr():
     }
 
 
-@app.route('/mathpix-ocr', methods=['POST'])
-@cross_origin()
-def mathpix_ocr():
-    img = request.get_json()['b64_img']
-
-    try:
-        return mathpix.submit_text(img)
-    except mathpix.MathpixApiException as e:
-        return e, 500
-
-
-@app.route('/solve-image-mathpix', methods=['POST'])
-@cross_origin()
-def solve_image_mathpix():
-    body = request.get_json()
-
-    try:
-        response = mathpix.submit_text(body['b64_img'])
-        latex_styled = response['latex_styled']
-
-        data = {
-            'solved': latex_solver.solve(latex_styled),
-            'input_detected': latex_solver.format_latex(latex_styled),
-            'confidence': response['confidence']
-        }
-
-        return data, 200
-    except mathpix.MathpixApiException as e:
-        return e, 500
-
-
 @app.route('/solve-image', methods=['POST'])
 @cross_origin()
 def solve_image():

flask/flaskapp/tests/test_flaskapp.py

@@ -7,25 +7,6 @@ def test_home_page(client, app):
     assert b'Hello, World!' == res.data
 
 
-def test_mathpix_ocr(client, app):
-    with open('tests/imagetest.txt', 'r') as file:
-        image = file.read().replace('\n', '')
-
-    response_schema = {
-        "type": "object",
-        "properties": {
-            "confidence": {"type": "number"},
-            "latex_styled": {"type": "string"},
-            "request_id": {"type": "string"},
-        },
-    }
-    res = client.post('/mathpix-ocr', json={
-        'b64_img': image
-    })
-
-    assert True == validate_json(instance=res.get_json(), schema=response_schema)
-
-
 def test_solve_image(client, app):
     with open('tests/imagetest.txt', 'r') as file:
         image = file.read().replace('\n', '')

readme.md

@@ -62,8 +62,8 @@ To run the tests:
 **Response Body**:
 
     {
-        "confidence": (number) CONFIDENCE_VALUE_FROM_MATHPIX,
-        "input_detected": (str) "LATEX_STRING_OF_INPUT_DETECTED_FROM_MATHPIX",
+        "confidence": (number) CONFIDENCE_VALUE,
+        "input_detected": (str) "LATEX_STRING_OF_INPUT_DETECTED",
         "solved": (str) "LATEX_STRING_OF_CAS_SOLUTION_TO_PROBLEM"
     }
 
@@ -84,28 +84,3 @@ To run the tests:
     {
         "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
-    }
-
-
-