fixed small bug w/ constants

Author: elizjo

ads/aqua/modeldeployment/deployment.py

@@ -1288,35 +1288,42 @@ def validate_deployment_params(
 
     def recommend_shape(self, **kwargs) -> Union[Table, ShapeRecommendationReport]:
         """
-        For the CLI (set generate_table = True), generates the table (in rich diff) with valid
+        For the CLI (set by default, generate_table = True), generates the table (in rich diff) with valid
         GPU deployment shapes for the provided model and configuration.
 
         For the API (set generate_table = False), generates the JSON with valid
         GPU deployment shapes for the provided model and configuration.
 
-        Validates if recommendations are generated, calls method to construct the rich diff
-        table with the recommendation data.
+        Validates the input and determines whether recommendations are available.
 
         Parameters
         ----------
-        model_ocid : str
-        OCID of the model to recommend feasible compute shapes.
+        **kwargs
+            model_ocid : str
+                (Required) The OCID of the model to recommend feasible compute shapes for.
+            generate_table : bool, optional
+                If True, generate and return a rich-diff table; if False, return a JSON response (default is False).
+            compartment_id : str, optional
+                The OCID of the user's compartment to use for the recommendation.
 
         Returns
         -------
         Table (generate_table = True)
-            A table format for the recommendation report with compatible deployment shapes
-            or troubleshooting info citing the largest shapes if no shape is suitable.
+            If `generate_table` is True, a table displaying the recommendation report with compatible deployment shapes,
+            or troubleshooting info if no shape is suitable.
 
         ShapeRecommendationReport (generate_table = False)
-            A recommendation report with compatible deployment shapes, or troubleshooting info
-            citing the largest shapes if no shape is suitable.
+            If `generate_table` is False, a structured recommendation report with compatible deployment shapes,
+            or troubleshooting info and citing the largest shapes if no shape is suitable.
 
         Raises
         ------
         AquaValueError
-            If model type is unsupported by tool (no recommendation report generated)
+            If the model type is unsupported and no recommendation report can be generated.
         """
+        deployment_config = self.get_deployment_config(model_id=kwargs.get("model_id"))
+        kwargs["deployment_config"] = deployment_config
+
         try:
             request = RequestRecommend(**kwargs)
         except ValidationError as e:

ads/aqua/shaperecommend/constants.py

@@ -86,7 +86,7 @@
 
 IN_FLIGHT_QUANTIZATION = {"4bit"}  # vLLM only supports 4bit in-flight-quantization
 
-VLLM_PARAMS = "VLLM_PARAMS"
+VLLM_PARAMS_FAMILY = "VLLM_PARAMS"
 VLLM_ENV = "VLLM"
 
 QUANT_FLAG = "--quantization"

ads/aqua/shaperecommend/shape_report.py

@@ -16,7 +16,7 @@
     QUANT_FLAG,
     QUANT_MAPPING,
     VLLM_ENV,
-    VLLM_PARAMS,
+    VLLM_PARAMS_FAMILY,
     WEIGHT_DTYPE_FLAG,
 )
 from ads.aqua.shaperecommend.estimator import MemoryEstimator
@@ -341,7 +341,7 @@ def from_deployment_config(
                 continue
 
             recommendation = ""
-            current_params = current_config.parameters.get(VLLM_PARAMS)
+            current_params = current_config.parameters.get(VLLM_PARAMS_FAMILY)
             current_env = current_config.env.get(VLLM_ENV)
 
             deployment_params = cls.create_deployment_config_from_params_string(