Merge pull request #112 from juanjux/feature/supported_languages

Add the SupportedLanguages protocol call

Author: juanjux

bblfsh/aliases.py

@@ -40,6 +40,14 @@
         "bblfsh.gopkg.in.bblfsh.sdk.%s.protocol.generated_pb2" % VERSION
         ).VersionRequest
 
+SupportedLanguagesRequest = importlib.import_module(
+        "bblfsh.gopkg.in.bblfsh.sdk.%s.protocol.generated_pb2" % VERSION
+        ).SupportedLanguagesRequest
+
+SupportedLanguagesResponse = importlib.import_module(
+        "bblfsh.gopkg.in.bblfsh.sdk.%s.protocol.generated_pb2" % VERSION
+        ).SupportedLanguagesResponse
+
 ProtocolServiceStub = importlib.import_module(
         "bblfsh.gopkg.in.bblfsh.sdk.%s.protocol.generated_pb2_grpc" % VERSION
         ).ProtocolServiceStub

bblfsh/client.py

@@ -3,7 +3,8 @@
 
 import grpc
 
-from bblfsh.aliases import ParseRequest, NativeParseRequest, VersionRequest, ProtocolServiceStub
+from bblfsh.aliases import (ParseRequest, NativeParseRequest, VersionRequest,
+        ProtocolServiceStub, SupportedLanguagesRequest, SupportedLanguagesResponse)
 from bblfsh.sdkversion import VERSION
 
 # The following two insertions fix the broken pb import paths
@@ -99,6 +100,10 @@ def native_parse(self, filename, language=None, contents=None, timeout=None):
                                language=self._scramble_language(language))
         return self._stub.NativeParse(request, timeout=timeout)
 
+    def supported_languages(self):
+        sup_response = self._stub.SupportedLanguages(SupportedLanguagesRequest())
+        return sup_response.languages
+
     def version(self):
         """
         Queries the Babelfish server for version and runtime information.

bblfsh/test.py

@@ -44,6 +44,8 @@ def testNonUTF8ParseError(self):
                           self.client.parse, "", "Python", b"a = '\x80abc'")
 
     def testUASTDefaultLanguage(self):
+        res = self.client.parse(__file__)
+        print(res)
         self._validate_resp(self.client.parse(__file__))
 
     def testUASTPython(self):
@@ -286,12 +288,21 @@ def testManyParsersAndFilters(self):
         # Check that memory usage has not doubled after running the parse+filter
         self.assertLess(after[2] / before[2], 2.0)
 
+    def testSupportedLanguages(self):
+        res = self.client.supported_languages()
+        self.assertGreater(len(res), 0)
+        for l in res:
+            for key in ('language', 'version', 'status', 'features'):
+                print(key)
+                self.assertTrue(hasattr(l, key))
+                self.assertIsNotNone(getattr(l, key))
+
     def _validate_filter(self, resp):
-        results = filter(resp.uast, "//Import[@roleImport and @roleDeclaration]//alias")
-        self.assertEqual(next(results).token, "os")
-        self.assertEqual(next(results).token, "resource")
-        self.assertEqual(next(results).token, "unittest")
-        self.assertEqual(next(results).token, "docker")
+        results = filter(resp.uast, "//Num")
+        self.assertEqual(next(results).token, "0")
+        self.assertEqual(next(results).token, "1")
+        self.assertEqual(next(results).token, "100")
+        self.assertEqual(next(results).token, "10")
 
 
 if __name__ == "__main__":

setup.py

@@ -10,9 +10,9 @@
 from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
 
-VERSION = "2.9.14"
+VERSION = "2.9.15"
 LIBUAST_VERSION = "v1.9.1"
-SDK_VERSION = "v1.8.0"
+SDK_VERSION = "v1.16.1"
 SDK_MAJOR = SDK_VERSION.split('.')[0]
 FORMAT_ARGS = globals()