Merge pull request #43 from jameskochubasas/master

Adding python model version capabilities and python null value scoring

Author: jlwalke2

src/sasctl/_services/model_repository.py

@@ -7,7 +7,7 @@
 """The Model Repository service supports registering and managing models."""
 
 from .service import Service
-from ..core import current_session, get
+from ..core import current_session, get, delete
 
 FUNCTIONS = {'Analytical', 'Classification', 'Clustering', 'Forecasting',
              'Prediction', 'Text categorization', 'Text extraction',
@@ -497,3 +497,24 @@ def copy_analytic_store(cls, model):
             model = cls.get_model(model, refresh=True)
 
         return cls.request_link(model, 'copyAnalyticStore')
+
+
+    @classmethod
+    def delete_model_contents(cls, model):
+        """Deletes all contents (files) in the model.
+
+        Parameters
+        ----------
+        model : str or dict
+            The name, id, or dictionary representation of a model.
+
+        Returns
+        -------
+
+        """
+        rel = 'delete'
+
+        filelist=cls.get_model_contents(model)
+        for delfile in filelist:
+            modelfileuri=cls.get_link(delfile, rel)
+            delete(modelfileuri['uri'])

src/sasctl/tasks.py

@@ -136,41 +136,6 @@ def register_model(model, name, project, repository=None, input=None,
     # 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
@@ -340,7 +305,18 @@ def get_version(x):
                 project['eventProbabilityVariable'] = prediction_variable
                 mr.update_project(project)
 
-    model = mr.create_model(model, project)
+    # If replacing an existing version, make sure the model version exists
+    if str(version).lower() != 'new':
+        #Update an existing model with new files
+        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 = mr.create_model_version(name)
+        mr.delete_model_contents(model)
+    else:
+        #Assume new model to create
+        model = mr.create_model(model, project)
 
     assert isinstance(model, RestObj)
 

src/sasctl/utils/pymas/core.py

@@ -60,10 +60,15 @@ def build_wrapper_function(func, variables, array_input, setup=None,
 
     # HELPER: SAS to python char issue where SAS char have spaces and python string does not.
     # NOTE: we assume SAS char always need white space to be trimmed.  This seems to match python model built so far
+    # Note: Using this string fix to help with None or blank input situation for numerics
     string_input = ('', )
     for v in variables:
-        if v.type == 'char' and not v.out:
-            string_input += ("        if {0}: {0} = {0}.strip()".format(v.name), )
+        if not v.out:
+            if v.type == 'char':
+                string_input += ("        if {0}: {0} = {0}.strip()".format(v.name), )
+            else:
+                string_input += ("        if {0} == None: {0} = np.nan".format(v.name), )
+        
 
     # Statement to execute the function w/ provided parameters
     if array_input:

tests/integration/test_pymas.py

@@ -185,6 +185,10 @@ def test_from_pickle(train_data, pickle_file):
                 rc = py.appendSrcLine('        msg = ""');
                 rc = py.appendSrcLine('        import numpy as np');
                 rc = py.appendSrcLine('');
+                rc = py.appendSrcLine('        if SepalLength == None: SepalLength = np.nan');
+                rc = py.appendSrcLine('        if SepalWidth == None: SepalWidth = np.nan');
+                rc = py.appendSrcLine('        if PetalLength == None: PetalLength = np.nan');
+                rc = py.appendSrcLine('        if PetalWidth == None: PetalWidth = np.nan');
                 rc = py.appendSrcLine('        inputarray = np.array([SepalLength,SepalWidth,PetalLength,PetalWidth]).reshape((1, -1))');
                 rc = py.appendSrcLine('        column = ["SepalLength","SepalWidth","PetalLength","PetalWidth"]');
                 rc = py.appendSrcLine('        import pandas as pd');