canvas 0.3.1__py3-none-any.whl → 0.5.0__py3-none-any.whl

canvas_sdk/effects/patient_chart_summary_configuration.py

@@ -25,6 +25,7 @@ class PatientChartSummaryConfiguration(_BaseEffect):
         IMMUNIZATIONS = "immunizations"
         SURGICAL_HISTORY = "surgical_history"
         FAMILY_HISTORY = "family_history"
+        CODING_GAPS = "coding_gaps"
 
     sections: list[Section] = Field(min_length=1)
 

canvas_sdk/effects/protocol_card/protocol_card.py

@@ -49,7 +49,7 @@ class ProtocolCard(_BaseEffect):
     title: str = ""
     narrative: str = ""
     recommendations: list[Recommendation] = []
-    status: Status = Status.DUE  # type: ignore
+    status: Status = Status.DUE
     feedback_enabled: bool = False
 
     @property

canvas_sdk/effects/protocol_card/tests.py

@@ -107,7 +107,7 @@ def test_apply_method_raises_error_without_patient_id_and_key() -> None:
     ],
 )
 def test_add_recommendations(
-    init_params: dict[str, str], rec1_params: dict[Any, Any], rec2_params: dict[str, str]
+    init_params: dict[Any, Any], rec1_params: dict[Any, Any], rec2_params: dict[Any, Any]
 ) -> None:
     p = ProtocolCard(**init_params)
     p.add_recommendation(**rec1_params)
@@ -156,7 +156,7 @@ def test_add_recommendations(
     ],
 )
 def test_add_recommendations_from_commands(
-    Command: _BaseCommand, init_params: dict[str, str]
+    Command: type[_BaseCommand], init_params: dict[str, str]
 ) -> None:
     cmd = Command(**init_params)
     p = ProtocolCard(patient_id="uuid", key="commands")

canvas_sdk/protocols/clinical_quality_measure.py

@@ -21,6 +21,7 @@ class ClinicalQualityMeasure(BaseProtocol):
         show_in_population: bool = True
         can_be_snoozed: bool = True
         is_abstract: bool = False
+        is_predictive: bool = False
 
     @classmethod
     def _meta(cls) -> dict[str, Any]:

canvas_sdk/utils/http.py

@@ -1,6 +1,6 @@
 import time
 from functools import wraps
-from typing import Any, Callable, Mapping, TypeVar
+from typing import Any, Callable, Mapping, TypeVar, cast
 
 import requests
 import statsd
@@ -28,7 +28,7 @@ class Http:
             self.statsd_client.timing(f"http_{fn.__name__}", timing)
             return result
 
