added support for no compartment id provided and unit test for the same

Author: Aryanag2

ads/aqua/shaperecommend/recommend.py

@@ -198,7 +198,7 @@ def _search_model_in_catalog(self, model_id: str, compartment_id: str) -> Option
             logger.warning(f"Could not search for model '{model_id}' in catalog: {e}")
         return None
 
-    def valid_compute_shapes(self, compartment_id: str) -> List["ComputeShapeSummary"]:
+    def valid_compute_shapes(self, compartment_id: Optional[str] = None) -> List["ComputeShapeSummary"]:
         """
         Returns a filtered list of GPU-only ComputeShapeSummary objects by reading and parsing a JSON file.
 
@@ -214,9 +214,22 @@ def valid_compute_shapes(self, compartment_id: str) -> List["ComputeShapeSummary
 
         Raises
         ------
-        ValueError
-            If the file cannot be opened, parsed, or the 'shapes' key is missing.
+        AquaValueError
+            If a compartment_id is not provided and cannot be found in the
+            environment variables.
         """
+        if not compartment_id:
+            compartment_id = os.environ.get("NB_SESSION_COMPARTMENT_OCID") or os.environ.get("PROJECT_COMPARTMENT_OCID")
+            if compartment_id:
+                logger.info(f"Using compartment_id from environment: {compartment_id}")
+
+        if not compartment_id:
+            raise AquaValueError(
+                "A compartment OCID is required to list available shapes. "
+                "Please provide it as a parameter or set the 'NB_SESSION_COMPARTMENT_OCID' "
+                "or 'PROJECT_COMPARTMENT_OCID' environment variable."
+            )
+
         oci_shapes = OCIDataScienceModelDeployment.shapes(compartment_id=compartment_id)
         set_user_shapes = {shape.name: shape for shape in oci_shapes}
 

tests/unitary/with_extras/aqua/test_recommend.py

@@ -503,4 +503,20 @@ def test_fetch_config_only_real_call_success(self):
             assert "model_type" in config
             assert "dim" in config
         except AquaValueError as e:
-            pytest.fail(f"Real network call to Hugging Face failed: {e}")
+            pytest.fail(f"Real network call to Hugging Face failed: {e}")
+            
+            
+    @patch('ads.aqua.shaperecommend.recommend.OCIDataScienceModelDeployment.shapes')
+    @patch.dict(os.environ, {}, clear=True)
+    def test_valid_compute_shapes_raises_error_no_compartment(self, mock_oci_shapes):
+        """
+        Tests that valid_compute_shapes raises a ValueError when no compartment ID is
+        provided and none can be found in the environment.
+        """
+        app = AquaShapeRecommend()
+        
+        with pytest.raises(AquaValueError, match="A compartment OCID is required"):
+            app.valid_compute_shapes(compartment_id=None)
+        
+        # Verify that the OCI SDK was not called because the check failed early
+        mock_oci_shapes.assert_not_called()