azureml-registry-tools 0.1.0a7__tar.gz → 0.1.0a9__tar.gz

{azureml_registry_tools-0.1.0a7/azureml_registry_tools.egg-info → azureml_registry_tools-0.1.0a9}/PKG-INFO

@@ -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 → azureml_registry_tools-0.1.0a9}/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_tools-0.1.0a7 → azureml_registry_tools-0.1.0a9}/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_tools-0.1.0a7 → azureml_registry_tools-0.1.0a9}/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 → azureml_registry_tools-0.1.0a9/azureml_registry_tools.egg-info}/PKG-INFO

@@ -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 → azureml_registry_tools-0.1.0a9}/setup.py

@@ -18,7 +18,7 @@ exclude_list = ["*.tests"]
 
 setup(
     name='azureml-registry-tools',
-    version="0.1.0a7",
+    version="0.1.0a9",
     description='AzureML Registry tools and CLI',
     author='Microsoft Corp',
     license="https://aka.ms/azureml-sdk-license",