From 2ff0e58ab092e047d59f5c3eb9a296ae8bcdf6fa Mon Sep 17 00:00:00 2001 From: rajdeep11 Date: Mon, 23 Dec 2024 12:23:37 +0530 Subject: [PATCH] changes for a featuregroup that does not exist Change-Id: I254f8a189e478fbb13e9960dbf23ba1f177ec332 Signed-off-by: rajdeep11 --- trainingmgr/db/featuregroup_db.py | 2 +- trainingmgr/service/featuregroup_service.py | 2 +- trainingmgr/service/training_job_service.py | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/trainingmgr/db/featuregroup_db.py b/trainingmgr/db/featuregroup_db.py index 079c888..0187a75 100644 --- a/trainingmgr/db/featuregroup_db.py +++ b/trainingmgr/db/featuregroup_db.py @@ -65,7 +65,7 @@ def get_feature_group_by_name_db(featuregroup_name): """ This Function return a feature group with name "featuregroup_name" """ - return FeatureGroup.query.filter_by(featuregroup_name=featuregroup_name).first() + return FeatureGroup.query.filter_by(featuregroup_name=featuregroup_name).one() def get_feature_groups_from_inputDataType_db(inputDataType): """ diff --git a/trainingmgr/service/featuregroup_service.py b/trainingmgr/service/featuregroup_service.py index af0a9d9..4b021f5 100644 --- a/trainingmgr/service/featuregroup_service.py +++ b/trainingmgr/service/featuregroup_service.py @@ -27,7 +27,7 @@ def get_featuregroup_by_name(featuregroup_name:str): try: featuregroup = get_feature_group_by_name_db(featuregroup_name) return featuregroup - except DBException as err: + except Exception as err: raise TMException(f"get featuregroup by name service failed with exception : {str(err)}") def get_featuregroup_from_inputDataType(inputDataType): diff --git a/trainingmgr/service/training_job_service.py b/trainingmgr/service/training_job_service.py index 24187d2..afbd875 100644 --- a/trainingmgr/service/training_job_service.py +++ b/trainingmgr/service/training_job_service.py @@ -206,11 +206,10 @@ def training(trainingjob): LOGGER.debug("Request for training trainingjob id %s ", trainingjob.id) try: - # trainingjob = get_training_job(trainingjob_id) - # print(trainingjob) - # trainingjob_name = trainingjob.trainingjob_name + training_job_id = trainingjob.id - featuregroup= get_featuregroup_by_name(getField(trainingjob.training_config, "feature_group_name")) + featuregroup_name = getField(trainingjob.training_config, "feature_group_name") + featuregroup= get_featuregroup_by_name(featuregroup_name) LOGGER.debug("featuregroup name is: "+featuregroup.featuregroup_name) feature_list_string = featuregroup.feature_list influxdb_info_dic={} @@ -258,11 +257,9 @@ def training(trainingjob): change_state_to_failed(training_job_id) if "No row was found when one was required" in str(err): return jsonify({ - 'message': str(err) + 'message': f"No featuregroup found with featuregroup name {featuregroup_name}" }), 404 except Exception as e: - # print(traceback.format_exc()) - # response_data = {"Exception": str(err)} LOGGER.debug("Error is training, job id: " + str(training_job_id)+" " + str(e)) change_state_to_failed(training_job_id) return jsonify({ -- 2.16.6