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

canvas_sdk/handlers/action_button.py

@@ -1,3 +1,4 @@
+import re
 from abc import abstractmethod
 from enum import StrEnum
 
@@ -6,6 +7,8 @@ from canvas_sdk.effects.show_button import ShowButtonEffect
 from canvas_sdk.events import EventType
 from canvas_sdk.handlers.base import BaseHandler
 
+SHOW_BUTTON_REGEX = re.compile(r"^SHOW_(.+?)_BUTTON$")
+
 
 class ActionButton(BaseHandler):
     """Base class for action buttons."""
@@ -13,16 +16,38 @@ class ActionButton(BaseHandler):
     RESPONDS_TO = [
         EventType.Name(EventType.SHOW_NOTE_HEADER_BUTTON),
         EventType.Name(EventType.SHOW_NOTE_FOOTER_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_SOCIAL_DETERMINANTS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_GOALS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_CONDITIONS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_MEDICATIONS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_ALLERGIES_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_CARE_TEAMS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_VITALS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_IMMUNIZATIONS_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_SURGICAL_HISTORY_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_FAMILY_HISTORY_SECTION_BUTTON),
+        EventType.Name(EventType.SHOW_CHART_SUMMARY_CODING_GAPS_SECTION_BUTTON),
         EventType.Name(EventType.ACTION_BUTTON_CLICKED),
     ]
 
     class ButtonLocation(StrEnum):
         NOTE_HEADER = "note_header"
         NOTE_FOOTER = "note_footer"
+        CHART_SUMMARY_SOCIAL_DETERMINANTS_SECTION = "chart_summary_social_determinants_section"
+        CHART_SUMMARY_GOALS_SECTION = "chart_summary_goals_section"
+        CHART_SUMMARY_CONDITIONS_SECTION = "chart_summary_conditions_section"
+        CHART_SUMMARY_MEDICATIONS_SECTION = "chart_summary_medications_section"
+        CHART_SUMMARY_ALLERGIES_SECTION = "chart_summary_allergies_section"
+        CHART_SUMMARY_CARE_TEAMS_SECTION = "chart_summary_care_teams_section"
+        CHART_SUMMARY_VITALS_SECTION = "chart_summary_vitals_section"
+        CHART_SUMMARY_IMMUNIZATIONS_SECTION = "chart_summary_immunizations_section"
+        CHART_SUMMARY_SURGICAL_HISTORY_SECTION = "chart_summary_surgical_history_section"
+        CHART_SUMMARY_FAMILY_HISTORY_SECTION = "chart_summary_family_history_section"
+        CHART_SUMMARY_CODING_GAPS_SECTION = "chart_summary_coding_gaps_section"
 
     BUTTON_TITLE: str = ""
     BUTTON_KEY: str = ""
-    BUTTON_LOCATION: ButtonLocation | None = None
+    BUTTON_LOCATION: ButtonLocation
 
     @abstractmethod
     def handle(self) -> list[Effect]:
@@ -35,21 +60,16 @@ class ActionButton(BaseHandler):
 
     def compute(self) -> list[Effect]:
         """Method to compute the effects."""
-        if self.BUTTON_LOCATION is None:
+        if not self.BUTTON_LOCATION:
             return []
 
-        if self.event.type in (
-            EventType.SHOW_NOTE_HEADER_BUTTON,
-            EventType.SHOW_NOTE_FOOTER_BUTTON,
-        ):
-            if self.context["location"].lower() == self.BUTTON_LOCATION.value and self.visible():
+        show_button_event_match = SHOW_BUTTON_REGEX.fullmatch(self.event.name)
+
+        if show_button_event_match:
+            location = show_button_event_match.group(1)
+            if self.ButtonLocation[location] == self.BUTTON_LOCATION and self.visible():
                 return [ShowButtonEffect(key=self.BUTTON_KEY, title=self.BUTTON_TITLE).apply()]
-            else:
-                return []
-        elif (
-            self.event.type == EventType.ACTION_BUTTON_CLICKED
-            and self.context["key"] == self.BUTTON_KEY
-        ):
+        elif self.context["key"] == self.BUTTON_KEY:
             return self.handle()
 
         return []

