draft updates for model version

Author: jlwalke2

src/sasctl/_services/model_repository.py

@@ -126,7 +126,9 @@ def get_model_contents(cls, model):
     @classmethod
     def create_model(cls, model, project, description=None, modeler=None,
                      function=None, algorithm=None, tool=None,
-                     is_champion=False, properties={}, **kwargs):
+                     is_champion=False, properties={},
+                     version=None,
+                     **kwargs):
         """Creates a model into a project or folder.
 
         Parameters
@@ -177,20 +179,31 @@ def create_model(cls, model, project, description=None, modeler=None,
             The display name for the model version.
         properties : array_like, optional (custom properties)
             Custom model properties that can be set: name, value, type
-
         inputVariables : array_like, optional
             Model input variables. By default, these are the same as the model
             project.
         outputVariables : array_like, optional
             Model output variables. By default, these are the same as the model
              project.
+         version : str or int
+            Whether to create a new version of the model or update an
+            existing version.  May be a specific numbered version to
+            replace, 'latest' to update the most recent version, or 'new' to
+            add a new version.  Defaults to 'new'
 
         Returns
         -------
         str
             The model schema returned in JSON format.
 
         """
+        version = version or 'new'
+
+        # Check if the model already exists
+        model_obj = cls.get_model(model)
+
+        is_new_model = model_obj == None
+
         if isinstance(model, str):
             model = {'name': model}
 
@@ -209,15 +222,16 @@ def create_model(cls, model, project, description=None, modeler=None,
         model['tool'] = tool or model.get('tool')
         model['champion'] = is_champion or model.get('champion')
         model['role'] = 'Champion' if model.get('champion',
-                                                False) else 'Challenger'
+                                                False) else None
         model['description'] = description or model.get('description')
         model.setdefault('properties', [{'name': k, 'value': v} for k, v in
                                         properties.items()])
 
         # TODO: add kwargs (pop)
         #     model.update(kwargs)
-        return cls.post('/models', json=model, headers={
-            'Content-Type': 'application/vnd.sas.models.model+json'})
+        if is_new_model:
+            return cls.post('/models', json=model, headers={
+                'Content-Type': 'application/vnd.sas.models.model+json'})
 
     @classmethod
     def add_model_content(cls, model, file, name=None, role=None):

src/sasctl/tasks.py

@@ -75,7 +75,8 @@ def register_model(model, name, project, repository=None, input=None,
     input
     version : {'new', 'latest', int}, optional
         Version number of the project in which the model should be created.
-    files :
+        Defaults to 'new'.
+    files : list
     force : bool, optional
         Create dependencies such as projects and repositories if they do not
         already exist.
@@ -100,6 +101,46 @@ def register_model(model, name, project, repository=None, input=None,
     # TODO: Allow file info to be specified
     # TODO: Performance stats
 
+    # If version not specified, default to creating a new version
+    version = version or 'new'
+
+    # If replacing an existing version, make sure the model version exists
+    if str(version).lower() != 'new':
+        model_obj = mr.get_model(name)
+        if model_obj is None:
+            raise ValueError("Unable to update version '%s' of model '%s%.  "
+                             "Model not found." % (version, name))
+        model_versions = request_link(model_obj, 'modelVersions')
+        assert isinstance(model_versions, list)
+
+        # Use 'new' to create a new version if one doesn't exist yet.
+        if len(model_versions) == 0:
+            raise ValueError("No existing version of model '%s' to update."
+                             % name)
+
+        # Help function for extracting version number of REST response
+        def get_version(x):
+            return float(x.get('modelVersionName', 0))
+
+        if str(version).isnumeric():
+            match = [x for x in model_versions if float(version) ==
+                     get_version(x)]
+            assert len(match) <= 1
+
+            match = match[0] if len(match) else None
+        elif str(version).lower() == 'latest':
+            # Sort by version number and get first
+            match = sorted(model_versions, key=get_version)[0]
+        else:
+            raise ValueError("Unrecognized version '%s'." % version)
+
+
+
+        # TODO: get ID of correct model version
+    # if version != new, get existing model
+    # get model (modelVersions) rel
+    # -> returns list w/ id, modelVersionName, etc
+
     files = files or []
 
     # Find the project if it already exists
@@ -111,6 +152,7 @@ def register_model(model, name, project, repository=None, input=None,
     if p is None and not create_project:
         raise ValueError("Project '{}' not found".format(project))
 
+    # Use default repository if not specified
     if repository is None:
         repository = mr.default_repository()
     else: