canvas 0.69.0__py3-none-any.whl → 0.71.0__py3-none-any.whl

canvas_sdk/commands/commands/family_history.py

@@ -1,4 +1,7 @@
+from pydantic_core import InitErrorDetails
+
 from canvas_sdk.commands.base import _BaseCommand as BaseCommand
+from canvas_sdk.commands.constants import CodeSystems, Coding
 
 
 class FamilyHistoryCommand(BaseCommand):
@@ -7,9 +10,22 @@ class FamilyHistoryCommand(BaseCommand):
     class Meta:
         key = "familyHistory"
 
-    family_history: str | None = None
+    family_history: str | Coding | None = None
     relative: str | None = None
     note: str | None = None
 
+    def _get_error_details(self, method: str) -> list[InitErrorDetails]:
+        errors = super()._get_error_details(method)
+
+        if (
+            isinstance(self.family_history, dict)
+            and self.family_history["system"] != CodeSystems.SNOMED
+            and self.family_history["system"] != CodeSystems.UNSTRUCTURED
+        ):
+            message = f"The 'coding.system' field must be '{CodeSystems.SNOMED}' or '{CodeSystems.UNSTRUCTURED}'."
+            errors.append(self._create_error_detail("value", message, self.family_history))
+
+        return errors
+
 
 __exports__ = ("FamilyHistoryCommand",)

canvas_sdk/commands/commands/immunization_statement.py

@@ -1,8 +1,11 @@
 from datetime import date
+from typing import Self
 
+from pydantic import model_validator
 from pydantic_core import InitErrorDetails
 
 from canvas_sdk.commands.base import _BaseCommand as BaseCommand
+from canvas_sdk.commands.constants import CodeSystems, Coding
 
 
 class ImmunizationStatementCommand(BaseCommand):
@@ -11,14 +14,53 @@ class ImmunizationStatementCommand(BaseCommand):
     class Meta:
         key = "immunizationStatement"
 
-    cpt_code: str
-    cvx_code: str
+    cpt_code: str | Coding | None = None
+    cvx_code: str | Coding | None = None
+    unstructured: Coding | None = None
     approximate_date: date | None = None
     comments: str | None = None
 
+    def _has_value(self, value: str | Coding | None) -> bool:
+        """Check if a value is set."""
+        if value is None:
+            return False
+        if isinstance(value, str):
+            return value.strip() != ""
+        # For Coding objects (dicts), check if it exists
+        return True
+
+    @model_validator(mode="after")
+    def check_needed_together_fields(self) -> Self:
+        """Check that both 'cpt_code' and 'cvx_code' are set if one is provided."""
+        has_cpt_code = self._has_value(self.cpt_code)
+        has_cvx_code = self._has_value(self.cvx_code)
+
+        if has_cpt_code ^ has_cvx_code:
+            raise ValueError(
+                "Both cpt_code and cvx_code must be provided if one is specified and cannot be empty."
+            )
+
+        return self
+
     def _get_error_details(self, method: str) -> list[InitErrorDetails]:
         errors = super()._get_error_details(method)
 
