canvas 0.19.0__tar.gz → 0.19.1__tar.gz

{canvas-0.19.0 → canvas-0.19.1}/PKG-INFO

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

canvas-0.19.1/canvas_sdk/__init__.py

@@ -0,0 +1,9 @@
+import os
+import sys
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+if "mypy" not in sys.argv[0]:
+    import django
+
+    django.setup()

{canvas-0.19.0 → canvas-0.19.1}/plugin_runner/plugin_installer.py

@@ -6,7 +6,7 @@ import tempfile
 from collections.abc import Generator
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Any, TypedDict
+from typing import TypedDict, cast
 from urllib import parse
 
 import psycopg
@@ -30,41 +30,32 @@ from settings import (
 UPLOAD_TO_PREFIX = "plugins"
 
 
-def get_database_dict_from_url() -> dict[str, Any]:
-    """Creates a psycopg ready dictionary from the home-app database URL."""
-    parsed_url = parse.urlparse(os.getenv("DATABASE_URL"))
-    db_name = parsed_url.path[1:]
-    return {
-        "dbname": db_name,
-        "user": parsed_url.username,
-        "password": parsed_url.password,
-        "host": parsed_url.hostname,
-        "port": parsed_url.port,
-    }
+def open_database_connection() -> Connection:
+    """Opens a psycopg connection to the home-app database.
 
+    When running within Aptible, use the database URL, otherwise pull from
+    the environment variables.
+    """
+    if os.getenv("DATABASE_URL"):
+        parsed_url = parse.urlparse(os.getenv("DATABASE_URL"))
+
+        return psycopg.connect(
+            dbname=cast(str, parsed_url.path[1:]),
+            user=cast(str, parsed_url.username),
+            password=cast(str, parsed_url.password),
+            host=cast(str, parsed_url.hostname),
+            port=parsed_url.port,
+        )
 
-def get_database_dict_from_env() -> dict[str, Any]:
-    """Creates a psycopg ready dictionary from the environment variables."""
     APP_NAME = os.getenv("APP_NAME")
 
-    return {
-        "dbname": APP_NAME,
-        "user": os.getenv("DB_USERNAME", "app"),
-        "password": os.getenv("DB_PASSWORD", "app"),
-        "host": os.getenv("DB_HOST", f"{APP_NAME}-db"),
-        "port": os.getenv("DB_PORT", "5432"),
-    }
-
-
-def open_database_connection() -> Connection:
-    """Opens a psycopg connection to the home-app database."""
-    # When running within Aptible, use the database URL, otherwise pull from the environment variables.
-    if os.getenv("DATABASE_URL"):
-        database_dict = get_database_dict_from_url()
-    else:
-        database_dict = get_database_dict_from_env()
-    conn = psycopg.connect(**database_dict)
-    return conn
+    return psycopg.connect(
+        dbname=APP_NAME,
+        user=os.getenv("DB_USERNAME", "app"),
+        password=os.getenv("DB_PASSWORD", "app"),
+        host=os.getenv("DB_HOST", f"{APP_NAME}-db"),
+        port=os.getenv("DB_PORT", "5432"),
+    )
 
 
 class PluginAttributes(TypedDict):

{canvas-0.19.0 → canvas-0.19.1}/pyproject.toml

@@ -50,7 +50,7 @@ license = "MIT"
 name = "canvas"
 readme = "README.md"
 requires-python = ">=3.11,<3.13"
-version = "0.19.0"
+version = "0.19.1"
 
 [project.scripts]
 canvas = "canvas_cli.main:app"
@@ -158,7 +158,11 @@ extend-immutable-calls = ["typer.Argument", "typer.Option"]
 convention = "google"
 
 [tool.semantic_release]
-build_command = "uv build"
+build_command = """
+uv lock
+git add uv.lock
+uv build
+"""
 commit_message = "chore: v{version}\n\nSee the changelog for changes."
 commit_version_number = true
 match = "main"

{canvas-0.19.0 → canvas-0.19.1}/settings.py

@@ -1,11 +1,10 @@
 import os
 import sys
+from urllib import parse
 
 from dotenv import load_dotenv
 from env_tools import env_to_bool
 
-from canvas_sdk.utils.db import get_database_dict_from_url
-
 load_dotenv()
 
 ENV = os.getenv("ENV", "development")
@@ -40,19 +39,30 @@ CANVAS_SDK_DB_HOST = os.getenv("CANVAS_SDK_DB_HOST", "home-app-db")
 CANVAS_SDK_DB_PORT = os.getenv("CANVAS_SDK_DB_PORT", "5432")
 
 if os.getenv("DATABASE_URL"):
-    database_dict = get_database_dict_from_url()
+    parsed_url = parse.urlparse(os.getenv("DATABASE_URL"))
+
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.postgresql",
+            "NAME": parsed_url.path[1:],
+            "USER": os.getenv("CANVAS_SDK_DATABASE_ROLE"),
+            "PASSWORD": os.getenv("CANVAS_SDK_DATABASE_ROLE_PASSWORD"),
+            "HOST": parsed_url.hostname,
+            "PORT": parsed_url.port,
+        }
+    }
 else:
-    database_dict = {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": CANVAS_SDK_DB_NAME,
-        "USER": CANVAS_SDK_DB_USERNAME,
-        "PASSWORD": CANVAS_SDK_DB_PASSWORD,
-        "HOST": CANVAS_SDK_DB_HOST,
-        "PORT": CANVAS_SDK_DB_PORT,
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.postgresql",
+            "NAME": CANVAS_SDK_DB_NAME,
+            "USER": CANVAS_SDK_DB_USERNAME,
+            "PASSWORD": CANVAS_SDK_DB_PASSWORD,
+            "HOST": CANVAS_SDK_DB_HOST,
+            "PORT": CANVAS_SDK_DB_PORT,
+        }
     }
 
-DATABASES = {"default": database_dict}
-
 AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID", "")
 AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY", "")
 AWS_REGION = os.getenv("AWS_REGION", "us-west-2")

canvas-0.19.0/canvas_sdk/__init__.py

@@ -1,7 +0,0 @@
-import os
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-
-import django
-
-django.setup()

canvas-0.19.0/canvas_sdk/utils/db.py

@@ -1,17 +0,0 @@
-import os
-from typing import Any
-from urllib import parse
-
-
-def get_database_dict_from_url() -> dict[str, Any]:
-    """Retrieves the database URL for the data module connection formatted for Django settings."""
-    parsed_url = parse.urlparse(os.getenv("DATABASE_URL"))
-    db_name = parsed_url.path[1:]
-    return {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": db_name,
-        "USER": os.getenv("CANVAS_SDK_DATABASE_ROLE"),
-        "PASSWORD": os.getenv("CANVAS_SDK_DATABASE_ROLE_PASSWORD"),
-        "HOST": parsed_url.hostname,
-        "PORT": parsed_url.port,
-    }