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

canvas_sdk/v1/data/device.py

@@ -1,26 +1,22 @@
 from django.db import models
 
-from canvas_sdk.v1.data import Patient
-from canvas_sdk.v1.data.user import CanvasUser
-
 
 class Device(models.Model):
     """Device."""
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_device_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, null=True)
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    originator = models.ForeignKey("v1.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, on_delete=models.DO_NOTHING, related_name="devices", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="devices", null=True
     )
     note_id = models.BigIntegerField()
     deleted = models.BooleanField()

canvas_sdk/v1/data/imaging.py

@@ -6,8 +6,6 @@ from canvas_sdk.v1.data.common import (
     ReviewPatientCommunicationMethod,
     ReviewStatus,
 )
-from canvas_sdk.v1.data.patient import Patient
-from canvas_sdk.v1.data.user import CanvasUser
 
 
 class ImagingOrder(models.Model):
@@ -15,32 +13,31 @@ class ImagingOrder(models.Model):
 
     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, null=True)
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     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)
+    committer = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    entered_in_error = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING)
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="imaging_orders", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="imaging_orders", null=True
     )
     # TODO - uncomment when Note model is complete
     #  note = models.ForeigneKey(Note, on_delete=models.DO_NOTHING, related_name="imaging_orders", null=True)
     imaging = models.CharField()
     # TODO - uncomment when ServiceProvider model is complete
-    # imaging_center = models.ForeignKey(ServiceProvider, on_delete=models.DO_NOTHING, related_name="imaging_orders", null=True)
+    # imaging_center = models.ForeignKey('v1.ServiceProvider', on_delete=models.DO_NOTHING, related_name="imaging_orders", null=True)
     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.DO_NOTHING, related_name="imaging_orders", null=True)
+    # ordering_provider = models.ForeignKey('v1.Staff', on_delete=models.DO_NOTHING, related_name="imaging_orders", null=True)
     delegated = models.BooleanField(default=False)
 
 
@@ -49,26 +46,25 @@ class ImagingReview(models.Model):
 
     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, null=True)
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     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_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", null=True)
+    # note = models.ForeignKey('v1.Note', on_delete=models.DO_NOTHING, related_name="imaging_reviews", null=True)
     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", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="imaging_reviews", null=True
     )
 
 
@@ -82,7 +78,6 @@ class ImagingReport(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_imagingreport_001"
 
     id = models.UUIDField()
@@ -94,7 +89,7 @@ class ImagingReport(models.Model):
     requires_signature = models.BooleanField()
     assigned_date = models.DateTimeField()
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="imaging_results", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="imaging_results", null=True
     )
     order = models.ForeignKey(ImagingOrder, on_delete=models.DO_NOTHING, null=True)
     source = models.CharField(choices=ImagingReportSource)

canvas_sdk/v1/data/lab.py

@@ -5,11 +5,6 @@ from canvas_sdk.v1.data.base import (
     TimeframeLookupQuerySetMixin,
     ValueSetLookupQuerySet,
 )
-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):
@@ -25,7 +20,6 @@ class LabReport(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labreport_001"
 
     objects = CommittableModelManager()
@@ -39,7 +33,7 @@ class LabReport(models.Model):
     requires_signature = models.BooleanField()
     assigned_date = models.DateTimeField()
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="lab_reports", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="lab_reports", null=True
     )
     transmission_type = models.CharField(choices=TransmissionType)
     for_test_only = models.BooleanField()
@@ -52,9 +46,9 @@ class LabReport(models.Model):
     original_date = models.DateTimeField()
     date_performed = models.DateTimeField()
     custom_document_name = models.CharField()
