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

# Conflicts:
#	src/sasctl/_services/model_repository.py
#	src/sasctl/pzmm/__init__.py
#	src/sasctl/pzmm/importModel.py
#	src/sasctl/pzmm/pickleModel.py

Author: smlindauer

src/sasctl/_services/model_repository.py

@@ -776,47 +776,6 @@ def get_model_details(cls, model):
         return cls.get("/models/%s" % id_)
 
     @classmethod
-    def create_custom_kpi(cls, model, project, body):
-        """_summary_
-
-        Parameters
-        ----------
-        model : _type_
-            _description_
-        project : _type_
-            _description_
-        body : _type_
-            _description_
-        '''
-        if cls.is_uuid(project):
-            projectId = project
-        elif isinstance(project, dict) and "id" in project:
-            projectId = project["id"]
-        else:
-            project = cls.get_project(project)
-            projectId = project["id"]
-
-        if cls.is_uuid(model):
-            modelId = model
-        elif isinstance(model, dict) and "id" in model:
-            modelId = model["id"]
-        else:
-            model = cls.list_models(filter="eq('projectId','{}')&eq('name','{}')".format(
-                projectId, model))
-            modelId = model["id"]
-
-        headers = {"Accept": "application/vnd.sas.collection+json"}
-        customKPI = {"TimeLabel": "{}".format(body["TimeLabel"]),
-                     "TimeSK": body["TimeSK"],
-                     "KPI": "{}".format(body["KPI"]),
-                     "Value": "{}".format(body["Value"])}
-        requestData = {"ProjectID": projectId,
-                       "ModelID": modelId,
-                       "KPIs": [customKPI]}
-        return cls.post("/projects/{}/kpis".format(projectId),
-                        headers=headers,
-                        data=json.dumps(requestData))
-    @classmethod
     def list_project_versions(cls, project):
         """_summary_
 

src/sasctl/pzmm/__init__.py

@@ -8,4 +8,4 @@
 from .importModel import ImportModel
 from .gitIntegration import GitIntegrate
 from .mlflow_model import MLFlowModel
-from .modelParameters import modelParameters
+from .modelParameters import ModelParameters

src/sasctl/pzmm/importModel.py

@@ -75,20 +75,14 @@ def model_exists(project, name, force, versionName="latest"):
     projectId = project["id"]
     projectVersions = mr.list_project_versions(project)
     if versionName == "latest":
-        # The "latest" option specifies the most recently created version of the project. Search only in that version.
         modTime = [item["modified"] for item in projectVersions]
         latestVersion = modTime.index(max(modTime))
         versionId = projectVersions[latestVersion]["id"]
-    elif versionName == "new":
-        # The "new" option specifies a new project version, so no models with the same name will exist already.
-        return
     else:
-        # Otherwise, search for the version name specified. If the version name is not found, produce an error message.
         for version in projectVersions:
-            if versionName == version["name"]:
+            if versionName is version["name"]:
                 versionId = version["id"]
                 break
-        ValueError("No version with the name specified could be found in the project.")
     projectModels = mr.get(
         "/projects/{}/projectVersions/{}/models".format(projectId, versionId)
     )
@@ -179,9 +173,9 @@ def pzmmImportModel(
         metrics : string list, optional
             The scoring metrics for the model. The default is a set of two
             metrics: EM_EVENTPROBABILITY and EM_CLASSIFICATION.
-        projectVersion : str, optional
-            Name of project version to check if a model of the same name already exists. Default
-            value is "latest".
+        projectVersion : string, optional
+            The project version to import the model in to on SAS Model Manager. The default value
+            is latest.
         modelFileName : string, optional
             Name of the model file that contains the model. By default None and assigned as
             modelPrefix + '.pickle'.
@@ -315,8 +309,7 @@ def getFiles(extensions):
             model_exists(project, modelPrefix, force, versionName=projectVersion)
 
             response = mr.import_model_from_zip(
-                modelPrefix, project, zipIOFile, force, version=projectVersion
-
+                modelPrefix, project, zipIOFile, force, projectVersion=projectVersion
             )
             try:
                 print(