azureml-registry-tools 0.1.0a12__tar.gz → 0.1.0a14__tar.gz

{azureml_registry_tools-0.1.0a12/azureml_registry_tools.egg-info → azureml_registry_tools-0.1.0a14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azureml-registry-tools
-Version: 0.1.0a12
+Version: 0.1.0a14
 Summary: AzureML Registry tools and CLI
 Author: Microsoft Corp
 License: https://aka.ms/azureml-sdk-license
@@ -10,7 +10,7 @@ Requires-Dist: azure-identity<2.0
 Requires-Dist: ruamel-yaml<0.19,>=0.17.21
 Requires-Dist: diskcache~=5.6
 Requires-Dist: azure-ai-ml<2.0
-Requires-Dist: azureml-assets<=1.16.86
+Requires-Dist: azureml-assets<2.0
 Dynamic: author
 Dynamic: license
 Dynamic: license-file

{azureml_registry_tools-0.1.0a12 → azureml_registry_tools-0.1.0a14}/azureml/registry/_cli/registry_syndication_cli.py

@@ -350,6 +350,8 @@ def main() -> None:
     asset_validate_parser = asset_subparsers.add_parser("validate", help="Validate an asset.")
     _add_common_args(asset_validate_parser, [dry_run_arg])
     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 deploy command
     asset_deploy_parser = asset_subparsers.add_parser("deploy", help="Deploy an asset to registry.")
@@ -447,7 +449,7 @@ def main() -> None:
     elif args.command == "asset":
         if args.asset_subcommand == "validate":
             # Config file is not needed for validation
-            asset_validate(args.asset_path, args.dry_run)
+            asset_validate(args.asset_path, args.dry_run, args.allow_additional_properties)
         elif args.asset_subcommand == "deploy":
             # Config file is required for deployment
             asset_deploy(args.asset_path, args.config, args.dry_run)

{azureml_registry_tools-0.1.0a12 → azureml_registry_tools-0.1.0a14}/azureml/registry/data/validate_model_schema.py

@@ -2,37 +2,71 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
 
-"""Validate model variant schema."""
+"""Validate model schema."""
 
 import argparse
-import yaml
-import sys
 import jsonschema
+import sys
+import yaml
+
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
 import azureml.assets as assets
 import azureml.assets.util as util
 from azureml.assets.util import logger
 
 
+def set_additional_properties_true(obj):
+    """Recursively set additionalProperties to True in a schema object."""
+    if isinstance(obj, dict):
+        if "additionalProperties" in obj:
+            obj["additionalProperties"] = True
+        for v in obj.values():
+            set_additional_properties_true(v)
+    elif isinstance(obj, list):
+        for item in obj:
+            set_additional_properties_true(item)
+
+
+def load_schema(schema_file: Path, allow_additional_properties: bool = False) -> Dict[str, Any]:
+    """Load and optionally modify the schema to allow for additional properties.
+
+    Args:
+        schema_file (Path): Path to the schema file
+        allow_additional_properties (bool): Whether to allow additional properties not defined in the schema
+
+    Returns:
+        dict: Loaded model schema
+    """
+    # Load schema from file
+    with open(schema_file, 'r') as file:
+        schema = yaml.safe_load(file)
+
+    if allow_additional_properties:
+        logger.print('Allowing for additional properties, setting "additionalProperties: true" in the model schema')
+        set_additional_properties_true(schema)
+
+    return schema
+
+
 def validate_model_schema(input_dirs: List[Path],
                           schema_file: Path,
-                          asset_config_filename: str) -> bool:
+                          asset_config_filename: str,
+                          allow_additional_properties: bool = False) -> bool:
     """Validate model variant schema.
 
     Args:
         input_dirs (List[Path]): Directories containing assets.
         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.
 
     Returns:
         bool: True on success.
     """
     # Load model schema from file
-    loaded_schema = {}
-    with open(schema_file, 'r') as file:
-        loaded_schema = yaml.safe_load(file)
+    loaded_schema = load_schema(schema_file, allow_additional_properties)
 
     # Create validator instance for collecting all errors
     validator = jsonschema.Draft7Validator(loaded_schema)