-    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    originator = models.ForeignKey("v1.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)
     deleted = models.BooleanField()
 
 
@@ -63,7 +57,6 @@ class LabReview(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labreview_001"
 
     objects = CommittableModelManager()
@@ -72,15 +65,15 @@ class LabReview(models.Model):
     dbid = models.BigIntegerField(primary_key=True)
     created = models.DateTimeField()
     modified = models.DateTimeField()
-    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     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)
     internal_comment = models.TextField()
     message_to_patient = models.CharField()
     status = models.CharField()
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="lab_reviews", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="lab_reviews", null=True
     )
     patient_communication_method = models.CharField()
 
@@ -105,7 +98,6 @@ class LabValue(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labvalue_001"
 
     objects = LabValueQuerySet.as_manager()
@@ -132,7 +124,6 @@ class LabValueCoding(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labvaluecoding_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -173,19 +164,18 @@ class LabOrder(models.Model):
 
     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, null=True)
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     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, on_delete=models.DO_NOTHING, related_name="lab_orders", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="lab_orders", null=True
     )
     ontology_lab_partner = models.CharField()
     # TODO - uncomment when the Note model is finished
@@ -222,16 +212,15 @@ class LabOrderReason(models.Model):
 
     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, null=True)
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     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)
     order = models.ForeignKey(
         LabOrder, on_delete=models.DO_NOTHING, related_name="reasons", null=True
     )
