diff --git a/app/main.py b/app/main.py index 0635c724..4b72ed3c 100644 --- a/app/main.py +++ b/app/main.py @@ -1,4 +1,4 @@ -from flask import Flask, request, Response, jsonify +from flask import Flask, jsonify from flask_cors import CORS # Local imports from app @@ -10,50 +10,6 @@ CORS(app) -# @app.route('/', methods=['GET']) -# def welcome(): -# return Response(f'Welcome to EyeLab!', status=200, mimetype='application/json') - -# @app.route('/api/user/sessions', methods=['GET']) -# def get_user_sessions(): -# # Get user sessions -# if request.method == 'GET': -# return session_route.get_user_sessions() - -# return Response('Invalid request method for route', status=405, mimetype='application/json') - -# @app.route('/api/session', methods=['GET','POST','PATCH','DELETE']) -# def session(): -# # Get by ID -# if request.method == 'GET': -# return session_route.get_session_by_id() - -# # Create Session -# elif request.method == 'POST': -# return session_route.create_session() - -# # Delete by ID -# elif request.method == 'DELETE': -# return session_route.delete_session_by_id() - -# # Update by ID -# elif request.method == 'PATCH': -# return session_route.update_session_by_id() - -# return Response('Invalid request method for route', status=405, mimetype='application/json') - -# @app.route('/api/session/results/record', methods=['GET']) -# def manage_recording(): -# if request.method == 'GET': -# return session_route.session_results_record() -# return Response('Invalid request method for route', status=405, mimetype='application/json') - -# @app.route('/api/session/results', methods=['GET']) -# def manage_results(): -# if request.method == 'GET': -# return session_route.session_results() -# return Response('Invalid request method for route', status=405, mimetype='application/json') - @app.route('/api/session/health', methods=['GET']) def health_check(): return jsonify({'status': 'ok'}), 200 @@ -65,15 +21,10 @@ def calib_validation(): Validates the calibration request. Returns: - If the request method is 'POST', it calls the `calib_results` function from the `session_route` module. - Otherwise, it returns a `Response` object with an error message and status code 405. + If the request body is valid, it delegates to session_route.calib_results(). """ - if request.method == "POST": - return session_route.calib_results() - return Response('Invalid request method for route', status=405, mimetype='application/json') + return session_route.calib_results() @app.route('/api/session/batch_predict', methods=['POST']) def batch_predict(): - if request.method == 'POST': - return session_route.batch_predict() - return Response('Invalid request method for route', status=405, mimetype='application/json') + return session_route.batch_predict() diff --git a/app/routes/session.py b/app/routes/session.py index 1db18593..15a77dd7 100644 --- a/app/routes/session.py +++ b/app/routes/session.py @@ -13,7 +13,7 @@ import traceback import re import requests -from flask import Flask, request, Response, send_file, jsonify +from flask import request, Response, send_file, jsonify # Local imports from app from app.services.storage import save_file_locally @@ -27,10 +27,6 @@ ALLOWED_EXTENSIONS = {"txt", "webm"} COLLECTION_NAME = "session" -# Initialize Flask app -app = Flask(__name__) - - # Helper function to convert NaN values to None for JSON serialization def convert_nan_to_none(obj): """