Skip to content

Commit d09d8dd

Browse files
CreylayCreylay
committed
Refactor: Rename 'Experiment' to 'ModelSession' across API and components
1 parent 38842d3 commit d09d8dd

23 files changed

Lines changed: 71 additions & 64 deletions

‎DashAI/front/src/api/datasets.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ export const getDatasetInfoByFilePath = async (
5555
return response.data;
5656
};
5757

58-
export const getExperimentsExist = async (id: number): Promise<object> => {
59-
const response = await api.get<object>(
60-
`${datasetEndpoint}/${id}/experiments-exist`,
58+
export const getModelSessionsExist = async (id: number): Promise<object> => {
59+
const response = await api.get(
60+
`${datasetEndpoint}/${id}/model-sessions-exist`,
6161
);
6262
return response.data;
6363
};

DashAI/front/src/api/experiment.ts renamed to DashAI/front/src/api/modelSession.ts

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,56 @@
11
import api from "./api";
2-
import type { IExperiment } from "../types/experiment";
2+
import type { IModelSession } from "../types/modelSession";
33

4-
const endpointURL = "/v1/experiment";
4+
const endpointURL = "/v1/model-session";
55

6-
export const getExperiments = async (): Promise<IExperiment[]> => {
7-
const response = await api.get<IExperiment[]>(endpointURL);
6+
export const getModelSessions = async (): Promise<IModelSession[]> => {
7+
const response = await api.get<IModelSession[]>(endpointURL);
88
return response.data;
99
};
1010

11-
export const getExperimentById = async (id: string): Promise<IExperiment> => {
12-
const response = await api.get<IExperiment>(`${endpointURL}/${id}`);
11+
export const getModelSessionById = async (
12+
id: string,
13+
): Promise<IModelSession> => {
14+
const response = await api.get<IModelSession>(`${endpointURL}/${id}`);
1315
return response.data;
1416
};
1517

16-
export const createExperiment = async (
18+
export const createModelSession = async (
1719
datasetId: number,
1820
taskName: string,
19-
expName: string,
21+
name: string,
2022
inputColumns: string[],
2123
outputColumns: string[],
2224
splitsValue: JSON,
23-
): Promise<IExperiment> => {
25+
): Promise<IModelSession> => {
2426
const data = {
2527
dataset_id: datasetId,
2628
task_name: taskName,
27-
name: expName,
29+
name: name,
2830
input_columns: inputColumns,
2931
output_columns: outputColumns,
3032
splits: splitsValue,
3133
};
3234

33-
const response = await api.post<IExperiment>("/v1/experiment/", data);
35+
const response = await api.post<IModelSession>("/v1/model-session/", data);
3436
return response.data;
3537
};
3638

37-
export const updateExperiment = async ({
39+
export const updateModelSession = async ({
3840
id,
3941
formData,
4042
}: {
4143
id: string;
4244
formData: { name?: string; dataset_id?: number; task_name?: string };
4345
}): Promise<object> => {
44-
const response = await api.patch(`/v1/experiment/${id}`, null, {
46+
const response = await api.patch(`/v1/model-session/${id}`, null, {
4547
params: formData,
4648
});
4749
return response.data;
4850
};
4951

50-
export const deleteExperiment = async (id: string): Promise<object> => {
51-
const response = await api.delete(`/v1/experiment/${id}`);
52+
export const deleteModelSession = async (id: string): Promise<object> => {
53+
const response = await api.delete(`/v1/model-session/${id}`);
5254
return response.data;
5355
};
5456

@@ -65,7 +67,7 @@ export const validateColumns = async (
6567
outputs_columns: outputColumns,
6668
};
6769
const response = await api.post<object>(
68-
"/v1/experiment/validation",
70+
"/v1/model-session/validation",
6971
formData,
7072
);
7173
return response.data;

‎DashAI/front/src/api/oldEndpoints.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ export const submitParameters = async (
3434
return response.data;
3535
};
3636

37-
export const runExperiment = async (sessionId: number): Promise<object> => {
38-
const response = await api.post<object>(`/v0/experiment/run/${sessionId}`);
37+
export const runModelSession = async (sessionId: number): Promise<object> => {
38+
const response = await api.post<object>(`/v0/model-session/run/${sessionId}`);
3939
return response.data;
4040
};
4141

4242
export const getResults = async (sessionId: number): Promise<object> => {
43-
const response = await api.get<object>(`/v0/experiment/results/${sessionId}`);
43+
const response = await api.get<object>(
44+
`/v0/model-session/results/${sessionId}`,
45+
);
4446
return response.data;
4547
};
4648

‎DashAI/front/src/api/run.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import api from "./api";
22
import type { IRun } from "../types/run";
33

4-
export const getRuns = async (experimentId: string = ""): Promise<IRun[]> => {
5-
const params = experimentId !== "" ? { experiment_id: experimentId } : {};
4+
export const getRuns = async (modelSessionId: string = ""): Promise<IRun[]> => {
5+
const params =
6+
modelSessionId !== "" ? { model_session_id: modelSessionId } : {};
67
const response = await api.get<IRun[]>("/v1/run/", { params });
78
return response.data;
89
};
@@ -21,7 +22,7 @@ export const getHyperparameterPlot = async (
2122
};
2223

2324
export const createRun = async (
24-
experimentId: string,
25+
modelSessionId: string,
2526
modelName: string,
2627
name: string,
2728
parameters: object,
@@ -35,7 +36,7 @@ export const createRun = async (
3536
description: string,
3637
): Promise<IRun> => {
3738
const data = {
38-
experiment_id: experimentId,
39+
model_session_id: modelSessionId,
3940
model_name: modelName,
4041
name,
4142
parameters,

‎DashAI/front/src/components/datasets/ConvertDatasetModal.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
getDatasetConverterList,
2727
} from "../../api/converter";
2828
import { ConverterListStatus } from "../../types/converter";
29-
import { getExperimentsExist } from "../../api/datasets";
29+
import { getModelSessionsExist } from "../../api/datasets";
3030
import CopyDatasetModal from "./converterModals/CopyDatasetModal";
3131
import ConverterClassColumnModal from "./converterModals/ConverterClassColumnModal";
3232
import TooltipedCellItem from "../shared/TooltipedCellItem";
@@ -114,7 +114,7 @@ function ConvertDatasetModal({ datasetId }) {
114114
const handleSaveConfig = async () => {
115115
// Check if there are experiments associated with the dataset
116116
try {
117-
const hasExperiments = await getExperimentsExist(datasetIdToModify);
117+
const hasExperiments = await getModelSessionsExist(datasetIdToModify);
118118
if (hasExperiments) {
119119
setOpenCopyModal(true);
120120
} else {

‎DashAI/front/src/components/experiments/ExperimentsTable.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { DataGrid, GridToolbar } from "@mui/x-data-grid";
99
import { Button, Grid, Paper, Typography, LinearProgress } from "@mui/material";
1010
import { useSnackbar } from "notistack";
1111

12-
import { deleteExperiment as deleteExperimentRequest } from "../../api/experiment";
12+
import { deleteModelSession as deleteModelSessionRequest } from "../../api/modelSession";
1313
import { formatDate } from "../../utils";
1414
import RunnerDialog from "./RunnerDialog";
1515
import Results from "../../pages/results/Results";
@@ -36,7 +36,7 @@ function ExperimentsTable({
3636

3737
const deleteExperiment = async (id) => {
3838
try {
39-
await deleteExperimentRequest(id);
39+
await deleteModelSessionRequest(id);
4040
enqueueSnackbar("Experiment successfully deleted.", {
4141
variant: "success",
4242
});

‎DashAI/front/src/components/experiments/NewExperimentModal.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { useTheme } from "@mui/material/styles";
1919
import useMediaQuery from "@mui/material/useMediaQuery";
2020
import { useSnackbar } from "notistack";
2121

22-
import { createExperiment as createExperimentRequest } from "../../api/experiment";
22+
import { createModelSession as createModelSessionRequest } from "../../api/modelSession";
2323
import { createRun as createRunRequest } from "../../api/run";
2424
import { generateSequentialName } from "../../utils/nameGenerator";
2525
import { checkIfHaveOptimazers } from "../../utils/schema";
@@ -136,7 +136,7 @@ export default function NewExperimentModal({
136136
const finalExperimentName =
137137
newExp.name.trim() === "" ? defaultName : newExp.name.trim();
138138

139-
const response = await createExperimentRequest(
139+
const response = await createModelSessionRequest(
140140
newExp.dataset.id,
141141
newExp.task_name,
142142
finalExperimentName,

‎DashAI/front/src/components/experiments/PrepareDatasetStep.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import DivideDatasetColumns from "./DivideDatasetColumns";
66
import SplitDatasetRows from "./SplitDatasetRows";
77
import { getDatasetInfo as getDatasetInfoRequest } from "../../api/datasets";
88
import { getComponents as getComponentsRequest } from "../../api/component";
9-
import { validateColumns as validateColumnsRequest } from "../../api/experiment";
9+
import { validateColumns as validateColumnsRequest } from "../../api/modelSession";
1010
import { useSnackbar } from "notistack";
1111
/**
1212
* Step of the experiment modal: Set the input and output columns to use for clasification

‎DashAI/front/src/components/explainers/SelectDatasetStep.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
} from "../../api/datasets";
2020
import { validateDataset as validateDatasetRequest } from "../../api/explainer";
2121
import { getRunById } from "../../api/run";
22-
import { getExperimentById } from "../../api/experiment";
22+
import { getModelSessionById } from "../../api/modelSession";
2323
import { formatDate } from "../../utils";
2424
import { SplitSelector } from "./SplitSelector";
2525
import NoteBox from "../notebooks/NoteBox";
@@ -136,7 +136,7 @@ export default function SelectDatasetStep({
136136
if (newExpl.run_id) {
137137
try {
138138
const run = await getRunById(newExpl.run_id);
139-
const experiment = await getExperimentById(run.experiment_id);
139+
const experiment = await getModelSessionById(run.model_session_id);
140140
const splitsExperiment = JSON.parse(experiment.splits);
141141
setSplits((prev) => ({
142142
...prev,

‎DashAI/front/src/components/explainers/TrainedModelsTable.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Grid, MenuItem, Paper, TextField, Typography } from "@mui/material";
44
import QueryStatsIcon from "@mui/icons-material/QueryStats";
55
import { useNavigate } from "react-router-dom";
66
import { useSnackbar } from "notistack";
7-
import { getExperiments as getExperimentsRequest } from "../../api/experiment";
7+
import { getModelSessions as getModelSessionsRequest } from "../../api/modelSession";
88
import { getRuns as getRunsRequest } from "../../api/run";
99
import { formatDate } from "../../utils";
1010
import { getComponents } from "../../api/component";
@@ -125,7 +125,7 @@ function TrainedModelsTable() {
125125
const getModels = async () => {
126126
setLoading(true);
127127
try {
128-
const experiments = await getExperimentsRequest();
128+
const experiments = await getModelSessionsRequest();
129129
const runs = await getRunsRequest();
130130
const rows = extractRows(experiments, runs);
131131
const filteredRows = rows.filter((row) => row.status === 3);

0 commit comments

Comments
 (0)