Generate services in a dirty way

tools/distrib/python/grpcio_tools/grpc_tools/_protoc_compiler.pyx

@@ -33,7 +33,8 @@ cdef extern from "grpc_tools/main.h":
     string message
 
   int protoc_main(int argc, char *argv[])
-  int protoc_in_memory(char* protobuf_path, char* include_path, map[string, string]* files_out, vector[cProtocError]* errors, vector[cProtocWarning]* wrnings) except +
+  int protoc_get_protos(char* protobuf_path, char* include_path, map[string, string]* files_out, vector[cProtocError]* errors, vector[cProtocWarning]* wrnings) except +
+  int protoc_get_services(char* protobuf_path, char* include_path, map[string, string]* files_out, vector[cProtocError]* errors, vector[cProtocWarning]* wrnings) except +
 
 def run_main(list args not None):
   cdef char **argv = <char **>stdlib.malloc(len(args)*sizeof(char *))
@@ -78,7 +79,25 @@ def get_protos(bytes protobuf_path, bytes include_path):
   cdef vector[cProtocError] errors
   # NOTE: Abbreviated name used to shadowing of the module name.
   cdef vector[cProtocWarning] wrnings
-  return_value = protoc_in_memory(protobuf_path, include_path, &files, &errors, &wrnings)
+  return_value = protoc_get_protos(protobuf_path, include_path, &files, &errors, &wrnings)
+  for warning in wrnings:
+      warnings.warn(_c_protoc_warning_to_protoc_warning(warning))
+  if return_value != 0:
+    if errors.size() != 0:
+       py_errors = [_c_protoc_error_to_protoc_error(c_error) for c_error in errors]
+       # TODO: Come up with a good system for printing multiple errors from
+       # protoc.
+       raise Exception(py_errors)
+    raise Exception("An unknown error occurred while compiling {}".format(protobuf_path))
+
+  return files
+
+def get_services(bytes protobuf_path, bytes include_path):
+  cdef map[string, string] files
+  cdef vector[cProtocError] errors
+  # NOTE: Abbreviated name used to shadowing of the module name.
+  cdef vector[cProtocWarning] wrnings
+  return_value = protoc_get_services(protobuf_path, include_path, &files, &errors, &wrnings)
   for warning in wrnings:
       warnings.warn(_c_protoc_warning_to_protoc_warning(warning))
   if return_value != 0:

tools/distrib/python/grpcio_tools/grpc_tools/main.cc

@@ -59,8 +59,8 @@ class GeneratorContextImpl : public ::google::protobuf::compiler::GeneratorConte
 public:
   GeneratorContextImpl(const std::vector<const ::google::protobuf::FileDescriptor*>& parsed_files,
                        std::map<std::string, std::string>* files_out) :
-    parsed_files_(parsed_files),
-    files_(files_out){}
+    files_(files_out),
+    parsed_files_(parsed_files) {}
 
   ::google::protobuf::io::ZeroCopyOutputStream* Open(const std::string& filename) {
     // TODO(rbellevi): Learn not to dream impossible dreams. :(
@@ -114,7 +114,7 @@ private:
 
 } // end namespace detail
 
-int protoc_in_memory(char* protobuf_path,
+int protoc_get_protos(char* protobuf_path,
                      char* include_path,
                      std::map<std::string, std::string>* files_out,
                      std::vector<ProtocError>* errors,
@@ -140,3 +140,30 @@ int protoc_in_memory(char* protobuf_path,
   // TODO: Come up with a better error reporting mechanism than this.
   return 0;
 }
+
+int protoc_get_services(char* protobuf_path,
+                     char* include_path,
+                     std::map<std::string, std::string>* files_out,
+                     std::vector<ProtocError>* errors,
+                     std::vector<ProtocWarning>* warnings)
+{
+  // TODO: Create parsed_files.
+  std::string protobuf_filename(protobuf_path);
+  std::unique_ptr<detail::ErrorCollectorImpl> error_collector(new detail::ErrorCollectorImpl(errors, warnings));
+  std::unique_ptr<::google::protobuf::compiler::DiskSourceTree> source_tree(new ::google::protobuf::compiler::DiskSourceTree());
+  // NOTE: This is equivalent to "--proto_path=."
+  source_tree->MapPath("", ".");
+  // TODO: Figure out more advanced virtual path mapping.
+  ::google::protobuf::compiler::Importer importer(source_tree.get(), error_collector.get());
+  const ::google::protobuf::FileDescriptor* parsed_file = importer.Import(protobuf_filename);
+  if (parsed_file == nullptr) {
+    return 1;
+  }
+  detail::GeneratorContextImpl generator_context({parsed_file}, files_out);
+  std::string error;
+  grpc_python_generator::GeneratorConfiguration grpc_py_config;
+  grpc_python_generator::PythonGrpcGenerator grpc_py_generator(grpc_py_config);
+  grpc_py_generator.Generate(parsed_file, "", &generator_context, &error);
+  // TODO: Come up with a better error reporting mechanism than this.
+  return 0;
+}

tools/distrib/python/grpcio_tools/grpc_tools/main.h

@@ -33,7 +33,13 @@ struct ProtocError {
 
 typedef ProtocError ProtocWarning;
 
-int protoc_in_memory(char* protobuf_path,
+int protoc_get_protos(char* protobuf_path,
+                     char* include_path,
+                     std::map<std::string, std::string>* files_out,
+                     std::vector<ProtocError>* errors,
+                     std::vector<ProtocWarning>* warnings);
+
+int protoc_get_services(char* protobuf_path,
                      char* include_path,
                      std::map<std::string, std::string>* files_out,
                      std::vector<ProtocError>* errors,

tools/distrib/python/grpcio_tools/grpc_tools/protoc.py

@@ -20,6 +20,7 @@ import sys
 # TODO: Figure out how to add this dependency to setuptools.
 import six
 import imp
+import os
 
 from grpc_tools import _protoc_compiler
 
@@ -38,11 +39,32 @@ def get_protos(protobuf_path, include_path):
   modules = []
   # TODO: Ensure pointer equality between two invocations of this function.
   for filename, code in six.iteritems(files):
-    module = imp.new_module(filename.decode('ascii'))
+    print("Filename {}".format(filename))
+    base_name = os.path.basename(filename.decode('ascii'))
+    proto_name, _ = os.path.splitext(base_name)
+    anchor_package = ".".join(os.path.normpath(os.path.dirname(filename.decode('ascii'))).split(os.sep))
+    module_name = "{}.{}".format(anchor_package, proto_name)
+    module = imp.new_module(module_name)
     six.exec_(code, module.__dict__)
     modules.append(module)
+    print("Inserting module {}".format(module_name))
+    sys.modules[module_name] = module
   return tuple(modules)
 
+def get_services(protobuf_path, include_path):
+  files = _protoc_compiler.get_services(protobuf_path.encode('ascii'), include_path.encode('ascii'))
+  modules = []
+  # TODO: Ensure pointer equality between two invocations of this function.
+  for filename, code in six.iteritems(files):
+    base_name = os.path.basename(filename.decode('ascii'))
+    proto_name, _ = os.path.splitext(base_name)
+    anchor_package = ".".join(os.path.normpath(os.path.dirname(filename.decode('ascii'))).split(os.sep))
+    module_name = "{}.{}".format(anchor_package, proto_name)
+    module = imp.new_module(module_name)
+    six.exec_(code, module.__dict__)
+    modules.append(module)
+    sys.modules[module_name] = module
+  return tuple(modules)
 
 
 if __name__ == '__main__':

tools/distrib/python/grpcio_tools/grpc_tools/protoc_test.py

@@ -30,6 +30,10 @@ class ProtocTest(unittest.TestCase):
         os.chdir(original_dir)
         # print("Protos: {}".format(vars(protos)))
         print(protos.SimpleMessageRequest)
+        os.chdir(os.path.join(original_dir, "tools/distrib/python/grpcio_tools/"))
+        services, = protoc.get_services("grpc_tools/simple.proto", "")
+        os.chdir(original_dir)
+        print("Services: {}".format(dir(services)))
 
 
 if __name__ == '__main__':