Moves generated directory and changes imports.

canvas-medical · Apr 9, 2024 · 6edd6c9 · 6edd6c9
1 parent c687bb1
commit 6edd6c9
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 4 deletions.
diff --git a/canvas_sdk/effects/__init__.py b/canvas_sdk/effects/__init__.py
@@ -1 +1 @@
-from plugin_runner.generated.messages.effects_pb2 import Effect, EffectType
+from generated.messages.effects_pb2 import Effect, EffectType
diff --git a/..._runner/generated/messages/effects_pb2.py → generated/messages/effects_pb2.py b/..._runner/generated/messages/effects_pb2.py → generated/messages/effects_pb2.py
diff --git a/...runner/generated/messages/effects_pb2.pyi → generated/messages/effects_pb2.pyi b/...runner/generated/messages/effects_pb2.pyi → generated/messages/effects_pb2.pyi
diff --git a/...er/generated/messages/effects_pb2_grpc.py → generated/messages/effects_pb2_grpc.py b/...er/generated/messages/effects_pb2_grpc.py → generated/messages/effects_pb2_grpc.py
diff --git a/...n_runner/generated/messages/events_pb2.py → generated/messages/events_pb2.py b/...n_runner/generated/messages/events_pb2.py → generated/messages/events_pb2.py
diff --git a/..._runner/generated/messages/events_pb2.pyi → generated/messages/events_pb2.pyi b/..._runner/generated/messages/events_pb2.pyi → generated/messages/events_pb2.pyi
diff --git a/...ner/generated/messages/events_pb2_grpc.py → generated/messages/events_pb2_grpc.py b/...ner/generated/messages/events_pb2_grpc.py → generated/messages/events_pb2_grpc.py
diff --git a/..._runner/generated/messages/plugins_pb2.py → generated/messages/plugins_pb2.py b/..._runner/generated/messages/plugins_pb2.py → generated/messages/plugins_pb2.py
diff --git a/...runner/generated/messages/plugins_pb2.pyi → generated/messages/plugins_pb2.pyi b/...runner/generated/messages/plugins_pb2.pyi → generated/messages/plugins_pb2.pyi
diff --git a/...er/generated/messages/plugins_pb2_grpc.py → generated/messages/plugins_pb2_grpc.py b/...er/generated/messages/plugins_pb2_grpc.py → generated/messages/plugins_pb2_grpc.py
diff --git a/...r/generated/services/plugin_runner_pb2.py → generated/services/plugin_runner_pb2.py b/...r/generated/services/plugin_runner_pb2.py → generated/services/plugin_runner_pb2.py
diff --git a/.../generated/services/plugin_runner_pb2.pyi → generated/services/plugin_runner_pb2.pyi b/.../generated/services/plugin_runner_pb2.pyi → generated/services/plugin_runner_pb2.pyi
diff --git a/...erated/services/plugin_runner_pb2_grpc.py → generated/services/plugin_runner_pb2_grpc.py b/...erated/services/plugin_runner_pb2_grpc.py → generated/services/plugin_runner_pb2_grpc.py
diff --git a/plugin_runner/runner.py → plugin_runner/plugin_runner.py b/plugin_runner/runner.py → plugin_runner/plugin_runner.py
@@ -10,6 +10,7 @@
 
 import grpc
 
+from canvas_sdk.effects import Effect, EffectType
 from generated.messages.events_pb2 import Event, EventResponse, EventType
 from generated.messages.plugins_pb2 import ReloadPluginsRequest, ReloadPluginsResponse
 from generated.services.plugin_runner_pb2_grpc import (

diff --git a/protobufs/generate_protobufs.sh b/protobufs/generate_protobufs.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 
+# Run this script from inside the /protobufs directory
+
 pushd ..
 
 python \
   -m grpc_tools.protoc \
   -I=protobufs/ \
-  --python_out=plugin_runner/ \
-  --pyi_out=plugin_runner/ \
-  --grpc_python_out=plugin_runner/ \
+  --python_out=./ \
+  --pyi_out=./ \
+  --grpc_python_out=./ \
   protobufs/generated/**/*.proto
 
 popd
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from plugin_runner.generated.messages.effects_pb2 import Effect, EffectType
		from generated.messages.effects_pb2 import Effect, EffectType