From: rajdeep11 Date: Mon, 8 Apr 2024 07:28:49 +0000 (+0530) Subject: changes in get_trainingjob X-Git-Tag: 2.0.0~6^2~1 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F84%2F12684%2F1;p=aiml-fw%2Fawmf%2Ftm.git changes in get_trainingjob Issue-id: AIMLFW-76 Change-Id: I0339d760e458bc1fd6e166c2c9be72f1554e85c0 Signed-off-by: rajdeep11 --- diff --git a/tests/test_tm_apis.py b/tests/test_tm_apis.py index a6f8a4e..87308a3 100644 --- a/tests/test_tm_apis.py +++ b/tests/test_tm_apis.py @@ -274,9 +274,7 @@ class Test_get_trainingjob_by_name_version: usecase_name = "usecase7" version = "1" response = self.client.get("/trainingjobs/{}/{}".format(usecase_name, version)) - expected_data = b'{"trainingjob": {"trainingjob_name": "usecase7", "description": "auto test", "feature_list": "*", "pipeline_name": "prediction with model name", "experiment_name": "Default", "arguments": {"epochs": "1", "usecase": "usecase7"}, "query_filter": "Enb=20 and Cellnum=6", "creation_time": "2022-09-20 11:40:30", "run_id": "7d09c0bf-7575-4475-86ff-5573fb3c4716", "steps_state": {"DATA_EXTRACTION": "FINISHED", "DATA_EXTRACTION_AND_TRAINING": "FINISHED", "TRAINING": "FINISHED", "TRAINING_AND_TRAINED_MODEL": "FINISHED", "TRAINED_MODEL": "FINISHED"}, "updation_time": "2022-09-20 11:42:20", "version": 1, "enable_versioning": true, "pipeline_version": "Near RT RIC", "datalake_source": "cassandra", "model_url": "{\\"datalake_source\\": {\\"CassandraSource\\": {}}}", "notification_url": "http://10.0.0.47:32002/model/usecase7/1/Model.zip", "_measurement": "", "bucket": "", "is_mme": "", "model_name": "", "model_info": false, "accuracy": {"metrics": [{"Accuracy": "0.0"}]}}}' - - assert response.content_type == "application/json", "not equal content type" + expected_data = b'{"trainingjob": {"trainingjob_name": "usecase7", "description": "auto test", "feature_list": "*", "pipeline_name": "prediction with model name", "experiment_name": "Default", "arguments": {"epochs": "1", "usecase": "usecase7"}, "query_filter": "Enb=20 and Cellnum=6", "creation_time": "2022-09-20 11:40:30", "run_id": "7d09c0bf-7575-4475-86ff-5573fb3c4716", "steps_state": {"DATA_EXTRACTION": "FINISHED", "DATA_EXTRACTION_AND_TRAINING": "FINISHED", "TRAINING": "FINISHED", "TRAINING_AND_TRAINED_MODEL": "FINISHED", "TRAINED_MODEL": "FINISHED"}, "updation_time": "2022-09-20 11:42:20", "version": 1, "enable_versioning": true, "pipeline_version": "Near RT RIC", "datalake_source": "cassandra", "model_url": "{\\"datalake_source\\": {\\"CassandraSource\\": {}}}", "notification_url": "http://10.0.0.47:32002/model/usecase7/1/Model.zip", "is_mme": "", "model_name": "", "model_info": "", "accuracy": {"metrics": [{"Accuracy": "0.0"}]}}}' assert response.status_code == status.HTTP_200_OK, "not equal code" assert response.data == expected_data, "not equal data" diff --git a/trainingmgr/trainingmgr_main.py b/trainingmgr/trainingmgr_main.py index 07eb39c..924900e 100644 --- a/trainingmgr/trainingmgr_main.py +++ b/trainingmgr/trainingmgr_main.py @@ -131,10 +131,6 @@ def get_trainingjob_by_name_version(trainingjob_name, version): url for downloading model notification_url: str url of notification server - _measurement: str - _measurement of influx db datalake - bucket: str - bucket name of influx db datalake is_mme: boolean whether the mme is enabled model_name: str @@ -180,11 +176,9 @@ def get_trainingjob_by_name_version(trainingjob_name, version): "datalake_source": get_one_key(json.loads(trainingjob_info[14])['datalake_source']), "model_url": trainingjob_info[15], "notification_url": trainingjob_info[16], - "_measurement": trainingjob_info[17], - "bucket": trainingjob_info[18], - "is_mme": trainingjob_info[20], - "model_name": trainingjob_info[21], - "model_info": trainingjob_info[22], + "is_mme": trainingjob_info[17], + "model_name": trainingjob_info[18], + "model_info": trainingjob_info[19], "accuracy": data } response_data = {"trainingjob": dict_data}