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

Author: jlwalke2

CHANGELOG.md

@@ -10,6 +10,11 @@ Unreleased
  - Improved API documentation
 
 
+v1.2.4 (2019-9-20)
+------------------
+**Bugfixes**
+ - `model_repository.get_model_contents` no longer raises an HTTP 406 error.
+ 
 v1.2.3 (2019-8-23)
 ------------------
 **Changes**

README.md

@@ -81,7 +81,7 @@ which can handle all necessary communication with the SAS Viya server:
 
 >>> with Session('example.com', authinfo=<authinfo file>):
 ...    model = lm.LogisticRegression()
-...    register_model('Sklearn Model', model, 'My Project')
+...    register_model(model, 'Sklearn Model', 'My Project')
 ```
 
 
@@ -165,7 +165,7 @@ Register a pure Python model in Model Manager:
 
 >>> with Session(host, authinfo=<authinfo file>):
 ...    model = lm.LogisticRegression()
-...    register_model('Sklearn Model', model, 'My Project')
+...    register_model(model, 'Sklearn Model', 'My Project')
 ```
 
 Register a CAS model in Model Manager:

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

src/sasctl/_services/model_repository.py

@@ -143,9 +143,7 @@ def get_model_contents(cls, model):
         """
         link = cls.get_model_link(model, 'contents', refresh=True)
 
-        if link is not None:
-            return get(link.get('href'),
-                       headers={'Accept': link.get('itemType', '*/*')})
+        return cls.request_link(link, 'contents')
 
     @classmethod
     def create_model(cls, model, project,

src/sasctl/core.py

@@ -792,6 +792,9 @@ def get_link(obj, rel):
                 return links[0]
             elif len(links) > 1:
                 return links
+    elif isinstance(obj, dict) and 'rel' in obj and obj['rel'] == rel:
+        # Object is already a link, just return it
+        return obj
 
 
 def request_link(obj, rel, **kwargs):
@@ -813,7 +816,6 @@ def request_link(obj, rel, **kwargs):
     if link is None:
         raise ValueError("Link '%s' not found in object %s." % (rel, obj))
 
-
     return request(link['method'], link['href'], **kwargs)
 
 

tests/cassettes/tests.integration.test_model_repository.TestAStoreModel.test_get_model_contents.json

@@ -26,6 +26,16 @@ def test_model_import(self, astore):
 
         assert self.model_name == model.name
 
+    def test_get_model_contents(self):
+        # Resolves https://github.com/sassoftware/python-sasctl/issues/33
+        content = mr.get_model_contents(self.model_name)
+
+        assert isinstance(content, list)
+        assert 'AstoreMetadata.json' in [str(c) for c in content]
+        assert 'ModelProperties.json' in [str(c) for c in content]
+        assert 'inputVar.json' in [str(c) for c in content]
+        assert 'outputVar.json' in [str(c) for c in content]
+
     def test_create_model_version(self):
         r = mr.create_model_version(self.model_name)
         assert r.modelVersionName == '2.0'