diff --git a/DashAI/back/api/api_v0/__init__.py b/DashAI/back/api/api_v0/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/DashAI/back/api/api_v0/api.py b/DashAI/back/api/api_v0/api.py deleted file mode 100644 index 380aa5b5b..000000000 --- a/DashAI/back/api/api_v0/api.py +++ /dev/null @@ -1,6 +0,0 @@ -from fastapi import APIRouter - -from DashAI.back.api.api_v0.endpoints import old_endpoints - -api_router_v0 = APIRouter() -api_router_v0.include_router(old_endpoints.router) diff --git a/DashAI/back/api/api_v0/endpoints/__init__.py b/DashAI/back/api/api_v0/endpoints/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/DashAI/back/api/api_v0/endpoints/old_endpoints.py b/DashAI/back/api/api_v0/endpoints/old_endpoints.py deleted file mode 100644 index f682f5090..000000000 --- a/DashAI/back/api/api_v0/endpoints/old_endpoints.py +++ /dev/null @@ -1,71 +0,0 @@ -import json - -from fastapi import APIRouter, Body - -from DashAI.back.api.api_v0.endpoints.session_class import session_info -from DashAI.back.config_object import ConfigObject -from DashAI.back.core.enums.squema_types import SquemaTypes -from DashAI.back.models.classes.getters import filter_by_parent - -router = APIRouter() - - -@router.get("/select/{schema_type}/{model_name}") -def select_schema(schema_type: str, model_name: str): - """Return the squema of any configurable object.""" - try: - return ConfigObject().get_squema(SquemaTypes[schema_type], model_name) - except (FileNotFoundError, json.decoder.JSONDecodeError): - return f"Squema for {model_name} not found" - - -@router.post("/dataset/upload/{dataset_id}") -async def upload_dataset_id(dataset_id: int): - return {"message": dataset_id + " to be implemented in the future."} - - -@router.get("/dataset/task_name/{session_id}") -async def get_task_name(session_id: int): - return session_info.task_name - - -@router.get("/getChildren/{parent}") -def get_children(parent): - """Return all the classes that inherits from the Model selected.""" - try: - return list(filter_by_parent(parent).keys()) - except TypeError: - return f"{parent} not found" - - -@router.get("/selectModel/{model_name}") -def select_model(model_name: str): - # TODO: Generalize this function to any kind of config object - """Return the squema of the selected model.""" - try: - return ConfigObject().get_squema(SquemaTypes.model, model_name) - except (FileNotFoundError, json.decoder.JSONDecodeError): - return f"Squema for {model_name} not found" - - -@router.post("/selectedParameters/{model_name}") -async def execute_model(model_name: str, payload: dict = Body(...)): - return 0 - - -@router.post("/model-session/run/{session_id}") -async def run_model_session(session_id: int): - return 0 - - -@router.get("/model-session/results/{session_id}") -async def get_results(session_id: int): - main_task = session_info.task - return main_task.modelSessionResults - - -@router.get("/play/{session_id}/{execution_id}/{input}") -async def generate_prediction(session_id: int, execution_id: int, input_data: str): - execution_id = 0 # TODO Get execution_id from user - main_task = session_info.task - return str(main_task.get_prediction(execution_id, input_data)) diff --git a/DashAI/back/api/api_v0/endpoints/session_class.py b/DashAI/back/api/api_v0/endpoints/session_class.py deleted file mode 100644 index 3bb8e4fb4..000000000 --- a/DashAI/back/api/api_v0/endpoints/session_class.py +++ /dev/null @@ -1,12 +0,0 @@ -# TODO Remove this, only a placeholder -# maybe this can give an insight of the future orchestator -class Session: - dataset = None - task_name = "" - task = None - - def state(self): - return {"dataset": self.dataset, "task_name": self.task_name, "task": self.task} - - -session_info = Session() # TODO Remove this diff --git a/DashAI/back/api/api_v1/endpoints/pipelines.py b/DashAI/back/api/api_v1/endpoints/pipelines.py index bb2e364eb..015dd64c7 100644 --- a/DashAI/back/api/api_v1/endpoints/pipelines.py +++ b/DashAI/back/api/api_v1/endpoints/pipelines.py @@ -7,9 +7,8 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status from kink import di, inject from sqlalchemy import exc -from sqlalchemy.orm.session import sessionmaker +from sqlalchemy.orm import Session, sessionmaker -from DashAI.back.api.api_v0.endpoints.session_class import Session from DashAI.back.api.api_v1.schemas.pipelines_params import ( DatasetFilterParams, PipelineCreateParams, diff --git a/DashAI/back/app.py b/DashAI/back/app.py index 3164801bb..58d9df03b 100644 --- a/DashAI/back/app.py +++ b/DashAI/back/app.py @@ -8,7 +8,6 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from DashAI.back.api.api_v0.api import api_router_v0 from DashAI.back.api.api_v1.api import api_router_v1 from DashAI.back.api.front_api import router as app_router from DashAI.back.container import build_container @@ -86,14 +85,11 @@ def create_app( logger.debug("6. Initializing FastAPI application.") app = FastAPI(title="DashAI") - api_v0 = FastAPI(title="DashAI API v0") api_v1 = FastAPI(title="DashAI API v1") - logger.debug("7. Mounting API routers.") - api_v0.include_router(api_router_v0) + logger.debug("7. Mounting API router.") api_v1.include_router(api_router_v1) - app.mount(config["API_V0_STR"], api_v0) app.mount(config["API_V1_STR"], api_v1) app.include_router(app_router)