@@ -99,12 +133,15 @@ def validate_model_schema(input_dirs: List[Path],
 
 if __name__ == "__main__":
     # Handle command-line args
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(description="Validate model specifications against JSON schema")
     parser.add_argument("-i", "--input-dirs", required=True,
                         help="Comma-separated list of directories containing assets")
-    parser.add_argument("-m", "--schema-file", default=Path(__file__).parent / "model.schema.json", type=Path, help="Model Schema file")
+    parser.add_argument("-m", "--schema-file", default=Path(__file__).parent / "model.schema.json", type=Path,
+                        help="Model Schema file")
     parser.add_argument("-a", "--asset-config-filename", default=assets.DEFAULT_ASSET_FILENAME,
                         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")
     args = parser.parse_args()
 
     # Convert comma-separated values to lists
@@ -113,7 +150,8 @@ if __name__ == "__main__":
     # Validate against model schema
     success = validate_model_schema(input_dirs=input_dirs,
                                     schema_file=args.schema_file,
-                                    asset_config_filename=args.asset_config_filename)
+                                    asset_config_filename=args.asset_config_filename,
+                                    allow_additional_properties=args.allow_additional_properties)
 
     if not success:
         sys.exit(1)

{azureml_registry_tools-0.1.0a12 → azureml_registry_tools-0.1.0a14}/azureml/registry/mgmt/asset_management.py

@@ -39,11 +39,12 @@ from azureml.assets.publish_utils import create_asset  # noqa: E402
 from azureml.assets.validate_assets import validate_assets  # noqa: E402
 
 
-def validate_model(asset_path: Path) -> bool:
+def validate_model(asset_path: Path, allow_additional_properties: bool = False) -> bool:
     """Validate model.
 
     Args:
         asset_path (Path): Path to the asset folder to validate
+        allow_additional_properties (bool): Whether to allow additional properties not defined in schema
 
     Returns:
         bool: True if validation passes, False otherwise
@@ -73,7 +74,8 @@ def validate_model(asset_path: Path) -> bool:
 
     print("⚙️ [VALIDATION #3]: Validating model schema...")
     if not validate_model_schema(input_dirs=[asset_path], schema_file=model_schema_file,
-                                 asset_config_filename=assets.DEFAULT_ASSET_FILENAME):
+                                 asset_config_filename=assets.DEFAULT_ASSET_FILENAME,
+                                 allow_additional_properties=allow_additional_properties):
         print("❌ [FAILED] Validation #3: validate_model_schema\n")
         errors += 1
     else:
@@ -193,12 +195,13 @@ def create_or_update_asset(readonly_asset: AssetConfig, config: RegistryConfig):
         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}")
 
 
-def asset_validate(asset_path: Path, dry_run: bool = False) -> bool:
+def asset_validate(asset_path: Path, dry_run: bool = False, allow_additional_properties: bool = False) -> bool:
     """Validate an asset at the specified path.
 
     Args:
         asset_path (Path): Path to the asset folder to validate
         dry_run (bool): If True, perform a dry run without side effects
+        allow_additional_properties (bool): Whether to allow additional properties not defined in schema
 
     Returns:
         bool: True if validation passes, False otherwise
@@ -231,7 +234,7 @@ def asset_validate(asset_path: Path, dry_run: bool = False) -> bool:
         return False
 
     # Perform validation
-    return validate_model(readonly_asset.file_path)
+    return validate_model(readonly_asset.file_path, allow_additional_properties)
 
 
 def asset_deploy(asset_path: Path, config_path: Path, dry_run: bool = False) -> bool:

{azureml_registry_tools-0.1.0a12 → azureml_registry_tools-0.1.0a14/azureml_registry_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azureml-registry-tools
-Version: 0.1.0a12
+Version: 0.1.0a14
 Summary: AzureML Registry tools and CLI
 Author: Microsoft Corp
 License: https://aka.ms/azureml-sdk-license
@@ -10,7 +10,7 @@ Requires-Dist: azure-identity<2.0
 Requires-Dist: ruamel-yaml<0.19,>=0.17.21
 Requires-Dist: diskcache~=5.6
 Requires-Dist: azure-ai-ml<2.0
-Requires-Dist: azureml-assets<=1.16.86
+Requires-Dist: azureml-assets<2.0
 Dynamic: author
 Dynamic: license
 Dynamic: license-file

{azureml_registry_tools-0.1.0a12 → azureml_registry_tools-0.1.0a14}/azureml_registry_tools.egg-info/requires.txt

@@ -2,4 +2,4 @@ azure-identity<2.0
 ruamel-yaml<0.19,>=0.17.21
 diskcache~=5.6
 azure-ai-ml<2.0
-azureml-assets<=1.16.86
+azureml-assets<2.0

{azureml_registry_tools-0.1.0a12 → azureml_registry_tools-0.1.0a14}/setup.py

@@ -11,14 +11,14 @@ DEPENDENCIES = [
     "ruamel-yaml>=0.17.21,<0.19",
     "diskcache~=5.6",
     "azure-ai-ml<2.0",
-    "azureml-assets<=1.16.86"
+    "azureml-assets<2.0"
 ]
 
 exclude_list = ["*.tests"]
 
 setup(
     name='azureml-registry-tools',
-    version="0.1.0a12",
+    version="0.1.0a14",
     description='AzureML Registry tools and CLI',
     author='Microsoft Corp',
     license="https://aka.ms/azureml-sdk-license",