From 0c40d4f3a1b4978a774c92458558e4e0a70c9223 Mon Sep 17 00:00:00 2001 From: Taewan Kim Date: Wed, 12 Mar 2025 14:22:55 +0900 Subject: [PATCH] fix the api of fetching training job list - ID, Pipeline Name, Feature Group Name are displayed on training jobs due to the response model change Change-Id: I5b8378447338e12f842d8a174e14c3c3119e319d Signed-off-by: Taewan Kim --- src/apis/training-job.js | 2 +- .../home/form/CreateOrEditTrainingJobForm.js | 16 +++++++--------- src/components/home/status/StatusPageRows.js | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/apis/training-job.js b/src/apis/training-job.js index cbc517f..d9d21e5 100644 --- a/src/apis/training-job.js +++ b/src/apis/training-job.js @@ -8,7 +8,7 @@ export const trainingJobAPI = { return await instance.get(`/trainingjobs/${params.trainingJobName}/${params.trainingJobVersion}/steps_state`); }, getLatestTrainingJob: async () => { - return await instance.get('/trainingjobs/latest'); + return await instance.get('/ai-ml-model-training/v1/training-jobs'); }, invokeTrainingJob: async ({ data }) => { return await instance.post('/trainingjobs/retraining', { ...data }); diff --git a/src/components/home/form/CreateOrEditTrainingJobForm.js b/src/components/home/form/CreateOrEditTrainingJobForm.js index 3ca1651..30df903 100644 --- a/src/components/home/form/CreateOrEditTrainingJobForm.js +++ b/src/components/home/form/CreateOrEditTrainingJobForm.js @@ -26,7 +26,7 @@ import { convertToCommaSeparatedString, } from '../common/CommonMethods'; import { instance, UCMgr_baseUrl } from '../../../states'; -import { pipelineAPI } from '../../../apis/pipeline'; +import { featureGroupAPI, pipelineAPI } from '../../../apis'; class CreateTrainingJob extends React.Component { constructor(props) { @@ -211,13 +211,12 @@ class CreateTrainingJob extends React.Component { } fetchPipelineVersions(pipeline_name, shouldGetLatestVersion) { - instance - .get(`/pipelines/${pipeline_name}/versions`) + pipelineAPI.getPipelineVersions({ params: { pipelineName: pipeline_name } }) .then(res => { - this.logger('Server reponded pipeline versions list', res.data.versions_list); + this.logger('Server reponded pipeline versions list', res.data); this.setState( { - plVerList: res.data.versions_list, + plVerList: res.data, }, () => { if (shouldGetLatestVersion) { @@ -274,13 +273,12 @@ class CreateTrainingJob extends React.Component { } fetchFeatureGroups() { - instance - .get('/featureGroup') + featureGroupAPI.getAllFeatureGroup() .then(res => { - this.logger('Server reponded FG', res.data.featuregroups); + this.logger('Server reponded FG', res.data.FeatureGroups); this.setState( { - featureGroupList: res.data.featuregroups, + featureGroupList: res.data.FeatureGroups, }, () => { let shouldChangeFGname = true; diff --git a/src/components/home/status/StatusPageRows.js b/src/components/home/status/StatusPageRows.js index a1df12b..3f2ecce 100644 --- a/src/components/home/status/StatusPageRows.js +++ b/src/components/home/status/StatusPageRows.js @@ -63,8 +63,8 @@ const StatusPageRows = props => { try { const result = await trainingJobAPI.getLatestTrainingJob(); logger('fetchTrainingJobs Result', result); - logger('Training Jobs are --> ', result.data.trainingjobs); - setTrainingJobs(result.data.trainingjobs); + logger('Training Jobs are --> ', result.data); + setTrainingJobs(result.data); } catch (e) { console.error(e); } @@ -164,19 +164,19 @@ const StatusPageRows = props => { ), }, { - id: 'trainingjob_name', - Header: 'Training Job Name', - accessor: 'trainingjob_name', + id: 'id', + Header: 'ID', + accessor: 'id', }, { - id: 'version', - Header: 'Version', - accessor: 'version', + id: 'trainingPipelineName', + Header: 'Pipeline Name', + accessor: 'training_config.trainingPipeline.training_pipeline_name', }, { - id: 'overall_status', - Header: 'Overall Status', - accessor: row => (row.overall_status === 'IN_PROGRESS' ? 'IN PROGRESS' : row.overall_status), + id: 'featureGroupName', + Header: 'Feature Group Name', + accessor: 'training_config.dataPipeline.feature_group_name', }, { id: 'stepsState', -- 2.16.6