azureml-registry-tools 0.1.0a3__tar.gz → 0.1.0a4__tar.gz

{azureml_registry_tools-0.1.0a3/azureml_registry_tools.egg-info → azureml_registry_tools-0.1.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azureml-registry-tools
-Version: 0.1.0a3
+Version: 0.1.0a4
 Summary: AzureML Registry tools and CLI
 Author: Microsoft Corp
 License: https://aka.ms/azureml-sdk-license

{azureml_registry_tools-0.1.0a3 → azureml_registry_tools-0.1.0a4}/azureml/registry/tools/create_or_update_assets.py

@@ -5,6 +5,7 @@
 """Create or update assets."""
 
 import azure
+import copy
 import json
 import os
 import re
@@ -14,7 +15,8 @@ from git import InvalidGitRepositoryError, Repo
 from pathlib import Path
 from typing import List, Union
 
-from azure.ai.ml import MLClient, load_data, load_model
+from azure.ai.ml import MLClient, load_component, load_data, load_model
+from azure.ai.ml.entities._component.component import Component
 from azure.ai.ml.entities._assets._artifacts.data import Data
 from azure.ai.ml.entities._assets._artifacts.model import Model
 from azure.identity import DefaultAzureCredential
@@ -121,38 +123,52 @@ def find_assets(input_dir: Path,
 
 
 def merge_yamls(existing_asset_file_name: str,
-                updated_asset_file_name: str) -> dict:
-    """Overwrite values from updated asset to existing asset with the exception of storage path.
+                updated_asset: AssetSpec) -> dict:
+    """Preserve storage value from existing asset to updated asset.
 
     Args:
         existing_asset_file_name (str): Name of file containing details of asset currently in registry.
-        updated_asset_file_name (str): Name of file containing updated asset.
-
+        updated_asset (AssetSpec): AssetSpec containing updated asset info.
     Returns:
         dict: Merged asset data.
     """
-    with open(existing_asset_file_name, "r") as existing_asset_file, open(updated_asset_file_name, "r") as updated_asset_file:
-        existing_asset_yaml = yaml.safe_load(existing_asset_file)
-        updated_asset_yaml = yaml.safe_load(updated_asset_file)
-    merged_asset = {**existing_asset_yaml, **updated_asset_yaml}
-    merged_asset["path"] = existing_asset_yaml["path"]
+    with open(existing_asset_file_name, "r") as existing_asset_file, open(updated_asset.file_name_with_path, "r") as updated_asset_file:
+        existing_asset_dict = yaml.safe_load(existing_asset_file)
+        updated_asset_dict = yaml.safe_load(updated_asset_file)
+
+    merged_asset = copy.deepcopy(updated_asset_dict)
+
+    if updated_asset.type == AssetType.MODEL or updated_asset.type == AssetType.DATA:
+        storage_key = "path"
+        # "path" is always required for models, use the existing value
+        if existing_asset_dict.get(storage_key) != updated_asset_dict.get(storage_key):
+            print(f'"{storage_key}" is immutable, using existing value from asset in registry: {existing_asset_dict[storage_key]}')
+            merged_asset[storage_key] = existing_asset_dict[storage_key]
+    elif updated_asset.type == AssetType.COMPONENT:
+        storage_key = "code"
+        if existing_asset_dict.get(storage_key) is None and updated_asset_dict.get(storage_key) is not None:
+            print(f'"{storage_key}" is immutable and cannot be added. Please create a new version to include "{storage_key}"')
+        elif existing_asset_dict.get(storage_key) != updated_asset_dict.get(storage_key):
+            print(f'"{storage_key}" is immutable, using existing value from asset in registry: {existing_asset_dict[storage_key]}')
+            merged_asset[storage_key] = existing_asset_dict[storage_key]
 
     return merged_asset
 
 
-def merge_assets(existing_asset: Union[Data, Model],
+def merge_assets(existing_asset: Union[Component, Data, Model],
                  asset: AssetSpec):
-    """Overwrite values from updated to existing asset while preserving existing asset path.
+    """Prepare asset for update by preserving storage value from existing asset.
 
     Args:
-        existing_asset (Union[Data, Model]): Asset currently in registry.
+        existing_asset (Union[Component, Data, Model]): Asset currently in registry.
         asset (AssetSpec): AssetSpec containing updated asset info.
     """
     with tempfile.NamedTemporaryFile(suffix=".yaml", delete=False) as existing_asset_temp_file:
         existing_asset_temp_file_name = existing_asset_temp_file.name
 
     existing_asset.dump(existing_asset_temp_file_name)
-    merged_result = merge_yamls(existing_asset_temp_file_name, asset.file_name_with_path)
+
+    merged_result = merge_yamls(existing_asset_temp_file_name, asset)
 
     with tempfile.NamedTemporaryFile(suffix=".yaml", delete=False) as merged_asset_temp_file:
         merged_asset_temp_file_name = merged_asset_temp_file.name
@@ -164,6 +180,8 @@ def merge_assets(existing_asset: Union[Data, Model],
         merged_asset = load_model(merged_asset_temp_file_name)
     elif asset.type == AssetType.DATA:
         merged_asset = load_data(merged_asset_temp_file_name)
+    elif asset.type == AssetType.COMPONENT:
+        merged_asset = load_component(merged_asset_temp_file_name)
 
     asset.set_asset_obj_to_create_or_update(merged_asset)
 
@@ -289,7 +307,7 @@ def create_or_update_assets(input_dir: Path,
                     raise
 
             if existing_asset:
-                if asset.type == AssetType.MODEL or asset.type == AssetType.DATA:
+                if asset.type in [AssetType.COMPONENT, AssetType.DATA, AssetType.MODEL]:
                     try:
                         merge_assets(existing_asset, asset)
                     except Exception as e:

{azureml_registry_tools-0.1.0a3 → azureml_registry_tools-0.1.0a4/azureml_registry_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azureml-registry-tools
-Version: 0.1.0a3
+Version: 0.1.0a4
 Summary: AzureML Registry tools and CLI
 Author: Microsoft Corp
 License: https://aka.ms/azureml-sdk-license

{azureml_registry_tools-0.1.0a3 → azureml_registry_tools-0.1.0a4}/setup.py

@@ -18,7 +18,7 @@ exclude_list = ["*.tests"]
 
 setup(
     name='azureml-registry-tools',
-    version="0.1.0a3",
+    version="0.1.0a4",
     description='AzureML Registry tools and CLI',
     author='Microsoft Corp',
     license="https://aka.ms/azureml-sdk-license",