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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azureml-registry-tools
-Version: 0.1.0a3
+Version: 0.1.0a5
 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.0a5}/azureml/registry/_cli/registry_syndication_cli.py

@@ -3,10 +3,12 @@
 # ---------------------------------------------------------
 import argparse
 import json
+import sys
+from uuid import UUID
 from azureml.registry._rest_client.registry_management_client import RegistryManagementClient
 from azureml.registry._rest_client.arm_client import ArmClient
 from azureml.registry.mgmt.create_manifest import generate_syndication_manifest
-from azureml.registry.mgmt.syndication_manifest import SyndicationManifest
+from azureml.registry.mgmt.syndication_manifest import SyndicationManifest, ResyncAssetsInManifestDto
 
 
 def syndication_manifest_show(registry_name: str) -> dict:
@@ -56,6 +58,31 @@ def syndication_manifest_delete(registry_name: str, dry_run: bool) -> None:
         RegistryManagementClient(registry_name=registry_name).delete_manifest()
 
 
+def syndication_manifest_sync(registry_name: str, manifest_value: str, tenant_id: str, asset_ids: list, dry_run: bool) -> None:
+    """Sync assets in the syndication manifest for the specified registry.
+
+    Args:
+        registry_name (str): Name of the AzureML registry.
+        manifest_value (str): Manifest value as a string (JSON).
+        tenant_id (str): Tenant ID to use for all assets.
+        asset_ids (list): List of asset IDs to sync.
+        dry_run (bool): If True, do not perform any changes.
+    """
+    if manifest_value:
+        # for inline manifest value allow different casing of keys
+        sync_dto = ResyncAssetsInManifestDto.from_dict(json.loads(manifest_value), normalize_keys=True)
+    else:
+        # Create from tenant ID and asset IDs
+        sync_dto = ResyncAssetsInManifestDto.from_asset_list(UUID(tenant_id), asset_ids)
+
+    dto = sync_dto.to_dict()
+    if dry_run:
+        print(f"Dry run: Would sync assets for registry {registry_name} with data: {json.dumps(dto, indent=2)}")
+    else:
+        client = RegistryManagementClient(registry_name=registry_name)
+        client.sync_assets_in_manifest(dto)
+
+
 def syndication_target_show(registry_name: str) -> object:
     """Show the current syndication target(s) for the specified registry and region.
 
@@ -129,6 +156,12 @@ def main() -> None:
       # Delete the current manifest
       registry-mgmt syndication manifest delete --registry-name myreg
 
+      # Sync assets from a JSON value
+      registry-mgmt syndication manifest sync --registry-name myreg --value '{"AssetsToResync": [...]}'
+
+      # Sync assets from tenant ID and asset list
+      registry-mgmt syndication manifest sync --registry-name myreg --tenant-id "12345678-1234-1234-1234-123456789012" --asset-ids asset1 asset2 asset3
+
       # Show the current target
       registry-mgmt syndication target show --registry-name myreg
 
@@ -184,6 +217,13 @@ def main() -> None:
     manifest_delete_parser = manifest_subparsers.add_parser("delete", help="Delete the current manifest.")
     _add_common_args(manifest_delete_parser, [registry_name_arg, dry_run_arg])
 
+    manifest_sync_parser = manifest_subparsers.add_parser("sync", help="Sync assets in the manifest.")
+    _add_common_args(manifest_sync_parser, [registry_name_arg, dry_run_arg])
+    sync_group = manifest_sync_parser.add_mutually_exclusive_group(required=True)
+    sync_group.add_argument("-v", "--value", type=str, help="Manifest sync value as JSON string.")
+    sync_group.add_argument("-t", "--tenant-id", type=str, help="Tenant ID to use for all assets.")
+    manifest_sync_parser.add_argument("-a", "--asset-ids", type=str, nargs="+", help="List of asset IDs to sync (only valid with --tenant-id).")
+
     # syndication target
     target_parser = synd_subparsers.add_parser("target", help="Manage syndication target.")
     target_subparsers = target_parser.add_subparsers(dest="target_subcommand", required=True)
@@ -215,6 +255,18 @@ def main() -> None:
                     syndication_manifest_delete(args.registry_name, args.dry_run)
                 else:
                     print("Manifest deletion cancelled.")
+            elif args.manifest_subcommand == "sync":
+                # Validate constraints for sync command
+                if args.tenant_id and not args.asset_ids:
+                    print("Error: --asset-ids is required when using --tenant-id", file=sys.stderr)
+                    sys.exit(1)
+                elif args.asset_ids and not args.tenant_id:
+                    print("Error: --asset-ids can only be used with --tenant-id", file=sys.stderr)
+                    sys.exit(1)
+                elif not args.value and not args.tenant_id:
+                    print("Error: Either --value or --tenant-id must be specified", file=sys.stderr)
+                    sys.exit(1)
+                syndication_manifest_sync(args.registry_name, args.value, args.tenant_id, args.asset_ids, args.dry_run)
         elif args.synd_subcommand == "target":
             if args.target_subcommand == "show":
                 print(syndication_target_show(args.registry_name))

{azureml_registry_tools-0.1.0a3 → azureml_registry_tools-0.1.0a5}/azureml/registry/_rest_client/registry_management_client.py

@@ -57,7 +57,7 @@ class RegistryManagementClient(BaseAzureRestClient):
         response = self.post(url, json=manifest_dto)
         return response.json()
 
-    def resync_assets_in_manifest(self, resync_assets_dto: dict) -> dict:
+    def sync_assets_in_manifest(self, resync_assets_dto: dict) -> dict:
         """
         Resynchronize assets in the syndication manifest.
 

