Merge pull request #2 from sassoftware/master

sync

Author: jameskochubasas

CHANGELOG.md

@@ -3,6 +3,11 @@ Unreleased
 ----------
  -
 
+v1.4.1 (2019-10-17)
+-------------------
+**Bugfixes**
+ - Fixed an issue where string inputs to Python models were incorrectly handled by DS2.
+
 v1.4 (2019-10-15)
 -----------------
 **Changes**

src/sasctl/__init__.py

@@ -4,7 +4,7 @@
 # Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-__version__ = '1.4'
+__version__ = '1.4.1'
 __author__ = 'SAS'
 __credits__ = ['Yi Jian Ching, Lucas De Paula, James Kochuba, Peter Tobac, '
                'Chris Toth, Jon Walker']

src/sasctl/utils/pymas/core.py

@@ -59,20 +59,19 @@ def build_wrapper_function(func, variables, array_input, setup=None,
     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()",)
+    # NOTE: we assume SAS char always need white space to be trimmed.  This seems to match python model built so far
+    string_input = ('', )
+    for v in variables:
+        if v.type == 'char' and not v.out:
+            string_input += ("        if {0}: {0} = {0}.strip()".format(v.name), )
 
     # Statement to execute the function w/ provided parameters
     if array_input:
-        middle = pythonStringInput +\
+        middle = string_input +\
                  ('        inputarray = np.array([{}]).reshape((1, -1))'.format(','.join(args)),
-                  '        column=[{}]'.format(','.join('"{0}"'.format(w) for w in args)),
+                  '        column = [{}]'.format(','.join('"{0}"'.format(w) for w in args)),
                   '        import pandas as pd',
-                  '        inputrun=pd.DataFrame(data=inputarray, columns=column)',
+                  '        inputrun = pd.DataFrame(data=inputarray, columns=column)',
                   '        result = {}(inputrun)'.format(func))
     else:
         func_call = '{}({})'.format(func, ','.join(args))

tests/integration/test_pymas.py

@@ -186,9 +186,9 @@ def test_from_pickle(train_data, pickle_file):
                 rc = py.appendSrcLine('        import numpy as np');
                 rc = py.appendSrcLine('');
                 rc = py.appendSrcLine('        inputarray = np.array([SepalLength,SepalWidth,PetalLength,PetalWidth]).reshape((1, -1))');
-                rc = py.appendSrcLine('        column=["SepalLength","SepalWidth","PetalLength","PetalWidth"]');
+                rc = py.appendSrcLine('        column = ["SepalLength","SepalWidth","PetalLength","PetalWidth"]');
                 rc = py.appendSrcLine('        import pandas as pd');
-                rc = py.appendSrcLine('        inputrun=pd.DataFrame(data=inputarray, columns=column)');
+                rc = py.appendSrcLine('        inputrun = pd.DataFrame(data=inputarray, columns=column)');
                 rc = py.appendSrcLine('        result = obj.predict(inputrun)');
                 rc = py.appendSrcLine('        if result.size == 1:');
                 rc = py.appendSrcLine('            result = np.asscalar(result)');