-        return wrapper
+        return cast(F, wrapper)
 
     @measure_time
     def get(

canvas_sdk/v1/data/common.py

@@ -0,0 +1,46 @@
+from django.db import models
+
+
+class DocumentReviewMode(models.TextChoices):
+    """Choices for document reviews."""
+
+    REVIEW_REQUIRED = "RR", "Review required"
+    ALREADY_REVIEWED_OFFLINE = "AR", "Already reviewed offline"
+    REVIEW_NOT_REQUIRED = "RN", "Review not required"
+
+
+class OrderStatus(models.TextChoices):
+    """Choices for Order statuses."""
+
+    PROPOSED = "proposed", "Proposed"
+    DRAFT = "draft", "Draft"
+    PLANNED = "planned", "Planned"
+    REQUESTED = "requested", "Requested"
+    RECEIVED = "received", "Received"
+    ACCEPTED = "accepted", "Accepted"
+    IN_PROGRESS = "in-progress", "In-progress"
+    REVIEW = "review", "Review"
+    COMPLETED = "completed", "Completed"
+    CANCELLED = "cancelled", "Cancelled"
+    SUSPENDED = "suspended", "Suspended"
+    REJECTED = "rejected", "Rejected"
+    FAILED = "failed", "Failed"
+    ENTERED_IN_ERROR = "EIE", "Entered in Error"
+
+
+class ReviewPatientCommunicationMethod(models.TextChoices):
+    """Choices for patient communication regarding reviews."""
+
+    DELEGATED_CALL_CAN_LEAVE_MESSAGE = "DM", "delegate call, can leave message"
+    DELEGATED_CALL_NEED_ANSWER = "DA", "delegate call, need patient to answer"
+    DELEGATED_LETTER = "DL", "delegate letter"
+    DO_NOT_COMMUNICATE = "DC", "do not communicate"
+    ALREADY_LEFT_MESSAGE = "AM", "already left message"
+    ALREADY_REVIEWED_WITH_PATIENT = "AR", "already reviewed with patient"
+
+
+class ReviewStatus(models.TextChoices):
+    """Status choices for reviews."""
+
+    STATUS_REVIEWING = "reviewing", "reviewing"
+    STATUS_REVIEWED = "reviewed", "reviewed"

canvas_sdk/v1/data/detected_issue.py

@@ -0,0 +1,52 @@
+from django.db import models
+
+from canvas_sdk.v1.data import Patient
+from canvas_sdk.v1.data.user import CanvasUser
+
+
+class DetectedIssue(models.Model):
+    """DetectedIssue."""
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_detectedissue_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    identified = models.DateTimeField()
+    deleted = models.BooleanField()
+    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    patient = models.ForeignKey(
+        Patient, on_delete=models.DO_NOTHING, related_name="detected_issues"
+    )
+    code = models.CharField()
+    status = models.CharField()
+    severity = models.CharField()
+    reference = models.CharField()
+    issue_identifier = models.CharField()
+    issue_identifier_system = models.CharField()
+    detail = models.TextField()
+
+
+class DetectedIssueEvidence(models.Model):
+    """DetectedIssueEvidence."""
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_detectedissueevidence_001"
+
+    dbid = models.BigIntegerField(primary_key=True)
+    system = models.CharField()
+    version = models.CharField()
+    code = models.CharField()
+    display = models.CharField()
+    user_selected = models.BooleanField()
+    detected_issue = models.ForeignKey(
+        DetectedIssue, on_delete=models.DO_NOTHING, related_name="evidence"
+    )

canvas_sdk/v1/data/imaging.py

@@ -0,0 +1,102 @@
+from django.db import models
+
+from canvas_sdk.v1.data.common import (
+    DocumentReviewMode,
+    OrderStatus,
+    ReviewPatientCommunicationMethod,
+    ReviewStatus,
+)
+from canvas_sdk.v1.data.patient import Patient
+from canvas_sdk.v1.data.user import CanvasUser
+
+
+class ImagingOrder(models.Model):
+    """Model to read ImagingOrder data."""
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_imagingorder_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    deleted = models.BooleanField()
+    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING, related_name="imaging_orders")
+    # TODO - uncomment when Note model is complete
+    #  note = models.ForeigneKey(Note, on_delete=models.DO_NOTHING, related_name="imaging_orders")
+    imaging = models.CharField()
+    # TODO - uncomment when ServiceProvider model is complete
+    # imaging_center = models.ForeignKey(ServiceProvider, related_name="imaging_orders", null=True, on_delete=models.DO_NOTHING)
+    note_to_radiologist = models.CharField()
+    internal_comment = models.CharField()
+    status = models.CharField(choices=OrderStatus)
+    date_time_ordered = models.DateTimeField()
+    priority = models.CharField()
+    # TODO - uncomment when Staff model is complete
+    # ordering_provider = models.ForeignKey(Staff, on_delete=models.CASCADE, related_name="imaging_orders", null=True)
+    delegated = models.BooleanField(default=False)
+
+
+class ImagingReview(models.Model):
+    """Model to read ImagingReview data."""
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_imagingreview_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    deleted = models.BooleanField()
+    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    patient_communication_method = models.CharField(choices=ReviewPatientCommunicationMethod)
+    # TODO  - uncomment when Note model is complete
+    # note = models.ForeignKey(Note, on_delete=models.DO_NOTHING, related_name="imaging_reviews")
+    internal_comment = models.CharField()
+    message_to_patient = models.CharField()
+    is_released_to_patient = models.BooleanField()
+    status = models.CharField(choices=ReviewStatus)
+    patient = models.ForeignKey(
+        Patient, on_delete=models.DO_NOTHING, related_name="imaging_reviews"
+    )
+
+
+class ImagingReport(models.Model):
+    """Model to read ImagingReport data."""
+
+    class ImagingReportSource(models.TextChoices):
+        RADIOLOGY_FROM_PATIENT = "RADIOLOGY_PATIENT", "Radiology Report From Patient"
+        VERBAL_FROM_PATIENT = "VERBAL_PATIENT", "Verbal Report From Patient"
+        DIRECTLY_REPORT = "DIRECTLY_RADIOLOGY", "Directly Radiology Report"
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_imagingreport_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    review_mode = models.CharField(choices=DocumentReviewMode)
+    junked = models.BooleanField()
+    requires_signature = models.BooleanField()
+    assigned_date = models.DateTimeField()
+    patient = models.ForeignKey(
+        Patient, on_delete=models.DO_NOTHING, related_name="imaging_results"
+    )
+    order = models.ForeignKey(ImagingOrder, on_delete=models.DO_NOTHING, null=True)
+    source = models.CharField(choices=ImagingReportSource)
+    name = models.CharField()
+    result_date = models.DateField()
+    original_date = models.DateField()
+    review = models.ForeignKey(ImagingReview, null=True, on_delete=models.DO_NOTHING)

