From 6edd6c9a6fb459c83d392fc85e6e6f842517e259 Mon Sep 17 00:00:00 2001
From: Joe Wilson <joe.wilson@canvasmedical.com>
Date: Tue, 9 Apr 2024 13:38:26 -0700
Subject: [PATCH] Moves generated directory and changes imports.

---
 canvas_sdk/effects/__init__.py                            | 2 +-
 .../generated => generated}/messages/effects_pb2.py       | 0
 .../generated => generated}/messages/effects_pb2.pyi      | 0
 .../generated => generated}/messages/effects_pb2_grpc.py  | 0
 .../generated => generated}/messages/events_pb2.py        | 0
 .../generated => generated}/messages/events_pb2.pyi       | 0
 .../generated => generated}/messages/events_pb2_grpc.py   | 0
 .../generated => generated}/messages/plugins_pb2.py       | 0
 .../generated => generated}/messages/plugins_pb2.pyi      | 0
 .../generated => generated}/messages/plugins_pb2_grpc.py  | 0
 .../generated => generated}/services/plugin_runner_pb2.py | 0
 .../services/plugin_runner_pb2.pyi                        | 0
 .../services/plugin_runner_pb2_grpc.py                    | 0
 plugin_runner/{runner.py => plugin_runner.py}             | 1 +
 protobufs/generate_protobufs.sh                           | 8 +++++---
 15 files changed, 7 insertions(+), 4 deletions(-)
 rename {plugin_runner/generated => generated}/messages/effects_pb2.py (100%)
 rename {plugin_runner/generated => generated}/messages/effects_pb2.pyi (100%)
 rename {plugin_runner/generated => generated}/messages/effects_pb2_grpc.py (100%)
 rename {plugin_runner/generated => generated}/messages/events_pb2.py (100%)
 rename {plugin_runner/generated => generated}/messages/events_pb2.pyi (100%)
 rename {plugin_runner/generated => generated}/messages/events_pb2_grpc.py (100%)
 rename {plugin_runner/generated => generated}/messages/plugins_pb2.py (100%)
 rename {plugin_runner/generated => generated}/messages/plugins_pb2.pyi (100%)
 rename {plugin_runner/generated => generated}/messages/plugins_pb2_grpc.py (100%)
 rename {plugin_runner/generated => generated}/services/plugin_runner_pb2.py (100%)
 rename {plugin_runner/generated => generated}/services/plugin_runner_pb2.pyi (100%)
 rename {plugin_runner/generated => generated}/services/plugin_runner_pb2_grpc.py (100%)
 rename plugin_runner/{runner.py => plugin_runner.py} (99%)

diff --git a/canvas_sdk/effects/__init__.py b/canvas_sdk/effects/__init__.py
index fbf79797..e5aa9d5b 100644
--- 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/plugin_runner/generated/messages/effects_pb2.py b/generated/messages/effects_pb2.py
similarity index 100%
rename from plugin_runner/generated/messages/effects_pb2.py
rename to generated/messages/effects_pb2.py
diff --git a/plugin_runner/generated/messages/effects_pb2.pyi b/generated/messages/effects_pb2.pyi
similarity index 100%
rename from plugin_runner/generated/messages/effects_pb2.pyi
rename to generated/messages/effects_pb2.pyi
diff --git a/plugin_runner/generated/messages/effects_pb2_grpc.py b/generated/messages/effects_pb2_grpc.py
similarity index 100%
rename from plugin_runner/generated/messages/effects_pb2_grpc.py
rename to generated/messages/effects_pb2_grpc.py
diff --git a/plugin_runner/generated/messages/events_pb2.py b/generated/messages/events_pb2.py
similarity index 100%
rename from plugin_runner/generated/messages/events_pb2.py
rename to generated/messages/events_pb2.py
diff --git a/plugin_runner/generated/messages/events_pb2.pyi b/generated/messages/events_pb2.pyi
similarity index 100%
rename from plugin_runner/generated/messages/events_pb2.pyi
rename to generated/messages/events_pb2.pyi
diff --git a/plugin_runner/generated/messages/events_pb2_grpc.py b/generated/messages/events_pb2_grpc.py
similarity index 100%
rename from plugin_runner/generated/messages/events_pb2_grpc.py
rename to generated/messages/events_pb2_grpc.py
diff --git a/plugin_runner/generated/messages/plugins_pb2.py b/generated/messages/plugins_pb2.py
similarity index 100%
rename from plugin_runner/generated/messages/plugins_pb2.py
rename to generated/messages/plugins_pb2.py
diff --git a/plugin_runner/generated/messages/plugins_pb2.pyi b/generated/messages/plugins_pb2.pyi
similarity index 100%
rename from plugin_runner/generated/messages/plugins_pb2.pyi
rename to generated/messages/plugins_pb2.pyi
diff --git a/plugin_runner/generated/messages/plugins_pb2_grpc.py b/generated/messages/plugins_pb2_grpc.py
similarity index 100%
rename from plugin_runner/generated/messages/plugins_pb2_grpc.py
rename to generated/messages/plugins_pb2_grpc.py
diff --git a/plugin_runner/generated/services/plugin_runner_pb2.py b/generated/services/plugin_runner_pb2.py
similarity index 100%
rename from plugin_runner/generated/services/plugin_runner_pb2.py
rename to generated/services/plugin_runner_pb2.py
diff --git a/plugin_runner/generated/services/plugin_runner_pb2.pyi b/generated/services/plugin_runner_pb2.pyi
similarity index 100%
rename from plugin_runner/generated/services/plugin_runner_pb2.pyi
rename to generated/services/plugin_runner_pb2.pyi
diff --git a/plugin_runner/generated/services/plugin_runner_pb2_grpc.py b/generated/services/plugin_runner_pb2_grpc.py
similarity index 100%
rename from plugin_runner/generated/services/plugin_runner_pb2_grpc.py
rename to generated/services/plugin_runner_pb2_grpc.py
diff --git a/plugin_runner/runner.py b/plugin_runner/plugin_runner.py
similarity index 99%
rename from plugin_runner/runner.py
rename to plugin_runner/plugin_runner.py
index bc332c2e..0a1929a9 100644
--- a/plugin_runner/runner.py
+++ b/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
index 35023e02..d09bf73f 100755
--- 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