Merge pull request #18 from jameskochubasas/master

CAS python score code generation

Author: Jon Walker

src/sasctl/tasks.py

@@ -159,6 +159,9 @@ def register_model(model, name, project, repository=None, input=None,
             files.append({'name': 'dmcas_espscorecode.sas',
                           'file': mas_module.score_code(dest='ESP'),
                           'role': 'Score Code'})
+            files.append({'name': 'dmcas_epscorecode.sas',
+                          'file': mas_module.score_code(dest='CAS'),
+                          'role': 'score'})
 
             model['inputVariables'] = [var.as_model_metadata()
                                        for var in mas_module.variables

src/sasctl/utils/pymas/core.py

@@ -373,20 +373,16 @@ def score_code(self, input_table=None, output_table=None, columns=None, dest='MA
                                                    '   end;',
                                                    'enddata;')
         elif dest == 'CAS':
-            if input_table is None:
-                raise ValueError('An input table must be specified when executing the code in CAS.')
-
-            output_table = output_table or input_table + '_pymas'
             thread = DS2Thread(self.variables, input_table, column_names=columns, return_message=self.return_message,
                                package=self.package)
 
             code += (str(thread),
-                     '    data {} (overwrite=yes);'.format(output_table),
-                     '    dcl thread {} t;'.format(thread.name),
-                     '    method run();',
-                     '       set from t;',
-                     '       output {} ;'.format(output_table),
-                     '    end;',
-                     '  enddata;')
-
-        return '\n'.join(code)
+                     'data SASEP.out;',
+                     '  dcl thread {} t;'.format(thread.name),
+                     '  method run();',
+                     '    set from t;',
+                     '    output;',
+                     '  end;',
+                     'enddata;')
+
+        return '\n'.join(code)

src/sasctl/utils/pymas/ds2.py

@@ -252,9 +252,6 @@ def name(self):
         return 'pyMasThread'
 
     def __str__(self):
-        extras = ['"rc"'] if self.return_code else []
-        extras += ['"msg"'] if self.return_message else []
-
         array_input = any([v.is_array for v in self.variables if not v.out])
 
         # If passing column data into Python as an array, need extra assignment statements to set values
@@ -272,25 +269,18 @@ def __str__(self):
         declarations = '\n'.join([v.as_declaration() for v in self.variables if
                                   v.out or v.is_array])
 
-        keep_vars = [v.name for v in self.variables] + extras
+        keep_vars = [v.name for v in self.variables]
 
-        code = ("        thread {} / inline;".format(self.name),
-                "            dcl package {} decisionPackage();".format(
-                    self.package.name),
+        code = ("thread {} / inline;".format(self.name),
+                "  dcl package {} pythonPackage();".format(self.package.name),
                 declarations,
-                '            dcl double "rc";',
-                "            dcl char(4096) character set utf8 msg;",
-                # "            keep {};".format(' '.join(keep_vars)),
-                "            method run();",
-                "                dcl integer localRC;",
-                "                set {} ( );".format(self.table),
+                "  method run();",
+                "    set SASEP.in;",
                 var_assignments,
-                "                decisionPackage.{}({});".format(
-                    self.package.methods[0].name,
-                    ','.join(keep_vars)),
-                "                output;",
-                "            end;",
-                "        endthread;")
+                "    pythonPackage.{}({});".format(self.package.methods[0].name,','.join(keep_vars)),
+                "    output;",
+                "  end;",
+                "endthread;")
 
         code = '\n'.join(code)