canvas_sdk/v1/data/lab.py

@@ -1,10 +1,21 @@
 from django.db import models
 
 from canvas_sdk.v1.data.base import CommittableModelManager
+from canvas_sdk.v1.data.condition import Condition
 from canvas_sdk.v1.data.patient import Patient
+
+# from canvas_sdk.v1.data.staff import Staff
 from canvas_sdk.v1.data.user import CanvasUser
 
 
+class TransmissionType(models.TextChoices):
+    """Choices for transmission types."""
+
+    FAX = "F", "fax"
+    HL7 = "H", "hl7"
+    MANUAL = "M", "manual"
+
+
 class LabReport(models.Model):
     """A class representing a lab report."""
 
@@ -23,19 +34,23 @@ class LabReport(models.Model):
     junked = models.BooleanField()
     requires_signature = models.BooleanField()
     assigned_date = models.DateTimeField()
-    patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING, related_name="lab_reports")
-    transmission_type = models.CharField()
+    patient = models.ForeignKey(
+        Patient, on_delete=models.DO_NOTHING, related_name="lab_reports", null=True
+    )
+    transmission_type = models.CharField(choices=TransmissionType)
     for_test_only = models.BooleanField()
     external_id = models.CharField()
     version = models.IntegerField()
     requisition_number = models.CharField()
-    review = models.ForeignKey("LabReview", related_name="reports", on_delete=models.DO_NOTHING)
+    review = models.ForeignKey(
+        "LabReview", related_name="reports", on_delete=models.DO_NOTHING, null=True
+    )
     original_date = models.DateTimeField()
     date_performed = models.DateTimeField()
     custom_document_name = models.CharField()
     originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
     deleted = models.BooleanField()
 
 
@@ -55,12 +70,12 @@ class LabReview(models.Model):
     modified = models.DateTimeField()
     originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
     deleted = models.BooleanField()
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
     internal_comment = models.TextField()
     message_to_patient = models.CharField()
     status = models.CharField()
-    patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING)
+    patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING, related_name="lab_reviews")
     patient_communication_method = models.CharField()
 
 
@@ -76,7 +91,9 @@ class LabValue(models.Model):
     dbid = models.BigIntegerField(primary_key=True)
     created = models.DateTimeField()
     modified = models.DateTimeField()
