Account for global options with server side completion

Author: jamesls

awsshell/autocomplete.py

@@ -63,7 +63,7 @@ def autocomplete(self, line):
             return self._current['commands']
 
         last_word = line.split()[-1]
-        if last_word in self.arg_metadata:
+        if last_word in self.arg_metadata or last_word in self._global_options:
             # The last thing we completed was an argument, record
             # this as self.last_arg
             self.last_option = last_word

awsshell/resource/index.py

@@ -163,7 +163,7 @@ def _get_client(self, service_name):
         self._client_cache[service_name] = client
         return client
 
-    def autocomplete(self, service, operation, param):
+    def retrieve_candidate_values(self, service, operation, param):
         if service not in self._services_with_completions:
             return
         # Example call:

awsshell/shellcomplete.py

@@ -11,9 +11,9 @@
 """
 import logging
 from prompt_toolkit.completion import Completer, Completion
+from awsshell import fuzzy
 
 
-logging.basicConfig(filename='/tmp/completions', level=logging.DEBUG)
 LOG = logging.getLogger(__name__)
 
 
@@ -93,8 +93,6 @@ def get_completions(self, document, complete_event):
         completions = self._completer.autocomplete(text_before_cursor)
         prompt_completions = list(self._convert_to_prompt_completions(
             completions, text_before_cursor))
-        LOG.debug("num_completions: %s, text: %s", len(prompt_completions),
-                  text_before_cursor)
         if (not prompt_completions and self._completer.last_option and
                 len(self._completer.cmd_path) == 3):
             # If we couldn't complete anything from the JSON model
@@ -114,12 +112,22 @@ def get_completions(self, document, complete_event):
             param = self._completer.arg_metadata.get(
                 self._completer.last_option, {}).get('api_name')
             if param is not None:
-                results = self._server_side_completer.autocomplete(
+                LOG.debug("Trying to retrieve autcompletion for: "
+                          "%s, %s, %s", service, operation, param)
+                results = self._server_side_completer.retrieve_candidate_values(
                     service, operation, param)
+                LOG.debug("Results for %s, %s, %s: %s",
+                          service, operation, param, results)
+                word_before_cursor = text_before_cursor.strip().split()[-1]
+                location = 0
+                if text_before_cursor[-1] != ' ' and word_before_cursor and results:
+                    # Filter the results down by fuzzy searching what
+                    # the user has provided.
+                    results = fuzzy.fuzzy_search(word_before_cursor, results)
+                    location = -len(word_before_cursor)
                 if results is not None:
                     for result in results:
                         # Insert at the end
-                        location = 0
                         yield Completion(result, location,
                                          display=result,
                                          display_meta='')

tests/test_completions.py

@@ -283,3 +283,57 @@ def test_cmd_path_updated_on_completions(index_data):
         '--tags': {'example': 'bar', 'minidoc': 'baz'},
     }
 
+
+def test_last_option_updated_up_releated_api_params(index_data):
+    index_data['aws']['commands'] = ['ec2']
+    index_data['aws']['children'] = {
+        'ec2': {
+            'commands': ['create-tags'],
+            'argument_metadata': {},
+            'arguments': [],
+            'children': {
+                'create-tags': {
+                    'commands': [],
+                    'argument_metadata': {
+                        '--resources': {'example': '', 'minidoc': 'foo'},
+                        '--tags': {'example': 'bar', 'minidoc': 'baz'},
+                    },
+                    'arguments': ['--resources', '--tags'],
+                    'children': {},
+                }
+            }
+        }
+    }
+    completer = AWSCLIModelCompleter(index_data)
+    completer.autocomplete('ec2 create-tags --resources ')
+    assert completer.last_option == '--resources'
+    completer.autocomplete('ec2 create-tags --resources f --tags ')
+    # last_option should be updated.
+    assert completer.last_option == '--tags'
+
+
+def test_last_option_is_updated_on_global_options(index_data):
+    index_data['aws']['arguments'] = ['--no-sign-request']
+    index_data['aws']['commands'] = ['ec2']
+    index_data['aws']['children'] = {
+        'ec2': {
+            'commands': ['create-tags'],
+            'argument_metadata': {},
+            'arguments': [],
+            'children': {
+                'create-tags': {
+                    'commands': [],
+                    'argument_metadata': {
+                        '--resources': {'example': '', 'minidoc': 'foo'},
+                    },
+                    'arguments': ['--resources'],
+                    'children': {},
+                }
+            }
+        }
+    }
+    completer = AWSCLIModelCompleter(index_data)
+    completer.autocomplete('ec2 create-tags --resources ')
+    assert completer.last_option == '--resources'
+    completer.autocomplete('ec2 create-tags --resources f --no-sign-request ')
+    assert completer.last_option == '--no-sign-request'