+        if self.unstructured and (self.cpt_code or self.cvx_code):
+            message = "Unstructured codes cannot be used with CPT or CVX codes."
+            errors.append(self._create_error_detail("value", message, self.cpt_code))
+
+        if isinstance(self.cpt_code, dict) and self.cpt_code["system"] != CodeSystems.CPT:
+            message = f"The 'cpt_code.system' field must be '{CodeSystems.CPT}'"
+            errors.append(self._create_error_detail("value", message, self.cpt_code))
+
+        if isinstance(self.cvx_code, dict) and self.cvx_code["system"] != CodeSystems.CVX:
+            message = f"The 'cvx_code.system' field must be '{CodeSystems.CVX}'"
+            errors.append(self._create_error_detail("value", message, self.cvx_code))
+
+        if self.unstructured and self.unstructured["system"] != CodeSystems.UNSTRUCTURED:
+            message = f"The 'unstructured.system' field must be '{CodeSystems.UNSTRUCTURED}'"
+            errors.append(self._create_error_detail("value", message, self.unstructured))
+
         if self.comments and len(self.comments) > 255:
             errors.append(
                 self._create_error_detail(

canvas_sdk/commands/commands/medication_statement.py

@@ -1,6 +1,8 @@
 from pydantic import Field
+from pydantic_core import InitErrorDetails
 
 from canvas_sdk.commands.base import _BaseCommand
+from canvas_sdk.commands.constants import CodeSystems, Coding
 
 
 class MedicationStatementCommand(_BaseCommand):
@@ -9,11 +11,24 @@ class MedicationStatementCommand(_BaseCommand):
     class Meta:
         key = "medicationStatement"
 
-    fdb_code: str | None = Field(
+    fdb_code: str | Coding | None = Field(
         default=None, json_schema_extra={"commands_api_name": "medication"}
     )
     sig: str | None = None
 
+    def _get_error_details(self, method: str) -> list[InitErrorDetails]:
+        errors = super()._get_error_details(method)
+
+        if (
+            isinstance(self.fdb_code, dict)
+            and self.fdb_code["system"] != CodeSystems.FDB
+            and self.fdb_code["system"] != CodeSystems.UNSTRUCTURED
+        ):
+            message = f"The 'coding.system' field must be '{CodeSystems.FDB}' or '{CodeSystems.UNSTRUCTURED}'."
+            errors.append(self._create_error_detail("value", message, self.fdb_code))
+
+        return errors
+
 
 # how do we make sure fdb_code is a valid code?
 

canvas_sdk/commands/commands/past_surgical_history.py

@@ -1,8 +1,10 @@
 from datetime import date
 
 from pydantic import Field
+from pydantic_core import InitErrorDetails
 
 from canvas_sdk.commands.base import _BaseCommand as BaseCommand
+from canvas_sdk.commands.constants import CodeSystems, Coding
 
 
 class PastSurgicalHistoryCommand(BaseCommand):
@@ -11,9 +13,22 @@ class PastSurgicalHistoryCommand(BaseCommand):
     class Meta:
         key = "surgicalHistory"
 
-    past_surgical_history: str | None = None
+    past_surgical_history: str | Coding | None = None
     approximate_date: date | None = None
     comment: str | None = Field(max_length=1000, default=None)
 
+    def _get_error_details(self, method: str) -> list[InitErrorDetails]:
+        errors = super()._get_error_details(method)
+
+        if (
+            isinstance(self.past_surgical_history, dict)
+            and self.past_surgical_history["system"] != CodeSystems.SNOMED
+            and self.past_surgical_history["system"] != CodeSystems.UNSTRUCTURED
+        ):
+            message = f"The 'coding.system' field must be '{CodeSystems.SNOMED}' or '{CodeSystems.UNSTRUCTURED}'."
+            errors.append(self._create_error_detail("value", message, self.past_surgical_history))
+
+        return errors
+
 
 __exports__ = ("PastSurgicalHistoryCommand",)

canvas_sdk/commands/commands/perform.py

@@ -1,6 +1,8 @@
 from pydantic import Field
+from pydantic_core import InitErrorDetails
 
 from canvas_sdk.commands.base import _BaseCommand as BaseCommand
+from canvas_sdk.commands.constants import CodeSystems, Coding
 
 
 class PerformCommand(BaseCommand):
@@ -9,8 +11,23 @@ class PerformCommand(BaseCommand):
     class Meta:
         key = "perform"
 
-    cpt_code: str | None = Field(default=None, json_schema_extra={"commands_api_name": "perform"})
+    cpt_code: str | Coding | None = Field(
+        default=None, json_schema_extra={"commands_api_name": "perform"}
+    )
     notes: str | None = None
 
+    def _get_error_details(self, method: str) -> list[InitErrorDetails]:
+        errors = super()._get_error_details(method)
+
+        if (
+            isinstance(self.cpt_code, dict)
+            and self.cpt_code["system"] != CodeSystems.CPT
+            and self.cpt_code["system"] != CodeSystems.UNSTRUCTURED
+        ):
+            message = f"The 'coding.system' field must be '{CodeSystems.CPT}' or '{CodeSystems.UNSTRUCTURED}'."
+            errors.append(self._create_error_detail("value", message, self.cpt_code))
+
+        return errors
+
 
 __exports__ = ("PerformCommand",)

canvas_sdk/effects/note/message.py

@@ -1,4 +1,5 @@
 import json
+from datetime import datetime
 from typing import Any
 from uuid import UUID
 
@@ -19,9 +20,10 @@ class Message(TrackableFieldsModel):
         effect_type = "MESSAGE"
 
     message_id: str | UUID | None = None
-    content: str
+    content: str | None
     sender_id: str | UUID
     recipient_id: str | UUID
+    read: datetime | None = None
 
     def _get_error_details(self, method: Any) -> list[InitErrorDetails]:
         errors = super()._get_error_details(method)
@@ -68,21 +70,27 @@ class Message(TrackableFieldsModel):
                             self.message_id,
                         )
                     )
-        elif (
-            method
-            in (
-                "create",
-                "create_and_send",
-            )
-            and self.message_id
+        elif method in (
+            "create",
+            "create_and_send",
         ):
-            errors.append(
-                self._create_error_detail(
-                    "value",
-                    "Can't set message ID when creating a message.",
-                    self.message_id,
+            if not self.content or self.content.strip() == "":
+                errors.append(
+                    self._create_error_detail(
+                        "value",
+                        "Message content cannot be empty.",
+                        self.content,
+                    )
+                )
+
+            if self.message_id:
+                errors.append(
+                    self._create_error_detail(
+                        "value",
+                        "Can't set message ID when creating a message.",
+                        self.message_id,
+                    )
                 )
-            )
 
         return errors
 

canvas_sdk/templates/utils.py

@@ -1,11 +1,25 @@
+from functools import cache, lru_cache
 from pathlib import Path
 from typing import Any
 
-from django.template import Context, Template
+from django.template.backends.django import get_installed_libraries
+from django.template.engine import Engine
 
 from canvas_sdk.utils.plugins import plugin_context
 
 
+@cache
+def _installed_template_libraries() -> dict[str, str]:
+    """Cache Django's template tag libraries lookup."""
+    return get_installed_libraries()
+
+
+@lru_cache(maxsize=5)
+def _engine_for_plugin(plugin_dir: str) -> Engine:
+    """Create a Django template engine for the given plugin directory."""
+    return Engine(dirs=[plugin_dir], libraries=_installed_template_libraries())
+
+
 @plugin_context
 def render_to_string(
     template_name: str,
@@ -36,9 +50,8 @@ def render_to_string(
     elif not template_path.exists():
         raise FileNotFoundError(f"Template {template_name} not found.")
 
-    template = Template(template_path.read_text())
-
-    return template.render(Context(context))
+    engine = _engine_for_plugin(plugin_dir)
+    return engine.render_to_string(str(template_path), context=context)
 
 
 __exports__ = ("render_to_string",)

canvas_sdk/v1/data/detected_issue.py

@@ -10,13 +10,29 @@ class DetectedIssue(AuditedModel, IdentifiableModel):
     class Meta:
         db_table = "canvas_sdk_data_api_detectedissue_001"
 
+    class Status(models.TextChoices):
+        REGISTERED = "registered", "Registered"
+        PRELIMINARY = "preliminary", "Preliminary"
+        CANCELLED = "cancelled", "Cancelled"
+        AMENDED = "amended", "Amended"
+        FINAL = "final", "Final"
+        CORRECTED = "corrected", "Corrected"
+        ENTERED_IN_ERROR = "entered-in-error", "Entered in Error"
+
+    class Severity(models.TextChoices):
+        HIGH = "high", "High"
+        MODERATE = "moderate", "Moderate"
+        LOW = "low", "Low"
+
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
     identified = models.DateTimeField()
     patient = models.ForeignKey(
         "v1.Patient", on_delete=models.DO_NOTHING, related_name="detected_issues", null=True
     )
     code = models.CharField(max_length=20)
-    status = models.CharField(max_length=16)
-    severity = models.CharField(max_length=10)
+    status = models.CharField(max_length=16, choices=Status.choices)
+    severity = models.CharField(max_length=10, choices=Severity.choices, blank=True, default="")
     reference = models.CharField(max_length=200)
     issue_identifier = models.CharField(max_length=255)
     issue_identifier_system = models.CharField(max_length=255)

canvas_sdk/v1/data/medication_statement.py

@@ -35,7 +35,7 @@ class MedicationStatement(AuditedModel, IdentifiableModel):
     dose_route = models.CharField(max_length=255, default="")
     dose_frequency = models.FloatField(null=True)
     dose_frequency_interval = models.CharField(max_length=255, default="")
-    sig_original_input = models.CharField(max_length=255, default="")
+    sig_original_input = models.CharField(max_length=1000, default="")
 
 
 __exports__ = ("MedicationStatement",)

canvas_sdk/v1/data/message.py

@@ -28,7 +28,7 @@ class Message(TimestampedModel, IdentifiableModel):
     note = models.ForeignKey(
         "v1.Note", on_delete=models.DO_NOTHING, related_name="message", null=True
     )
-    read = models.BooleanField()
+    read = models.DateTimeField(null=True, blank=True)
 
 
 class MessageAttachment(IdentifiableModel):

plugin_runner/plugin_runner.py

@@ -429,6 +429,7 @@ def synchronize_plugins(run_once: bool = False) -> None:
                         log.info(
                             f'synchronize_plugins: installing/reloading plugin "{plugin_name}" for action=reload'
                         )
+                        unload_plugin(plugin_name)
                         install_plugin(plugin_name, attributes=plugin)
                         plugin_dir = pathlib.Path(PLUGIN_DIRECTORY) / plugin_name
                         load_plugin(plugin_dir.resolve())

protobufs/canvas_generated/messages/effects.proto

@@ -181,6 +181,7 @@ enum EffectType {
   CREATE_QUESTIONNAIRE_RESULT = 138;
 
   ANNOTATE_PATIENT_CHART_CONDITION_RESULTS = 200;
+  ANNOTATE_PATIENT_CHART_DETECTED_ISSUE_RESULTS = 201;
 
   ANNOTATE_CLAIM_CONDITION_RESULTS = 300;
 

protobufs/canvas_generated/messages/events.proto

@@ -48,6 +48,8 @@ enum EventType {
   MEDICATION_LIST_ITEM_CREATED = 40;
   MEDICATION_LIST_ITEM_UPDATED = 41;
   MESSAGE_CREATED = 42;
+  MESSAGE_TRANSMISSION_CREATED = 53;
+  MESSAGE_TRANSMISSION_UPDATED = 56;
   PATIENT_CREATED = 43;
   PATIENT_UPDATED = 44;
   PRESCRIPTION_CREATED = 45;
@@ -1110,6 +1112,8 @@ enum EventType {
   ACTION_BUTTON_CLICKED = 70002;
 
   PATIENT_CHART__CONDITIONS = 100000;
+  PATIENT_CHART__DETECTED_ISSUES = 100005;
+
   PATIENT_CHART_SUMMARY__SECTION_CONFIGURATION = 100001;
 
   PATIENT_PROFILE__SECTION_CONFIGURATION = 100002;

settings.py

@@ -172,15 +172,6 @@ SECRETS_FILE_NAME = "SECRETS.json"
 
 SENTRY_DSN = os.getenv("SENTRY_DSN")
 
-TEMPLATES = [
-    {
-        "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [],
-        "APP_DIRS": False,
-        "OPTIONS": {},
-    },
-]
-
 
 if IS_SCRIPT:
     CACHES = {