-    report = models.ForeignKey("LabReport", related_name="values", on_delete=models.DO_NOTHING)
+    report = models.ForeignKey(
+        "LabReport", related_name="values", on_delete=models.DO_NOTHING, null=True
+    )
     value = models.TextField()
     units = models.CharField()
     abnormal_flag = models.CharField()
@@ -98,7 +115,162 @@ class LabValueCoding(models.Model):
     dbid = models.BigIntegerField(primary_key=True)
     created = models.DateTimeField()
     modified = models.DateTimeField()
-    value = models.ForeignKey(LabValue, on_delete=models.DO_NOTHING, related_name="codings")
+    value = models.ForeignKey(
+        LabValue, on_delete=models.DO_NOTHING, related_name="codings", null=True
+    )
     code = models.CharField()
     name = models.CharField()
     system = models.CharField()
+
+
+class LabOrder(models.Model):
+    """A class representing a lab order."""
+
+    class SpecimenCollectionType(models.TextChoices):
+        """Choices for specimen collection types."""
+
+        ON_LOCATION = "L", "on location"
+        PATIENT_SERVICE_CENTER = "P", "patient service center"
+        OTHER = "O", "other"
+
+    class CourtesyCopyType(models.TextChoices):
+        """Choices for courtesy copy types."""
+
+        ACCOUNT = "A", "account"
+        FAX = "F", "fax"
+        PATIENT = "P", "patient"
+
+    class ManualProcessingStatus(models.TextChoices):
+        """Choices for manual processing statuses."""
+
+        MANUAL_PROCESSING_STATUS_NEEDS_REVIEW = "NEEDS_REVIEW", "Needs Review"
+        MANUAL_PROCESSING_STATUS_IN_PROGRESS = "IN_PROGRESS", "In Progress"
+        MANUAL_PROCESSING_STATUS_PROCESSED = "PROCESSED", "Processed"
+        MANUAL_PROCESSING_STATUS_FLAGGED = "FLAGGED", "Flagged"
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_laborder_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    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)
+    patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING, related_name="lab_orders")
+    ontology_lab_partner = models.CharField()
+    # TODO - uncomment when the Note model is finished
+    # note = models.ForeignKey("Note", on_delete=models.DO_NOTHING)
+    comment = models.CharField()
+    requisition_number = models.CharField()
+    is_patient_bill = models.BooleanField(null=True)
+    date_ordered = models.DateTimeField()
+    fasting_status = models.BooleanField(null=True)
+    specimen_collection_type = models.CharField(choices=SpecimenCollectionType, null=True)
+    transmission_type = models.CharField(choices=TransmissionType, null=True)
+    courtesy_copy_type = models.CharField(choices=CourtesyCopyType, null=True)
+    courtesy_copy_number = models.CharField()
+    courtesy_copy_text = models.CharField()
+    # TODO - uncomment when Staff model is added
+    # ordering_provider = models.ForeignKey(Staff, on_delete=models.DO_NOTHING, null=True)
+    parent_order = models.ForeignKey("LabOrder", on_delete=models.DO_NOTHING, null=True)
+    healthgorilla_id = models.CharField()
+    manual_processing_status = models.CharField(choices=ManualProcessingStatus)
+    manual_processing_comment = models.CharField()
+    labcorp_abn_url = models.URLField()
+
+
+class LabOrderReason(models.Model):
+    """A class representing a lab order reason."""
+
+    class LabReasonMode(models.TextChoices):
+        """Choices for lab order reasons."""
+
+        MONITOR = "MO", "monitor"
+        INVESTIGATE = "IN", "investigate"
+        SCREEN_FOR = "SF", "screen for"
+        UNKNOWN = "UNK", "unknown"
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_laborderreason_001"
+
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    deleted = models.BooleanField()
+    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    order = models.ForeignKey(LabOrder, on_delete=models.DO_NOTHING, related_name="reasons")
+    mode = models.CharField(max_length=30, choices=LabReasonMode)
+
+
+class LabOrderReasonCondition(models.Model):
+    """A class representing a lab order reason's condition."""
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_laborderreasoncondition_001"
+
+    dbid = models.BigIntegerField(primary_key=True)
+    created = models.DateTimeField()
+    modified = models.DateTimeField()
+    reason = models.ForeignKey(
+        LabOrderReason, on_delete=models.DO_NOTHING, related_name="reason_conditions", null=True
+    )
+    condition = models.ForeignKey(
+        Condition,
+        on_delete=models.DO_NOTHING,
+        related_name="lab_order_reason_conditions",
+        null=True,
+    )
+
+
+class LabTest(models.Model):
+    """A class representing a lab test."""
+
+    class LabTestOrderStatus(models.TextChoices):
+        """Choicees for lab test order statuses."""
+
+        NEW = "NE", "new"
+        STAGED_FOR_REQUISITION = "SR", "staged for requisition"
+        SENDING = "SE", "sending"
+        SENDING_FAILED = "SF", "sending failed"
+        PROCESSING = "PR", "processing"
+        PROCESSING_FAILED = "PF", "processing failed"
+        RECEIVED = "RE", "received"
+        REVIEWED = "RV", "reviewed"
+        INACTIVE = "IN", "inactive"
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_labtest_001"
+
+    id = models.UUIDField()
+    dbid = models.BigIntegerField(primary_key=True)
+    ontology_test_name = models.CharField(max_length=512, blank=True, default="")
+    ontology_test_code = models.CharField(max_length=512, blank=True, default="")
+    status = models.CharField(max_length=30, choices=LabTestOrderStatus)
+    report = models.ForeignKey(
+        LabReport, on_delete=models.DO_NOTHING, null=True, related_name="tests"
+    )
+    aoe_code = models.CharField(max_length=10, default="")
+    procedure_class = models.CharField(max_length=10, default="")
+    specimen_type = models.CharField()
+    specimen_source_code = models.CharField()
+    specimen_source_description = models.CharField()
+    specimen_source_coding_system = models.CharField()
+    order = models.ForeignKey(
+        LabOrder, on_delete=models.DO_NOTHING, related_name="tests", null=True
+    )
+
+    def __str__(self) -> str:
+        return f"{self.ontology_test_name}: f{self.ontology_test_code}"