canvas_sdk/handlers/application.py

@@ -14,7 +14,7 @@ class Application(BaseHandler, ABC):
         """Handle the application events."""
         match self.event.type:
             case EventType.APPLICATION__ON_OPEN:
-                return [self.on_open()] if self.target == self.identifier else []
+                return [self.on_open()] if self.event.target.id == self.identifier else []
             case _:
                 return []
 

canvas_sdk/handlers/cron_task.py

@@ -29,7 +29,7 @@ class CronTask(BaseHandler):
         """
         if not self.SCHEDULE:
             raise ValueError("You must set a SCHEDULE.")
-        datetime = arrow.get(self.target).datetime
+        datetime = arrow.get(self.event.target.id).datetime
         if datetime in Cron(self.SCHEDULE):
             return self.execute()
         return []

canvas_sdk/protocols/clinical_quality_measure.py

@@ -94,7 +94,7 @@ class ClinicalQualityMeasure(BaseProtocol):
 
         def patient_id(model: "type[Model]") -> str:
             if model == Patient:
-                return self.target
+                return self.event.target.id
             else:
                 return cast(
                     str,

canvas_sdk/templates/__init__.py

@@ -0,0 +1,3 @@
+from .utils import render_to_string
+
+__all__ = ("render_to_string",)

canvas_sdk/templates/tests/test_utils.py

@@ -0,0 +1,43 @@
+from pathlib import Path
+
+import pytest
+
+from canvas_sdk.effects import Effect
+from canvas_sdk.events import Event, EventRequest, EventType
+from plugin_runner.plugin_runner import LOADED_PLUGINS
+
+
+@pytest.mark.parametrize("install_test_plugin", ["test_render_template"], indirect=True)
+def test_render_to_string_valid_template(
+    install_test_plugin: Path, load_test_plugins: None
+) -> None:
+    """Test that the render_to_string function loads and renders a valid template."""
+    plugin = LOADED_PLUGINS[
+        "test_render_template:test_render_template.protocols.my_protocol:ValidTemplate"
+    ]
+    result: list[Effect] = plugin["class"](Event(EventRequest(type=EventType.UNKNOWN))).compute()
+    assert "html" in result[0].payload
+
+
+@pytest.mark.parametrize("install_test_plugin", ["test_render_template"], indirect=True)
+def test_render_to_string_invalid_template(
+    install_test_plugin: Path, load_test_plugins: None
+) -> None:
+    """Test that the render_to_string function raises an error for invalid templates."""
+    plugin = LOADED_PLUGINS[
+        "test_render_template:test_render_template.protocols.my_protocol:InvalidTemplate"
+    ]
+    with pytest.raises(FileNotFoundError):
+        plugin["class"](Event(EventRequest(type=EventType.UNKNOWN))).compute()
+
+
+@pytest.mark.parametrize("install_test_plugin", ["test_render_template"], indirect=True)
+def test_render_to_string_forbidden_template(
+    install_test_plugin: Path, load_test_plugins: None
+) -> None:
+    """Test that the render_to_string function raises an error for a template outside plugin package."""
+    plugin = LOADED_PLUGINS[
+        "test_render_template:test_render_template.protocols.my_protocol:ForbiddenTemplate"
+    ]
+    with pytest.raises(PermissionError):
+        plugin["class"](Event(EventRequest(type=EventType.UNKNOWN))).compute()

canvas_sdk/templates/utils.py

@@ -0,0 +1,44 @@
+import inspect
+from pathlib import Path
+from typing import Any
+
+from django.template import Context, Template
+
+from settings import PLUGIN_DIRECTORY
+
+
+def render_to_string(template_name: str, context: dict[str, Any] | None = None) -> str | None:
+    """Load a template and render it with the given context.
+
+    Args:
+        template_name (str): The path to the template file, relative to the plugin package.
+            If the path starts with a forward slash ("/"), it will be stripped during resolution.
+        context (dict[str, Any] | None): A dictionary of variables to pass to the template
+            for rendering. Defaults to None, which uses an empty context.
+
+    Returns:
+        str: The rendered template as a string.
+
+    Raises:
+        FileNotFoundError: If the template file does not exist within the plugin's directory
+            or if the resolved path is invalid.
+    """
+    plugins_dir = Path(PLUGIN_DIRECTORY).resolve()
+    current_frame = inspect.currentframe()
+    caller = current_frame.f_back if current_frame else None
+
+    if not caller or "__is_plugin__" not in caller.f_globals:
+        return None
+
+    plugin_name = caller.f_globals["__name__"].split(".")[0]
+    plugin_dir = plugins_dir / plugin_name
+    template_path = Path(plugin_dir / template_name.lstrip("/")).resolve()
+
+    if not template_path.is_relative_to(plugin_dir):
+        raise PermissionError(f"Invalid template '{template_name}'")
+    elif not template_path.exists():
+        raise FileNotFoundError(f"Template {template_name} not found.")
+
+    template = Template(template_path.read_text())
+
+    return template.render(Context(context))

canvas_sdk/v1/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class CanvasSdkV1Config(AppConfig):
+    """AppConfig for v1 of the SDK data module."""
+
+    name = "canvas_sdk.v1"

canvas_sdk/v1/data/__init__.py

@@ -1,23 +1,116 @@
+from .allergy_intolerance import AllergyIntolerance, AllergyIntoleranceCoding
+from .appointment import Appointment
+from .assessment import Assessment
 from .billing import BillingLineItem
+from .care_team import CareTeamMembership, CareTeamRole
+from .command import Command
 from .condition import Condition, ConditionCoding
+from .coverage import Coverage, Transactor, TransactorAddress, TransactorPhone
+from .detected_issue import DetectedIssue, DetectedIssueEvidence
+from .device import Device
+from .imaging import ImagingOrder, ImagingReport, ImagingReview
+from .lab import (
+    LabOrder,
+    LabOrderReason,
+    LabOrderReasonCondition,
+    LabReport,
+    LabReview,
+    LabTest,
+    LabValue,
+    LabValueCoding,
+)
 from .medication import Medication, MedicationCoding
+from .note import Note, NoteType
+from .observation import (
+    Observation,
+    ObservationCoding,
+    ObservationComponent,
+    ObservationComponentCoding,
+    ObservationValueCoding,
+)
 from .organization import Organization
-from .patient import Patient
-from .practicelocation import PracticeLocation
+from .patient import (
+    Patient,
+    PatientAddress,
+    PatientContactPoint,
+    PatientExternalIdentifier,
+    PatientSetting,
+)
+from .practicelocation import PracticeLocation, PracticeLocationSetting
+from .protocol_override import ProtocolOverride
+from .questionnaire import (
+    Interview,
+    InterviewQuestionnaireMap,
+    InterviewQuestionResponse,
+    Question,
+    Questionnaire,
+    QuestionnaireQuestionMap,
+    ResponseOption,
+    ResponseOptionSet,
+)
 from .staff import Staff
-from .task import Task, TaskComment, TaskLabel
+from .task import Task, TaskComment, TaskLabel, TaskTaskLabel
+from .user import CanvasUser
 
-__all__ = (
+__all__ = [
+    "Appointment",
+    "AllergyIntolerance",
+    "AllergyIntoleranceCoding",
+    "Assessment",
     "BillingLineItem",
+    "CanvasUser",
+    "CareTeamMembership",
+    "CareTeamRole",
+    "Command",
     "Condition",
     "ConditionCoding",
+    "Coverage",
+    "DetectedIssue",
+    "DetectedIssueEvidence",
+    "Device",
+    "ImagingOrder",
+    "ImagingReport",
+    "ImagingReview",
+    "Interview",
+    "InterviewQuestionnaireMap",
+    "InterviewQuestionResponse",
+    "LabOrder",
+    "LabOrderReason",
+    "LabOrderReasonCondition",
+    "LabReport",
+    "LabReview",
+    "LabTest",
+    "LabValue",
+    "LabValueCoding",
     "Medication",
     "MedicationCoding",
+    "Note",
+    "NoteType",
+    "Observation",
+    "ObservationCoding",
+    "ObservationComponent",
+    "ObservationComponentCoding",
+    "ObservationValueCoding",
     "Organization",
     "Patient",
+    "PatientAddress",
+    "PatientContactPoint",
+    "PatientExternalIdentifier",
+    "PatientSetting",
     "PracticeLocation",
+    "PracticeLocationSetting",
+    "ProtocolOverride",
+    "Question",
+    "Questionnaire",
+    "QuestionnaireQuestionMap",
+    "ResponseOption",
+    "ResponseOptionSet",
     "Staff",
     "Task",
     "TaskComment",
     "TaskLabel",
-)
+    "TaskTaskLabel",
+    "Transactor",
+    "TransactorAddress",
+    "TransactorPhone",
+]

canvas_sdk/v1/data/allergy_intolerance.py

@@ -1,8 +1,26 @@
+from typing import cast
+
 from django.db import models
 
-from canvas_sdk.v1.data.base import CommittableModelManager, ValueSetLookupQuerySet
-from canvas_sdk.v1.data.patient import Patient
-from canvas_sdk.v1.data.user import CanvasUser
+from canvas_sdk.v1.data.base import (
+    BaseModelManager,
+    CommittableQuerySetMixin,
+    ForPatientQuerySetMixin,
+    ValueSetLookupQuerySet,
+)
+
+
+class AllergyIntoleranceQuerySet(
+    ValueSetLookupQuerySet,
+    CommittableQuerySetMixin,
+    ForPatientQuerySetMixin,
+):
+    """AllergyIntoleranceQuerySet."""
+
+    pass
+
+
+AllergyIntoleranceManager = BaseModelManager.from_queryset(AllergyIntoleranceQuerySet)
 
 
 class AllergyIntolerance(models.Model):
@@ -10,20 +28,19 @@ class AllergyIntolerance(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_allergyintolerance_001"
 
-    objects = CommittableModelManager().from_queryset(ValueSetLookupQuerySet)()
+    objects = cast(AllergyIntoleranceQuerySet, AllergyIntoleranceManager())
 
     id = models.UUIDField()
     dbid = models.BigIntegerField(primary_key=True)
     created = models.DateTimeField()
     modified = models.DateTimeField()
     deleted = models.BooleanField()
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    committer = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    entered_in_error = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     patient = models.ForeignKey(
-        Patient,
+        "v1.Patient",
         on_delete=models.DO_NOTHING,
         related_name="allergy_intolerances",
         null=True,
@@ -46,7 +63,6 @@ class AllergyIntoleranceCoding(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_allergyintolerancecoding_001"
 
     dbid = models.BigIntegerField(primary_key=True)

canvas_sdk/v1/data/appointment.py

@@ -0,0 +1,56 @@
+from django.db import models
+
+
+class AppointmentProgressStatus(models.TextChoices):
+    """AppointmentProgressStatus."""
+
+    UNCONFIRMED = "unconfirmed", "Unconfirmed"
+    ATTEMPTED = "attempted", "Attempted"
+    CONFIRMED = "confirmed", "Confirmed"
+    ARRIVED = "arrived", "Arrived"
+    ROOMED = "roomed", "Roomed"
+    EXITED = "exited", "Exited"
+    NOSHOWED = "noshowed", "No-showed"
+    CANCELLED = "cancelled", "Cancelled"
+
+
+class Appointment(models.Model):
+    """Appointment."""
+
+    class Meta:
+        managed = False
+        db_table = "canvas_sdk_data_api_appointment_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    entered_in_error = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    patient = models.ForeignKey(
+        "v1.Patient",
+        on_delete=models.DO_NOTHING,
+        related_name="appointments",
+        null=True,
+    )
+    appointment_rescheduled_from = models.ForeignKey(
+        "self",
+        on_delete=models.DO_NOTHING,
+        related_name="appointment_rescheduled_to",
+        null=True,
+    )
+    provider = models.ForeignKey("v1.Staff", on_delete=models.DO_NOTHING, null=True)
+    start_time = models.DateTimeField()
+    duration_minutes = models.IntegerField()
+    comment = models.TextField(null=True)
+    note = models.ForeignKey("v1.Note", on_delete=models.DO_NOTHING, null=True)
+
+    note_type = models.ForeignKey(
+        "v1.NoteType", on_delete=models.DO_NOTHING, related_name="appointments", null=True
+    )
+
+    status = models.CharField(
+        max_length=20,
+        choices=AppointmentProgressStatus,
+    )
+    meeting_link = models.URLField(null=True, blank=True)
+    telehealth_instructions_sent = models.BooleanField()
+    location = models.ForeignKey("v1.PracticeLocation", on_delete=models.DO_NOTHING, null=True)
+    description = models.TextField(null=True, blank=True)

canvas_sdk/v1/data/assessment.py

@@ -0,0 +1,40 @@
+from django.db import models
+
+
+class AssessmentStatus(models.TextChoices):
+    """AssessmentStatus."""
+
+    STATUS_IMPROVING = "improved", "Improved"
+    STATUS_STABLE = "stable", "Unchanged"
+    STATUS_DETERIORATING = "deteriorated", "Deteriorated"
+
+
+class Assessment(models.Model):
+    """Assessment."""
+
+    class Meta:
+        managed = False
+        db_table = "canvas_sdk_data_api_assessment_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING)
+    committer = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    deleted = models.BooleanField()
+    entered_in_error = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    patient = models.ForeignKey(
+        "v1.Patient",
+        on_delete=models.DO_NOTHING,
+        related_name="assessments",
+    )
+    note = models.ForeignKey("v1.Note", on_delete=models.DO_NOTHING, related_name="assessments")
+    condition = models.ForeignKey(
+        "v1.Condition", on_delete=models.CASCADE, related_name="assessments", null=True
+    )
+    interview = models.ForeignKey("v1.Interview", on_delete=models.DO_NOTHING, null=True)
+    status = models.CharField(choices=AssessmentStatus.choices)
+    narrative = models.CharField()
+    background = models.CharField()
+    care_team = models.CharField()

canvas_sdk/v1/data/base.py

@@ -10,25 +10,12 @@ if TYPE_CHECKING:
     from canvas_sdk.value_set.value_set import ValueSet
 
 
-class CommittableModelManager(models.Manager):
-    """A manager for commands that can be committed."""
+class BaseModelManager(models.Manager):
+    """A base manager for models."""
 
-    def get_queryset(self) -> "CommittableQuerySet":
+    def get_queryset(self) -> models.QuerySet:
         """Return a queryset that filters out deleted objects."""
-        # TODO: Should we just filter these out at the view level?
-        return CommittableQuerySet(self.model, using=self._db).filter(deleted=False)
-
-
-class CommittableQuerySet(models.QuerySet):
-    """A queryset for committable objects."""
-
-    def committed(self) -> "Self":
-        """Return a queryset that filters for objects that have been committed."""
-        return self.filter(committer_id__isnull=False, entered_in_error_id__isnull=True)
-
-    def for_patient(self, patient_id: str) -> "Self":
-        """Return a queryset that filters objects for a specific patient."""
-        return self.filter(patient__id=patient_id)
+        return super().get_queryset().filter(deleted=False)
 
 
 class BaseQuerySet(models.QuerySet):
@@ -40,10 +27,14 @@ class BaseQuerySet(models.QuerySet):
 class QuerySetProtocol(Protocol):
     """A typing protocol for use in mixins into models.QuerySet-inherited classes."""
 
-    def filter(self, *args: Any, **kwargs: Any) -> models.QuerySet[Any]:
+    def filter(self, *args: Any, **kwargs: Any) -> Self:
         """Django's models.QuerySet filter method."""
         ...
 
