canvas 0.19.0__py3-none-any.whl → 0.19.1__py3-none-any.whl

{canvas-0.19.0.dist-info → canvas-0.19.1.dist-info}/METADATA

@@ -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.0.dist-info → canvas-0.19.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-settings.py,sha256=wtQMRHsbynzEjZb5WmUMV3q27oWc6prLS9ztnEAsqMg,2829
+settings.py,sha256=Mk332hOSmNyLVRKLUhtc1Kll-P5Iun7vbkZ0chwnOAs,3176
 canvas_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 canvas_cli/conftest.py,sha256=0mEjjU7_w9nq-HCvscxFJClw-EeyQYujNLLRPssksZQ,931
 canvas_cli/main.py,sha256=L6JQkt1yxy30cA3-M9v7JD8WMW4i0M5GPr9kZetAito,2728
@@ -110,7 +110,7 @@ canvas_generated/messages/plugins_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCN
 canvas_generated/services/plugin_runner_pb2.py,sha256=RfAo_imYoSuoexq-1IHhMhXZgQpzq91pqugxsigL8NU,1557
 canvas_generated/services/plugin_runner_pb2.pyi,sha256=1w-Pa4k7HtlmQAr7B6sgV64zdZplBKQKHN-S8bjwO3w,265
 canvas_generated/services/plugin_runner_pb2_grpc.py,sha256=EzJJVkP_AZ3dwBA7OxUito0NSalRmjjg8q9TZ_P18ww,4549
-canvas_sdk/__init__.py,sha256=d7V1Qsp4hSqp8opmvqp-0J33uibArUjwENMfzSDAdZg,102
+canvas_sdk/__init__.py,sha256=7IuwjhqIaOO5BgCfXi-B1eV6XfK9Ku5PHPWuTGeDNgU,151
 canvas_sdk/base.py,sha256=aaWilIx70lsAE76x7QaJolyIvcFnXDGPw1UMv9t0FDw,2035
 canvas_sdk/commands/__init__.py,sha256=cNQy1Y_Ji3cPush2hbaoXC3pbIFmobv_Vm-UG0w0hlc,2696
 canvas_sdk/commands/base.py,sha256=ScfOo4QXTInhTf6OGLT5dEu81yhZAcgVT8qxwIKWbow,5155
@@ -190,7 +190,6 @@ canvas_sdk/templates/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 canvas_sdk/templates/tests/test_utils.py,sha256=VRahmmVwXKcp1NMLoA3BZL4cFFXzFnD-i5IUpcEeXTg,1832
 canvas_sdk/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 canvas_sdk/utils/__init__.py,sha256=nZEfYeU-qNZBOh39b8zAuEh0Wzh2PgXxs0NRKKe66Pg,184
-canvas_sdk/utils/db.py,sha256=0AO5bhu-k9OsAHpXe1RHzyDZnBGHUEzrv8-vYtTIoeA,592
 canvas_sdk/utils/http.py,sha256=McFtcrgdR2W8XguTaTF54O5Xf5r5buoYDldDM5H5ahY,5846
 canvas_sdk/utils/plugins.py,sha256=853MW2fiLpyG3o9ISEawAthQeRiZP73cai5Tngwu4MY,767
 canvas_sdk/utils/stats.py,sha256=sJhIW_IssUVefQN6rrUAt1P0KvVIUIYcnpZlMHLibNA,732
@@ -255,7 +254,7 @@ plugin_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plugin_runner/authentication.py,sha256=SDPso2AogtLAV_H0LuMDp99IMZuF3oTq-Q_AXAvJ8uc,1116
 plugin_runner/aws_headers.py,sha256=DenX_nAMVhXMJZw88PLZbqJsi5_XriNtr3jE-eJqHY4,2773
 plugin_runner/exceptions.py,sha256=YnRZiQVzbU3HrVlmEXLje_np99009YnhTRVHHyBCtqc,433
-plugin_runner/plugin_installer.py,sha256=0gHMpI4CDkWljbU7HLhbPjl2E_oHxDZMlmPtTqCyS9o,7748
+plugin_runner/plugin_installer.py,sha256=8hWllx7YciatEozFRwcp5Y_L_KyEi2e8CGienRWrZs0,7375
 plugin_runner/plugin_runner.py,sha256=h_FHStJrvRiG9DSf8uXHKFb4aby2wBzLAe10Ov4xnas,16437
 plugin_runner/sandbox.py,sha256=P64SKpKZdoJwk2NsirGRKq7xjygBtvdipIAVSD5roY8,14509
 plugin_runner/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -329,7 +328,7 @@ protobufs/canvas_generated/messages/plugins.proto,sha256=oNainUPWFYQjgCX7bJEPI9_
 protobufs/canvas_generated/services/plugin_runner.proto,sha256=doadBKn5k4xAtOgR-q_pEvW4yzxpUaHNOowMG6CL5GY,304
 pubsub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pubsub/pubsub.py,sha256=pyTW0JU8mtaqiAV6g6xjZwel1CVy2EonPMU-_vkmhUM,1044
-canvas-0.19.0.dist-info/METADATA,sha256=9BEPGPmvmAz3MMnfXYJlCQ7mIWYBavowj7fLjb4emqQ,4375
-canvas-0.19.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-canvas-0.19.0.dist-info/entry_points.txt,sha256=0Vs_9GmTVUNniH6eDBlRPgofmADMV4BES6Ao26M4AbM,47
-canvas-0.19.0.dist-info/RECORD,,
+canvas-0.19.1.dist-info/METADATA,sha256=7w1TpwcKJ-BjC9HRzHYW4OW6LzUFr1gHFxlqRrIkX-U,4375
+canvas-0.19.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+canvas-0.19.1.dist-info/entry_points.txt,sha256=0Vs_9GmTVUNniH6eDBlRPgofmADMV4BES6Ao26M4AbM,47
+canvas-0.19.1.dist-info/RECORD,,

canvas_sdk/__init__.py

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

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):

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_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,
-    }