canvas_sdk/v1/data/patient.py

@@ -49,4 +49,7 @@ class Patient(models.Model):
     @classmethod
     def find(cls, id: str) -> Self:
         """Find a patient by id."""
-        return cls.objects.get(id=id)
+        return cls._default_manager.get(id=id)
+
+    def __str__(self) -> str:
+        return f"{self.first_name} {self.last_name}"

canvas_sdk/v1/data/protocol_override.py

@@ -0,0 +1,58 @@
+from django.db import models
+
+from canvas_sdk.v1.data.base import CommittableModelManager
+from canvas_sdk.v1.data.patient import Patient
+from canvas_sdk.v1.data.user import CanvasUser
+
+
+class IntervalUnit(models.TextChoices):
+    """ProtocolOverride cycle IntervalUnit."""
+
+    DAYS = "days", "days"
+    MONTHS = "months", "months"
+    YEARS = "years", "years"
+
+
+class Status(models.TextChoices):
+    """ProtocolOverride Status."""
+
+    ACTIVE = "active", "active"
+    INACTIVE = "inactive", "inactive"
+
+
+class ProtocolOverride(models.Model):
+    """ProtocolOverride."""
+
+    class Meta:
+        managed = False
+        app_label = "canvas_sdk"
+        db_table = "canvas_sdk_data_api_protocoloverride_001"
+
+    objects = CommittableModelManager()
+
+    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)
+    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING)
+    patient = models.ForeignKey(
+        Patient,
+        on_delete=models.DO_NOTHING,
+        related_name="allergy_intolerances",
+    )
+    protocol_key = models.CharField()
+    is_adjustment = models.BooleanField()
+    reference_date = models.DateTimeField()
+    cycle_in_days = models.IntegerField()
+    is_snooze = models.BooleanField()
+    snooze_date = models.DateField()
+    snoozed_days = models.IntegerField()
+    # reason_id = models.BigIntegerField()
+    snooze_comment = models.TextField()
+    narrative = models.CharField()
+    # note_id = models.BigIntegerField()
+    cycle_quantity = models.IntegerField()
+    cycle_unit = models.CharField(choices=IntervalUnit.choices)
+    status = models.CharField(choices=Status.choices)

