azureml-acft-multimodal-components 0.0.70__py3-none-any.whl → 0.0.72__py3-none-any.whl

azureml/acft/multimodal/components/_version.py

@@ -1,2 +1,2 @@
-ver = "0.0.70"
-selfver = "0.0.70"
+ver = "0.0.72"
+selfver = "0.0.72"

azureml/acft/multimodal/components/utils/model_selector_utils.py

@@ -11,15 +11,13 @@ from typing import Dict, Any, Union
 import shutil
 import yaml
 import json
-from azure.identity import DefaultAzureCredential
-from azure.ai.ml import MLClient
 
 from azureml.acft.common_components import get_logger_app
 from azureml.acft.accelerator.utils.error_handling.exceptions import LLMException
-from azureml.acft.accelerator.utils.error_handling.error_definitions import LLMInternalError
+from azureml.acft.accelerator.utils.error_handling.error_definitions import LLMInternalError, MissingData
 from azureml._common._error_definition.azureml_error import AzureMLError  # type: ignore
 from azureml.acft.multimodal.components.constants.constants import SaveFileConstants, MLFlowHFFlavourConstants, \
-    MLFlowPyfuncLiterals, ModelTypes
+    MLFlowPyfuncLiterals
 
 logger = get_logger_app(__name__)
 
@@ -221,50 +219,6 @@ def convert_pyfunc_mlflow_to_pytorch_model(mlflow_model_path: str, download_dir:
         )
 
 