+    def distinct(self) -> Self:
+        """Django's models.QuerySet distinct method."""
+        ...
+
 
 class ValueSetLookupQuerySetProtocol(QuerySetProtocol):
     """A typing protocol for use in mixins using value set lookup methods."""
@@ -61,10 +52,26 @@ class ValueSetLookupQuerySetProtocol(QuerySetProtocol):
         raise NotImplementedError
 
 
+class CommittableQuerySetMixin(QuerySetProtocol):
+    """A queryset for committable objects."""
+
+    def committed(self) -> Self:
+        """Return a queryset that filters for objects that have been committed."""
+        return self.filter(committer_id__isnull=False, entered_in_error_id__isnull=True)
+
+
+class ForPatientQuerySetMixin(QuerySetProtocol):
+    """A queryset for patient assets."""
+
+    def for_patient(self, patient_id: str) -> Self:
+        """Return a queryset that filters objects for a specific patient."""
+        return self.filter(patient__id=patient_id)
+
+
 class ValueSetLookupQuerySetMixin(ValueSetLookupQuerySetProtocol):
     """A QuerySet mixin that can filter objects based on a ValueSet."""
 
-    def find(self, value_set: type["ValueSet"]) -> models.QuerySet[Any]:
+    def find(self, value_set: type["ValueSet"]) -> Self:
         """
         Filters conditions, medications, etc. to those found in the inherited ValueSet class that is passed.
 
@@ -146,7 +153,7 @@ class TimeframeLookupQuerySetMixin(TimeframeLookupQuerySetProtocol):
         """Returns the field that should be filtered on. Can be overridden for different models."""
         return "note__datetime_of_service"
 
-    def within(self, timeframe: "Timeframe") -> models.QuerySet:
+    def within(self, timeframe: "Timeframe") -> Self:
         """A method to filter a queryset for datetimes within a timeframe."""
         return self.filter(
             **{
@@ -158,13 +165,19 @@ class TimeframeLookupQuerySetMixin(TimeframeLookupQuerySetProtocol):
         )
 
 
-class ValueSetLookupQuerySet(CommittableQuerySet, ValueSetLookupQuerySetMixin):
+class CommittableQuerySet(BaseQuerySet, CommittableQuerySetMixin):
+    """A queryset for committable objects."""
+
+    pass
+
+
+class ValueSetLookupQuerySet(BaseQuerySet, ValueSetLookupQuerySetMixin):
     """A class that includes methods for looking up value sets."""
 
     pass
 
 
-class ValueSetLookupByNameQuerySet(CommittableQuerySet, ValueSetLookupByNameQuerySetMixin):
+class ValueSetLookupByNameQuerySet(BaseQuerySet, ValueSetLookupByNameQuerySetMixin):
     """A class that includes methods for looking up value sets by name."""
 
     pass

canvas_sdk/v1/data/billing.py

@@ -1,10 +1,8 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Self
 
 from django.db import models
 
 from canvas_sdk.v1.data.base import ValueSetTimeframeLookupQuerySet
-from canvas_sdk.v1.data.note import Note
-from canvas_sdk.v1.data.patient import Patient
 from canvas_sdk.value_set.value_set import CodeConstants
 
 if TYPE_CHECKING:
@@ -14,7 +12,7 @@ if TYPE_CHECKING:
 class BillingLineItemQuerySet(ValueSetTimeframeLookupQuerySet):
     """A class that adds functionality to filter BillingLineItem objects."""
 
-    def find(self, value_set: type["ValueSet"]) -> models.QuerySet:
+    def find(self, value_set: type["ValueSet"]) -> Self:
         """
         This method is overridden to use for BillingLineItem CPT codes.
         The codes are saved as string values in the BillingLineItem.cpt field,
@@ -36,7 +34,6 @@ class BillingLineItem(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_billinglineitem_001"
 
     # objects = BillingLineItemQuerySet.as_manager()
@@ -47,10 +44,10 @@ class BillingLineItem(models.Model):
     created = models.DateTimeField()
     modified = models.DateTimeField()
     note = models.ForeignKey(
-        Note, on_delete=models.DO_NOTHING, related_name="billing_line_items", null=True
+        "v1.Note", on_delete=models.DO_NOTHING, related_name="billing_line_items", null=True
     )
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="billing_line_items", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="billing_line_items", null=True
     )
     cpt = models.CharField()
     charge = models.DecimalField()