Merge remote-tracking branch 'origin/develop' into feature/redo-db-migrations

Author: Creylay

DashAI/back/api/api_v0/endpoints/old_endpoints.py

@@ -53,15 +53,15 @@ async def execute_model(model_name: str, payload: dict = Body(...)):
     return 0
 
 
-@router.post("/experiment/run/{session_id}")
-async def run_experiment(session_id: int):
+@router.post("/model-session/run/{session_id}")
+async def run_model_session(session_id: int):
     return 0
 
 
-@router.get("/experiment/results/{session_id}")
+@router.get("/model-session/results/{session_id}")
 async def get_results(session_id: int):
     main_task = session_info.task
-    return main_task.experimentResults
+    return main_task.modelSessionResults
 
 
 @router.get("/play/{session_id}/{execution_id}/{input}")

DashAI/back/api/api_v1/api.py

@@ -4,13 +4,13 @@
     components,
     converters,
     datasets,
-    experiments,
     explainers,
     explorers,
     generative_process,
     generative_session,
     jobs,
     metrics,
+    model_sessions,
     notebook,
     pipelines,
     plugins,
@@ -22,7 +22,7 @@
 api_router_v1.include_router(converters.router, prefix="/converter")
 api_router_v1.include_router(components.router, prefix="/component")
 api_router_v1.include_router(datasets.router, prefix="/dataset")
-api_router_v1.include_router(experiments.router, prefix="/experiment")
+api_router_v1.include_router(model_sessions.router, prefix="/model-session")
 api_router_v1.include_router(explainers.router, prefix="/explainer")
 api_router_v1.include_router(explorers.router, prefix="/explorer")
 api_router_v1.include_router(jobs.router, prefix="/job")

DashAI/back/api/api_v1/endpoints/datasets.py

@@ -27,7 +27,7 @@
     get_columns_spec,
     get_dataset_info,
 )
-from DashAI.back.dependencies.database.models import Dataset, Experiment
+from DashAI.back.dependencies.database.models import Dataset, ModelSession
 from DashAI.back.types.inf.type_inference import infer_types
 from DashAI.back.types.type_validation import validate_multiple_type_changes
 from DashAI.back.types.utils import arrow_to_dashai_schema
@@ -506,13 +506,13 @@ async def get_info(
     return info
 
 
-@router.get("/{dataset_id}/experiments-exist")
+@router.get("/{dataset_id}/model-sessions-exist")
 @inject
-async def get_experiments_exist(
+async def get_model_sessions_exist(
     dataset_id: int,
     session_factory: sessionmaker = Depends(lambda: di["session_factory"]),
 ):
-    """Get a boolean indicating if there are experiments associated with the dataset.
+    """Get a boolean indicating if there are model sessions associated with the dataset.
 
     Parameters
     ----------
@@ -522,7 +522,7 @@ async def get_experiments_exist(
     Returns
     -------
     bool
-        True if there are experiments associated with the dataset, False otherwise.
+        True if there are model sessions associated with the dataset, False otherwise.
     """
     with session_factory() as db:
         try:
@@ -539,13 +539,15 @@ async def get_experiments_exist(
                     detail="Dataset is not in finished state",
                 )
 
-            # Check if there are any experiments associated with the dataset
-            experiments_exist = (
-                db.query(Experiment).filter(Experiment.dataset_id == dataset_id).first()
+            # Check if there are any model sessions associated with the dataset
+            model_sessions_exist = (
+                db.query(ModelSession)
+                .filter(ModelSession.dataset_id == dataset_id)
+                .first()
                 is not None
             )
 
-            return experiments_exist
+            return model_sessions_exist
 
         except exc.SQLAlchemyError as e:
             logger.exception(e)

DashAI/back/api/api_v1/endpoints/explainers.py

@@ -17,9 +17,9 @@
 from DashAI.back.dataloaders.classes.dashai_dataset import load_dataset
 from DashAI.back.dependencies.database.models import (
     Dataset,
-    Experiment,
     GlobalExplainer,
     LocalExplainer,
+    ModelSession,
     Run,
 )
 from DashAI.back.dependencies.registry import ComponentRegistry
@@ -624,11 +624,11 @@ async def validate_dataset(
                     status_code=status.HTTP_404_NOT_FOUND,
                     detail="Run not found",
                 )
-            experiment: Experiment = db.get(Experiment, run.experiment_id)
-            if not experiment:
+            model_session: ModelSession = db.get(ModelSession, run.model_session_id)
+            if not model_session:
                 raise HTTPException(
                     status_code=status.HTTP_404_NOT_FOUND,
-                    detail="Experiment not found",
+                    detail="Model session not found",
                 )
 
             dataset: Dataset = db.get(Dataset, params.dataset_id)
@@ -654,8 +654,8 @@ async def validate_dataset(
 
     # TODO: validate dataset for task
     validation_response = {}
-    input_columns = experiment.input_columns
-    output_columns = experiment.output_columns
+    input_columns = model_session.input_columns
+    output_columns = model_session.output_columns
     columns = input_columns + output_columns
 
     instances_columns = list(instances.features)