Make name optional and infer from model name

mlserver/repository.py

@@ -42,6 +42,12 @@ async def list(self) -> List[ModelSettings]:
     def _load_model_settings(self, model_settings_path: str) -> ModelSettings:
         model_settings = ModelSettings.parse_file(model_settings_path)
 
+        # TODO: Raise warning if name is different than folder's name
+        if not model_settings.name:
+            # If name not present, default to folder name
+            default_model_name = os.path.basename(os.path.dirname(model_settings_path))
+            model_settings.name = default_model_name
+
         if not model_settings.parameters:
             model_settings.parameters = ModelParameters()
 

mlserver/settings.py

@@ -50,7 +50,7 @@ class ModelSettings(BaseSettings):
     class Config:
         env_prefix = ENV_PREFIX_MODEL_SETTINGS
 
-    name: str
+    name: str = ""
 
     # Model metadata
     platform: str = ""

tests/test_repository.py

@@ -1,4 +1,5 @@
 import os
+import json
 
 from mlserver.repository import ModelRepository, DEFAULT_MODEL_SETTINGS_FILENAME
 from mlserver.settings import ModelSettings, ENV_PREFIX_MODEL_SETTINGS
@@ -30,7 +31,6 @@ async def test_list_multi_model(multi_model_folder: str):
 
     assert len(settings_list) == 5
     for idx, model_settings in enumerate(settings_list):
-        # Models get read in reverse
         assert model_settings.parameters.version == f"v{idx}"  # type: ignore
 
 
@@ -63,6 +63,20 @@ async def test_list_fallback(
     )
 
 
+async def test_name_fallback(model_folder: str, model_repository: ModelRepository):
+    # Create empty model-settings.json file
+    model_settings = ModelSettings()
+    model_settings_path = os.path.join(model_folder, DEFAULT_MODEL_SETTINGS_FILENAME)
+    with open(model_settings_path, "w") as model_settings_file:
+        d = model_settings.dict()
+        del d["name"]
+        d["implementation"] = get_import_path(d["implementation"])
+        json.dump(d, model_settings_file)
+
+    model_settings = model_repository._load_model_settings(model_settings_path)
+    assert model_settings.name == os.path.basename(model_folder)
+
+
 async def test_find(
     model_repository: ModelRepository, sum_model_settings: ModelSettings
 ):