azureml-registry-tools 0.1.0a14__py3-none-any.whl → 0.1.0a16__py3-none-any.whl

azureml/registry/_cli/registry_syndication_cli.py

@@ -15,7 +15,6 @@ from azureml.registry.mgmt.create_manifest import generate_syndication_manifest
 from azureml.registry.mgmt.model_management import (
     model_delete, model_get, model_list, parse_asset_id
 )
-from azureml.registry.mgmt.registry_config import create_registry_config
 from azureml.registry.mgmt.syndication_manifest import ResyncAssetsInManifestDto, SyndicationManifest
 
 
@@ -141,14 +140,6 @@ def show_command(registry_name: str, as_arm_object: bool) -> object:
     return discovery
 
 
-def validate_registry_cfg(cfg_file_name) -> str:
-    """Validate if registry config extension is .cfg."""
-    cfg_file_path = Path(cfg_file_name)
-    if not cfg_file_path.suffix == ".cfg":
-        raise argparse.ArgumentTypeError(f"--config arg {cfg_file_name} must be a path to a .cfg file")
-    return cfg_file_path
-
-
 def _add_common_args(p, arg_dicts=None):
     if arg_dicts is None:
         arg_dicts = []
@@ -187,14 +178,11 @@ def main() -> None:
       # Validate an asset
       registry-mgmt asset validate --asset-path ./path-to-asset
 
-      # Deploy an asset to registry (using config file)
-      registry-mgmt asset deploy --asset-path ./path-to-asset --config ./registry-mgmt.cfg
+      # Preview an asset to registry
+      registry-mgmt asset preview --asset-path ./path-to-asset --registry-name myreg --subscription sub123 --resource-group rg123
 
-      # Create registry configuration file
-      registry-mgmt asset config --registry-name myreg --subscription sub123 --resource-group rg123 --tenant-id tenant123
-
-      # Create registry configuration file with storage overrides
-      registry-mgmt asset config --registry-name myreg --subscription sub123 --resource-group rg123 --tenant-id tenant123 --storage-name storage123 --container-name container123 --container-path path123
+      # Deploy an asset to registry
+      registry-mgmt asset deploy --asset-path ./path-to-asset --registry-name myreg --subscription sub123 --resource-group rg123
 
       # Create asset template files
       registry-mgmt asset template --folder ./folder-path
@@ -352,21 +340,19 @@ def main() -> None:
     asset_validate_parser.add_argument("--asset-path", type=Path, help="Path to the asset folder to validate.")
     asset_validate_parser.add_argument("--allow-additional-properties", action="store_true",
                                        help="Allow additional properties not defined in the schema")
+    # asset preview command
+    asset_preview_parser = asset_subparsers.add_parser("preview", help="Preview a model card to registry.")
+    _add_common_args(asset_preview_parser, [registry_name_arg, subscription_arg, resource_group_arg, dry_run_arg])
+    asset_preview_parser.add_argument("--asset-path", type=Path, help="Path to the asset folder to preview.")
+    asset_preview_parser.add_argument("--allow-additional-properties", action="store_true",
+                                      help="Allow additional properties not defined in the schema")
 
     # asset deploy command
-    asset_deploy_parser = asset_subparsers.add_parser("deploy", help="Deploy an asset to registry.")
-    _add_common_args(asset_deploy_parser, [dry_run_arg])
-    asset_deploy_parser.add_argument("-c", "--config", type=validate_registry_cfg, required=True, help="Path to registry config file.")
+    asset_deploy_parser = asset_subparsers.add_parser("deploy", help="Deploy a model to registry.")
+    _add_common_args(asset_deploy_parser, [registry_name_arg, subscription_arg, resource_group_arg, dry_run_arg])
     asset_deploy_parser.add_argument("--asset-path", type=Path, help="Path to the asset folder to deploy.")
-
-    # asset config command
-    asset_config_parser = asset_subparsers.add_parser("config", help="Create registry configuration file.")
-    _add_common_args(asset_config_parser, [registry_name_arg, subscription_arg, resource_group_arg])
-    asset_config_parser.add_argument("--tenant-id", type=str, required=True, help="Registry Tenant ID.")
-    asset_config_parser.add_argument("-c", "--config-file", type=validate_registry_cfg, help="Registry config file path to write to (default: registry-mgmt.cfg).")
-    asset_config_parser.add_argument("--storage-name", type=str, help="Storage account name for storage overrides.")
-    asset_config_parser.add_argument("--container-name", type=str, help="Container name for storage overrides.")
-    asset_config_parser.add_argument("--container-path", type=str, help="Container path for storage overrides.")
+    asset_deploy_parser.add_argument("--allow-additional-properties", action="store_true",
+                                     help="Allow additional properties not defined in the schema")
 
     # asset template command
     asset_template_parser = asset_subparsers.add_parser("template", help="Create asset template files.")
@@ -448,27 +434,23 @@ def main() -> None:
                 syndication_target_set(args.registry_name, args.value, args.dry_run)
     elif args.command == "asset":
         if args.asset_subcommand == "validate":
-            # Config file is not needed for validation
             asset_validate(args.asset_path, args.dry_run, args.allow_additional_properties)
+        elif args.asset_subcommand == "preview":
+            asset_deploy(asset_path=args.asset_path,
+                         registry_name=args.registry_name,
+                         subscription_id=args.subscription,
+                         resource_group=args.resource_group,
+                         dry_run=args.dry_run,
+                         allow_additional_properties=args.allow_additional_properties,
+                         override_storage=True)
         elif args.asset_subcommand == "deploy":
