Add supported languages with aliases

Signed-off-by: kuba-- <kuba@sourced.tech>

Author: kuba--

bblfsh/aliases.py

@@ -9,6 +9,7 @@
     "bblfsh.gopkg.in.bblfsh.sdk.v2.protocol.generated_pb2")
 protocol_grpc_v2_module = importlib.import_module(
     "bblfsh.gopkg.in.bblfsh.sdk.v2.protocol.generated_pb2_grpc")
+
 protocol_v1_module = importlib.import_module(
     "bblfsh.gopkg.in.bblfsh.sdk.v1.protocol.generated_pb2")
 protocol_grpc_v1_module = importlib.import_module(
@@ -20,7 +21,7 @@
 ParseError = protocol_v2_module.ParseError
 Mode = protocol_v2_module.Mode
 ModeType = google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper
-
+Manifest = protocol_v2_module.Manifest
 
 class Modes:
     pass
@@ -30,10 +31,16 @@ class Modes:
     setattr(Modes, k, v.number)
 
 DriverStub = protocol_grpc_v2_module.DriverStub
-DriverServicer = protocol_grpc_v2_module.DriverServicer
+DriverHostStub = protocol_grpc_v2_module.DriverHostStub
+
+ProtocolServiceStub = protocol_grpc_v1_module.ProtocolServiceStub
 
 VersionRequest = protocol_v1_module.VersionRequest
 VersionResponse = protocol_v1_module.VersionResponse
 SupportedLanguagesRequest = protocol_v1_module.SupportedLanguagesRequest
 SupportedLanguagesResponse = protocol_v1_module.SupportedLanguagesResponse
-ProtocolServiceStub = protocol_grpc_v1_module.ProtocolServiceStub
+
+VersionRequestV2 = protocol_v2_module.VersionRequest
+VersionResponseV2 =  protocol_v2_module.VersionResponse
+SupportedLanguagesRequestV2 = protocol_v2_module.SupportedLanguagesRequest
+SupportedLanguagesResponseV2 = protocol_v2_module.SupportedLanguagesResponse

bblfsh/client.py

@@ -3,9 +3,21 @@
 
 import grpc
 
-from bblfsh.aliases import (ParseRequest, DriverStub, ProtocolServiceStub,
-                            VersionRequest, SupportedLanguagesRequest, ModeType,
-                            VersionResponse)
+from bblfsh.aliases import (
+    ParseRequest,
+    DriverStub,
+    DriverHostStub,
+    ProtocolServiceStub,
+    VersionRequest,
+    VersionRequestV2,
+    SupportedLanguagesRequest,
+    SupportedLanguagesRequestV2,
+    ModeType,
+    VersionResponse,
+    VersionResponseV2,
+    Manifest
+)
+
 from bblfsh.result_context import ResultContext
 
 
@@ -34,6 +46,7 @@ def __init__(self, endpoint: Union[str, grpc.Channel]) -> None:
 
         self._stub_v1 = ProtocolServiceStub(self._channel)
         self._stub_v2 = DriverStub(self._channel)
+        self._hoststub_v2 = DriverHostStub(self._channel)
 
     @staticmethod
     def _ensure_utf8(text: bytes) -> str:
@@ -91,6 +104,10 @@ def supported_languages(self) -> List[str]:
         sup_response = self._stub_v1.SupportedLanguages(SupportedLanguagesRequest())
         return sup_response.languages
 
+    def supported_language_manifests(self) -> List[Manifest]:
+        sup_response = self._hoststub_v2.SupportedLanguages(SupportedLanguagesRequestV2())
+        return sup_response.languages
+
     def version(self) -> VersionResponse:
         """
         Queries the Babelfish server for version and runtime information.
@@ -100,6 +117,16 @@ def version(self) -> VersionResponse:
         """
         return self._stub_v1.Version(VersionRequest())
 
+    def server_version(self) -> VersionResponseV2:
+        """
+        Queries the Babelfish server for version information.
+
+        :return: A VersionResponse class contains a "version" dictionary
+                 with the keys "version" for the semantic version
+                 and "build" for the build timestamp.
+        """
+        return self._hoststub_v2.ServerVersion(VersionRequestV2())
+
     @staticmethod
     def _scramble_language(lang: Optional[str]) -> Optional[str]:
         # TODO: remove once aliases are integrated
@@ -117,4 +144,4 @@ def close(self) -> None:
         not supported.
         """
         self._channel.close()
-        self._channel = self._stub_v1 = self._stub_v2 = None
+        self._channel = self._stub_v1 = self._stub_v2 = self._hoststub_v2 = None

bblfsh/test.py

@@ -41,11 +41,19 @@ def _parse_fixture(self) -> ResultContext:
 
     def testVersion(self) -> None:
         version = self.client.version()
+
         self.assertTrue(hasattr(version, "version"))
         self.assertTrue(version.version)
         self.assertTrue(hasattr(version, "build"))
         self.assertTrue(version.build)
 
+    def testServerVersion(self) -> None:
+        version = self.client.server_version().version
+
+        self.assertTrue(hasattr(version, "version"))
+        self.assertTrue(version.version)
+        self.assertTrue(hasattr(version, "build"))
+
     def testNativeParse(self) -> None:
         ctx = self.client.parse(self.fixtures_pyfile, mode=Modes.NATIVE)
         self._validate_ctx(ctx)
@@ -405,6 +413,18 @@ def testSupportedLanguages(self) -> None:
                 self.assertTrue(hasattr(l, key))
                 self.assertIsNotNone(getattr(l, key))
 
+    def testSupportedLanguageManifests(self) -> None:
+        langs_with_aliases = {'csharp', 'cpp', 'javascript', 'bash'}
+        res = self.client.supported_language_manifests()
+        self.assertGreater(len(res), 0)
+        for l in res:
+            for key in ('name', 'language', 'version', 'status', 'features'):
+                self.assertTrue(hasattr(l, key))
+                self.assertIsNotNone(getattr(l, key))
+            if getattr(l, 'language') in langs_with_aliases:
+                self.assertTrue(hasattr(l, 'aliases'))
+                self.assertGreater(len(getattr(l, 'aliases')), 0)
+
     def testEncode(self) -> None:
         ctx = self._parse_fixture()
         # This test is here for backward compatibility purposes,

proto/github.com/gogo/protobuf/gogoproto/gogo.proto

@@ -33,6 +33,7 @@ import "google/protobuf/descriptor.proto";
 
 option java_package = "com.google.protobuf";
 option java_outer_classname = "GoGoProtos";
+option go_package = "github.com/gogo/protobuf/gogoproto";
 
 extend google.protobuf.EnumOptions {
 	optional bool goproto_enum_prefix = 62001;
@@ -78,10 +79,14 @@ extend google.protobuf.FileOptions {
 	optional bool gogoproto_import = 63027;
 	optional bool protosizer_all = 63028;
 	optional bool compare_all = 63029;
-    optional bool typedecl_all = 63030;
-    optional bool enumdecl_all = 63031;
+	optional bool typedecl_all = 63030;
+	optional bool enumdecl_all = 63031;
 
 	optional bool goproto_registration = 63032;
+	optional bool messagename_all = 63033;
+
+	optional bool goproto_sizecache_all = 63034;
+	optional bool goproto_unkeyed_all = 63035;
 }
 
 extend google.protobuf.MessageOptions {
@@ -114,6 +119,11 @@ extend google.protobuf.MessageOptions {
 	optional bool compare = 64029;
 
 	optional bool typedecl = 64030;
+
+	optional bool messagename = 64033;
+
+	optional bool goproto_sizecache = 64034;
+	optional bool goproto_unkeyed = 64035;
 }
 
 extend google.protobuf.FieldOptions {
@@ -129,4 +139,6 @@ extend google.protobuf.FieldOptions {
 
 	optional bool stdtime = 65010;
 	optional bool stdduration = 65011;
-}
+	optional bool wktpointer = 65012;
+
+}

setup.py

@@ -15,11 +15,22 @@
 # The VERSION line is edited automatically during deployments.
 # You may change the contents of the string, but do not otherwise edit the line.
 VERSION = "3.x.x-dev"
+
+# LIBUAST_URL is a format url which points to the libuast package
+# (see LIBUAST_VERSION and get_libuast_arch()). The url is used to download
+# and install uast library.
+LIBUAST_URL = "https://github.com/bblfsh/libuast/releases/download/{version}/libuast-{arch}.tar.gz"
 LIBUAST_VERSION = "v3.4.2"
+
 SDK_V1_VERSION = "v1.17.0"
 SDK_V1_MAJOR = SDK_V1_VERSION.split('.')[0]
-SDK_V2_VERSION = "v2.16.4"
-SDK_V2_MAJOR = SDK_V2_VERSION.split('.')[0]
+
+# SDK_URL is a format url which points to the sdk package.
+# The url is used to download and install python bindings for bblfsh sdk.
+SDK_URL = "https://github.com/bblfsh/sdk/archive/{version}.tar.gz"
+SDK_V3_VERSION  = "v3.3.0"
+SDK_V3_PROTOCOL = "v2" # package gopkg.in.bblfsh.sdk.v2.protocol
+
 
 FORMAT_ARGS = globals()
 
@@ -152,8 +163,7 @@ def get_libuast():
     mkdir(local_libuast)
 
     # Retrieve libuast
-    untar_url("https://github.com/bblfsh/libuast/releases/download/%s/libuast-%s.tar.gz" % (
-        LIBUAST_VERSION, get_libuast_arch()))
+    untar_url(LIBUAST_URL.format(version=LIBUAST_VERSION, arch=get_libuast_arch()))
     mv(get_libuast_arch(), local_libuast)
 
 
@@ -170,10 +180,10 @@ def proto_download_v1():
 
 
 def proto_download_v2():
-    untar_url("https://github.com/bblfsh/sdk/archive/%s.tar.gz"
-              % SDK_V2_VERSION)
-    sdkdir = "sdk-" + SDK_V2_VERSION[1:]
-    destdir = j("proto", "gopkg.in", "bblfsh", "sdk.{SDK_V2_MAJOR}")
+    untar_url(SDK_URL.format(version=SDK_V3_VERSION))
+    sdkdir = "sdk-" + SDK_V3_VERSION[1:]
+    destdir = j("proto", "gopkg.in", "bblfsh", "sdk.{SDK_V3_PROTOCOL}")
+
     cp(j(sdkdir, "protocol", "driver.proto"),
        j(destdir, "protocol", "generated.proto"))
     cp(j(sdkdir, "uast", "role", "generated.proto"),
@@ -261,18 +271,18 @@ def importlib_import_replacer(match):
     protoc(j("gopkg.in", "bblfsh", "sdk." + SDK_V1_MAJOR, "protocol", "generated.proto"), True)
     protoc(j("gopkg.in", "bblfsh", "sdk." + SDK_V1_MAJOR, "uast", "generated.proto"))
 
-    protoc(j("gopkg.in", "bblfsh", "sdk." + SDK_V2_MAJOR, "uast", "generated.proto"))
-    protoc(j("gopkg.in", "bblfsh", "sdk." + SDK_V2_MAJOR, "protocol", "generated.proto"), True)
+    protoc(j("gopkg.in", "bblfsh", "sdk." + SDK_V3_PROTOCOL, "uast", "generated.proto"))
+    protoc(j("gopkg.in", "bblfsh", "sdk." + SDK_V3_PROTOCOL, "protocol", "generated.proto"), True)
 
 
 def do_get_deps():
     get_libuast()
 
     create_dirs(SDK_V1_MAJOR)
-    create_dirs(SDK_V2_MAJOR)
+    create_dirs(SDK_V3_PROTOCOL)
 
     create_inits(SDK_V1_MAJOR)
-    create_inits(SDK_V2_MAJOR)
+    create_inits(SDK_V3_PROTOCOL)
 
     proto_download_v1()
     proto_download_v2()