canvas 0.16.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

protobufs/canvas_generated/messages/plugins.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+message ReloadPluginsRequest {
+
+}
+
+message ReloadPluginsResponse {
+  bool success = 1;
+}

protobufs/canvas_generated/services/plugin_runner.proto

@@ -0,0 +1,12 @@
+syntax = 'proto3';
+
+import "canvas_generated/messages/events.proto";
+import "canvas_generated/messages/plugins.proto";
+
+package canvas;
+
+service PluginRunner {
+  rpc HandleEvent (Event) returns (stream EventResponse);
+
+  rpc ReloadPlugins (ReloadPluginsRequest) returns (stream ReloadPluginsResponse);
+}

settings.py

@@ -12,12 +12,14 @@ ENV = os.getenv("ENV", "development")
 IS_PRODUCTION = ENV == "production"
 IS_TESTING = env_to_bool("IS_TESTING", "pytest" in sys.argv[0] or sys.argv[0] == "-c")
 CUSTOMER_IDENTIFIER = os.getenv("CUSTOMER_IDENTIFIER", "local")
+APP_NAME = os.getenv("APP_NAME")
 
 INTEGRATION_TEST_URL = os.getenv("INTEGRATION_TEST_URL")
 INTEGRATION_TEST_CLIENT_ID = os.getenv("INTEGRATION_TEST_CLIENT_ID")
 INTEGRATION_TEST_CLIENT_SECRET = os.getenv("INTEGRATION_TEST_CLIENT_SECRET")
 
 GRAPHQL_ENDPOINT = os.getenv("GRAPHQL_ENDPOINT", "http://localhost:8000/plugins-graphql")
+REDIS_ENDPOINT = os.getenv("REDIS_ENDPOINT", f"redis://{APP_NAME}-redis:6379")
 
 INSTALLED_APPS = [
     "canvas_sdk.v1",
@@ -68,7 +70,8 @@ PLUGIN_DIRECTORY = os.getenv(
         else "./custom-plugins"
     ),
 )
-
+PLUGINS_PUBSUB_CHANNEL = os.getenv("PLUGINS_PUBSUB_CHANNEL", default="plugins")
+CHANNEL_NAME = f"{CUSTOMER_IDENTIFIER}:{PLUGINS_PUBSUB_CHANNEL}"
 MANIFEST_FILE_NAME = "CANVAS_MANIFEST.json"
 
 SECRETS_FILE_NAME = "SECRETS.json"

canvas-0.16.0.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-canvas=canvas_cli.main:app
-

plugin_runner/plugin_synchronizer.py

@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import pickle
-from pathlib import Path
-from subprocess import STDOUT, CalledProcessError, check_output
-
-import redis
-
-from plugin_runner.plugin_installer import install_plugins
-
-APP_NAME = os.getenv("APP_NAME")
-
-CUSTOMER_IDENTIFIER = os.getenv("CUSTOMER_IDENTIFIER")
-PLUGINS_PUBSUB_CHANNEL = os.getenv("PLUGINS_PUBSUB_CHANNEL", default="plugins")
-
-CHANNEL_NAME = f"{CUSTOMER_IDENTIFIER}:{PLUGINS_PUBSUB_CHANNEL}"
-
-REDIS_ENDPOINT = os.getenv("REDIS_ENDPOINT", f"redis://{APP_NAME}-redis:6379")
-
-try:
-    CLIENT_ID = Path("/app/container-unique-id.txt").read_text()
-except FileNotFoundError:
-    CLIENT_ID = "non-unique"
-
-
-def get_client() -> tuple[redis.Redis, redis.client.PubSub]:
-    """Return a Redis client and pubsub object."""
-    client = redis.Redis.from_url(REDIS_ENDPOINT)
-    pubsub = client.pubsub()
-
-    return client, pubsub
-
-
-def publish_message(message: dict) -> None:
-    """Publish a message to the pubsub channel."""
-    client, _ = get_client()
-
-    message_with_id = {**message, "client_id": CLIENT_ID}
-
-    client.publish(CHANNEL_NAME, pickle.dumps(message_with_id))
-    client.close()
-
-
-def main() -> None:
-    """Listen for messages on the pubsub channel and restart the plugin-runner."""
-    print("plugin-synchronizer: starting")
-    try:
-        print("plugin-synchronizer: installing plugins after web container start")
-        install_plugins()
-        print("plugin-synchronizer: sending SIGHUP to plugin-runner")
-        check_output(["circusctl", "signal", "plugin-runner", "1"], cwd="/app", stderr=STDOUT)
-    except CalledProcessError as e:
-        print("plugin-synchronizer: `install_plugins` failed:", e)
-
-    _, pubsub = get_client()
-
-    pubsub.psubscribe(CHANNEL_NAME)
-
-    for message in pubsub.listen():
-        if not message:
-            continue
-
-        message_type = message.get("type", "")
-
-        if message_type != "pmessage":
-            continue
-
-        data = pickle.loads(message.get("data", pickle.dumps({})))
-
-        if "action" not in data or "client_id" not in data:
-            continue
-
-        if data["action"] == "restart":
-            # Run the plugin installer process
-            try:
-                print("plugin-synchronizer: installing plugins after receiving restart message")
-                install_plugins()
-            except CalledProcessError as e:
-                print("plugin-synchronizer: `install_plugins` failed:", e)
-
-            try:
-                print("plugin-synchronizer: sending SIGHUP to plugin-runner")
-                check_output(
-                    ["circusctl", "signal", "plugin-runner", "1"], cwd="/app", stderr=STDOUT
-                )
-            except CalledProcessError as e:
-                print("plugin-synchronizer: `circusctl signal plugin-runner 1` failed:", e)
-
-
-if __name__ == "__main__":
-    main()