-            # Config file is required for deployment
-            asset_deploy(args.asset_path, args.config, args.dry_run)
-        elif args.asset_subcommand == "config":
-            # Validate storage parameters - all or none must be provided
-            storage_args = [args.storage_name, args.container_name, args.container_path]
-            if any(storage_args) and not all(storage_args):
-                parser.error("When using storage overrides, --storage-name, --container-name, and --container-path are all required.")
-
-            create_registry_config(
-                registry_name=args.registry_name,
-                subscription_id=args.subscription,
-                resource_group=args.resource_group,
-                tenant_id=args.tenant_id,
-                config_file_path=args.config_file,
-                storage_name=args.storage_name,
-                container_name=args.container_name,
-                container_path=args.container_path
-            )
+            asset_deploy(asset_path=args.asset_path,
+                         registry_name=args.registry_name,
+                         subscription_id=args.subscription,
+                         resource_group=args.resource_group,
+                         dry_run=args.dry_run,
+                         allow_additional_properties=args.allow_additional_properties,
+                         override_storage=False)
         elif args.asset_subcommand == "template":
             # Create asset template files
             asset_template(args.folder, args.dry_run)
@@ -516,8 +498,7 @@ def main() -> None:
             if not registry_name or not model_name or not version:
                 print("Error: Registry name, model name, and version must be provided", file=sys.stderr)
                 sys.exit(1)
