Merge branch 'main' into feature/fallback_automlx

Author: codeloop

ads/aqua/app.py

@@ -225,6 +225,7 @@ def create_model_catalog(
         model_taxonomy_metadata: Union[ModelTaxonomyMetadata, Dict],
         compartment_id: str,
         project_id: str,
+        defined_tags: Dict = None,
         **kwargs,
     ) -> DataScienceModel:
         model = (
@@ -237,7 +238,7 @@ def create_model_catalog(
             .with_custom_metadata_list(model_custom_metadata)
             .with_defined_metadata_list(model_taxonomy_metadata)
             .with_provenance_metadata(ModelProvenanceMetadata(training_id=UNKNOWN))
-            # TODO: decide what parameters will be needed
+            .with_defined_tags(**(defined_tags or {})) # Create defined tags when a model is created.
             .create(
                 **kwargs,
             )

ads/aqua/evaluation/evaluation.py

@@ -260,6 +260,10 @@ def create(
             **create_aqua_evaluation_details.model_parameters,
         )
 
+        evaluation_model_defined_tags = (
+            create_aqua_evaluation_details.defined_tags or {}
+        )
+
         target_compartment = (
             create_aqua_evaluation_details.compartment_id or COMPARTMENT_OCID
         )
@@ -311,9 +315,7 @@ def create(
                         create_aqua_evaluation_details.experiment_description
                     )
                     .with_freeform_tags(**evaluation_mvs_freeform_tags)
-                    .with_defined_tags(
-                        **(create_aqua_evaluation_details.defined_tags or {})
-                    )
+                    .with_defined_tags(**evaluation_model_defined_tags)
                     # TODO: decide what parameters will be needed
                     .create(**kwargs)
                 )
@@ -358,6 +360,7 @@ def create(
             .with_custom_metadata_list(evaluation_model_custom_metadata)
             .with_defined_metadata_list(evaluation_model_taxonomy_metadata)
             .with_provenance_metadata(ModelProvenanceMetadata(training_id=UNKNOWN))
+            .with_defined_tags(**evaluation_model_defined_tags)
             # TODO uncomment this once the evaluation container will get the updated version of the ADS
             # .with_input_schema(create_aqua_evaluation_details.to_dict())
             # TODO: decide what parameters will be needed
@@ -390,7 +393,7 @@ def create(
             .with_shape_name(create_aqua_evaluation_details.shape_name)
             .with_block_storage_size(create_aqua_evaluation_details.block_storage_size)
             .with_freeform_tag(**evaluation_job_freeform_tags)
-            .with_defined_tag(**(create_aqua_evaluation_details.defined_tags or {}))
+            .with_defined_tag(**evaluation_model_defined_tags)
         )
         if (
             create_aqua_evaluation_details.memory_in_gbs
@@ -429,15 +432,17 @@ def create(
                 metrics=create_aqua_evaluation_details.metrics,
                 inference_configuration=eval_inference_configuration or {},
             )
-        ).create(**kwargs)  ## TODO: decide what parameters will be needed
+        ).create(
+            **kwargs
+        )  ## TODO: decide what parameters will be needed
         logger.debug(
             f"Successfully created evaluation job {evaluation_job.id} for {create_aqua_evaluation_details.evaluation_source_id}."
         )
 
         evaluation_job_run = evaluation_job.run(
             name=evaluation_model.display_name,
             freeform_tags=evaluation_job_freeform_tags,
-            defined_tags=(create_aqua_evaluation_details.defined_tags or {}),
+            defined_tags=evaluation_model_defined_tags,
             wait=False,
         )
         logger.debug(
@@ -461,16 +466,12 @@ def create(
             Tags.AQUA_EVALUATION: Tags.AQUA_EVALUATION,
             **(create_aqua_evaluation_details.freeform_tags or {}),
         }
-        evaluation_model_defined_tags = (
-            create_aqua_evaluation_details.defined_tags or {}
-        )
 
         self.ds_client.update_model(
             model_id=evaluation_model.id,
             update_model_details=UpdateModelDetails(
                 custom_metadata_list=updated_custom_metadata_list,
                 freeform_tags=evaluation_model_freeform_tags,
-                defined_tags=evaluation_model_defined_tags,
             ),
         )
 

ads/aqua/finetuning/finetuning.py

@@ -263,6 +263,7 @@ def create(
             compartment_id=target_compartment,
             project_id=target_project,
             model_by_reference=True,
+            defined_tags=create_fine_tuning_details.defined_tags
         )
 
         ft_job_freeform_tags = {
@@ -382,14 +383,12 @@ def create(
             Tags.AQUA_FINE_TUNED_MODEL_TAG: f"{source.id}#{source.display_name}",
             **(create_fine_tuning_details.freeform_tags or {}),
         }
-        model_defined_tags = create_fine_tuning_details.defined_tags or {}
 
         self.update_model(
             model_id=ft_model.id,
             update_model_details=UpdateModelDetails(
                 custom_metadata_list=updated_custom_metadata_list,
                 freeform_tags=model_freeform_tags,
-                defined_tags=model_defined_tags,
             ),
         )
         logger.debug(
@@ -490,7 +489,7 @@ def create(
                 "finetuning_source": source.id,
                 "finetuning_experiment_id": experiment_model_version_set_id,
                 **model_freeform_tags,
-                **model_defined_tags,
+                **(create_fine_tuning_details.defined_tags or {}),
             },
             parameters=ft_parameters,
         )

docs/source/release_notes.rst

@@ -2,16 +2,23 @@
 Release Notes
 =============
 
+2.13.3
+-------
+Release date: March 21, 2025
+
+* Fixed defined tag permission issue when creating AI Quick Action fine-tuning and evaluation.
+
+
 2.13.2
 -------
-Release date: March 14th, 2025
+Release date: March 14, 2025
 
 * Fixed bug in DataScienceModel defined metadata.
 
 
 2.13.1
 -------
-Release date: March 13th, 2025
+Release date: March 13, 2025
 
 
 * Upgraded OCI SDK to ``v2.148.0`` for improved compatibility and performance.
@@ -35,21 +42,21 @@ Release date: March 13th, 2025
 
 2.13.0
 -------
-Release date: Feb 14th, 2025
+Release date: Feb 14, 2025
 
 * Fixed bug in DataScienceModel defined metadata where non-predefined metadata keys caused errors.
 
 
 2.12.11
 -------
-Release date: Feb 5th, 2025
+Release date: Feb 5, 2025
 
 * Fixed bug while loading model configuration in AI Quick Actions.
 
 
 2.12.10
 -------
-Release date: Feb 5th, 2025
+Release date: Feb 5, 2025
 
 * Support inference container URI to be edited for unverified models in AI Quick Actions.
 * Logging improvements for all CRUD operations in AI Quick Actions.

pyproject.toml

@@ -21,7 +21,7 @@ build-backend = "flit_core.buildapi"
 
 # Required
 name = "oracle_ads" # the install (PyPI) name; name for local build in [tool.flit.module] section below
-version = "2.13.2"
+version = "2.13.3"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"