Merge pull request #1 from sassoftware/master

sync 1.4

Author: jameskochubasas

CHANGELOG.md

@@ -3,6 +3,17 @@ Unreleased
 ----------
  -
 
+v1.4 (2019-10-15)
+-----------------
+**Changes**
+ - `PyMAS.score_code` now supports a `dest='Python'` option to retrieve the generated Python wrapper code.
+ - `register_model` task includes a `python_wrapper.py` file when registering a Python model. 
+ - Improved error message when user lacks required permissions to register a model. 
+ 
+**Bugfixes**
+ - Fixed an issue with CAS/EP score code that caused problems with model performance metrics.
+ 
+
 v1.3 (2019-10-10)
 ----------------- 
 **Improvements**

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

src/sasctl/exceptions.py

@@ -13,5 +13,10 @@ def __init__(self, username, *args, **kwargs):
         super(AuthenticationError, self).__init__(msg, *args, **kwargs)
 
 
+class AuthorizationError(RuntimeError):
+    """A user lacks permission to perform an action."""
+    pass
+
+
 class JobTimeoutError(RuntimeError):
     pass

src/sasctl/tasks.py

@@ -15,8 +15,11 @@
 import sys
 import warnings
 
+from six.moves.urllib.error import HTTPError
+
 from . import utils
 from .core import RestObj, current_session, get, get_link, request_link
+from .exceptions import AuthorizationError
 from .services import model_management as mm
 from .services import model_publish as mp
 from .services import model_repository as mr
@@ -180,10 +183,20 @@ def get_version(x):
         raise ValueError("Project '{}' not found".format(project))
 
     # Use default repository if not specified
-    if repository is None:
-        repo_obj = mr.default_repository()
-    else:
-        repo_obj = mr.get_repository(repository)
+    try:
+        if repository is None:
+            repo_obj = mr.default_repository()
+        else:
+            repo_obj = mr.get_repository(repository)
+    except HTTPError as e:
+        if e.code == 403:
+            raise AuthorizationError('Unable to register model.  User account '
+                                     'does not have read permissions for the '
+                                     '/modelRepository/repositories/ URL. '
+                                     'Please contact your SAS Viya '
+                                     'administrator.')
+        else:
+            raise e
 
     # Unable to find or create the repo.
     if repo_obj is None and repository is None:
@@ -247,8 +260,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)

tests/cassettes/tests.integration.test_examples.test_sklearn_model.json

@@ -8,7 +8,7 @@
 from six.moves import mock
 
 from sasctl.core import RestObj
-
+from sasctl._services.model_repository import ModelRepository
 
 def test_sklearn_metadata():
     pytest.importorskip('sklearn')
@@ -77,7 +77,7 @@ def test_parse_module_url():
 def test_save_performance_project_types():
     from sasctl.tasks import update_model_performance
 
-    with mock.patch('sasctl._services.model_repository.ModelRepository''.get_model') as model:
+    with mock.patch('sasctl._services.model_repository.ModelRepository.get_model') as model:
         with mock.patch('sasctl._services.model_repository.ModelRepository.get_project') as project:
             model.return_value = RestObj(name='fakemodel', projectId=1)
 
@@ -98,3 +98,34 @@ def test_save_performance_project_types():
                 update_model_performance(None, None, None)
 
     # Check projects w/ invalid properties
+
+
+@mock.patch.object(ModelRepository, 'get_repository')
+@mock.patch.object(ModelRepository, 'get_project')
+def test_register_model_403_error(get_project, get_repository):
+    """Verify HTTP 403 is converted to a user-friendly error.
+
+    Depending on environment configuration, this can happen when attempting to
+    find a repository.
+
+    See: https://github.com/sassoftware/python-sasctl/issues/39
+    """
+
+    from six.moves.urllib.error import HTTPError
+    from sasctl.exceptions import AuthorizationError
+    from sasctl.tasks import register_model
+
+    get_project.return_value = {'name': 'Project Name'}
+    get_repository.side_effect = HTTPError(None, 403, None, None, None)
+
+    # HTTP 403 error when getting repository should throw a user-friendly
+    # AuthorizationError
+    with pytest.raises(AuthorizationError):
+        register_model(None, 'model name', 'project name')
+
+    # All other errors should be bubbled up
+    get_repository.side_effect = HTTPError(None, 404, None, None, None)
+    with pytest.raises(HTTPError):
+        register_model(None, 'model name', 'project name')
+
+