{azureml_registry_tools-0.1.0a3 → azureml_registry_tools-0.1.0a5}/azureml/registry/mgmt/syndication_manifest.py

@@ -148,3 +148,79 @@ class SyndicationManifest:
             tenant_id=tenant_id,
             source_registries=source_registries
         )
+
+
+@dataclass
+class AssetToResync:
+    """Represents an asset to resync with its associated tenant ID."""
+
+    asset_id: str
+    tenant_id: UUID
+
+    def to_dict(self) -> dict:
+        """Convert the AssetToResync instance to a dictionary."""
+        return {
+            "AssetId": self.asset_id,
+            "TenantId": str(self.tenant_id)
+        }
+
+    @staticmethod
+    def from_dict(d: dict, normalize_keys=False) -> "AssetToResync":
+        """Create an AssetToResync instance from a dictionary."""
+        asset_id = _get_key(d, "AssetId", "asset_id", normalize_keys=normalize_keys)
+        if asset_id is None:
+            raise ValueError("Missing required field 'AssetId' in dictionary.")
+
+        tenant_id_str = _get_key(d, "TenantId", "tenant_id", normalize_keys=normalize_keys)
+        if tenant_id_str is None:
+            raise ValueError("Missing required field 'TenantId' in dictionary.")
+
+        try:
+            tenant_id = UUID(str(tenant_id_str))
+        except ValueError:
+            raise ValueError("TenantId must be a valid UUID string.")
+
+        return AssetToResync(
+            asset_id=str(asset_id),
+            tenant_id=tenant_id
+        )
+
+
+@dataclass
+class ResyncAssetsInManifestDto:
+    """Represents a collection of assets to resync in a manifest."""
+
+    assets_to_resync: List[AssetToResync]
+
+    def to_dict(self) -> dict:
+        """Convert the ResyncAssetsInManifestDto instance to a dictionary."""
+        return {
+            "AssetsToResync": [asset.to_dict() for asset in self.assets_to_resync]
+        }
+
+    @staticmethod
+    def from_dict(d: dict, normalize_keys=False) -> "ResyncAssetsInManifestDto":
+        """Create a ResyncAssetsInManifestDto instance from a dictionary."""
+        assets_list = _get_key(d, "AssetsToResync", "assets_to_resync", normalize_keys=normalize_keys)
+        if not isinstance(assets_list, list):
+            raise ValueError("AssetsToResync must be a list.")
+        return ResyncAssetsInManifestDto(
+            assets_to_resync=[AssetToResync.from_dict(asset, normalize_keys=normalize_keys) for asset in assets_list]
+        )
+
+    @staticmethod
+    def from_asset_list(tenant_id: UUID, asset_ids: List[str]) -> "ResyncAssetsInManifestDto":
+        """Create a ResyncAssetsInManifestDto instance from a tenant ID and list of asset ID strings.
+
+        Args:
+            tenant_id (UUID): The tenant ID to use for all assets.
+            asset_ids (List[str]): List of asset ID strings.
+
+        Returns:
+            ResyncAssetsInManifestDto: Instance with assets created from the provided IDs and tenant ID.
+        """
+        assets_to_resync = [
+            AssetToResync(asset_id=asset_id, tenant_id=tenant_id)
+            for asset_id in asset_ids
+        ]
+        return ResyncAssetsInManifestDto(assets_to_resync=assets_to_resync)

{azureml_registry_tools-0.1.0a3 → azureml_registry_tools-0.1.0a5}/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.0a5/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.0a5
 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.0a5}/setup.py

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