Multi fix: call predict with DF vs np array for string issue, strip extra space on strings from SAS char to match python string, generate unique module name for python so MAS does not see conflicts

Author: Cloud User

src/sasctl/utils/pymas/core.py

@@ -58,11 +58,25 @@ def build_wrapper_function(func, variables, array_input, setup=None,
     args = input_names
     func = func.__name__ if callable(func) else func
 
+    # 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
+    pythonStringInput = ('',)
+    for tmp1 in variables:
+        if not tmp1.out:
+            if tmp1.type == 'char':
+                pythonStringInput = pythonStringInput + ("        if " + tmp1.name + ": " + tmp1.name + " = " + tmp1.name + ".strip()",)
+
     # Statement to execute the function w/ provided parameters
     if array_input:
-        func_call = '{}(np.array([{}]).reshape((1, -1)))'.format(func, ','.join(args))
+        middle = pythonStringInput +\
+                 ('        inputarray = np.array([{}]).reshape((1, -1))'.format(','.join(args)),
+                  '        column=[{}]'.format(','.join('"{0}"'.format(w) for w in args)),
+                  '        import pandas as pd',
+                  '        inputrun=pd.DataFrame(data=inputarray, columns=column)',
+                  '        result = {}(inputrun)'.format(func))
     else:
         func_call = '{}({})'.format(func, ','.join(args))
+        middle = ('        result = {}'.format(func_call))
 
     # TODO: Verify that # of values returned by wrapped func matches length of output_names
     # TODO: cast all return types before returning (DS2 errors out if not exact match)
@@ -80,6 +94,7 @@ def build_wrapper_function(func, variables, array_input, setup=None,
     else:
         header = ('', )
 
+
     definition = header +\
                  ('def wrapper({}):'.format(', '.join(args)),
                   '    "Output: {}"'.format(', '.join(output_names + ['msg']) if return_msg
@@ -90,9 +105,9 @@ def build_wrapper_function(func, variables, array_input, setup=None,
                   '        if _compile_error is not None:',
                   '            raise _compile_error',
                   '        msg = ""' if return_msg else '',
-                  '        import numpy as np',
-                  '        result = {}'.format(func_call),
-                  '        if result.size == 1:',
+                  '        import numpy as np') +\
+                 middle +\
+                 ('        if result.size == 1:',
                   '            result = np.asscalar(result)',
                   '    except Exception as e:',
                   '        msg = str(e)' if return_msg else '',
@@ -103,6 +118,7 @@ def build_wrapper_function(func, variables, array_input, setup=None,
                   '    else: ',
                   '        return result, msg')
 
+
     return '\n'.join(definition)
 
 

src/sasctl/utils/pymas/ds2.py

@@ -18,7 +18,7 @@ def __init__(self, variables, code=None, return_code=True,
         self._python_code = code or []
         code = code or []
 
-        self.methods = [DS2PyMASMethod(variables, code, return_code,
+        self.methods = [DS2PyMASMethod(self._id, variables, code, return_code,
                                        return_message, target)]
 
         self._body = ("dcl package pymas py;",
@@ -88,7 +88,7 @@ def code(self):
 
 
 class DS2PyMASMethod(DS2BaseMethod):
-    def __init__(self, variables, python_code, return_code=True,
+    def __init__(self, name, variables, python_code, return_code=True,
                  return_message=True, target='wrapper'):
 
         target = target or 'wrapper'
@@ -110,12 +110,12 @@ def __init__(self, variables, python_code, return_code=True,
                 self.private_variables] \
                + ["if null(py) then do;",
                   "    py = _new_ pymas();",
-                  "    rc = py.useModule('mypymodule', 1);",
+                  "    rc = py.useModule('%s', 1);" % name,
                   "    if rc then do;"] \
                + ["        rc = py.appendSrcLine('%s');" % l for l in
                   python_code] \
                + ["        pycode = py.getSource();",
-                  "        revision = py.publish(pycode, 'mypymodule');",
+                  "        revision = py.publish(pycode, '%s');" % name,
                   "        if revision lt 1 then do;",
                   "            logr.log('e', 'py.publish() failed.');",
                   "            rc = -1;",