-def download_model_from_registry(model_name: str, download_dir: str):
-    """
-    downloads mlflow models from azureml-preview registry
-    """
-    # in azure-ai-ml-1.0.0 DefaultAzureCredential handles ManagedIdentityCredential internally
-    client_id = os.environ.get("DEFAULT_IDENTITY_CLIENT_ID", None)
-    if client_id:
-        logger.info("Using DEFAULT_IDENTITY_CLIENT_ID")
-        credential = DefaultAzureCredential(managed_identity_client_id=client_id)
-    else:
-        credential = DefaultAzureCredential()
-    registry_mlclient = MLClient(credential=credential, registry_name=MODEL_REGISTRY_NAME)
-    registry_models_list = registry_mlclient.models.list(name=model_name)
-    registry_models_versions = [int(model.version) for model in registry_models_list]
-
-    # download the model from registry - mlflow model
-    model_tmp_download_path = os.path.join(download_dir, "azuremlft_download")
-    if len(registry_models_versions) > 0:
-        model_version = str(max(registry_models_versions))
-        registry_mlclient.models.download(
-            name=model_name,
-            version=model_version,
-            download_path=model_tmp_download_path,
-        )
-        logger.info(f"Model {model_name}/{model_version} is downloaded")
-        mlflow_model_dir = os.path.join(
-            model_tmp_download_path, model_name,
-            MLFlowHFFlavourConstants.MODEL_ROOT_DIRECTORY
-        )
-        model_save_path = os.path.join(download_dir, model_name)
-        # convert mlflow model to pytorch model and save it to model_save_path
-        if model_name == ModelTypes.MMEFT:
-            convert_pyfunc_mlflow_to_pytorch_model(mlflow_model_dir, model_save_path)
-        else:
-            convert_hf_mlflow_to_pytorch_model(mlflow_model_dir, model_save_path)
-    else:
-        raise LLMException._with_error(
-            AzureMLError.create(
-                LLMInternalError,
-                error="Model not found in registry"
-            )
-        )
-
-
 def model_selector(model_selector_args: Dict[str, Any]):
     """
     Downloads model from azureml-preview registry if present
@@ -315,16 +269,8 @@ def model_selector(model_selector_args: Dict[str, Any]):
         else:
             convert_hf_mlflow_to_pytorch_model(mlflow_model_path, download_dir)
     else:
-        try:
-            logger.info(f'Downloading the model from registry to {model_selector_args["output_dir"]}')
-            download_model_from_registry(model_selector_args["model_name"], model_selector_args["output_dir"])
-        except Exception as e:
-            # TODO Check why shutil rmtree is called
-            # shutil.rmtree(model_selector_args["output_dir"], ignore_errors=True)
-            logger.info(
-                f'Unable to download model, will fetch {model_selector_args["model_name"]} model while fine-tuning',
-                exc_info=True
-            )
+        logger.error("missing mlflow and pytorch model path")
+        raise LLMException._with_error(AzureMLError.create(MissingData, data_argument_name="model_path"))
 
     # Saving model selector args
     model_selector_args_save_path = os.path.join(model_selector_args["output_dir"],

{azureml_acft_multimodal_components-0.0.70.dist-info → azureml_acft_multimodal_components-0.0.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: azureml-acft-multimodal-components
-Version: 0.0.70
+Version: 0.0.72
 Summary: Contains the acft multimodal-contrib package used in script to build azureml components.
 Home-page: https://msdata.visualstudio.com/Vienna/_git/sdk-cli-v2?version=GBtraining_finetune
 Author: Microsoft Corp
@@ -41,6 +41,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{azureml_acft_multimodal_components-0.0.70.dist-info → azureml_acft_multimodal_components-0.0.72.dist-info}/RECORD

@@ -3,7 +3,7 @@ azureml/acft/__init__.py,sha256=9yEu-iBWQHMmb7eapxBKtSs5hHWMDIZeGhXEntYSp4w,267
 azureml/acft/multimodal/__init__.py,sha256=9yEu-iBWQHMmb7eapxBKtSs5hHWMDIZeGhXEntYSp4w,267
 azureml/acft/multimodal/components/NOTICE.txt,sha256=Wi77VU9zlsSpIoTfQyhQ73Nwze4miS9YDG4rcI6izo4,530804
 azureml/acft/multimodal/components/__init__.py,sha256=qC5hRHbTbRwhm4xSfuFpDl0ungDu3rxgX7bfPsaTQVA,792
-azureml/acft/multimodal/components/_version.py,sha256=u8TK3F765DOTjiO6122J9B_zP36XQ1O3Vo5pwSa9104,36
+azureml/acft/multimodal/components/_version.py,sha256=hSHlV8vLL9jPcHbarNf9j12RY_GUE-BNDwSwWxwsHEA,36
 azureml/acft/multimodal/components/base_runner.py,sha256=DpEqtXoO1iwqd5EJtjXauZ_D3C2LLLoqT2wYw-84YDg,1235
 azureml/acft/multimodal/components/task_factory.py,sha256=Ar4emx5xmw72NZKkDzw6tdixw9d6PiGTSa1CsleyqKY,980
 azureml/acft/multimodal/components/artifacts/__init__.py,sha256=ouf2rAWSHFJAg_qtQ9B9JwI7xakZ69hDiMGqpDuzL-c,298
@@ -49,10 +49,10 @@ azureml/acft/multimodal/components/tasks/multimodal_classification/preprocess/au
 azureml/acft/multimodal/components/tasks/multimodal_classification/preprocess/preprocess_for_finetune.py,sha256=1HP-HegyMJywUvEfuXxMWXdTBxkNJM3Za18ZTLtDfYs,11999
 azureml/acft/multimodal/components/utils/__init__.py,sha256=9yEu-iBWQHMmb7eapxBKtSs5hHWMDIZeGhXEntYSp4w,267
 azureml/acft/multimodal/components/utils/common_utils.py,sha256=CDqbSGlQHedatUXOnjPV8cAcW1-BKap48R4g-D-4Va8,2105
-azureml/acft/multimodal/components/utils/model_selector_utils.py,sha256=gLQNgWVONG4mhqls1vfFl301YITuHJUTJB6EJPoowW4,12833
+azureml/acft/multimodal/components/utils/model_selector_utils.py,sha256=GuckKzNcOmjc2hFqVEGZiEElhJGzqNR2borBE7k6xmE,10318
 azureml/acft/multimodal/components/utils/trainer_callbacks.py,sha256=3ElNRjxp8Ipt2xC-NQUEy676FLd26K0URB7aPRK2p2c,5795
-azureml_acft_multimodal_components-0.0.70.dist-info/LICENSE.txt,sha256=GBoIyZ-6vJ4xjRc8U3wTw4EfkuaEdVTm_gbr1Nm8uDI,859
-azureml_acft_multimodal_components-0.0.70.dist-info/METADATA,sha256=G7wIS2iaUE4Q_y-OOhRaAtkze-VFS6kQh0q3O9DyFRI,2051
-azureml_acft_multimodal_components-0.0.70.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-azureml_acft_multimodal_components-0.0.70.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
-azureml_acft_multimodal_components-0.0.70.dist-info/RECORD,,
+azureml_acft_multimodal_components-0.0.72.dist-info/licenses/LICENSE.txt,sha256=GBoIyZ-6vJ4xjRc8U3wTw4EfkuaEdVTm_gbr1Nm8uDI,859
+azureml_acft_multimodal_components-0.0.72.dist-info/METADATA,sha256=tms92XU3HDsekgUDEtS7FcuwjdjA96CHb9IQCZ0zp-w,2074
+azureml_acft_multimodal_components-0.0.72.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+azureml_acft_multimodal_components-0.0.72.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
+azureml_acft_multimodal_components-0.0.72.dist-info/RECORD,,

{azureml_acft_multimodal_components-0.0.70.dist-info → azureml_acft_multimodal_components-0.0.72.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any