Merge branch 'master' of https://github.com/sassoftware/python-sasctl into dev-1.3.0

# Conflicts:
#	CHANGELOG.md

Author: jlwalke2

CHANGELOG.md

@@ -11,8 +11,16 @@ Unreleased
  - All `list_xxx` methods return all matching items unless a `limit` parameter is specified.
  - Improved API documentation.
  - Updated `full_lifecycle` example with performance monitoring.
+
+v1.2.5 (2019-10-10)
+-------------------
+**Changes**
+ - Registering an ASTORE model now creates an empty ASTORE file in Model Manager to be consistent with Model Studio behavior. 
 
- 
+**Bugfixes**
+ - `microanalytic_score.define_steps` now works with steps having no input parameters.
+ - Fixed an issue where score code generated from an ASTORE model lacked output variables.
+
 v1.2.4 (2019-9-20)
 ------------------
 **Bugfixes**

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.2.4'
+__version__ = '1.2.5'
 __author__ = 'SAS'
 __credits__ = ['Yi Jian Ching, Lucas De Paula, James Kochuba, Peter Tobac, '
                'Chris Toth, Jon Walker']

src/sasctl/_services/microanalytic_score.py

@@ -227,8 +227,8 @@ def define_steps(self, module):
             step = self.get_module_step(module, id)
 
             # Method should have an argument for each parameter of the step
-            arguments = [k['name'] for k in step.inputs]
-            arg_types = [k['type'] for k in step.inputs]
+            arguments = [k['name'] for k in step.get('inputs', [])]
+            arg_types = [k['type'] for k in step.get('inputs', [])]
 
             # Format call to execute_module_step()
             call_params = ['{}={}'.format(i, i) for i in arguments]
@@ -237,28 +237,31 @@ def define_steps(self, module):
             type_string = '    # type: ({})'.format(', '.join(arg_types))
 
             # Method signature
-            signature = 'def _%s_%s(%s, **kwargs):' \
+            input_params = [a for a in arguments] + ['**kwargs']
+            signature = 'def _%s_%s(%s):' \
                         % (module.name,
                            step.id,
-                           ', '.join(a for a in arguments))
+                           ', '.join(input_params))
 
             # MAS always lower-cases variable names
             # Since the original Python variables may have a different case,
             # allow kwargs to be used to input alternative caps
-            arg_checks = ['for k in kwargs.keys():']
-            for arg in arguments:
-                arg_checks.append("    if k.lower() == '%s':" % arg.lower())
-                arg_checks.append("        %s = kwargs[k]" % arg)
-                arg_checks.append("        continue")
+            if len(arguments):
+                arg_checks = ['for k in kwargs.keys():']
+                for arg in arguments:
+                    arg_checks.append("    if k.lower() == '%s':" % arg.lower())
+                    arg_checks.append("        %s = kwargs[k]" % arg)
+                    arg_checks.append("        continue")
+            else:
+                arg_checks = []
 
             # Full method source code
             # Drops 'rc' and 'msg' from return values
             code = (signature,
                     type_string,
                     '    """Execute step %s of module %s."""' % (step, module),
                     '\n'.join(['    %s' % a for a in arg_checks]),
-                    '    r = execute_module_step(module, step, {})'.format(
-                        ', '.join(call_params)),
+                    '    r = execute_module_step(%s)' % ', '.join(['module', 'step'] + call_params),
                     '    r.pop("rc", None)',
                     '    r.pop("msg", None)',
                     '    if len(r) == 1:',

src/sasctl/utils/astore.py

@@ -131,13 +131,17 @@ 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
+    # 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.
+    astore = bytes()
 
     # Raise error if describe action fails
     if result.status_code != 0:
@@ -312,7 +316,7 @@ def extract_type(var, out=False):
     score_method += (' ',
                      '       {}.scorerecord();'.format(id),
                      ' ')
-    score_method += tuple('       "{}" = this."{}";'.format(var, var) for var in result.InputVariables.Name)
+    score_method += tuple('       "{}" = this."{}";'.format(var, var) for var in result.OutputVariables.Name)
 
     footer = ('    end;',
               'endpackage;')

tests/unit/test_microanalytic_score.py

@@ -10,6 +10,7 @@
 from sasctl.services import microanalytic_score as mas
 
 from sasctl import current_session
+from sasctl.core import RestObj
 
 with mock.patch('sasctl.core.requests.Session.request'):
     current_session('example.com', 'username', 'password')
@@ -46,3 +47,126 @@ def test_delete_module(caplog):
         assert mas.delete_module('spam') is None
         assert any("Object 'spam' not found" in r.msg for r in caplog.records)
 
+
+def test_define_steps():
+
+    # Mock module to be returned
+    module = RestObj(name='unittestmodule',
+                     stepIds=['step1', 'step2'])
+
+    # Mock module step with no inputs
+    step1 = RestObj(id='post')
+
+    # Mock module step with multiple inputs
+    step2 = RestObj({
+        "id": "score",
+        "inputs": [
+            {
+                "name": "age",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "b",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "chas",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "crim",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "dis",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "indus",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "lstat",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "nox",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "ptratio",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "rad",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "rm",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "tax",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "zn",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            }
+        ],
+        "outputs": [
+            {
+                "name": "em_prediction",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "p_price",
+                "type": "decimal",
+                "dim": 0,
+                "size": 0
+            },
+            {
+                "name": "_warn_",
+                "type": "string",
+                "dim": 0,
+                "size": 4
+            }
+        ]
+    })
+
+    with mock.patch('sasctl._services.microanalytic_score.MicroAnalyticScore.get_module') as get_module:
+        with mock.patch('sasctl._services.microanalytic_score.MicroAnalyticScore''.get_module_step') as get_step:
+            get_module.return_value = module
+            get_step.side_effect = [step1, step2]
+            result = mas.define_steps(None)
+
+    for step in get_step.side_effect:
+        assert hasattr(result, step.id)