cleanup

Author: jlwalke2

src/sasctl/tasks.py

@@ -247,8 +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')})
+            files.append({'name': 'python_wrapper.py',
+                          'file': mas_module.score_code(dest='Python')})
 
             model['inputVariables'] = [var.as_model_metadata()
                                        for var in mas_module.variables

src/sasctl/utils/astore.py

@@ -131,13 +131,6 @@ def create_files_from_astore(table):
     sess.loadactionset('astore')
 
     result = sess.astore.describe(rstore=table, epcode=True)
-    # astore = sess.astore.download(rstore=table)
-    # if not hasattr(astore, "blob"):
-    #     raise ValueError("Failed to download binary data for ASTORE '%s'."
-    #                      % astore)
-    # astore = astore.blob
-    #
-    # astore = bytes(astore)      # Convert from SWAT blob type
 
     # Model Manager expects a 0-byte ASTORE file.  Will retrieve actual ASTORE
     # from CAS during model publish.
@@ -149,11 +142,12 @@ def create_files_from_astore(table):
 
     astore_key = result.Key.Key[0].strip()
 
-    # 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)
+    # 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)

src/sasctl/utils/pymas/core.py

@@ -350,19 +350,21 @@ def score_code(self, input_table=None, output_table=None, columns=None, dest='MA
             The name of the table where execution results will be written
         columns : list of str
             Names of the columns from `table` that will be passed to `func`
-        dest : str {'MAS', 'EP', 'CAS'}
+        dest : str {'MAS', 'EP', 'CAS', 'Python'}
+            Specifies the publishing destination for the score code to ensure
+            that compatible code is generated.
 
         Returns
         -------
+        str
+            Score code
 
-        """
+        .. versionchanged:: 1.3.1
+            Added `dest='Python'` option
 
+        """
         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:
@@ -394,4 +396,8 @@ def score_code(self, input_table=None, output_table=None, columns=None, dest='MA
                      '  end;',
                      'enddata;')
 
+        elif dest == 'PYTHON':
+            # Python code return
+            code = self.package._python_code
+
         return '\n'.join(code)