srijan-deepsource
diff --git a/‎CHANGELOG.md
Lines changed: 2 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/sasctl/_services/model_repository.py
Lines changed: 8 additions & 1 deletion b/‎src/sasctl/_services/model_repository.py
Lines changed: 8 additions & 1 deletion
diff --git a/‎src/sasctl/_services/service.py
Lines changed: 20 additions & 10 deletions b/‎src/sasctl/_services/service.py
Lines changed: 20 additions & 10 deletions
diff --git a/‎tests/unit/test_model_repository.py
Lines changed: 34 additions & 1 deletion b/‎tests/unit/test_model_repository.py
Lines changed: 34 additions & 1 deletion
@@ -2,9 +2,11 @@ Unreleased
 ----------
 **Bugfixes**
  - SSL warnings no longer repeatedly raised when `verify_ssl=False` but `CAS_CLIENT_SSL_CA_LIST` is specified.
+ - `model_repository.delete_model_contents()` no longer fails when only one file is found.
 
 **Improvements**
  - All `delete_*()` service methods return `None` instead of empty string.
+ - All `get_*()` service methods issue a warning if multiple items are found when retrieving by name.
 
 v1.5.7 (2021-05-04)
 -------------------
 
@@ -144,9 +144,16 @@ def get_model_contents(cls, model):
             The code designated as the model's score code
 
         """
+
         link = cls.get_model_link(model, 'contents', refresh=True)
+        contents = cls.request_link(link, 'contents')
+
+        # By default, request_link() will unwrap a length-1 list.
+        # If that happens, re-wrap so a list is always returned.
+        if isinstance(contents, list):
+            return contents
 
-        return cls.request_link(link, 'contents')
+        return [contents]
 
     @classmethod
     @sasctl_command('get', 'repositories')
 
@@ -8,6 +8,7 @@
 
 import logging
 import time
+import warnings
 
 import six
 from six.moves.urllib_parse import quote
@@ -252,18 +253,27 @@ def get_item(cls, item, refresh=False):
                 return cls.get(path + '/{id}'.format(id=item))
             results = list_items(cls, **get_filter(item))
 
-            # Not sure why, but as of 19w04 the filter doesn't seem to work
+            match = None
             for result in results:
                 if result['name'] == str(item):
-                    # Make a request for the specific object so that ETag
-                    # is included, allowing updates.
-                    if cls.get_link(result, 'self'):
-                        return cls.request_link(result, 'self')
-
-                    id_ = result.get('id', result['name'])
-                    return cls.get(path + '/{id}'.format(id=id_))
-
-            return None
+                    # The first result that matches on name should be stored.
+                    # Will be returned after determining that there aren't additional
+                    # matches
+                    if match is None:
+                        # Make a request for the specific object so that ETag
+                        # is included, allowing updates.
+                        if cls.get_link(result, 'self'):
+                            match = cls.request_link(result, 'self')
+                        else:
+                            id_ = result.get('id', result['name'])
+                            match = cls.get(path + '/{id}'.format(id=id_))
+                    # We already found a match so this is a duplicate.  Warn the user so they know
+                    # the item returned may not be the one they were expecting.
+                    else:
+                        warnings.warn("Multiple items found with name '%s'.  Only the first result is returned." % item)
+                        break
+
+            return match
 
         @sasctl_command('update')
         def update_item(cls, item):
 
@@ -5,8 +5,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import copy
-from six.moves import mock
+from unittest import mock
 
+import pytest
 from sasctl import current_session
 from sasctl.services import model_repository as mr
 
@@ -121,3 +122,35 @@ def test_copy_analytic_store():
             obj, rel = args
             assert obj == get_model.return_value
             assert rel == 'copyAnalyticStore'
+
+
+def test_get_model_by_name():
+    """If multiple models exist with the same name, a warning should be raised.
+
+    From https://github.com/sassoftware/python-sasctl/issues/92
+    """
+
+    MODEL_NAME = 'Test Model'
+
+    # Create a dummy session
+    with mock.patch('sasctl.core.requests.Session.request'):
+        current_session('example.com', 'user', 'password')
+
+    mock_responses = [
+        # First response is for list_items/list_models
+        [
+            {'id': 12345, 'name': MODEL_NAME},
+            {'id': 67890, 'name': MODEL_NAME}
+        ],
+
+        # Second response is mock GET for model details
+        {'id': 12345, 'name': MODEL_NAME}
+    ]
+
+    with mock.patch('sasctl._services.model_repository.ModelRepository.request') as request:
+        request.side_effect = mock_responses
+
+        with pytest.warns(Warning):
+            result = mr.get_model(MODEL_NAME)
+    assert result['id']== 12345
+    assert result['name'] == MODEL_NAME