canvas 0.56.0__tar.gz → 0.57.1__tar.gz

{canvas-0.56.0 → canvas-0.57.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: canvas
-Version: 0.56.0
+Version: 0.57.1
 Summary: SDK to customize event-driven actions in your Canvas instance
 Author-email: Canvas Team <engineering@canvasmedical.com>
 License-Expression: MIT

canvas-0.57.1/canvas_cli/apps/plugin/__init__.py

@@ -0,0 +1,23 @@
+from canvas_cli.apps.plugin.plugin import (
+    disable,
+    enable,
+    init,
+    install,
+    list,
+    list_secrets,
+    set_secrets,
+    uninstall,
+    validate_manifest,
+)
+
+__all__ = (
+    "list_secrets",
+    "set_secrets",
+    "disable",
+    "enable",
+    "init",
+    "install",
+    "list",
+    "uninstall",
+    "validate_manifest",
+)

{canvas-0.56.0 → canvas-0.57.1}/canvas_cli/apps/plugin/plugin.py

@@ -1,9 +1,12 @@
 import ast
+import base64
+import builtins
 import json
 import tarfile
 import tempfile
 from collections.abc import Iterable
 from pathlib import Path
+from pprint import pprint
 from typing import Any, cast
 from urllib.parse import urljoin
 
@@ -160,17 +163,17 @@ def _get_meta_properties(protocol_path: Path, classname: str) -> dict[str, str]:
         if isinstance(meta_b.value, ast.Constant):
             value = meta_b.value.value
         elif isinstance(meta_b.value, ast.List):
-            value = [cast(ast.Constant, e).value for e in meta_b.value.elts]
+            value = [cast(ast.Constant, e).value for e in meta_b.value.elts]  # type: ignore[assignment]
         elif isinstance(meta_b.value, ast.Dict):
             keys = meta_b.value.keys
             values = meta_b.value.values
-            value = {
+            value = {  # type: ignore[assignment]
                 cast(ast.Constant, k).value: cast(ast.Constant, values[i]).value
                 for i, k in enumerate(keys)
             }
         else:
             value = None
-        meta[target_id] = value
+        meta[target_id] = value  # type: ignore[assignment]
 
     return meta
 
@@ -204,6 +207,18 @@ def get_base_plugin_template_path(plugin_type: str) -> Path:
             return context.plugin_template_dir / context.default_plugin_template_name
 
 
+def parse_secrets(secrets: builtins.list[str]) -> builtins.list[str]:
+    """Parse secrets from the command line, expecting them in the format Key=value."""
+    parsed_secrets = []
+
+    for secret in secrets:
+        if "=" not in secret:
+            raise typer.BadParameter(f"Invalid secret format: '{secret}'. Use key=value.")
+        parsed_secrets.append(secret)
+
+    return parsed_secrets
+
+
 def init(
     plugin_type: str = typer.Argument(
         "protocol",
@@ -222,6 +237,9 @@ def init(
 
 def install(
     plugin_name: Path = typer.Argument(..., help="Path to plugin to install"),
+    secrets: builtins.list[str] = typer.Option(
+        [], "--secret", callback=parse_secrets, help="Secrets to set, e.g. Key=value"
+    ),
     host: str | None = typer.Option(
         callback=get_default_host,
         help="Canvas instance to connect to",
@@ -243,6 +261,11 @@ def install(
     else:
         raise typer.BadParameter(f"Plugin '{plugin_name}' needs to be a valid directory")
 
+    encoded_secrets = []
+    for pair in secrets:
+        encoded = base64.b64encode(pair.encode()).decode()
+        encoded_secrets.append(("secret", encoded))
+
     print(f"Installing plugin: {built_package_path} into {host}")
 
     url = plugin_url(host)
@@ -250,10 +273,11 @@ def install(
     print(f"Posting {built_package_path.absolute()} to {url}")
 
     try:
+        data = [("is_enabled", True)] + encoded_secrets
         with open(built_package_path, "rb") as package:
             r = requests.post(
                 url,
-                data={"is_enabled": True},
+                data=data,
                 files={"package": package},
                 headers={"Authorization": f"Bearer {token}"},
             )
@@ -270,7 +294,7 @@ def install(
         package_name := _get_name_from_metadata(host, token, built_package_path)
     ):
         print(f"Plugin {package_name} already exists, updating instead...")
-        update(package_name, built_package_path, is_enabled=True, host=host)
+        update(package_name, built_package_path, is_enabled=True, secrets=secrets, host=host)
     else:
         print(f"Status code {r.status_code}: {r.text}")
         raise typer.Exit(1)
@@ -427,6 +451,58 @@ def list(
         raise typer.Exit(1)
 
 
+def list_secrets(
+    plugin: str = typer.Argument(..., help="Plugin name to list secrets for"),
+    host: str | None = typer.Option(
+        callback=get_default_host,
+        help="Canvas instance to connect to",
+        default=None,
+    ),
+) -> None:
+    """List all secrets from a plugin on a Canvas instance."""
+    if not host:
+        raise typer.BadParameter("Please specify a host or add one to the configuration file")
+
+    url = plugin_url(host, plugin, "metadata")
+
+    token = get_or_request_api_token(host)
+
+    try:
+        r = requests.get(
+            url,
+            headers={"Authorization": f"Bearer {token}"},
+        )
+    except requests.exceptions.RequestException:
+        print(f"Failed to connect to {host}")
+        raise typer.Exit(1) from None
+
+    if r.status_code == requests.codes.ok:
+        secrets = r.json().get("secrets", [])
+
+        if secrets:
+            pprint(secrets)
+        else:
+            print("No secrets configured.")
+    else:
+        print(f"Status code {r.status_code}: {r.text}")
+        raise typer.Exit(1)
+
+
+def set_secrets(
+    plugin: str = typer.Argument(..., help="Plugin name to configure"),
+    host: str | None = typer.Option(
+        callback=get_default_host,
+        help="Canvas instance to connect to",
+        default=None,
+    ),
+    secrets: builtins.list[str] = typer.Argument(
+        ..., callback=parse_secrets, help="Secrets to set, e.g. Key=value"
+    ),
+) -> None:
+    """Configure plugin secrets on a Canvas instance."""
+    update(name=plugin, package_path=None, secrets=secrets, host=host, is_enabled=None)
+
+
 def validate_manifest(
     plugin_name: Path = typer.Argument(..., help="Path to plugin to validate"),
 ) -> None:
@@ -473,6 +549,9 @@ def update(
     is_enabled: bool | None = typer.Option(
         None, "--enable/--disable", show_default=False, help="Enable/disable the plugin"
     ),
+    secrets: builtins.list[str] = typer.Option(
+        [], "--secret", callback=parse_secrets, help="Secrets to set, e.g. Key=value"
+    ),
     host: str | None = typer.Option(
         callback=get_default_host,
         help="Canvas instance to connect to",
@@ -488,12 +567,27 @@ def update(
 
     token = get_or_request_api_token(host)
 
-    print(f"Updating plugin {name} from {host} with {is_enabled=}, {package_path=}")
+    encoded_secrets = []
+    for pair in secrets:
+        encoded = base64.b64encode(pair.encode()).decode()
+        encoded_secrets.append(("secret", encoded))
+
+    args = [
+        *((f"is_enabled={is_enabled}",) if is_enabled is not None else ()),
+        *((f"package_path={package_path}",) if package_path is not None else ()),
+        *((f"secrets={','.join([s.split('=')[0] for s in secrets])}",) if secrets else ()),
+    ]
+
+    print(f"Updating plugin {name} from {host}" + (f" with {', '.join(args)}" if args else ""))
 
     url = plugin_url(host, name)
 
     try:
-        data = {"is_enabled": is_enabled} if is_enabled is not None else {}
+        data = (
+            [("is_enabled", is_enabled)] + encoded_secrets
+            if is_enabled is not None
+            else encoded_secrets
+        )
         headers = {"Authorization": f"Bearer {token}"}
 
         if package_path:
@@ -515,7 +609,10 @@ def update(
         raise typer.Exit(1) from None
 
     if r.status_code == requests.codes.ok:
-        print("New plugin version uploaded! Check logs for more details.")
+        if package_path:
+            print("New plugin version uploaded! Check logs for more details.")
+        elif secrets:
+            print("Plugin secrets successfully updated.")
 
     else:
         print(f"Status code {r.status_code}: {r.text}")

{canvas-0.56.0 → canvas-0.57.1}/canvas_cli/main.py

@@ -29,6 +29,16 @@ app.command(
 app.command(short_help="Run the specified plugins for local development.")(run_plugins)
 app.command(short_help="Run the specified plugin for local development.")(run_plugin)
 
+# Config app
+config_app = typer.Typer(help="Manage plugin secrets.", rich_markup_mode=None, add_completion=False)
+app.add_typer(config_app, name="config")
+config_app.command(name="list", short_help="List plugin secrets on a Canvas instance.")(
+    plugin.list_secrets
+)
+config_app.command(name="set", short_help="Set plugin secrets on a Canvas instance.")(
+    plugin.set_secrets
+)
+
 # Our current version
 __version__ = importlib.metadata.version("canvas")
 

{canvas-0.56.0 → canvas-0.57.1}/plugin_runner/plugin_runner.py

@@ -731,7 +731,14 @@ def main(specified_plugin_paths: list[str] | None = None) -> None:
     port = "50051"
 
     executor = ThreadPoolExecutor(max_workers=settings.PLUGIN_RUNNER_MAX_WORKERS)
-    server = grpc.server(thread_pool=executor)
+    server = grpc.server(
+        thread_pool=executor,
+        options=(
+            # set max message lengths to 64mb
+            ("grpc.max_receive_message_length", 64 * 1024 * 1024),
+            ("grpc.max_send_message_length", 64 * 1024 * 1024),
+        ),
+    )
     server.add_insecure_port("127.0.0.1:" + port)
 
     add_PluginRunnerServicer_to_server(PluginRunner(), server)

{canvas-0.56.0 → canvas-0.57.1}/pyproject.toml

@@ -6,8 +6,8 @@ requires = ["hatchling"]
 dev = [
   "grpcio-tools>=1.60.1,<2",
   "httpretty>=1.1.4",
-  "mypy",
-  "pre-commit",
+  "mypy>=1.17.0,<2",
+  "pre-commit>=4.3.0,<5",
   "psutil>=7.0.0",
   "pytest",
   "pytest-cov",
@@ -57,7 +57,7 @@ license = "MIT"
 name = "canvas"
 readme = "README.md"
 requires-python = ">=3.11,<3.13"
-version = "0.56.0"
+version = "0.57.1"
 
 [project.scripts]
 canvas = "canvas_cli.main:app"
@@ -181,6 +181,7 @@ version_source = "tag"
 version_toml = ["pyproject.toml:project.version"]
 
 [tool.uv]
+required-version = "~=0.8.0"
 
 [[tool.uv.index]]
 default = true

canvas-0.56.0/canvas_cli/apps/plugin/__init__.py

@@ -1,11 +0,0 @@
-from canvas_cli.apps.plugin.plugin import (
-    disable,
-    enable,
-    init,
-    install,
-    list,
-    uninstall,
-    validate_manifest,
-)
-
-__all__ = ("uninstall", "enable", "disable", "init", "validate_manifest", "install", "list")