azureml-registry-tools 0.1.0a7__py3-none-any.whl → 0.1.0a9__py3-none-any.whl

azureml/registry/data/validate_model_schema.py

@@ -102,7 +102,7 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-i", "--input-dirs", required=True,
                         help="Comma-separated list of directories containing assets")
-    parser.add_argument("-m", "--schema-file", required=True, 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")
     args = parser.parse_args()

azureml/registry/data/validate_model_variant_schema.py

@@ -69,7 +69,7 @@ if __name__ == "__main__":
     # Handle command-line args
     parser = argparse.ArgumentParser()
     parser.add_argument("-i", "--input-dirs", required=True, help="Comma-separated list of directories containing assets")
-    parser.add_argument("-m", "--model-variant-schema-file", required=True, type=Path, help="Model Variant Schema file")
+    parser.add_argument("-m", "--model-variant-schema-file", default=Path(__file__).parent / "model-variant.schema.json", type=Path, help="Model Variant Schema file")
     parser.add_argument("-a", "--asset-config-filename", default=assets.DEFAULT_ASSET_FILENAME, help="Asset config file name to search for")
     args = parser.parse_args()
 

azureml/registry/mgmt/asset_management.py

@@ -107,12 +107,13 @@ def set_storage_and_sas(asset: AssetConfig, storage_config: dict):
     _ = extra_config.path.get_uri(token_expiration=timedelta(hours=1))
 
 
-def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str) -> AssetConfig:
+def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str, storage_overrides_exist: 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.
 
     Returns:
         AssetConfig: Mutable asset configuration object
@@ -124,12 +125,14 @@ def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str) -> Asse
     mutable_asset_dir = Path(mutable_asset_dir).resolve()
     base_asset_file = base_asset.file_name_with_path.resolve()
     base_spec_file = base_asset.spec_with_path.resolve()
+    base_model_file = base_asset.extra_config_with_path.resolve()
 
     shutil.copytree(common_dir, mutable_asset_dir, dirs_exist_ok=True)
 
     # Reference asset files in mutable directory
     asset_config_file = mutable_asset_dir / base_asset_file.relative_to(common_dir)
     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:
@@ -139,6 +142,16 @@ def build_mutable_asset(base_asset: AssetConfig, mutable_asset_dir: str) -> Asse
     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"
+
+        with open(model_config_file, "w") as f:
+            yaml.dump(model_config, f)
+
     mutable_asset = AssetConfig(asset_config_file)
 
     return mutable_asset
@@ -162,7 +175,7 @@ def create_or_update_asset(readonly_asset: AssetConfig, config: RegistryConfig):
     )
 
     with tempfile.TemporaryDirectory() as mutable_asset_dir:
-        mutable_asset = build_mutable_asset(base_asset=readonly_asset, mutable_asset_dir=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
         try:
             set_storage_and_sas(mutable_asset, config.storage_config)

{azureml_registry_tools-0.1.0a7.dist-info → azureml_registry_tools-0.1.0a9.dist-info}/METADATA

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

{azureml_registry_tools-0.1.0a7.dist-info → azureml_registry_tools-0.1.0a9.dist-info}/RECORD

@@ -15,10 +15,10 @@ azureml/registry/data/model-variant.schema.json,sha256=AT4Dy6cCtp_SFUfSqYIqcER8A
 azureml/registry/data/model.schema.json,sha256=sNzo7agu_49GdfSa08T61Hy87j-XY5IwLh6XU39QTAY,25814
 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=VLgQQhgS-lWuYC9bCBop_Yp1k70SzaM_8JU4Sc7aE14,5198
-azureml/registry/data/validate_model_variant_schema.py,sha256=4gpL9fTN4APu3TdrAUTzd3oavByBv19afjHbK__BEno,3583
+azureml/registry/data/validate_model_schema.py,sha256=-13fTuX1iqO7OhZFv8NbBpPlBcs-plNYJVPu40Cgl5M,5236
+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=7dUp8Dg-YffAWBtqLK6l2to8lafcPfh5GB0aH7ujVsc,9911
+azureml/registry/mgmt/asset_management.py,sha256=loe_RkzJYwFX0brG5OJfv4XpgHAvc28zSSukNA7FgT0,10714
 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
@@ -29,9 +29,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.0a7.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
-azureml_registry_tools-0.1.0a7.dist-info/METADATA,sha256=R1Pk35pE-6ocXl6mlW3DBOKa-6SJ2XMM27bOlJLpjhI,521
-azureml_registry_tools-0.1.0a7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-azureml_registry_tools-0.1.0a7.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
-azureml_registry_tools-0.1.0a7.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
-azureml_registry_tools-0.1.0a7.dist-info/RECORD,,
+azureml_registry_tools-0.1.0a9.dist-info/licenses/LICENSE.txt,sha256=n20rxwp7_NGrrShv9Qvcs90sjI1l3Pkt3m-5OPCWzgs,845
+azureml_registry_tools-0.1.0a9.dist-info/METADATA,sha256=rlJEImnW42AWIfYYtpiN6TLkRjAkFg8KWQu3sTc5mRo,521
+azureml_registry_tools-0.1.0a9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+azureml_registry_tools-0.1.0a9.dist-info/entry_points.txt,sha256=iRUkAeQidMnO6RQzpLqMUBTcyYtNzAfSin9WnSdVGLw,147
+azureml_registry_tools-0.1.0a9.dist-info/top_level.txt,sha256=ZOeEa0TAXo6i5wOjwBoqfIGEuxOcKuscGgNSpizqREY,8
+azureml_registry_tools-0.1.0a9.dist-info/RECORD,,