From c56f5fb0a547c4f8510f983afaf924e1ec4c4561 Mon Sep 17 00:00:00 2001 From: Andrew Duane Date: Tue, 20 Feb 2024 18:03:04 -0800 Subject: [PATCH] Ensure the generated classes are clearly marked as such via directory structure --- .../{ => generated}/messages/effects_pb2.py | 10 +++--- .../{ => generated}/messages/effects_pb2.pyi | 0 .../messages/effects_pb2_grpc.py | 0 .../generated/messages/events_pb2.py | 31 +++++++++++++++++++ .../{ => generated}/messages/events_pb2.pyi | 2 +- .../messages/events_pb2_grpc.py | 0 .../services/plugin_runner_pb2.py | 12 +++---- .../services/plugin_runner_pb2.pyi | 2 +- .../services/plugin_runner_pb2_grpc.py | 14 ++++----- plugin_runner/messages/events_pb2.py | 31 ------------------- plugin_runner/plugin_runner.py | 6 ++-- protobufs/generate_protobufs.sh | 4 +-- .../{ => generated}/messages/effects.proto | 0 .../{ => generated}/messages/events.proto | 2 +- .../services/plugin_runner.proto | 2 +- 15 files changed, 58 insertions(+), 58 deletions(-) rename plugin_runner/{ => generated}/messages/effects_pb2.py (59%) rename plugin_runner/{ => generated}/messages/effects_pb2.pyi (100%) rename plugin_runner/{ => generated}/messages/effects_pb2_grpc.py (100%) create mode 100644 plugin_runner/generated/messages/events_pb2.py rename plugin_runner/{ => generated}/messages/events_pb2.pyi (99%) rename plugin_runner/{ => generated}/messages/events_pb2_grpc.py (100%) rename plugin_runner/{ => generated}/services/plugin_runner_pb2.py (52%) rename plugin_runner/{ => generated}/services/plugin_runner_pb2.pyi (70%) rename plugin_runner/{ => generated}/services/plugin_runner_pb2_grpc.py (75%) delete mode 100644 plugin_runner/messages/events_pb2.py rename protobufs/{ => generated}/messages/effects.proto (100%) rename protobufs/{ => generated}/messages/events.proto (97%) rename protobufs/{ => generated}/services/plugin_runner.proto (74%) diff --git a/plugin_runner/messages/effects_pb2.py b/plugin_runner/generated/messages/effects_pb2.py similarity index 59% rename from plugin_runner/messages/effects_pb2.py rename to plugin_runner/generated/messages/effects_pb2.py index baf961f9..cfc041f8 100644 --- a/plugin_runner/messages/effects_pb2.py +++ b/plugin_runner/generated/messages/effects_pb2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: messages/effects.proto +# source: generated/messages/effects.proto # Protobuf Python Version: 4.25.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor @@ -14,13 +14,13 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16messages/effects.proto\x12\x06\x63\x61nvas\"\'\n\x06\x45\x66\x66\x65\x63t\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07payload\x18\x02 \x01(\tb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n generated/messages/effects.proto\x12\x06\x63\x61nvas\"\'\n\x06\x45\x66\x66\x65\x63t\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07payload\x18\x02 \x01(\tb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'messages.effects_pb2', _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'generated.messages.effects_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None - _globals['_EFFECT']._serialized_start=34 - _globals['_EFFECT']._serialized_end=73 + _globals['_EFFECT']._serialized_start=44 + _globals['_EFFECT']._serialized_end=83 # @@protoc_insertion_point(module_scope) diff --git a/plugin_runner/messages/effects_pb2.pyi b/plugin_runner/generated/messages/effects_pb2.pyi similarity index 100% rename from plugin_runner/messages/effects_pb2.pyi rename to plugin_runner/generated/messages/effects_pb2.pyi diff --git a/plugin_runner/messages/effects_pb2_grpc.py b/plugin_runner/generated/messages/effects_pb2_grpc.py similarity index 100% rename from plugin_runner/messages/effects_pb2_grpc.py rename to plugin_runner/generated/messages/effects_pb2_grpc.py diff --git a/plugin_runner/generated/messages/events_pb2.py b/plugin_runner/generated/messages/events_pb2.py new file mode 100644 index 00000000..5df69b41 --- /dev/null +++ b/plugin_runner/generated/messages/events_pb2.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: generated/messages/events.proto +# Protobuf Python Version: 4.25.0 +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +from generated.messages import effects_pb2 as generated_dot_messages_dot_effects__pb2 + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fgenerated/messages/events.proto\x12\x06\x63\x61nvas\x1a generated/messages/effects.proto\"8\n\x05\x45vent\x12\x1f\n\x04type\x18\x01 \x01(\x0e\x32\x11.canvas.EventType\x12\x0e\n\x06target\x18\x02 \x01(\t\"A\n\rEventResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\x12\x1f\n\x07\x65\x66\x66\x65\x63ts\x18\x02 \x03(\x0b\x32\x0e.canvas.Effect*\x95\x0c\n\tEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x1f\n\x1b\x41LLERGY_INTOLERANCE_CREATED\x10\x01\x12\x1f\n\x1b\x41LLERGY_INTOLERANCE_UPDATED\x10\x02\x12\x16\n\x12\x41PPOINTMENT_BOOKED\x10\x03\x12\x18\n\x14\x41PPOINTMENT_CANCELED\x10\x04\x12\x1a\n\x16\x41PPOINTMENT_CHECKED_IN\x10\x05\x12\x17\n\x13\x41PPOINTMENT_CREATED\x10\x06\x12\x19\n\x15\x41PPOINTMENT_NO_SHOWED\x10\x07\x12\x1b\n\x17\x41PPOINTMENT_RESCHEDULED\x10\x08\x12\x18\n\x14\x41PPOINTMENT_RESTORED\x10\t\x12\x17\n\x13\x41PPOINTMENT_UPDATED\x10\n\x12\x1d\n\x19\x42ILLING_LINE_ITEM_CREATED\x10\x0b\x12\x1d\n\x19\x42ILLING_LINE_ITEM_UPDATED\x10\x0c\x12\x16\n\x12\x43ONDITION_ASSESSED\x10\r\x12\x15\n\x11\x43ONDITION_CREATED\x10\x0e\x12\x16\n\x12\x43ONDITION_RESOLVED\x10\x0f\x12\x15\n\x11\x43ONDITION_UPDATED\x10\x10\x12\x13\n\x0f\x43ONSENT_CREATED\x10\x11\x12\x13\n\x0f\x43ONSENT_DELETED\x10\x12\x12\x13\n\x0f\x43ONSENT_UPDATED\x10\x13\x12\x14\n\x10\x43OVERAGE_CREATED\x10\x14\x12\x14\n\x10\x43OVERAGE_UPDATED\x10\x15\x12\x15\n\x11\x45NCOUNTER_CREATED\x10\x16\x12\x15\n\x11\x45NCOUNTER_UPDATED\x10\x17\x12\x1a\n\x16\x45XTERNAL_EVENT_CREATED\x10\x18\x12\x1a\n\x16\x45XTERNAL_EVENT_UPDATED\x10\x19\x12\x1a\n\x16IMAGING_REPORT_CREATED\x10\x1a\x12\x1a\n\x16IMAGING_REPORT_UPDATED\x10\x1b\x12\x18\n\x14IMMUNIZATION_CREATED\x10\x1c\x12\"\n\x1eIMMUNIZATION_STATEMENT_CREATED\x10\x1d\x12\"\n\x1eIMMUNIZATION_STATEMENT_UPDATED\x10\x1e\x12\x18\n\x14IMMUNIZATION_UPDATED\x10\x1f\x12\x17\n\x13INSTRUCTION_CREATED\x10 \x12\x17\n\x13INSTRUCTION_UPDATED\x10!\x12\x15\n\x11INTERVIEW_CREATED\x10\"\x12\x15\n\x11INTERVIEW_UPDATED\x10#\x12\x15\n\x11LAB_ORDER_CREATED\x10$\x12\x15\n\x11LAB_ORDER_UPDATED\x10%\x12\x16\n\x12LAB_REPORT_CREATED\x10&\x12\x16\n\x12LAB_REPORT_UPDATED\x10\'\x12 \n\x1cMEDICATION_LIST_ITEM_CREATED\x10(\x12 \n\x1cMEDICATION_LIST_ITEM_UPDATED\x10)\x12\x13\n\x0fMESSAGE_CREATED\x10*\x12\x13\n\x0fPATIENT_CREATED\x10+\x12\x13\n\x0fPATIENT_UPDATED\x10,\x12\x18\n\x14PRESCRIPTION_CREATED\x10-\x12\x18\n\x14PRESCRIPTION_UPDATED\x10.\x12\x1b\n\x17REFERRAL_REPORT_CREATED\x10/\x12\x1b\n\x17REFERRAL_REPORT_UPDATED\x10\x30\x12\x11\n\rTASK_ASSIGNED\x10\x31\x12\x0f\n\x0bTASK_CLOSED\x10\x32\x12\x18\n\x14TASK_COMMENT_CREATED\x10\x33\x12\x18\n\x14TASK_COMMENT_UPDATED\x10\x34\x12\x12\n\x0eTASK_COMPLETED\x10\x35\x12\x10\n\x0cTASK_CREATED\x10\x36\x12\x18\n\x14TASK_LABELS_ADJUSTED\x10\x37\x12\x13\n\x0fTASK_UNASSIGNED\x10\x38\x12\x10\n\x0cTASK_UPDATED\x10\x39\x12\x16\n\x12VITAL_SIGN_CREATED\x10:\x12\x16\n\x12VITAL_SIGN_UPDATED\x10;\x12\x10\n\x0c\x43HART_OPENED\x10<\x12\x16\n\x12\x43OMMAND_ORIGINATED\x10=b\x06proto3') + +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'generated.messages.events_pb2', _globals) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _globals['_EVENTTYPE']._serialized_start=203 + _globals['_EVENTTYPE']._serialized_end=1760 + _globals['_EVENT']._serialized_start=77 + _globals['_EVENT']._serialized_end=133 + _globals['_EVENTRESPONSE']._serialized_start=135 + _globals['_EVENTRESPONSE']._serialized_end=200 +# @@protoc_insertion_point(module_scope) diff --git a/plugin_runner/messages/events_pb2.pyi b/plugin_runner/generated/messages/events_pb2.pyi similarity index 99% rename from plugin_runner/messages/events_pb2.pyi rename to plugin_runner/generated/messages/events_pb2.pyi index 4bf17ee6..fe930373 100644 --- a/plugin_runner/messages/events_pb2.pyi +++ b/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 diff --git a/plugin_runner/messages/events_pb2_grpc.py b/plugin_runner/generated/messages/events_pb2_grpc.py similarity index 100% rename from plugin_runner/messages/events_pb2_grpc.py rename to plugin_runner/generated/messages/events_pb2_grpc.py diff --git a/plugin_runner/services/plugin_runner_pb2.py b/plugin_runner/generated/services/plugin_runner_pb2.py similarity index 52% rename from plugin_runner/services/plugin_runner_pb2.py rename to plugin_runner/generated/services/plugin_runner_pb2.py index 43dae21b..15e5acd6 100644 --- a/plugin_runner/services/plugin_runner_pb2.py +++ b/plugin_runner/generated/services/plugin_runner_pb2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: services/plugin_runner.proto +# source: generated/services/plugin_runner.proto # Protobuf Python Version: 4.25.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor @@ -12,16 +12,16 @@ _sym_db = _symbol_database.Default() -from messages import events_pb2 as messages_dot_events__pb2 +from generated.messages import events_pb2 as generated_dot_messages_dot_events__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cservices/plugin_runner.proto\x12\x06\x63\x61nvas\x1a\x15messages/events.proto2E\n\x0cPluginRunner\x12\x35\n\x0bHandleEvent\x12\r.canvas.Event\x1a\x15.canvas.EventResponse0\x01\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&generated/services/plugin_runner.proto\x12\x06\x63\x61nvas\x1a\x1fgenerated/messages/events.proto2E\n\x0cPluginRunner\x12\x35\n\x0bHandleEvent\x12\r.canvas.Event\x1a\x15.canvas.EventResponse0\x01\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'services.plugin_runner_pb2', _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'generated.services.plugin_runner_pb2', _globals) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None - _globals['_PLUGINRUNNER']._serialized_start=63 - _globals['_PLUGINRUNNER']._serialized_end=132 + _globals['_PLUGINRUNNER']._serialized_start=83 + _globals['_PLUGINRUNNER']._serialized_end=152 # @@protoc_insertion_point(module_scope) diff --git a/plugin_runner/services/plugin_runner_pb2.pyi b/plugin_runner/generated/services/plugin_runner_pb2.pyi similarity index 70% rename from plugin_runner/services/plugin_runner_pb2.pyi rename to plugin_runner/generated/services/plugin_runner_pb2.pyi index 8398fed2..e4f93da2 100644 --- a/plugin_runner/services/plugin_runner_pb2.pyi +++ b/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 diff --git a/plugin_runner/services/plugin_runner_pb2_grpc.py b/plugin_runner/generated/services/plugin_runner_pb2_grpc.py similarity index 75% rename from plugin_runner/services/plugin_runner_pb2_grpc.py rename to plugin_runner/generated/services/plugin_runner_pb2_grpc.py index 38264083..83f2b63e 100644 --- a/plugin_runner/services/plugin_runner_pb2_grpc.py +++ b/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) diff --git a/plugin_runner/messages/events_pb2.py b/plugin_runner/messages/events_pb2.py deleted file mode 100644 index 9bd1615e..00000000 --- a/plugin_runner/messages/events_pb2.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: messages/events.proto -# Protobuf Python Version: 4.25.0 -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import builder as _builder -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from messages import effects_pb2 as messages_dot_effects__pb2 - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15messages/events.proto\x12\x06\x63\x61nvas\x1a\x16messages/effects.proto\"8\n\x05\x45vent\x12\x1f\n\x04type\x18\x01 \x01(\x0e\x32\x11.canvas.EventType\x12\x0e\n\x06target\x18\x02 \x01(\t\"A\n\rEventResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\x12\x1f\n\x07\x65\x66\x66\x65\x63ts\x18\x02 \x03(\x0b\x32\x0e.canvas.Effect*\x95\x0c\n\tEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x1f\n\x1b\x41LLERGY_INTOLERANCE_CREATED\x10\x01\x12\x1f\n\x1b\x41LLERGY_INTOLERANCE_UPDATED\x10\x02\x12\x16\n\x12\x41PPOINTMENT_BOOKED\x10\x03\x12\x18\n\x14\x41PPOINTMENT_CANCELED\x10\x04\x12\x1a\n\x16\x41PPOINTMENT_CHECKED_IN\x10\x05\x12\x17\n\x13\x41PPOINTMENT_CREATED\x10\x06\x12\x19\n\x15\x41PPOINTMENT_NO_SHOWED\x10\x07\x12\x1b\n\x17\x41PPOINTMENT_RESCHEDULED\x10\x08\x12\x18\n\x14\x41PPOINTMENT_RESTORED\x10\t\x12\x17\n\x13\x41PPOINTMENT_UPDATED\x10\n\x12\x1d\n\x19\x42ILLING_LINE_ITEM_CREATED\x10\x0b\x12\x1d\n\x19\x42ILLING_LINE_ITEM_UPDATED\x10\x0c\x12\x16\n\x12\x43ONDITION_ASSESSED\x10\r\x12\x15\n\x11\x43ONDITION_CREATED\x10\x0e\x12\x16\n\x12\x43ONDITION_RESOLVED\x10\x0f\x12\x15\n\x11\x43ONDITION_UPDATED\x10\x10\x12\x13\n\x0f\x43ONSENT_CREATED\x10\x11\x12\x13\n\x0f\x43ONSENT_DELETED\x10\x12\x12\x13\n\x0f\x43ONSENT_UPDATED\x10\x13\x12\x14\n\x10\x43OVERAGE_CREATED\x10\x14\x12\x14\n\x10\x43OVERAGE_UPDATED\x10\x15\x12\x15\n\x11\x45NCOUNTER_CREATED\x10\x16\x12\x15\n\x11\x45NCOUNTER_UPDATED\x10\x17\x12\x1a\n\x16\x45XTERNAL_EVENT_CREATED\x10\x18\x12\x1a\n\x16\x45XTERNAL_EVENT_UPDATED\x10\x19\x12\x1a\n\x16IMAGING_REPORT_CREATED\x10\x1a\x12\x1a\n\x16IMAGING_REPORT_UPDATED\x10\x1b\x12\x18\n\x14IMMUNIZATION_CREATED\x10\x1c\x12\"\n\x1eIMMUNIZATION_STATEMENT_CREATED\x10\x1d\x12\"\n\x1eIMMUNIZATION_STATEMENT_UPDATED\x10\x1e\x12\x18\n\x14IMMUNIZATION_UPDATED\x10\x1f\x12\x17\n\x13INSTRUCTION_CREATED\x10 \x12\x17\n\x13INSTRUCTION_UPDATED\x10!\x12\x15\n\x11INTERVIEW_CREATED\x10\"\x12\x15\n\x11INTERVIEW_UPDATED\x10#\x12\x15\n\x11LAB_ORDER_CREATED\x10$\x12\x15\n\x11LAB_ORDER_UPDATED\x10%\x12\x16\n\x12LAB_REPORT_CREATED\x10&\x12\x16\n\x12LAB_REPORT_UPDATED\x10\'\x12 \n\x1cMEDICATION_LIST_ITEM_CREATED\x10(\x12 \n\x1cMEDICATION_LIST_ITEM_UPDATED\x10)\x12\x13\n\x0fMESSAGE_CREATED\x10*\x12\x13\n\x0fPATIENT_CREATED\x10+\x12\x13\n\x0fPATIENT_UPDATED\x10,\x12\x18\n\x14PRESCRIPTION_CREATED\x10-\x12\x18\n\x14PRESCRIPTION_UPDATED\x10.\x12\x1b\n\x17REFERRAL_REPORT_CREATED\x10/\x12\x1b\n\x17REFERRAL_REPORT_UPDATED\x10\x30\x12\x11\n\rTASK_ASSIGNED\x10\x31\x12\x0f\n\x0bTASK_CLOSED\x10\x32\x12\x18\n\x14TASK_COMMENT_CREATED\x10\x33\x12\x18\n\x14TASK_COMMENT_UPDATED\x10\x34\x12\x12\n\x0eTASK_COMPLETED\x10\x35\x12\x10\n\x0cTASK_CREATED\x10\x36\x12\x18\n\x14TASK_LABELS_ADJUSTED\x10\x37\x12\x13\n\x0fTASK_UNASSIGNED\x10\x38\x12\x10\n\x0cTASK_UPDATED\x10\x39\x12\x16\n\x12VITAL_SIGN_CREATED\x10:\x12\x16\n\x12VITAL_SIGN_UPDATED\x10;\x12\x10\n\x0c\x43HART_OPENED\x10<\x12\x16\n\x12\x43OMMAND_ORIGINATED\x10=b\x06proto3') - -_globals = globals() -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'messages.events_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_EVENTTYPE']._serialized_start=183 - _globals['_EVENTTYPE']._serialized_end=1740 - _globals['_EVENT']._serialized_start=57 - _globals['_EVENT']._serialized_end=113 - _globals['_EVENTRESPONSE']._serialized_start=115 - _globals['_EVENTRESPONSE']._serialized_end=180 -# @@protoc_insertion_point(module_scope) diff --git a/plugin_runner/plugin_runner.py b/plugin_runner/plugin_runner.py index b59d1917..69d66a7f 100644 --- a/plugin_runner/plugin_runner.py +++ b/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): diff --git a/protobufs/generate_protobufs.sh b/protobufs/generate_protobufs.sh index a432383b..49aa7e74 100755 --- a/protobufs/generate_protobufs.sh +++ b/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 diff --git a/protobufs/messages/effects.proto b/protobufs/generated/messages/effects.proto similarity index 100% rename from protobufs/messages/effects.proto rename to protobufs/generated/messages/effects.proto diff --git a/protobufs/messages/events.proto b/protobufs/generated/messages/events.proto similarity index 97% rename from protobufs/messages/events.proto rename to protobufs/generated/messages/events.proto index 03d163a3..7f411340 100644 --- a/protobufs/messages/events.proto +++ b/protobufs/generated/messages/events.proto @@ -1,6 +1,6 @@ syntax = 'proto3'; -import "messages/effects.proto"; +import "generated/messages/effects.proto"; package canvas; diff --git a/protobufs/services/plugin_runner.proto b/protobufs/generated/services/plugin_runner.proto similarity index 74% rename from protobufs/services/plugin_runner.proto rename to protobufs/generated/services/plugin_runner.proto index e1922d7e..a9bda501 100644 --- a/protobufs/services/plugin_runner.proto +++ b/protobufs/generated/services/plugin_runner.proto @@ -1,6 +1,6 @@ syntax = 'proto3'; -import "messages/events.proto"; +import "generated/messages/events.proto"; package canvas;