oracle-ads 2.13.2rc1__py3-none-any.whl → 2.13.3__py3-none-any.whl

ads/aqua/app.py

@@ -225,6 +225,7 @@ class AquaApp:
         model_taxonomy_metadata: Union[ModelTaxonomyMetadata, Dict],
         compartment_id: str,
         project_id: str,
+        defined_tags: Dict = None,
         **kwargs,
     ) -> DataScienceModel:
         model = (
@@ -237,7 +238,7 @@ class AquaApp:
             .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 @@ class AquaEvaluationApp(AquaApp):
             **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 @@ class AquaEvaluationApp(AquaApp):
                         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 @@ class AquaEvaluationApp(AquaApp):
             .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 @@ class AquaEvaluationApp(AquaApp):
             .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,7 +432,9 @@ class AquaEvaluationApp(AquaApp):
                 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}."
         )
@@ -437,7 +442,7 @@ class AquaEvaluationApp(AquaApp):
         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 @@ class AquaEvaluationApp(AquaApp):
             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 @@ class AquaFineTuningApp(AquaApp):
             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 @@ class AquaFineTuningApp(AquaApp):
             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 @@ class AquaFineTuningApp(AquaApp):
                 "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,
         )

{oracle_ads-2.13.2rc1.dist-info → oracle_ads-2.13.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.13.2rc1
+Version: 2.13.3
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
 Author: Oracle Data Science

{oracle_ads-2.13.2rc1.dist-info → oracle_ads-2.13.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ ads/__init__.py,sha256=OxHySbHbMqPgZ8sUj33Bxy-smSiNgRjtcSUV77oBL08,3787
 ads/cli.py,sha256=WkOpZv8jWgFYN9BNkt2LJBs9KzJHgFqq3pIymsqc8Q4,4292
 ads/config.py,sha256=Xa6CGxNUQf3CKTS9HpXnAWR5kOFvAs0M66f8kEl6z54,8051
 ads/aqua/__init__.py,sha256=I3HL7LadTue3X41EPUZue4rILG8xeMTapJiBA6Lu8Mg,1149
-ads/aqua/app.py,sha256=Ug-Jt5qvnO1CtxRqIf9dWbz6i_WrR4rf0Mf3s8dgGXA,14281
+ads/aqua/app.py,sha256=_LrDKMR0SSxPEylIMPTsJvXnSnJFDud_MS3tMO25RMo,14360
 ads/aqua/cli.py,sha256=W-0kswzRDEilqHyw5GSMOrARgvOyPRtkEtpy54ew0Jo,3907
 ads/aqua/constants.py,sha256=bdBBafATGl5rYHjZ2i9jZPDKFab8nWjzjJKA2DFgIDc,3019
 ads/aqua/data.py,sha256=HfxLfKiNiPJecMQy0JAztUsT3IdZilHHHOrCJnjZMc4,408
@@ -30,7 +30,7 @@ ads/aqua/evaluation/__init__.py,sha256=Fd7WL7MpQ1FtJjlftMY2KHli5cz1wr5MDu3hGmV89
 ads/aqua/evaluation/constants.py,sha256=dmvDs_t93EhGa0N7J0y8R18AFW0cokj2Q5Oy0LHelxU,1436
 ads/aqua/evaluation/entities.py,sha256=pvZWrO-Hlsh0TIFnly84OijKHULRVM13D5a-4ZGxte8,5733
 ads/aqua/evaluation/errors.py,sha256=IbqcQFgXfwzlF5EoaT5jPw8JE8OWqtgiXpH0ddFhRzY,4523
-ads/aqua/evaluation/evaluation.py,sha256=p3oPgogtdE_viFCeS6jiJENGrWlYZMPloPW7c50r5ns,59595
+ads/aqua/evaluation/evaluation.py,sha256=Q8822M1asVpBdw5e2LmN1B-vI3k8SdT-44nGQI0d4YI,59510
 ads/aqua/extension/__init__.py,sha256=mRArjU6UZpZYVr0qHSSkPteA_CKcCZIczOFaK421m9o,1453
 ads/aqua/extension/aqua_ws_msg_handler.py,sha256=zR7Fb3LEXzPrEICooWvuo_ahoY6KhcABpKUmYQkEpS0,3626
 ads/aqua/extension/base_handler.py,sha256=gK3YBBrkbG__0eAq49zHRmJKJXp-lvEOYdYlDuxWPpM,5475
@@ -52,7 +52,7 @@ ads/aqua/extension/models/ws_models.py,sha256=y_3LlzKGNRcWqfuW5TGHl0PchM5xE83WGm
 ads/aqua/finetuning/__init__.py,sha256=vwYT5PluMR0mDQwVIavn_8Icms7LmvfV_FOrJ8fJx8I,296
 ads/aqua/finetuning/constants.py,sha256=Fx-8LMyF9ZbV9zo5LUYgCv9VniV7djGnM2iW7js2ILE,844
 ads/aqua/finetuning/entities.py,sha256=1RRaRFuxoBtApeCIqG-0H8Iom2kz2dv7LOX6y2wWLnA,6116
-ads/aqua/finetuning/finetuning.py,sha256=XICYUsbj6U2XMRs2aHMpTBaTlb2b88Moq3InR9IRYK4,26332
+ads/aqua/finetuning/finetuning.py,sha256=-re_K9wR46_EbENddUEefNrnYd5IlR0GotUa_kkgXU8,26302
 ads/aqua/model/__init__.py,sha256=j2iylvERdANxgrEDp7b_mLcKMz1CF5Go0qgYCiMwdos,278
 ads/aqua/model/constants.py,sha256=pI_oHKSLJvt3dOC4hdkj75Y3CJqK9yW3AT1kHyDfPTI,1500
 ads/aqua/model/entities.py,sha256=kBjsihInnbGw9MhWQEfJ4hcWEzv6BxF8VlDDFWUPYVg,9903
@@ -849,8 +849,8 @@ ads/type_discovery/unknown_detector.py,sha256=yZuYQReO7PUyoWZE7onhhtYaOg6088wf1y
 ads/type_discovery/zipcode_detector.py,sha256=3AlETg_ZF4FT0u914WXvTT3F3Z6Vf51WiIt34yQMRbw,1421
 ads/vault/__init__.py,sha256=x9tMdDAOdF5iDHk9u2di_K-ze5Nq068x25EWOBoWwqY,245
 ads/vault/vault.py,sha256=hFBkpYE-Hfmzu1L0sQwUfYcGxpWmgG18JPndRl0NOXI,8624
-oracle_ads-2.13.2rc1.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.13.2rc1.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.13.2rc1.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-oracle_ads-2.13.2rc1.dist-info/METADATA,sha256=W_1M3xrI7Nde-4P6W8hlevNetQT2B0yeGw9X8wbEMTI,16261
-oracle_ads-2.13.2rc1.dist-info/RECORD,,
+oracle_ads-2.13.3.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.13.3.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.13.3.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
+oracle_ads-2.13.3.dist-info/METADATA,sha256=sFqtvGBYnP_WSLQ_-qjVCHDTOJ-oAd8ekjPkGIwtHq4,16258
+oracle_ads-2.13.3.dist-info/RECORD,,