canvas_sdk/v1/data/questionnaire.py

@@ -109,7 +109,7 @@ class Questionnaire(models.Model):
     code_system = models.CharField()
     code = models.CharField()
     search_tags = models.CharField()
-    questions = models.ManyToManyField(Question, through="QuestionnaireQuestionMap")
+    questions = models.ManyToManyField(Question, through="canvas_sdk.QuestionnaireQuestionMap")  # type: ignore[misc, var-annotated]
     use_in_shx = models.BooleanField()
     carry_forward = models.TextField()
 
@@ -152,7 +152,9 @@ class Interview(models.Model):
     patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING, related_name="interviews")
     note_id = models.BigIntegerField()
     appointment_id = models.BigIntegerField()
-    questionnaires = models.ManyToManyField(Questionnaire, through="InterviewQuestionnaireMap")
+    questionnaires = models.ManyToManyField(  # type: ignore[var-annotated]
+        Questionnaire, through="canvas_sdk.InterviewQuestionnaireMap"  # type: ignore[misc]
+    )
     progress_status = models.CharField()
     created = models.DateTimeField()
     modified = models.DateTimeField()

canvas_sdk/value_set/tests/test_value_sets.py

@@ -1,11 +1,10 @@
-import pytest
-
 from canvas_sdk.value_set.v2022.condition import (
     DisordersOfTheImmuneSystem,
     EncephalopathyDueToChildhoodVaccination,
     Rhabdomyolysis,
     StableAndUnstableAngina,
 )
+from canvas_sdk.value_set.value_set import CombinedValueSet
 
 
 def test_value_set_class_values_property() -> None:
@@ -15,7 +14,9 @@ def test_value_set_class_values_property() -> None:
 
 
 def test_value_set_class_pipe_operator_with_two_value_sets() -> None:
-    combined_value_set = DisordersOfTheImmuneSystem | EncephalopathyDueToChildhoodVaccination
+    combined_value_set: CombinedValueSet = (
+        DisordersOfTheImmuneSystem | EncephalopathyDueToChildhoodVaccination
+    )
 
     both_classes_icd_10_codes = DisordersOfTheImmuneSystem.ICD10CM.union(
         EncephalopathyDueToChildhoodVaccination.ICD10CM
@@ -29,7 +30,7 @@ def test_value_set_class_pipe_operator_with_two_value_sets() -> None:
 
 
 def test_value_set_class_pipe_operator_with_three_value_sets() -> None:
-    combined_value_set = (
+    combined_value_set: CombinedValueSet = (
         DisordersOfTheImmuneSystem | EncephalopathyDueToChildhoodVaccination | Rhabdomyolysis
     )
 
@@ -45,8 +46,10 @@ def test_value_set_class_pipe_operator_with_three_value_sets() -> None:
 
 
 def test_value_set_class_pipe_operator_with_two_combined_value_sets() -> None:
-    combined_value_set_1 = DisordersOfTheImmuneSystem | EncephalopathyDueToChildhoodVaccination
-    combined_value_set_2 = Rhabdomyolysis | StableAndUnstableAngina
+    combined_value_set_1: CombinedValueSet = (
+        DisordersOfTheImmuneSystem | EncephalopathyDueToChildhoodVaccination
+    )
+    combined_value_set_2: CombinedValueSet = Rhabdomyolysis | StableAndUnstableAngina
 
     combined_value_set = combined_value_set_1 | combined_value_set_2