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

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/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_tools-0.1.0a15.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.0a15
+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.0a15.dist-info → azureml_registry_tools-0.1.0a16.dist-info}/RECORD

@@ -13,10 +13,10 @@ azureml/registry/data/asset.yaml.template,sha256=WTgfuvKEBp-EVFSQ0JpU0h4z_ULJdUL
 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=zSRyOR__9NGL2j0tugY7HgFkwkAdcE2pJyyyGsz1SAk,248
-azureml/registry/data/validate_model_schema.py,sha256=bcxeyAT0Cl-0WbpVj_AXpMPnkJbnRxAbNKODtE-kBJg,6884
+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=bipZR_yLMEka0PU-vaPDhBsc9D5veTacrHYwaIT5Dpw,10977
@@ -30,9 +30,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.0a15.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
-azureml_registry_tools-0.1.0a15.dist-info/METADATA,sha256=JoRnlHgWhdH6ZJss_on0g2OdFGnaMh06XnEFUSEfWzI,522
-azureml_registry_tools-0.1.0a15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-azureml_registry_tools-0.1.0a15.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
-azureml_registry_tools-0.1.0a15.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
-azureml_registry_tools-0.1.0a15.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,,