Merge remote-tracking branch 'origin/refactorPZMM' into refactorPZMM

# Conflicts:
#	src/sasctl/pzmm/model_parameters.py

Author: smlindauer

src/sasctl/_services/model_management.py

@@ -204,13 +204,22 @@ def create_performance_definition(
 
         # Separate single models from multiple models
         if not isinstance(models, list):
-            models = mr.get_model(models)
+            models = [models]
+        if project:
+            project = mr.get_project(project)
+            project_models = mr.get(f'/projects/{project.id}/models')
+            project_models = [m for m in project_models if m.name in models]
+            models = project_models
+            # Necessary to eventually provide variables to the performance definition
+            models[0] = mr.get_model(project_models[0].id)
         else:
             # Collect all models into a list. This converts the PagedList response from mr.list_models to a normal list.
             for i, model in enumerate(models):
                 models[i] = mr.get_model(model)
-        if not project:
             project = mr.get_project(models[0].projectId)
+            # Ensures that all models are in the same project
+            if not all([model.projectId == project.id for model in models]):
+                raise ValueError("Not all models are contained within the same project. Try specifying a project.")
 
         # Performance data cannot be captured unless certain project properties have been configured.
         for required in ["targetVariable", "targetLevel"]:

src/sasctl/pzmm/model_parameters.py

@@ -141,14 +141,13 @@ def update_kpis(
         models_to_update = kpis["ModelUUID"].unique().tolist()
 
         for model in models_to_update:
-            try:
-                current_params, file_name = _find_file(model, "hyperparameters")
-            except:
-                model_name = {kpis.loc[kpis["ModelUUID"]==model, "ModelName"].iloc[0]}
-                print(f'No hyperparameter file for current model {model_name}. Attempting for next model...')
-            else:
-                updated_json = cls._update_json(model, current_params.json(), kpis)
-                mr.add_model_content(model, json.dumps(updated_json, indent=4), file_name)
+           try:
+               current_params, file_name = _find_file(model, "hyperparameters")
+           except:
+               print(f'No hyperparamter file for current model {kpis.loc[kpis["ModelUUID"]==model, "ModelName"].iloc[0]}. Attempting for next model...')
+           else:
+               updated_json = cls._update_json(model, current_params, kpis)
+               mr.add_model_content(model, json.dumps(updated_json, indent=4), file_name)
 
     @staticmethod
     def get_hyperparameters(model: Union[str, dict, RestObj]) -> Tuple[dict, str]:
@@ -175,7 +174,7 @@ def get_hyperparameters(model: Union[str, dict, RestObj]) -> Tuple[dict, str]:
             model = mr.get_model(model)
             id_ = model["id"]
         file_contents, file_name = _find_file(id_, "hyperparameters")
-        return file_contents.hyperparameters, file_name
+        return file_contents, file_name
 
     @classmethod
     def add_hyperparameters(cls, model: Union[str, dict, RestObj], **kwargs) -> None:
@@ -201,7 +200,7 @@ def add_hyperparameters(cls, model: Union[str, dict, RestObj], **kwargs) -> None
             id_ = model["id"]
         hyperparameters, file_name = cls.get_hyperparameters(id_)
         for key, value in kwargs.items():
-            hyperparameters[key] = value
+            hyperparameters["hyperparameters"][key] = value
         mr.add_model_content(
             model,
             json.dumps(hyperparameters, indent=4),