Merge pull request #40 from jameskochubasas/master

Fix astore register model for performance charts, add python wrapper …

Author: Jon Walker

src/sasctl/tasks.py

@@ -247,6 +247,8 @@ def get_version(x):
             files.append({'name': 'dmcas_epscorecode.sas',
                           'file': mas_module.score_code(dest='CAS'),
                           'role': 'score'})
+            files.append({'name': 'python_wrappercode.py',
+                          'file': mas_module.score_code(dest='PY')})
 
             model['inputVariables'] = [var.as_model_metadata()
                                        for var in mas_module.variables

src/sasctl/utils/astore.py

@@ -148,7 +148,12 @@ def create_files_from_astore(table):
         raise RuntimeError(result)
 
     astore_key = result.Key.Key[0].strip()
-    ep_ds2 = result.epcode
+
+    # Remove "Keep" sas code from CAS/EP code so full table plus output are returned
+    # This is so the MM performance charts and test work
+    keepstart=result.epcode.find("Keep")
+    keepend=result.epcode.find(";",keepstart)
+    ep_ds2 = result.epcode[0:keepstart] + result.epcode[keepend+1:]
     package_ds2 = _generate_package_code(result)
     model_properties = _get_model_properties(result)
     input_vars = [get_variable_properties(var)
@@ -163,7 +168,7 @@ def create_files_from_astore(table):
         table.save(name=astore_filename, caslib='ModelStore', replace=True)
 
     file_metadata = [{'role': 'analyticStore', 'name': ''},
-                     {'role': 'score', 'name': 'dmcas_packagescorecode.sas'}]
+                     {'role': 'score', 'name': 'dmcas_epscorecode.sas'}]
 
     astore_metadata = [{'name': astore_filename,
                         'caslib': 'ModelStore',

src/sasctl/utils/pymas/core.py

@@ -332,6 +332,7 @@ def __init__(self, target_function, variables, python_source,
         # Lines of Python code to be embedded in DS2
         python_source = list(self.wrapper)
 
+        self.python_source = python_source
         self.variables = variables
         self.return_code = return_code
         self.return_message = return_msg
@@ -358,6 +359,10 @@ def score_code(self, input_table=None, output_table=None, columns=None, dest='MA
 
         dest = dest.upper()
 
+        # Python code return
+        if dest == 'PY':
+            return '\n'.join(map(str, self.python_source))
+
         # Check for names that could result in DS2 errors.
         DS2_KEYWORDS = ['input', 'output']
         for k in DS2_KEYWORDS: