Ensure the generated classes are clearly marked as such via directory…

… structure

plugin_runner/messages/events_pb2.pyi → plugin_runner/generated/messages/events_pb2.pyi

@@ -1,4 +1,4 @@
-from messages import effects_pb2 as _effects_pb2
+from generated.messages import effects_pb2 as _effects_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
 from google.protobuf import descriptor as _descriptor

plugin_runner/services/plugin_runner_pb2.pyi → plugin_runner/generated/services/plugin_runner_pb2.pyi

@@ -1,4 +1,4 @@
-from messages import events_pb2 as _events_pb2
+from generated.messages import events_pb2 as _events_pb2
 from google.protobuf import descriptor as _descriptor
 from typing import ClassVar as _ClassVar
 

plugin_runner/services/plugin_runner_pb2_grpc.py → plugin_runner/generated/services/plugin_runner_pb2_grpc.py

@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from messages import events_pb2 as messages_dot_events__pb2
+from generated.messages import events_pb2 as generated_dot_messages_dot_events__pb2
 
 
 class PluginRunnerStub(object):
@@ -16,8 +16,8 @@ def __init__(self, channel):
         """
         self.HandleEvent = channel.unary_stream(
                 '/canvas.PluginRunner/HandleEvent',
-                request_serializer=messages_dot_events__pb2.Event.SerializeToString,
-                response_deserializer=messages_dot_events__pb2.EventResponse.FromString,
+                request_serializer=generated_dot_messages_dot_events__pb2.Event.SerializeToString,
+                response_deserializer=generated_dot_messages_dot_events__pb2.EventResponse.FromString,
                 )
 
 
@@ -35,8 +35,8 @@ def add_PluginRunnerServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'HandleEvent': grpc.unary_stream_rpc_method_handler(
                     servicer.HandleEvent,
-                    request_deserializer=messages_dot_events__pb2.Event.FromString,
-                    response_serializer=messages_dot_events__pb2.EventResponse.SerializeToString,
+                    request_deserializer=generated_dot_messages_dot_events__pb2.Event.FromString,
+                    response_serializer=generated_dot_messages_dot_events__pb2.EventResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -60,7 +60,7 @@ def HandleEvent(request,
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_stream(request, target, '/canvas.PluginRunner/HandleEvent',
-            messages_dot_events__pb2.Event.SerializeToString,
-            messages_dot_events__pb2.EventResponse.FromString,
+            generated_dot_messages_dot_events__pb2.Event.SerializeToString,
+            generated_dot_messages_dot_events__pb2.EventResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

plugin_runner/plugin_runner.py

@@ -5,9 +5,9 @@
 
 import grpc
 
-from messages.effects_pb2 import Effect
-from messages.events_pb2 import EventResponse, EventType
-from services.plugin_runner_pb2_grpc import PluginRunnerServicer, add_PluginRunnerServicer_to_server
+from generated.messages.effects_pb2 import Effect
+from generated.messages.events_pb2 import EventResponse, EventType
+from generated.services.plugin_runner_pb2_grpc import PluginRunnerServicer, add_PluginRunnerServicer_to_server
 
 
 class PluginRunner(PluginRunnerServicer):

protobufs/generate_protobufs.sh

@@ -1,4 +1,4 @@
 #! /bin/sh
 
-# poetry run python -m grpc_tools.protoc -I=protobufs/ --python_out=plugin_runner/ --pyi_out=plugin_runner/ --grpc_python_out=plugin_runner/ protobufs/**/*.proto
-python -m grpc_tools.protoc -I=protobufs/ --python_out=plugin_runner/ --pyi_out=plugin_runner/ --grpc_python_out=plugin_runner/ protobufs/**/*.proto
+# poetry run python -m grpc_tools.protoc -I=protobufs/ --python_out=plugin_runner/ --pyi_out=plugin_runner/ --grpc_python_out=plugin_runner/ protobufs/generated/**/*.proto
+python -m grpc_tools.protoc -I=protobufs/ --python_out=plugin_runner/ --pyi_out=plugin_runner/ --grpc_python_out=plugin_runner/ protobufs/generated/**/*.proto

protobufs/messages/events.proto → protobufs/generated/messages/events.proto

@@ -1,6 +1,6 @@
 syntax = 'proto3';
 
-import "messages/effects.proto";
+import "generated/messages/effects.proto";
 
 package canvas;
 

protobufs/services/plugin_runner.proto → protobufs/generated/services/plugin_runner.proto

@@ -1,6 +1,6 @@
 syntax = 'proto3';
 
-import "messages/events.proto";
+import "generated/messages/events.proto";
 
 package canvas;