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

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

@@ -1,15 +1,24 @@
+from typing import cast
+
 from django.db import models
 
 from canvas_sdk.v1.data.base import (
-    CommittableModelManager,
+    BaseModelManager,
+    BaseQuerySet,
+    CommittableQuerySetMixin,
+    ForPatientQuerySetMixin,
     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 LabReportQuerySet(BaseQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin):
+    """A queryset for lab reports."""
+
+    pass
+
+
+LabReportManager = BaseModelManager.from_queryset(LabReportQuerySet)
 
 
 class TransmissionType(models.TextChoices):
@@ -25,10 +34,9 @@ class LabReport(models.Model):
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labreport_001"
 
-    objects = CommittableModelManager()
+    objects = cast(LabReportQuerySet, LabReportManager())
 
     id = models.UUIDField()
     dbid = models.BigIntegerField(primary_key=True)
@@ -39,7 +47,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,35 +60,43 @@ 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()
 
 
+class LabReviewQuerySet(BaseQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin):
+    """A queryset for lab reviews."""
+
+    pass
+
+
+LabReviewManager = BaseModelManager.from_queryset(LabReviewQuerySet)
+
+
 class LabReview(models.Model):
     """A class representing a lab review."""
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_labreview_001"
 
-    objects = CommittableModelManager()
+    objects = cast(LabReviewQuerySet, LabReviewManager())
 
     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)
     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 +121,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 +147,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 +187,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 +235,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 +255,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 +264,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 +289,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

@@ -1,9 +1,14 @@
+from typing import cast
+
 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
+from canvas_sdk.v1.data.base import (
+    BaseModelManager,
+    CommittableQuerySetMixin,
+    ForPatientQuerySetMixin,
+    ValueSetLookupQuerySet,
+)
 
 
 class Status(TextChoices):
@@ -13,30 +18,32 @@ class Status(TextChoices):
     INACTIVE = "inactive", "inactive"
 
 
-class MedicationQuerySet(ValueSetLookupQuerySet):
+class MedicationQuerySet(ValueSetLookupQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin):
     """MedicationQuerySet."""
 
     pass
 
 
+MedicationManager = BaseModelManager.from_queryset(MedicationQuerySet)
+
+
 class Medication(models.Model):
     """Medication."""
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_medication_001"
 
-    objects = CommittableModelManager.from_queryset(MedicationQuerySet)()
+    objects = cast(MedicationQuerySet, MedicationManager())
 
     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 +59,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)
@@ -126,6 +120,8 @@ class NoteType(models.Model):
     deprecated_at = models.DateTimeField()
     is_patient_required = models.BooleanField()
     allow_custom_title = models.BooleanField()
+    is_scheduleable_via_patient_portal = models.BooleanField()
+    online_duration = models.IntegerField()
 
 
 class Note(models.Model):
@@ -133,30 +129,31 @@ 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, related_name="notes", 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,36 +1,45 @@
+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 ObservationQuerySet(ValueSetLookupQuerySet):
+class ObservationQuerySet(
+    ValueSetLookupQuerySet, CommittableQuerySetMixin, ForPatientQuerySetMixin
+):
     """ObservationQuerySet."""
 
     pass
 
 
+ObservationManager = BaseModelManager.from_queryset(ObservationQuerySet)
+
+
 class Observation(models.Model):
     """Observation."""
 
     class Meta:
         managed = False
-        app_label = "canvas_sdk"
         db_table = "canvas_sdk_data_api_observation_001"
 
-    objects = CommittableModelManager.from_queryset(ObservationQuerySet)()
+    objects = cast(ObservationQuerySet, ObservationManager())
 
     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)
     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 +57,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 +75,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 +93,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 +111,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)