From: rajdeep11 Date: Thu, 7 Dec 2023 12:28:27 +0000 (+0530) Subject: changes in the get trainingjob api X-Git-Tag: 1.2.0~7 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F12183%2F1;p=aiml-fw%2Fawmf%2Ftm.git changes in the get trainingjob api Issue-Id: AIMLFW-65 Change-Id: Ib597e80ce9787c89329bdc6ad197d40ebae70f35 Signed-off-by: rajdeep11 --- diff --git a/tests/test_tm_apis.py b/tests/test_tm_apis.py index 436acab..6a34031 100644 --- a/tests/test_tm_apis.py +++ b/tests/test_tm_apis.py @@ -208,14 +208,14 @@ class Test_get_trainingjob_by_name_version: self.client = trainingmgr_main.APP.test_client(self) self.logger = trainingmgr_main.LOGGER - @patch('trainingmgr.trainingmgr_main.get_info_by_version',return_value=[('usecase7', 'auto test', '*', 'prediction with model name', 'Default', '{"arguments": {"epochs": "1", "usecase": "usecase7"}}', 'Enb=20 and Cellnum=6', datetime.datetime(2022, 9, 20,11, 40, 30), '7d09c0bf-7575-4475-86ff-5573fb3c4716', '{"DATA_EXTRACTION": "FINISHED", "DATA_EXTRACTION_AND_TRAINING": "FINISHED", "TRAINING": "FINISHED", "TRAINING_AND_TRAINED_MODEL": "FINISHED", "TRAINED_MODEL": "FINISHED"}', datetime.datetime(2022, 9, 20, 11, 42, 20), 1, True, 'Near RT RIC', '{"datalake_source": {"CassandraSource": {}}}', '{"datalake_source": {"CassandraSource": {}}}','http://10.0.0.47:32002/model/usecase7/1/Model.zip','','','','','')]) + @patch('trainingmgr.trainingmgr_main.get_info_by_version',return_value=[('usecase7', 'auto test', '*', 'prediction with model name', 'Default', '{"arguments": {"epochs": "1", "usecase": "usecase7"}}', 'Enb=20 and Cellnum=6', datetime.datetime(2022, 9, 20,11, 40, 30), '7d09c0bf-7575-4475-86ff-5573fb3c4716', '{"DATA_EXTRACTION": "FINISHED", "DATA_EXTRACTION_AND_TRAINING": "FINISHED", "TRAINING": "FINISHED", "TRAINING_AND_TRAINED_MODEL": "FINISHED", "TRAINED_MODEL": "FINISHED"}', datetime.datetime(2022, 9, 20, 11, 42, 20), 1, True, 'Near RT RIC', '{"datalake_source": {"CassandraSource": {}}}', '{"datalake_source": {"CassandraSource": {}}}','http://10.0.0.47:32002/model/usecase7/1/Model.zip','','','','','',False,'','')]) @patch('trainingmgr.trainingmgr_main.get_metrics',return_value={"metrics": [{"Accuracy": "0.0"}]}) @patch('trainingmgr.trainingmgr_main.get_one_key',return_value='cassandra') def test_get_trainingjob_by_name_version(self,mock1,mock2,mock3): 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": "", "accuracy": {"metrics": [{"Accuracy": "0.0"}]}}}' + 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" assert response.status_code == status.HTTP_200_OK, "not equal code" diff --git a/trainingmgr/trainingmgr_main.py b/trainingmgr/trainingmgr_main.py index 224292e..dbfcdee 100644 --- a/trainingmgr/trainingmgr_main.py +++ b/trainingmgr/trainingmgr_main.py @@ -135,6 +135,12 @@ def get_trainingjob_by_name_version(trainingjob_name, version): _measurement of influx db datalake bucket: str bucket name of influx db datalake + is_mme: boolean + whether the mme is enabled + model_name: str + model name + model_info: str + model info provided by the mme status code: HTTP status code 200 @@ -176,6 +182,9 @@ def get_trainingjob_by_name_version(trainingjob_name, version): "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], "accuracy": data } response_data = {"trainingjob": dict_data}