@@ -243,7 +232,6 @@ class LabOrderReasonCondition(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_laborderreasoncondition_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -253,7 +241,7 @@ class LabOrderReasonCondition(models.Model):
         LabOrderReason, on_delete=models.DO_NOTHING, related_name="reason_conditions", null=True
     )
     condition = models.ForeignKey(
-        Condition,
+        "v1.Condition",
         on_delete=models.DO_NOTHING,
         related_name="lab_order_reason_conditions",
         null=True,
@@ -278,7 +266,6 @@ class LabTest(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labtest_001"
 
     id = models.UUIDField()

canvas_sdk/v1/data/medication.py

@@ -2,8 +2,6 @@ from django.db import models
 from django.db.models import TextChoices
 
 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
 
 
 class Status(TextChoices):
@@ -24,7 +22,6 @@ class Medication(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_medication_001"
 
     objects = CommittableModelManager.from_queryset(MedicationQuerySet)()
@@ -32,11 +29,11 @@ class Medication(models.Model):
     id = models.UUIDField()
     dbid = models.BigIntegerField(primary_key=True)
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="medications", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="medications", null=True
     )
     deleted = models.BooleanField()
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    entered_in_error = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    committer = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
     status = models.CharField(choices=Status.choices)
     start_date = models.DateTimeField()
     end_date = models.DateTimeField()
@@ -52,7 +49,6 @@ class MedicationCoding(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_medicationcoding_001"
 
     dbid = models.BigIntegerField(primary_key=True)

canvas_sdk/v1/data/note.py

@@ -1,11 +1,6 @@
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 
-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 NoteTypeCategories(models.TextChoices):
     """Note type categories."""
@@ -97,7 +92,6 @@ class NoteType(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_notetype_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -133,30 +127,29 @@ class Note(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_note_001"
 
     id = models.CharField(max_length=32)
     dbid = models.BigIntegerField(db_column="dbid", primary_key=True)
     created = models.DateTimeField()
     modified = models.DateTimeField()
-    patient = models.ForeignKey(Patient, on_delete=models.DO_NOTHING, null=True)
+    patient = models.ForeignKey("v1.Patient", on_delete=models.DO_NOTHING, null=True)
     provider = models.ForeignKey(
-        "Staff", on_delete=models.DO_NOTHING, related_name="notes", null=True
+        "v1.Staff", on_delete=models.DO_NOTHING, related_name="notes", null=True
     )
     note_type = models.CharField(choices=NoteTypes.choices, null=True)
     note_type_version = models.ForeignKey(
-        "NoteType", on_delete=models.DO_NOTHING, related_name="notes", null=True
+        "v1.NoteType", on_delete=models.DO_NOTHING, related_name="notes", null=True
     )
     title = models.TextField()
     body = models.JSONField()
-    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    last_modified_by_staff = models.ForeignKey("Staff", on_delete=models.DO_NOTHING, null=True)
+    originator = models.ForeignKey("v1.CanvasUser", on_delete=models.DO_NOTHING, null=True)
+    last_modified_by_staff = models.ForeignKey("v1.Staff", on_delete=models.DO_NOTHING, null=True)
     checksum = models.CharField()
     billing_note = models.TextField()
     # TODO -implement InpatientStay model
-    # inpatient_stay = models.ForeignKey("InpatientStay", on_delete=models.DO_NOTHING, null=True)
+    # inpatient_stay = models.ForeignKey("v1.InpatientStay", on_delete=models.DO_NOTHING, null=True)
     related_data = models.JSONField()
-    location = models.ForeignKey("PracticeLocation", on_delete=models.DO_NOTHING, null=True)
+    location = models.ForeignKey("v1.PracticeLocation", on_delete=models.DO_NOTHING, null=True)
     datetime_of_service = models.DateTimeField()
     place_of_service = models.CharField()

canvas_sdk/v1/data/observation.py

@@ -1,8 +1,6 @@
 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
 
 
 class ObservationQuerySet(ValueSetLookupQuerySet):
@@ -16,7 +14,6 @@ class Observation(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_observation_001"
 
     objects = CommittableModelManager.from_queryset(ObservationQuerySet)()
@@ -25,12 +22,12 @@ class Observation(models.Model):
     dbid = models.BigIntegerField(primary_key=True)
     created = models.DateTimeField()
     modified = models.DateTimeField()
-    originator = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    committer = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
-    entered_in_error = models.ForeignKey(CanvasUser, on_delete=models.DO_NOTHING, null=True)
+    originator = models.ForeignKey("v1.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)
     deleted = models.BooleanField()
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="observations", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="observations", null=True
     )
     is_member_of = models.ForeignKey(
         "self", on_delete=models.DO_NOTHING, related_name="members", null=True
@@ -48,7 +45,6 @@ class ObservationCoding(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_observationcoding_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -67,7 +63,6 @@ class ObservationComponent(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_observationcomponent_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -86,7 +81,6 @@ class ObservationComponentCoding(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_observationcomponentcoding_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -105,7 +99,6 @@ class ObservationValueCoding(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_observationvaluecoding_001"
 
     dbid = models.BigIntegerField(primary_key=True)

canvas_sdk/v1/data/organization.py

@@ -8,7 +8,6 @@ class Organization(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_organization_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -26,4 +25,4 @@ class Organization(models.Model):
     group_npi_number = models.CharField()
     group_taxonomy_number = models.CharField()
     include_zz_qualifier = models.BooleanField()
-    main_location = models.OneToOneField("PracticeLocation", on_delete=models.DO_NOTHING)
+    main_location = models.OneToOneField("v1.PracticeLocation", on_delete=models.DO_NOTHING)

canvas_sdk/v1/data/patient.py

@@ -21,7 +21,6 @@ class Patient(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_patient_001"
 
     id = models.CharField(max_length=32, db_column="key")

canvas_sdk/v1/data/practicelocation.py

@@ -57,7 +57,6 @@ class PracticeLocation(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_practicelocation_001"
 
     id = models.UUIDField()
@@ -65,7 +64,7 @@ class PracticeLocation(models.Model):
     created = models.DateTimeField()
     modified = models.DateTimeField()
     organization = models.ForeignKey(
-        "Organization", on_delete=models.DO_NOTHING, related_name="practice_locations", null=True
+        "v1.Organization", on_delete=models.DO_NOTHING, related_name="practice_locations", null=True
     )
     place_of_service_code = models.CharField(choices=PracticeLocationPOS.choices)
     full_name = models.CharField()
@@ -91,12 +90,11 @@ class PracticeLocationSetting(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_practicelocationsetting_001"
 
     dbid = models.BigIntegerField(primary_key=True)
     practice_location = models.ForeignKey(
-        PracticeLocation, on_delete=models.DO_NOTHING, related_name="settings", null=True
+        "v1.PracticeLocation", on_delete=models.DO_NOTHING, related_name="settings", null=True
     )
     name = models.CharField()
     value = models.JSONField()

canvas_sdk/v1/data/protocol_override.py

@@ -1,8 +1,6 @@
 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):
@@ -25,7 +23,6 @@ class ProtocolOverride(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_protocoloverride_001"
 
     objects = CommittableModelManager()
@@ -35,10 +32,10 @@ class ProtocolOverride(models.Model):
     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, on_delete=models.DO_NOTHING, related_name="protocol_overrides", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="protocol_overrides", null=True
     )
     protocol_key = models.CharField()
     is_adjustment = models.BooleanField()

canvas_sdk/v1/data/questionnaire.py

@@ -3,12 +3,10 @@ from collections.abc import Container
 from django.db import models
 from django.db.models import Q
 
-from canvas_sdk.v1.data import Patient
 from canvas_sdk.v1.data.base import (
     CommittableModelManager,
     ValueSetLookupByNameQuerySet,
 )
-from canvas_sdk.v1.data.user import CanvasUser
 
 
 class ResponseOptionSet(models.Model):
@@ -16,7 +14,6 @@ class ResponseOptionSet(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_responseoptionset_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -35,7 +32,6 @@ class ResponseOption(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_responseoption_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -57,7 +53,6 @@ class Question(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_question_001"
 
     id = models.UUIDField()
@@ -89,7 +84,6 @@ class Questionnaire(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_questionnaire_001"
 
     objects = models.Manager.from_queryset(QuestionnaireValueSetLookupQuerySet)()
@@ -109,7 +103,7 @@ class Questionnaire(models.Model):
     code_system = models.CharField()
     code = models.CharField()
     search_tags = models.CharField()
-    questions = models.ManyToManyField(Question, through="canvas_sdk.QuestionnaireQuestionMap")  # type: ignore[misc, var-annotated]
+    questions = models.ManyToManyField(Question, through="v1.QuestionnaireQuestionMap")  # type: ignore[misc, var-annotated]
     use_in_shx = models.BooleanField()
     carry_forward = models.TextField()
 
@@ -119,7 +113,6 @@ class QuestionnaireQuestionMap(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_questionnairequestionmap_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -135,7 +128,6 @@ class Interview(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_interview_001"
 
     objects = CommittableModelManager()
@@ -143,20 +135,20 @@ class Interview(models.Model):
     id = models.UUIDField()
     dbid = models.BigIntegerField(primary_key=True)
     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)
     status = models.CharField()
     name = models.CharField()
     language_id = models.BigIntegerField()
     use_case_in_charting = models.CharField()
     patient = models.ForeignKey(
-        Patient, on_delete=models.DO_NOTHING, related_name="interviews", null=True
+        "v1.Patient", on_delete=models.DO_NOTHING, related_name="interviews", null=True
     )
     note_id = models.BigIntegerField()
     appointment_id = models.BigIntegerField()
     questionnaires = models.ManyToManyField(  # type: ignore[var-annotated]
         Questionnaire,
-        through="canvas_sdk.InterviewQuestionnaireMap",  # type: ignore[misc]
+        through="v1.InterviewQuestionnaireMap",  # type: ignore[misc]
     )
     progress_status = models.CharField()
     created = models.DateTimeField()
@@ -168,7 +160,6 @@ class InterviewQuestionnaireMap(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_interviewquestionnairemap_001"
 
     dbid = models.BigIntegerField(primary_key=True)
@@ -184,7 +175,6 @@ class InterviewQuestionResponse(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_interviewquestionresponse_001"
 
     dbid = models.BigIntegerField(primary_key=True)