fixed apertium#206: added ListPairHandler to handle /listPairs and updated ListHandler for /list

Author: gopalM-3

apertium_apy/apy.py

@@ -44,6 +44,7 @@
     GenerateHandler,
     IdentifyLangHandler,
     ListHandler,
+    ListPairHandler,
     ListLanguageNamesHandler,
     PerWordHandler,
     PipeDebugHandler,
@@ -265,7 +266,7 @@ def setup_application(args):
     handlers = [
         (r'/', RootHandler),
         (r'/list', ListHandler),
-        (r'/listPairs', ListHandler),
+        (r'/listPairs', ListPairHandler),
         (r'/stats', StatsHandler),
         (r'/pairprefs', PairPrefsHandler),
         (r'/translate', TranslateHandler),

apertium_apy/handlers/__init__.py

@@ -5,6 +5,7 @@
 from apertium_apy.handlers.identify_lang import IdentifyLangHandler  # noqa: F401
 from apertium_apy.handlers.list_language_names import ListLanguageNamesHandler  # noqa: F401
 from apertium_apy.handlers.list_modes import ListHandler  # noqa: F401
+from apertium_apy.handlers.list_modes import ListPairHandler # noqa: F401
 from apertium_apy.handlers.per_word import PerWordHandler  # noqa: F401
 from apertium_apy.handlers.pipe_debug import PipeDebugHandler  # noqa: F401
 from apertium_apy.handlers.speller import SpellerHandler  # noqa: F401

apertium_apy/handlers/list_modes.py

@@ -7,9 +7,9 @@
 class ListHandler(BaseHandler):
     @tornado.gen.coroutine
     def get(self):
-        query = self.get_argument('q', default='pairs')
+        query = self.get_argument('q', default='all')
 
-        if query == 'pairs':
+        if query == 'all':
             src = self.get_argument('src', default=None)
             response_data = []
             if src:
@@ -20,7 +20,15 @@ def get(self):
                 response_data.append({'sourceLanguage': l1, 'targetLanguage': l2})
                 if self.get_arguments('include_deprecated_codes'):
                     response_data.append({'sourceLanguage': to_alpha2_code(l1), 'targetLanguage': to_alpha2_code(l2)})
-            self.send_response({'responseData': response_data, 'responseDetails': None, 'responseStatus': 200})
+            response = {
+                'responseData': response_data,
+                'generators': {pair: modename for (pair, (path, modename)) in self.generators.items()},
+                'taggers': {pair: modename for (pair, (path, modename)) in self.taggers.items()},
+                'spellers': {lang_src: modename for (lang_src, (path, modename)) in self.spellers.items()},
+                'responseDetails': None,
+                'responseStatus': 200
+            }
+            self.send_response(response)
         elif query == 'analyzers' or query == 'analysers':
             self.send_response({pair: modename for (pair, (path, modename)) in self.analyzers.items()})
         elif query == 'generators':
@@ -31,3 +39,18 @@ def get(self):
             self.send_response({lang_src: modename for (lang_src, (path, modename)) in self.spellers.items()})
         else:
             self.send_error(400, explanation='Expecting q argument to be one of analysers, generators, spellers, disambiguators, or pairs')
+
+class ListPairHandler(BaseHandler):
+    @tornado.gen.coroutine
+    def get(self):
+        src = self.get_argument('src', default=None)
+        response_data = []
+        if src:
+            pairs = [(src, trg) for trg in self.paths[src]]
+        else:
+            pairs = [(p[0], p[1]) for par in self.pairs for p in [par.split('-')]]
+        for (l1, l2) in pairs:
+            response_data.append({'sourceLanguage': l1, 'targetLanguage': l2})
+            if self.get_arguments('include_deprecated_codes'):
+                response_data.append({'sourceLanguage': to_alpha2_code(l1), 'targetLanguage': to_alpha2_code(l2)})
+        self.send_response({'responseData': response_data, 'responseDetails': None, 'responseStatus': 200})