azureml-registry-tools 0.1.0a12__py3-none-any.whl → 0.1.0a13__py3-none-any.whl

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/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/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.dist-info → azureml_registry_tools-0.1.0a13.dist-info}/METADATA

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

{azureml_registry_tools-0.1.0a12.dist-info → azureml_registry_tools-0.1.0a13.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=7HZ9dfv_KL4H-sRebz7xvNHgeN3MUCSJl-pOxZPFJeU,29000
+azureml/registry/_cli/registry_syndication_cli.py,sha256=ozx57mKjmgJ4ABULBjX8-0Y0bF8hIN_s1ukALdXrTVc,29228
 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
@@ -16,10 +16,10 @@ azureml/registry/data/model-variant.schema.json,sha256=AT4Dy6cCtp_SFUfSqYIqcER8A
 azureml/registry/data/model.schema.json,sha256=2Ew3wt9QMzIBdLeIQXph0Fj7X8OqZJbzu_7-c4SEKZY,26062
 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=-13fTuX1iqO7OhZFv8NbBpPlBcs-plNYJVPu40Cgl5M,5236
+azureml/registry/data/validate_model_schema.py,sha256=bcxeyAT0Cl-0WbpVj_AXpMPnkJbnRxAbNKODtE-kBJg,6884
 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=loe_RkzJYwFX0brG5OJfv4XpgHAvc28zSSukNA7FgT0,10714
+azureml/registry/mgmt/asset_management.py,sha256=7U1QJZTS4bOnheKeyc5WUMCCsEeWMJAS5peTshT_Yzg,11129
 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
@@ -31,9 +31,9 @@ azureml/registry/tools/config.py,sha256=tjPaoBsWtPXBL8Ww1hcJtsr2SuIjPKt79dR8iovc
 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.0a12.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
-azureml_registry_tools-0.1.0a12.dist-info/METADATA,sha256=Dgdf2cPZ_pYJThoZ2IpkbmiG5xeTm5VY_3B--34Rjhc,527
-azureml_registry_tools-0.1.0a12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-azureml_registry_tools-0.1.0a12.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
-azureml_registry_tools-0.1.0a12.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
-azureml_registry_tools-0.1.0a12.dist-info/RECORD,,
+azureml_registry_tools-0.1.0a13.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
+azureml_registry_tools-0.1.0a13.dist-info/METADATA,sha256=ehMdSIszV-lZKkTKpf2IQMM_vNMB2uxvDHdZqN1BvEU,527
+azureml_registry_tools-0.1.0a13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+azureml_registry_tools-0.1.0a13.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
+azureml_registry_tools-0.1.0a13.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
+azureml_registry_tools-0.1.0a13.dist-info/RECORD,,