-
-            # Single call to model_get with args values directly
+            # Get model
             print(model_get(
                 registry_name=registry_name,
                 name=model_name,
@@ -553,7 +534,7 @@ def main() -> None:
                 print("Error: Registry name and model name must be provided", file=sys.stderr)
                 sys.exit(1)
 
-            # Single call to model_delete with args values directly
+            # Delete model
             model_delete(
                 registry_name=registry_name,
                 name=model_name,

azureml/registry/data/description.md.template

@@ -1,3 +1,2 @@
-<!-- DO NOT CHANGE MARKDOWN HEADERS. IF CHANGED, MODEL CARD MAY BE REJECTED BY A REVIEWER -->
- 
+<!-- REMOVE THESE HEADERS AFTER UPDATING -->
 <!-- `description.md` is required. -->

azureml/registry/data/evaluation.md.template

@@ -1,3 +1,2 @@
-<!-- DO NOT CHANGE MARKDOWN HEADERS. IF CHANGED, MODEL CARD MAY BE REJECTED BY A REVIEWER -->
- 
+<!-- REMOVE THESE HEADERS AFTER UPDATING -->
 <!-- `evaluation.md` is highly recommended, but not required. It captures information about the performance of the model. We highly recommend including this section as this information is often used to decide what model to use. -->

azureml/registry/data/model.schema.json

@@ -432,7 +432,7 @@
     "skuListDefinition": {
       "type": "string",
       "description": "A comma-separated list of valid SKUs with no duplicates",
-      "pattern": "^(Standard_(DS3_v2|NC12s_v3|NC16as_T4_v3|NC24ads_A100_v4|NC24rs_v3|NC24s_v3|NC40ads_H100_v5|NC48ads_A100_v4|NC4as_T4_v3|NC64as_T4_v3|NC6s_v3|NC80adis_H100_v5|NC8as_T4_v3|NC96ads_A100_v4|ND40rs_v2|ND96amsr_A100_v4|ND96asr_v4|ND96isr_H100_v5|DS12_v2|DS4_v2|DS5_v2|D16a_v4|D16as_v4|D32a_v4|D32as_v4|D48a_v4|D48as_v4|D64a_v4|D64as_v4|D8a_v4|D8as_v4|D96a_v4|D96as_v4|E16s_v3|E2s_v3|E32s_v3|E48s_v3|E4s_v3|E64s_v3|E8s_v3|F16s_v2|F32s_v2|F48s_v2|F4s_v2|F64s_v2|F72s_v2|F8s_v2|FX12mds|FX24mds|FX36mds|FX48mds|FX4mds|NV12s_v3|NV24s_v3|NV48s_v3))(?:\\s*,\\s*Standard_(DS3_v2|NC12s_v3|NC16as_T4_v3|NC24ads_A100_v4|NC24rs_v3|NC24s_v3|NC40ads_H100_v5|NC48ads_A100_v4|NC4as_T4_v3|NC64as_T4_v3|NC6s_v3|NC80adis_H100_v5|NC8as_T4_v3|NC96ads_A100_v4|ND40rs_v2|ND96amsr_A100_v4|ND96asr_v4|ND96isr_H100_v5|DS12_v2|DS4_v2|DS5_v2|D16a_v4|D16as_v4|D32a_v4|D32as_v4|D48a_v4|D48as_v4|D64a_v4|D64as_v4|D8a_v4|D8as_v4|D96a_v4|D96as_v4|E16s_v3|E2s_v3|E32s_v3|E48s_v3|E4s_v3|E64s_v3|E8s_v3|F16s_v2|F32s_v2|F48s_v2|F4s_v2|F64s_v2|F72s_v2|F8s_v2|FX12mds|FX24mds|FX36mds|FX48mds|FX4mds|NV12s_v3|NV24s_v3|NV48s_v3))*$"
+      "pattern": "^(Standard_(DS3_v2|NC12s_v3|NC16as_T4_v3|NC24ads_A100_v4|NC24rs_v3|NC24s_v3|NC40ads_H100_v5|NC48ads_A100_v4|NC4as_T4_v3|NC64as_T4_v3|NC6s_v3|NC80adis_H100_v5|NC8as_T4_v3|NC96ads_A100_v4|ND40rs_v2|ND96amsr_A100_v4|ND96amsr_v4|ND96asr_v4|ND96isr_H100_v5|DS12_v2|DS4_v2|DS5_v2|D16a_v4|D16as_v4|D32a_v4|D32as_v4|D48a_v4|D48as_v4|D64a_v4|D64as_v4|D8a_v4|D8as_v4|D96a_v4|D96as_v4|E16s_v3|E2s_v3|E32s_v3|E48s_v3|E4s_v3|E64s_v3|E8s_v3|F16s_v2|F32s_v2|F48s_v2|F4s_v2|F64s_v2|F72s_v2|F8s_v2|FX12mds|FX24mds|FX36mds|FX48mds|FX4mds|NV12s_v3|NV24s_v3|NV48s_v3))(?:\\s*,\\s*Standard_(DS3_v2|NC12s_v3|NC16as_T4_v3|NC24ads_A100_v4|NC24rs_v3|NC24s_v3|NC40ads_H100_v5|NC48ads_A100_v4|NC4as_T4_v3|NC64as_T4_v3|NC6s_v3|NC80adis_H100_v5|NC8as_T4_v3|NC96ads_A100_v4|ND40rs_v2|ND96amsr_A100_v4|ND96amsr_v4|ND96asr_v4|ND96isr_H100_v5|DS12_v2|DS4_v2|DS5_v2|D16a_v4|D16as_v4|D32a_v4|D32as_v4|D48a_v4|D48as_v4|D64a_v4|D64as_v4|D8a_v4|D8as_v4|D96a_v4|D96as_v4|E16s_v3|E2s_v3|E32s_v3|E48s_v3|E4s_v3|E64s_v3|E8s_v3|F16s_v2|F32s_v2|F48s_v2|F4s_v2|F64s_v2|F72s_v2|F8s_v2|FX12mds|FX24mds|FX36mds|FX48mds|FX4mds|NV12s_v3|NV24s_v3|NV48s_v3))*$"
     },
     "skuEnum": {
       "enum": [
@@ -452,6 +452,7 @@
         "Standard_NC96ads_A100_v4",
         "Standard_ND40rs_v2",
         "Standard_ND96amsr_A100_v4",
+        "Standard_ND96amsr_v4",
         "Standard_ND96asr_v4",
         "Standard_ND96isr_H100_v5",
         "Standard_DS12_v2",

azureml/registry/data/notes.md.template

@@ -1,3 +1,2 @@
-<!-- DO NOT CHANGE MARKDOWN HEADERS. IF CHANGED, MODEL CARD MAY BE REJECTED BY A REVIEWER -->
- 
-<!-- `notes.md` is highly recommended, but not required. It captures information about how your model is created. We highly recommend including this section to provide transparency for the customers. -->
+<!-- REMOVE THESE HEADERS AFTER UPDATING -->
+<!-- `notes.md` is highly recommended, but not required. It captures information about how your model is created. We highly recommend including this section to provide transparency for the customers. -->

azureml/registry/data/validate_model_schema.py

@@ -53,7 +53,8 @@ def load_schema(schema_file: Path, allow_additional_properties: bool = False) ->
 def validate_model_schema(input_dirs: List[Path],
                           schema_file: Path,
                           asset_config_filename: str,
-                          allow_additional_properties: bool = False) -> bool:
+                          allow_additional_properties: bool = False,
+                          changed_files: List[Path] = None) -> bool:
     """Validate model variant schema.
 
     Args:
@@ -61,6 +62,7 @@ def validate_model_schema(input_dirs: List[Path],
         schema_file (Path): File containing model variant schema.
         asset_config_filename (str): Asset config filename to search for.
         allow_additional_properties (bool): Whether to allow additional properties not defined in schema.
+        changed_files (List[Path], optional): List of changed files, used to filter assets. Defaults to None.
 
     Returns:
         bool: True on success.
@@ -71,63 +73,82 @@ def validate_model_schema(input_dirs: List[Path],
     # Create validator instance for collecting all errors
     validator = jsonschema.Draft7Validator(loaded_schema)
 
+    # Gather list of just changed assets, for later filtering
+    changed_assets = util.find_asset_config_files(input_dirs, asset_config_filename, changed_files) if changed_files else None  # noqa: E501
+
     asset_count = 0
     model_count = 0
+    changed_model_count = 0
     error_count = 0
     for input_dir in input_dirs:
         # Recursively find all files with the name matching asset_config_filename
-        for asset_config in util.find_assets(input_dir, asset_config_filename):
+        for asset_config_path in util.find_asset_config_files(input_dir, asset_config_filename):
             asset_count += 1
+
+            validate_this = changed_assets is None or asset_config_path in changed_assets
+
+            try:
+                asset_config = assets.AssetConfig(asset_config_path)
+            except Exception as e:
+                raise Exception(f"Error loading asset config from {asset_config_path}: {e}")
+
             file_path = asset_config.spec_with_path
+
             if asset_config.type == assets.AssetType.MODEL:
                 model_count += 1
-                # Validate the file against the schema
-                try:
-                    with open(file_path, "r") as f:
-                        spec_config = yaml.safe_load(f)
-
-                    # Collect all validation errors
-                    errors = list(validator.iter_errors(spec_config))
-
-                    if not errors:
-                        logger.print(f"{file_path} is valid.")
-                    else:
-                        logger.log_error(f"\n‼️{file_path} has {len(errors)} validation error(s):")
-
-                        for e in errors:
-                            # Get detailed error information for each error
-                            error_path = '.'.join(str(p) for p in e.path) if e.path else "root"
-                            line_info = ""
-
-                            # Get line number from jsonschema error if available
-                            if hasattr(e, 'lineno') and e.lineno is not None:
-                                line_info = f" at line {e.lineno}"
-                            else:
-                                # Try to find line number by looking at the path and instance
-                                try:
-                                    with open(file_path, "r") as f:
-                                        yaml_content = f.readlines()
-                                        yaml_lines = []
-                                        for idx, line in enumerate(yaml_content):
-                                            if error_path in line:
-                                                yaml_lines.append(f"line {idx+1}: {line.strip()}")
-                                        if yaml_lines:
-                                            line_info = "\nPossible location(s):\n  " + "\n  ".join(yaml_lines)
-                                except Exception:
-                                    pass
-
-                            schema_path = '.'.join(str(p) for p in e.schema_path)
-                            logger.print(f"⚠️ {file_path} is invalid at path '{error_path}'{line_info}:")
-                            logger.print(f"  Error: {e.message}")
-                            logger.print(f"  Instance: {e.instance}")
-                            logger.print(f"  Schema path: {schema_path}")
+
+                if validate_this:
+                    changed_model_count += 1
+                    # Validate the file against the schema
+                    try:
+                        with open(file_path, "r") as f:
+                            spec_config = yaml.safe_load(f)
+
+                        # Collect all validation errors
+                        errors = list(validator.iter_errors(spec_config))
+
+                        if not errors:
+                            logger.print(f"{file_path} is valid.")
+                        else:
+                            logger.log_error(f"\n‼️{file_path} has {len(errors)} validation error(s):")
+
+                            for e in errors:
+                                # Get detailed error information for each error
+                                error_path = '.'.join(str(p) for p in e.path) if e.path else "root"
+                                line_info = ""
+
+                                # Get line number from jsonschema error if available
+                                if hasattr(e, 'lineno') and e.lineno is not None:
+                                    line_info = f" at line {e.lineno}"
+                                else:
+                                    # Try to find line number by looking at the path and instance
+                                    try:
+                                        with open(file_path, "r") as f:
+                                            yaml_content = f.readlines()
+                                            yaml_lines = []
+                                            for idx, line in enumerate(yaml_content):
+                                                if error_path in line:
+                                                    yaml_lines.append(f"line {idx+1}: {line.strip()}")
+                                            if yaml_lines:
+                                                line_info = "\nPossible location(s):\n  " + "\n  ".join(yaml_lines)
+                                    except Exception:
+                                        pass
+
+                                schema_path = '.'.join(str(p) for p in e.schema_path)
+                                logger.print(f"⚠️ {file_path} is invalid at path '{error_path}'{line_info}:")
+                                logger.print(f"  Error: {e.message}")
+                                logger.print(f"  Instance: {e.instance}")
+                                logger.print(f"  Schema path: {schema_path}")
+                            error_count += 1
+                    except Exception as e:
+                        logger.log_error(f"Error processing {file_path}: {str(e)}")
                         error_count += 1
-                except Exception as e:
-                    logger.log_error(f"Error processing {file_path}: {str(e)}")
-                    error_count += 1
 
     logger.print(f"Found {asset_count} total asset(s).")
-    logger.print(f"Found {error_count} model(s) with error(s) out of {model_count} total model(s)")
+    if changed_assets is not None:
+        logger.print(f"Found {error_count} model(s) with error(s) out of {changed_model_count} total changed model(s)")
+    else:
+        logger.print(f"Found {error_count} model(s) with error(s) out of {model_count} total model(s)")
     return error_count == 0
 
 
@@ -142,16 +163,20 @@ if __name__ == "__main__":
                         help="Asset config file name to search for")
     parser.add_argument("--allow-additional-properties", action="store_true",
                         help="Allow additional properties not defined in the schema")
+    parser.add_argument("-c", "--changed-files",
+                        help="Comma-separated list of changed files, used to filter assets")
     args = parser.parse_args()
 
     # Convert comma-separated values to lists
     input_dirs = [Path(d) for d in args.input_dirs.split(",")]
+    changed_files = [Path(f) for f in args.changed_files.split(",")] if args.changed_files else []
 
     # Validate against model schema
     success = validate_model_schema(input_dirs=input_dirs,
                                     schema_file=args.schema_file,
                                     asset_config_filename=args.asset_config_filename,
-                                    allow_additional_properties=args.allow_additional_properties)
+                                    allow_additional_properties=args.allow_additional_properties,
+                                    changed_files=changed_files)
 
     if not success:
         sys.exit(1)

azureml/registry/mgmt/asset_management.py

@@ -7,7 +7,7 @@ import sys
 import shutil
 import tempfile
 import yaml
-from datetime import datetime, timedelta
+from datetime import datetime
 from pathlib import Path
 from typing import List
 
@@ -16,7 +16,6 @@ from azure.identity import DefaultAzureCredential
 
 from azureml.registry.data.validate_model_schema import validate_model_schema
 from azureml.registry.data.validate_model_variant_schema import validate_model_variant_schema
-from azureml.registry.mgmt.registry_config import RegistryConfig
 
 # Windows compatibility patch - must be applied before importing azureml.assets
 from subprocess import run
@@ -34,7 +33,7 @@ publish_utils.run_command = patched_run_command
 
 import azureml.assets as assets  # noqa: E402
 import azureml.assets.util as util  # noqa: E402
-from azureml.assets.config import AssetConfig, AssetType, AzureBlobstoreAssetPath  # noqa: E402
+from azureml.assets.config import AssetConfig, AssetType  # noqa: E402
 from azureml.assets.publish_utils import create_asset  # noqa: E402
 from azureml.assets.validate_assets import validate_assets  # noqa: E402
 
@@ -88,34 +87,13 @@ def validate_model(asset_path: Path, allow_additional_properties: bool = False)
     return True
 
 
-def set_storage_and_sas(asset: AssetConfig, storage_config: dict):
-    """Use storage configuration and generate/set SAS token.
-
-    Args:
-        asset (AssetConfig): Asset configuration object to modify
-        storage_config (dict): Storage configuration dictionary
-    """
-    if not storage_config:
-        # No storage overrides provided, skip storage configuration
-        return
-
-    print("Overriding storage configuration with provided values...")
-    extra_config = asset.extra_config_as_object()
-    extra_config._path = AzureBlobstoreAssetPath(
-        storage_name=storage_config["storage_name"],
-        container_name=storage_config["container_name"],
-        container_path=storage_config["container_path"]
-    )
-    _ = extra_config.path.get_uri(token_expiration=timedelta(hours=1))
-
-
-def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str, storage_overrides_exist: bool = False) -> AssetConfig:
+def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str, override_storage: bool = False) -> AssetConfig:
     """Build a mutable copy of the asset in a temporary directory.
 
     Args:
         base_asset (AssetConfig): Base asset configuration to copy
         mutable_asset_dir (str): Directory path for the mutable asset copy
-        storage_overrides_exist (bool, optional): If True, model config will be modified to set type to custom_model.
+        override_storage (bool, optional): If True, model config will be modified to reference a local temp file.
 
     Returns:
         AssetConfig: Mutable asset configuration object
@@ -136,63 +114,75 @@ def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str, storage
     spec_config_file = mutable_asset_dir / base_spec_file.relative_to(common_dir)
     model_config_file = mutable_asset_dir / base_model_file.relative_to(common_dir)
 
-    # Autoincrement version for mutable asset
-    with open(spec_config_file, "r") as f:
-        spec_config = yaml.safe_load(f)
-        spec_config["version"] = datetime.now().strftime("%Y%m%d%H%M%S")
-
-    with open(spec_config_file, "w") as f:
-        yaml.dump(spec_config, f)
-
-    # If storage overrides are provided, default set model type to custom_model
-    if storage_overrides_exist:
-        print("Storage overrides provided, default setting model type to custom_model")
-        with open(model_config_file, "r") as f:
-            model_config = yaml.safe_load(f)
-            model_config["publish"]["type"] = "custom_model"
-
+    # Override storage info for model card preview
+    if override_storage:
+        print("Model card preview - Default setting version and storage info")
+
+        # Autoincrement version for mutable asset
+        with open(spec_config_file, "r") as f:
+            spec_config = yaml.safe_load(f)
+            spec_config["version"] = datetime.now().strftime("%Y%m%d%H%M%S")
+
+        with open(spec_config_file, "w") as f:
+            yaml.dump(spec_config, f)
+
+        # Create dummy file to upload to storage
+        with open(mutable_asset_dir / "dummy.txt", "w") as f:
+            f.write("This is a dummy file used in the artifact for model card preview.")
+
+        yaml_content = """
+        path:
+            uri: ./dummy.txt
+            type: local
+        publish:
+            description: description.md
+            type: custom_model
+        """
+        new_model_config = yaml.safe_load(yaml_content)
+
+        # Overwrite model config
         with open(model_config_file, "w") as f:
-            yaml.dump(model_config, f)
+            yaml.dump(new_model_config, f)
 
     mutable_asset = AssetConfig(asset_config_file)
 
     return mutable_asset
 
 
-def create_or_update_asset(readonly_asset: AssetConfig, config: RegistryConfig):
+def create_or_update_asset(readonly_asset: AssetConfig, registry_name: str, subscription_id: str, resource_group: str, override_storage: bool = False):
     """Create or update an asset in the AzureML registry.
 
     Args:
         readonly_asset (AssetConfig): Asset configuration to create or update
-        config (RegistryConfig): Registry configuration settings
+        registry_name (str): Name of AzureML registry to deploy to
+        subscription_id (str): Subscription ID of AzureML registry to deploy to
+        resource_group (str): Resource group of AzureML registry to deploy to
+        override_storage (bool): Whether to override storage settings
     """
     print("[CREATING/UPDATING ASSET]")
-    print(f"Using registry configuration from: {config.config_path}")
+    print(f"Registry name: {registry_name}, Subscription ID: {subscription_id}, Resource group: {resource_group}")
+
     # Create ML client
     ml_client = MLClient(
-        subscription_id=config.subscription_id,
-        resource_group_name=config.resource_group,
-        registry_name=config.registry_name,
+        subscription_id=subscription_id,
+        resource_group_name=resource_group,
+        registry_name=registry_name,
         credential=DefaultAzureCredential(),
     )
 
     with tempfile.TemporaryDirectory() as mutable_asset_dir:
-        mutable_asset = build_mutable_asset(base_asset=readonly_asset, mutable_asset_dir=mutable_asset_dir, storage_overrides_exist=bool(config.storage_config))
-        # autoincrement version
+        mutable_asset = build_mutable_asset(base_asset=readonly_asset, mutable_asset_dir=mutable_asset_dir, override_storage=override_storage)
         try:
-            set_storage_and_sas(mutable_asset, config.storage_config)
-            success = create_asset(mutable_asset, config.registry_name, ml_client)
+            success = create_asset(mutable_asset, registry_name, ml_client)
+            if not success:
+                raise RuntimeError(f"Failed to create/update asset: create_asset 'success' returned {success}")
         except Exception as e:
             print(f"Failed to create/update asset: {e}")
             raise
 
-        if not success:
-            print(f"Failed to create/update asset: create_asset 'success' returned {success}")
-            raise
-
         print("\n[VALIDATE YOUR ASSET IN THE UI HERE]")
-        print(f" - Model Catalog link: https://ai.azure.com/explore/models/{mutable_asset.name}/version/{mutable_asset.version}/registry/{config.registry_name}?tid={config.tenant_id}")
-        print(f" - Azure Portal link: https://ml.azure.com/registries/{config.registry_name}/models/{mutable_asset.name}/version/{mutable_asset.version}?tid={config.tenant_id}")
+        print(f" - Model Catalog link: https://ai.azure.com/explore/models/{mutable_asset.name}/version/{mutable_asset.version}/registry/{registry_name}")
+        print(f" - Azure Portal link: https://ml.azure.com/registries/{registry_name}/models/{mutable_asset.name}/version/{mutable_asset.version}")
 
 
 def asset_validate(asset_path: Path, dry_run: bool = False, allow_additional_properties: bool = False) -> bool:
@@ -237,31 +227,29 @@ def asset_validate(asset_path: Path, dry_run: bool = False, allow_additional_pro
     return validate_model(readonly_asset.file_path, allow_additional_properties)
 
 
-def asset_deploy(asset_path: Path, config_path: Path, dry_run: bool = False) -> bool:
-    """Deploy an asset using configuration file.
+def asset_deploy(asset_path: Path, registry_name: str, subscription_id: str, resource_group: str, dry_run: bool = False, allow_additional_properties: bool = False, override_storage: bool = False) -> bool:
+    """Deploy an asset to a registry.
 
     Args:
         asset_path (Path): Path to the asset folder to deploy
-        config_path (Path): Path to configuration file
         dry_run (bool): If True, perform a dry run without deploying
+        allow_additional_properties (bool): Whether to allow additional properties not defined in schema
+        override_storage (bool): Whether to override storage settings
 
     Returns:
         bool: True if deployment succeeds, False otherwise
     """
-    try:
-        config = RegistryConfig(config_path)
-    except Exception as e:
-        print(f"❌ [ERROR]: Configuration validation failed: {e}")
-        return False
-
     if dry_run:
-        print(f"[DRY RUN] Would deploy asset at {asset_path} to registry {config.registry_name}")
+        if override_storage:
+            print(f"[DRY RUN] Would preview asset at {asset_path} to registry {registry_name}")
+        else:
+            print(f"[DRY RUN] Would deploy asset at {asset_path} to registry {registry_name}")
         return True
 
     asset_path = asset_path.resolve()
 
     # Validate asset before deployment
-    if not asset_validate(asset_path, dry_run=False):
+    if not asset_validate(asset_path, dry_run=False, allow_additional_properties=allow_additional_properties):
         print("❌ [ERROR]: Asset validation failed. Asset deployment aborted.")
         return False
 
@@ -269,7 +257,7 @@ def asset_deploy(asset_path: Path, config_path: Path, dry_run: bool = False) ->
     readonly_asset = assets.AssetConfig(asset_path / assets.DEFAULT_ASSET_FILENAME)
 
     try:
-        create_or_update_asset(readonly_asset, config)
+        create_or_update_asset(readonly_asset, registry_name, subscription_id, resource_group, override_storage)
         return True
     except Exception as e:
         print(f"❌ [ERROR]: Failed to deploy asset: {e}")

{azureml_registry_tools-0.1.0a14.dist-info → azureml_registry_tools-0.1.0a16.dist-info}/METADATA

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

{azureml_registry_tools-0.1.0a14.dist-info → azureml_registry_tools-0.1.0a16.dist-info}/RECORD

@@ -1,7 +1,7 @@
 azureml/__init__.py,sha256=_gYz_vABVrp9EyOZEYn4Ya8XotJC2rZn-b9kFTEj1Dk,266
 azureml/registry/__init__.py,sha256=qjP86n1Yz6hdZb3az-wjfi7LNndsFjMQI6lXmKfXapM,266
 azureml/registry/_cli/__init__.py,sha256=dJ020ynrregpUaNGu8xVLLmX3cC9DAjaBMP1qnljLEE,208
-azureml/registry/_cli/registry_syndication_cli.py,sha256=ozx57mKjmgJ4ABULBjX8-0Y0bF8hIN_s1ukALdXrTVc,29228
+azureml/registry/_cli/registry_syndication_cli.py,sha256=7LyyBDC5OnJu9OMBAl_L_SWs9jB0hjRdhdeLqTFXFfg,28166
 azureml/registry/_cli/repo2registry_cli.py,sha256=4CDv4tYWLTjVgdXIcoKA9iu_gOv_Z_xn05wSANkdmdg,5378
 azureml/registry/_rest_client/__init__.py,sha256=Eh0vB8AVlwkZlHLO4DCGHyyfRYYgeTeVjiUAX_WujG0,219
 azureml/registry/_rest_client/arm_client.py,sha256=KVSj0V1bN-vCUV3fBbIdZDpWTLKYT6qdWIZtDjx2la4,4516
@@ -10,30 +10,29 @@ azureml/registry/_rest_client/registry_management_client.py,sha256=3-PBwj91lkG1y
 azureml/registry/_rest_client/registry_model_client.py,sha256=LqJGTuYQtBnHSeSbOl5KVbiO6vGBkKQ7HD5jc4fvV3k,14466
 azureml/registry/data/__init__.py,sha256=cW3X6HATz6XF-K_7uKdybTbJb9EZSecBN4J27NGdZmU,231
 azureml/registry/data/asset.yaml.template,sha256=WTgfuvKEBp-EVFSQ0JpU0h4z_ULJdULO9kHmB_9Fr1o,96
-azureml/registry/data/description.md.template,sha256=tIcjydGGScMP0PhJMrYjzdWMjd-8z5winufNjH2A3OE,135
-azureml/registry/data/evaluation.md.template,sha256=UZJti1kFu-VsRGVl_QA_GhUS8hU63Yo3Flih3_RMD14,328
+azureml/registry/data/description.md.template,sha256=wQLk54U8hoXU1y9235R4irc6FGYPXGO-x9EHUorP15Q,84
+azureml/registry/data/evaluation.md.template,sha256=JaDecIfLV9vZDUrZzVRPzVHHnKD-BQGBgQ-cw1dHavU,277
 azureml/registry/data/model-variant.schema.json,sha256=AT4Dy6cCtp_SFUfSqYIqcER8AldpYm0QIEy1abY3QWE,1699
-azureml/registry/data/model.schema.json,sha256=2Ew3wt9QMzIBdLeIQXph0Fj7X8OqZJbzu_7-c4SEKZY,26062
+azureml/registry/data/model.schema.json,sha256=TORbhePqEYovjg2Cem-JGJL7Tm-EbA00WvYeybMuWO4,26118
 azureml/registry/data/model.yaml.template,sha256=h5uqAN22FLaWrbPxIb8yVKH9cGDBrIwooXYYfsKhxDw,245
-azureml/registry/data/notes.md.template,sha256=yFQ7qbrjlGDLZGuSoJUvQjctXsnCdoUd6txJuT-duCY,300
-azureml/registry/data/validate_model_schema.py,sha256=bcxeyAT0Cl-0WbpVj_AXpMPnkJbnRxAbNKODtE-kBJg,6884
+azureml/registry/data/notes.md.template,sha256=zSRyOR__9NGL2j0tugY7HgFkwkAdcE2pJyyyGsz1SAk,248
+azureml/registry/data/validate_model_schema.py,sha256=OQp2E01kdxSphvUQYQvelSiD24-qUG6nTFuzW60wX2c,8322
 azureml/registry/data/validate_model_variant_schema.py,sha256=JPVNtRBn6qciMu4PaRXOvS86OGGW0cocL2Rri4xYKo8,3629
 azureml/registry/mgmt/__init__.py,sha256=LMhqcEC8ItmmpKZljElGXH-6olHlT3SLl0dJU01OvuM,226
-azureml/registry/mgmt/asset_management.py,sha256=7U1QJZTS4bOnheKeyc5WUMCCsEeWMJAS5peTshT_Yzg,11129
+azureml/registry/mgmt/asset_management.py,sha256=bipZR_yLMEka0PU-vaPDhBsc9D5veTacrHYwaIT5Dpw,10977
 azureml/registry/mgmt/create_asset_template.py,sha256=ejwLuIsmzJOoUePoxbM-eGMg2E3QHfdX-nPMBzYUVMQ,3525
 azureml/registry/mgmt/create_manifest.py,sha256=N9wRmjAKO09A3utN_lCUsM_Ufpj7PL0SJz-XHPHWuyM,9528
 azureml/registry/mgmt/create_model_spec.py,sha256=1PdAcUf-LomvljoT8wKQihXMTLd7DoTgN0qDX4Lol1A,10473
 azureml/registry/mgmt/model_management.py,sha256=STTr_uvdPKV2NaJ5UvS5aMi3yejVF6Hkj9DjofJLQik,7453
-azureml/registry/mgmt/registry_config.py,sha256=NhIkTCNlfbfJrVGw61AmBAIZQ5HU2cb4kXAI9j3Wwy4,7181
 azureml/registry/mgmt/syndication_manifest.py,sha256=8Sfd49QuCA5en5_mIOLE21kZVpnReUXowx_g0TVRgWg,9025
 azureml/registry/tools/__init__.py,sha256=IAuWWpGfZm__pAkBIxmpJz84QskpkxBr0yDk1TUSnkE,223
 azureml/registry/tools/config.py,sha256=tjPaoBsWtPXBL8Ww1hcJtsr2SuIjPKt79dR8iovcebg,3639
 azureml/registry/tools/create_or_update_assets.py,sha256=Q-_BV7KWn1huQn5JriKT_8xJNoQQ_HK5wCftrq9DepA,15988
 azureml/registry/tools/registry_utils.py,sha256=zgYlCiOONtQJ4yZ9wg8tKVoE8dh6rrjB8hYBGhpV9-0,1403
 azureml/registry/tools/repo2registry_config.py,sha256=eXp_tU8Jyi30g8xGf7wbpLgKEPpieohBANKxMSLzq7s,4873
-azureml_registry_tools-0.1.0a14.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
-azureml_registry_tools-0.1.0a14.dist-info/METADATA,sha256=90L_gy3OmDVd2cwoRoLgLgtfPPalJwn9qAcZuZAqByo,522
-azureml_registry_tools-0.1.0a14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-azureml_registry_tools-0.1.0a14.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
-azureml_registry_tools-0.1.0a14.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
-azureml_registry_tools-0.1.0a14.dist-info/RECORD,,
+azureml_registry_tools-0.1.0a16.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
+azureml_registry_tools-0.1.0a16.dist-info/METADATA,sha256=tQuJc5f47M5C2roGH_tm4D9elTB_DmW9G_1YNaLrnHw,522
+azureml_registry_tools-0.1.0a16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+azureml_registry_tools-0.1.0a16.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
+azureml_registry_tools-0.1.0a16.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
+azureml_registry_tools-0.1.0a16.dist-info/RECORD,,

azureml/registry/mgmt/registry_config.py

@@ -1,147 +0,0 @@
-# ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# ---------------------------------------------------------
-
-"""RegistryConfig class."""
-
-import configparser
-from pathlib import Path
-from typing import Dict
-
-
-class RegistryConfig:
-    """RegistryConfig class."""
-
-    def __init__(self, config_path: Path = None):
-        """Registry config init.
-
-        Args:
-            config_path (Path, optional): Path to configuration file. Defaults to "registry-mgmt.cfg".
-        """
-        if config_path is None:
-            print("No config path provided, using default 'registry-mgmt.cfg'.")
-            config_path = Path("registry-mgmt.cfg")
-        self.config_path = config_path
-        if not self.config_path.is_file():
-            raise FileNotFoundError(f"File '{self.config_path.resolve().as_posix()}' does not exist.")
-
-        self.config = configparser.ConfigParser()
-        self.config.read(self.config_path)
-        self._validate_schema()
-
-    def _validate_schema(self) -> None:
-        """Validate registry config schema."""
-        config_file_name = str(self.config_path)
-
-        if not self.config.has_section("registry"):
-            raise Exception(f'"registry" section not found in config file {config_file_name}')
-
-        # Validate registry section
-        if not self.config.has_option("registry", "registry_name"):
-            raise Exception(f'Key "registry_name" not found under "registry" section in config file {config_file_name}')
-        if not self.config.has_option("registry", "tenant_id"):
-            raise Exception(f'Key "tenant_id" not found under "registry" section in config file {config_file_name}')
-        if not self.config.has_option("registry", "subscription_id"):
-            raise Exception(f'Key "subscription_id" not found under "registry" section in config file {config_file_name}')
-        if not self.config.has_option("registry", "resource_group"):
-            raise Exception(f'Key "resource_group" not found under "registry" section in config file {config_file_name}')
-
-        # Validate that values are not empty
-        required_settings = ["registry_name", "tenant_id", "subscription_id", "resource_group"]
-        for setting in required_settings:
-            if not self.config.get("registry", setting).strip():
-                raise Exception(f'Value for "{setting}" is empty in "registry" section in config file {config_file_name}')
-
-        # Validate storage_overrides section (optional, but if present, validate its contents)
-        if self.config.has_section("storage_overrides"):
-            allowed_storage_keys = {"storage_name", "container_name", "container_path"}
-            actual_storage_keys = set(self.config.options("storage_overrides"))
-
-            # Check for unexpected keys
-            unexpected_keys = actual_storage_keys - allowed_storage_keys
-            if unexpected_keys:
-                raise Exception(f'Unexpected keys {sorted(unexpected_keys)} found in "storage_overrides" section in config file {config_file_name}. Only {sorted(allowed_storage_keys)} are allowed.')
-
-            # Check for required keys
-            if not self.config.has_option("storage_overrides", "storage_name"):
-                raise Exception(f'Key "storage_name" not found under "storage_overrides" section in config file {config_file_name}')
-            if not self.config.has_option("storage_overrides", "container_name"):
-                raise Exception(f'Key "container_name" not found under "storage_overrides" section in config file {config_file_name}')
-            if not self.config.has_option("storage_overrides", "container_path"):
-                raise Exception(f'Key "container_path" not found under "storage_overrides" section in config file {config_file_name}')
-
-            # Validate that storage values are not empty
-            required_storage_settings = ["storage_name", "container_name", "container_path"]
-            for setting in required_storage_settings:
-                if not self.config.get("storage_overrides", setting).strip():
-                    raise Exception(f'Value for "{setting}" is empty in "storage_overrides" section in config file {config_file_name}')
-
-    @property
-    def registry_name(self) -> str:
-        """Get registry name from config."""
-        return self.config.get("registry", "registry_name")
-
-    @property
-    def tenant_id(self) -> str:
-        """Get tenant ID from config."""
-        return self.config.get("registry", "tenant_id")
-
-    @property
-    def subscription_id(self) -> str:
-        """Get subscription ID from config."""
-        return self.config.get("registry", "subscription_id")
-
-    @property
-    def resource_group(self) -> str:
-        """Get resource group from config."""
-        return self.config.get("registry", "resource_group")
-
-    @property
-    def storage_config(self) -> Dict[str, str]:
-        """Get storage configuration."""
-        if self.config.has_section("storage_overrides"):
-            return dict(self.config["storage_overrides"])
-        return {}
-
-
-def create_registry_config(registry_name: str, subscription_id: str, resource_group: str, tenant_id: str,
-                           config_file_path: Path, storage_name: str = None, container_name: str = None,
-                           container_path: str = None):
-    """Create registry config.
-
-    Args:
-        registry_name (str): Registry name.
-        subscription_id (str): Registry subscription id.
-        resource_group (str): Registry resource group.
-        tenant_id (str): Tenant ID.
-        config_file_path (Path): Path to config file.
-        storage_name (str, optional): Storage account name for storage overrides. Defaults to None.
-        container_name (str, optional): Container name for storage overrides. Defaults to None.
-        container_path (str, optional): Container path for storage overrides. Defaults to None.
-    """
-    print("Creating registry config...")
-
-    registry_config = configparser.ConfigParser()
-    registry_config.add_section("registry")
-    registry_config.set("registry", "registry_name", registry_name)
-    registry_config.set("registry", "subscription_id", subscription_id)
-    registry_config.set("registry", "resource_group", resource_group)
-    registry_config.set("registry", "tenant_id", tenant_id)
-
-    # Add storage overrides if provided
-    if storage_name and container_name and container_path:
-        registry_config.add_section("storage_overrides")
-        registry_config.set("storage_overrides", "storage_name", storage_name)
-        registry_config.set("storage_overrides", "container_name", container_name)
-        registry_config.set("storage_overrides", "container_path", container_path)
-
-    # Write to path
-    if config_file_path is None:
-        print('No config file path provided, using default "registry-mgmt.cfg"')
-        config_file_path = Path("registry-mgmt.cfg")
-    with open(config_file_path, "w") as config_file:
-        registry_config.write(config_file)
-
-    config_abs_path = Path(config_file_path).resolve().as_posix()
-
-    print(f"Wrote registry config file to {config_abs_path}")