From: Swaraj Kumar <swaraj.kumar@samsung.com>
Date: Tue, 4 Feb 2025 02:42:52 +0000 (+0530)
Subject: Model not found error
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F14106%2F2;p=aiml-fw%2Fawmf%2Ftm.git

Model not found error

Change-Id: I3d25248d2c4b29b39e89e1bfaa37e00d680b099f
Signed-off-by: Swaraj Kumar <swaraj.kumar@samsung.com>
---

diff --git a/tests/test_trainingmgr_main.py b/tests/test_trainingmgr_main.py
index 6aad439..4da8b07 100644
--- a/tests/test_trainingmgr_main.py
+++ b/tests/test_trainingmgr_main.py
@@ -76,14 +76,26 @@ class TestGetModel:
     @patch('trainingmgr.trainingmgr_main.MM_SDK', return_value=mocked_mm_sdk)
     @patch('trainingmgr.trainingmgr_main.send_file')
     def test_getmodel_model_not_found(self, mock_sendfile, mock_model_metrics_sdk):
-        
         mock_sendfile.side_effect = Exception("An error occurred (404) when calling the HeadObject operation: Not Found")
-        response = self.client.get("/model/{modelname}/{modelversion}/{artifactversion}/Model.zip".format(modelname="nonexistent_model",
-                                modelversion="1.0", artifactversion = "1.0"), content_type="application/json")
-        
+        response = self.client.get(
+            "/model/{modelname}/{modelversion}/{artifactversion}/Model.zip".format(
+                modelname="nonexistent_model", modelversion="1.0", artifactversion="1.0"
+            ),
+            content_type="application/json",
+        )
         assert response.status_code == 404
-        assert b"error while downloading model as no model with modelId nonexistent_model 1.0 1.0 was found" in response.data
-    
+        # Expected response as a plain string
+        expected_response = (
+            f"Error while downloading model: "
+            f"Model Name = nonexistent_model, "
+            f"Model Version = 1.0, "
+            f"Artifact Version = 1.0, "
+            f"Model not found"
+        )
+        # Convert response data from bytes to a string
+        actual_response = response.data.decode("utf-8")
+        assert actual_response == expected_response, f"Expected: {expected_response}, Got: {actual_response}"
+           
     @patch('trainingmgr.trainingmgr_main.MM_SDK', return_value=mocked_mm_sdk)
     @patch('trainingmgr.trainingmgr_main.send_file')
     def test_getmodel_internal_server_error(self, mock_sendfile, mock_model_metrics_sdk):
diff --git a/trainingmgr/trainingmgr_main.py b/trainingmgr/trainingmgr_main.py
index 7f96e4b..0b858dc 100644
--- a/trainingmgr/trainingmgr_main.py
+++ b/trainingmgr/trainingmgr_main.py
@@ -109,8 +109,16 @@ def get_model(modelname, modelversion, artifactversion):
         
         # for no model present in leofs
         if "An error occurred (404) when calling the HeadObject operation: Not Found" in str(err):
-            return {"Exception": f"error while downloading model as no model with modelId {modelname} {modelversion} {artifactversion} was found"}, status.HTTP_404_NOT_FOUND
-        
+            err_msg = (
+                f"Error while downloading model: "
+                f"Model Name = {modelname}, "
+                f"Model Version = {modelversion}, "
+                f"Artifact Version = {artifactversion}, "
+                f"Model not found"
+            )
+            LOGGER.error(err_msg)  
+            return err_msg, status.HTTP_404_NOT_FOUND
+
         return {"Exception": "error while downloading model"}, status.HTTP_500_INTERNAL_SERVER_ERROR
 
 
@@ -169,7 +177,7 @@ def data_extraction_notification():
         registered_model_list = get_modelinfo_by_modelId_service(model_id.modelname, model_id.modelversion)
 
         if registered_model_list is None:
-            return jsonify({"Exception":f"modelId {model_id.modelname} and {model_id.modelversion} is not registered at MME, Please first register at MME and then continue"}), status.HTTP_400_BAD_REQUEST
+            return jsonify({"Exception":f"Model Name = {model_id.modelname} and Model Version = {model_id.modelversion} is not registered at MME, Please first register at MME and then continue"}), status.HTTP_400_BAD_REQUEST
 
         registered_model_dict = registered_model_list[0]