fixing

Author: amirrr

server/api.py

@@ -6,20 +6,14 @@
 from sanic.request import Request
 from sanic_jwt import Initialize
 from sanic_cors import CORS
-from dotenv import load_dotenv
 import socketio
-from controllers.assisstant import RunAssistant
-from controllers.features import GetFeatures
+from config.app_config import AppConfig
+from controllers.assisstant import run_assistant
 from controllers.login import login_user, validate_user
-from db.database import init_db
+from database.database import init_db
 
-load_dotenv()
 
-app = Sanic(__name__)
-
-# Load configuration
-app.config.SECRET = os.getenv("SOCKET_SECRET")
-app.config.JWT_SECRET = os.getenv("JWT_SECRET")
+app = Sanic("Atlas", config=AppConfig())
 
 # Initialize CORS
 CORS(app, resources={r"/*": {"origins": "*"}})
@@ -31,7 +25,7 @@
 
 # Initialize database
 @app.before_server_start
-async def attach_db(app, loop):
+async def attach_db(_app, _loop):
     """
     Initialize the database connection.
     """
@@ -67,7 +61,7 @@ async def login(request: Request):
     if request.method == "POST":
         data = request.json
         email = data.get("email")
-        return await login_user(email)
+        return await login_user(email=email)
 
 
 @app.route("/api/validate", methods=["POST"])
@@ -82,6 +76,17 @@ async def validate(request: Request):
         return await validate_user(email=email, token=token)
 
 
+@app.route("/api/run_assistant", methods=["POST"])
+async def run_assistant_endpoint(request: Request):
+    """
+    Handles the POST request for running the assistant.
+    """
+    if request.method == "POST":
+        file = request.form.get("file")
+        sid = request.form.get("sid")
+        return await run_assistant(sid=sid, file=file, sio=sio)
+
+
 @sio.on("connect", namespace="/home")
 async def handle_connect(sid, _environ, _auth):
     """

server/config/app_config.py

@@ -0,0 +1,28 @@
+"""
+Configuration class for the application.
+"""
+
+import os
+from sanic.config import Config
+from dotenv import load_dotenv
+
+load_dotenv()
+
+
+class AppConfig(Config):
+    """
+    Configuration class for the application.
+
+    Attributes:
+        BASE_URL (str): The base URL of the application.
+        SECRET (str): The secret key for the application's socket.
+        JWT_SECRET (str): The secret key for JSON Web Tokens (JWT).
+        JWT_ALGORITHM (str): The algorithm used for JWT encryption.
+        JWT_EXP_DELTA_SECONDS (int): The expiration time for JWT tokens in seconds.
+    """
+
+    BASE_URL = os.getenv("BASE_URL")
+    SECRET = os.getenv("SOCKET_SECRET")
+    JWT_SECRET = os.getenv("JWT_SECRET")
+    JWT_ALGORITHM = "HS256"
+    JWT_EXP_DELTA_SECONDS = 3600

server/controllers/assisstant.py

@@ -3,9 +3,8 @@
 """
 
 import os
-import json
-from flask import jsonify, make_response, request
-from flask_restful import Resource
+from sanic import json as json_response
+import socketio
 
 
 from assistant import AssistantException, call_asssistant_api
@@ -17,68 +16,41 @@
     os.makedirs(UPLOAD_DIRECTORY)
 
 
-class RunAssistant(Resource):
+def run_assistant(sid, file, sio: socketio.AsyncServer):
     """
-    Represents a resource for handling file uploads.
-    Methods:
-    - post: Handles the POST request for file uploads.
+    Run the assistant with the uploaded file
     """
-
-    def __init__(self, **kwargs):
-        self.socketio = kwargs.get("socketio")
-
-    def post(self):
-        """
-        Handles the POST request for file uploads.
-        Returns:
-        - JSON response containing the status of the upload:
-        - If successful, returns {"message": "File successfully uploaded", "path": file_path}.
-        - If there is an error, returns {"error": "No file part"} or {"error": "No selected file"}.
-        """
-        sid = request.form.get("sid")
-
-        if "file" not in request.files:
-            return jsonify({"error": "No file part"})
-        file = request.files["file"]
-        if file.filename == "":
-            return jsonify({"error": "No selected file"})
-        if file:
-            file_path = os.path.join(UPLOAD_DIRECTORY, file.filename)
-            file.save(file_path)
-            try:
-                result = call_asssistant_api(file_path, sid, self.socketio)
-
-                # print("result : ", json.dumps(result))
-                self.socketio.emit(
-                    "status",
-                    {"status": "Fetching all features...", "progress": 0},
-                    to=sid,
-                )
-
-                response_data = {
-                    "message": "File successfully uploaded",
-                    "file_name": file.filename,
-                    "experiments": result["experiments"],
-                }
-
-                # Delete the uploaded
-                if os.path.isfile(file_path):
-                    os.remove(file_path)
-                    print("File removed from local storage successfully")
-                else:
-                    # If it fails, inform the user.
-                    print(f"Error: {file_path} file not found")
-
-                response = make_response(jsonify(response_data))
-                response.status_code = 200
-                return response
-            except AssistantException as e:
-                response_data = {"error": str(e)}
-                response = make_response(jsonify(response_data))
-                response.status_code = 500
-                return response
-        else:
-            response_data = {"error": "File upload failed"}
-            response = make_response(jsonify(response_data))
-            response.status_code = 400
-            return response
+    if file:
+        file_path = os.path.join(UPLOAD_DIRECTORY, file.filename)
+        file.save(file_path)
+        try:
+            result = call_asssistant_api(file_path, sid, sio)
+
+            # print("result : ", json.dumps(result))
+            sio.emit(
+                "status",
+                {"status": "Fetching all features...", "progress": 0},
+                to=sid,
+            )
+
+            response_data = {
+                "message": "File successfully uploaded",
+                "file_name": file.filename,
+                "experiments": result["experiments"],
+            }
+
+            # Delete the uploaded
+            if os.path.isfile(file_path):
+                os.remove(file_path)
+                print("File removed from local storage successfully")
+            else:
+                # If it fails, inform the user.
+                print(f"Error: {file_path} file not found")
+
+            return json_response(body=response_data, status=200)
+        except AssistantException as e:
+            response_data = {"error": str(e)}
+            return json_response(body=response_data, status=500)
+    else:
+        response_data = {"error": "File upload failed"}
+        return json_response(body=response_data, status=400)