Addressing review comments

Author: kumar-shivam-ranjan

ads/aqua/extension/common_handler.py

@@ -51,20 +51,22 @@ def get(self):
 
         """
 
-        current_version_path = os.path.join(
+        current_aqua_version_path = os.path.join(
             os.path.dirname(os.path.abspath(__file__)), "..", "version.json"
         )
+        current_aqua_version = json.loads(read_file(current_aqua_version_path))
+        current_ads_version = {"ads": metadata.version("oracle_ads")}
+        current_version = {"installed": {**current_aqua_version, **current_ads_version}}
+
         latest_version_artifact_path = ObjectStorageDetails(
             CONDA_BUCKET_NAME, CONDA_BUCKET_NS, "service_pack/aqua_latest_version.json"
         ).path
-        latest_version_content = read_file(
-            latest_version_artifact_path, auth=default_signer()
+
+        latest_version = json.loads(
+            read_file(latest_version_artifact_path, auth=default_signer())
         )
-        current_version_content = read_file(current_version_path)
-        response = {
-            **json.loads(current_version_content),
-            **json.loads(latest_version_content),
-        }
+
+        response = {**current_version, **latest_version}
         return self.finish(response)
 
 

ads/aqua/modeldeployment/entities.py

@@ -147,6 +147,8 @@ def from_oci_model_deployment(
         AquaDeployment:
             The instance of the Aqua model deployment.
         """
+        print("oci_model_deployment: ", oci_model_deployment)
+
         instance_configuration = oci_model_deployment.model_deployment_configuration_details.model_configuration_details.instance_configuration
         instance_shape_config_details = (
             instance_configuration.model_deployment_instance_shape_config_details

ads/aqua/version.json

@@ -1,6 +1,3 @@
 {
-  "installed": {
-    "ads": "2.14.2",
-    "aqua": "0.1.3.0"
-  }
+  "aqua": "1.0.7"
 }