endoreg-db 0.8.4.4__py3-none-any.whl → 0.8.8.0__py3-none-any.whl

endoreg_db/models/__init__.py

@@ -1,199 +1,174 @@
 ####### Administration ########
 from .administration import (
-    AiModel,
     ActiveModel,
-    ModelType,
+    AiModel,
     Case,
-    CaseTemplate,
-    CaseTemplateRule,
-    CaseTemplateRuleType,
-    CaseTemplateRuleValue,
-    CaseTemplateRuleValueType,
-    CaseTemplateType,
     Center,
     CenterProduct,
     CenterResource,
-    CenterWaste,
     CenterShift,
-    Person,
-    Patient,
+    CenterWaste,
+    Employee,
+    EmployeeQualification,
+    EmployeeType,
     Examiner,
-    PortalUserInfo,
     FirstName,
     LastName,
-    Profession,
+    ModelType,
+    Patient,
+    PatientExternalID,
+    Person,
+    PortalUserInfo,
     Product,
-    ProductMaterial,
     ProductGroup,
-    ReferenceProduct,
+    ProductMaterial,
     ProductWeight,
+    Profession,
     Qualification,
     QualificationType,
+    ReferenceProduct,
+    ScheduledDays,
     Shift,
     ShiftType,
-    ScheduledDays,
-    Employee,
-    EmployeeType,
-    EmployeeQualification,
 )
 
-
 ####### Label ########
 from .label import (
+    ImageClassificationAnnotation,
     Label,
     LabelSet,
     LabelType,
-    VideoSegmentationLabel,
-    VideoSegmentationLabelSet,
     LabelVideoSegment,
-    ImageClassificationAnnotation,
     VideoSegmentationAnnotation,
+    VideoSegmentationLabel,
+    VideoSegmentationLabelSet,
 )
 
 ####### Media ########
 from .media import (
-    VideoFile,
-    Frame,
-    RawPdfFile,
-    DocumentType,
     AnonymExaminationReport,
     AnonymHistologyReport,
+    DocumentType,
+    Frame,
+    RawPdfFile,
     ReportReaderConfig,
     ReportReaderFlag,
+    VideoFile,
     VideoMetadata,
     VideoProcessingHistory,
 )
 
 ######## Medical ########
 from .medical import (
+    Contraindication,
     Disease,
     DiseaseClassification,
     DiseaseClassificationChoice,
+    Endoscope,
+    EndoscopeType,
+    EndoscopyProcessor,
     Event,
     EventClassification,
     EventClassificationChoice,
-    Contraindication,
     Examination,
-    ExaminationRequirementSet,
-    ExaminationType,
     ExaminationIndication,
-    ExaminationIndicationClassificationChoice,
     ExaminationIndicationClassification,
+    ExaminationIndicationClassificationChoice,
+    ExaminationRequirementSet,
     ExaminationTime,
     ExaminationTimeType,
+    ExaminationType,
     Finding,
-    PatientFindingClassification,
-    FindingClassificationType,
     FindingClassification,
     FindingClassificationChoice,
-    FindingType,
+    FindingClassificationType,
     FindingIntervention,
     FindingInterventionType,
+    FindingType,
+    LabValue,
+    Medication,
+    MedicationIndication,
+    MedicationIndicationType,
+    MedicationIntakeTime,
+    MedicationSchedule,
+    Organ,
     PatientDisease,
     PatientEvent,
-    PatientExaminationIndication,
     PatientExamination,
+    PatientExaminationIndication,
     PatientFinding,
+    PatientFindingClassification,
     PatientFindingIntervention,
     PatientLabSample,
     PatientLabSampleType,
     PatientLabValue,
     PatientMedication,
     PatientMedicationSchedule,
-    Organ,
     Risk,
     RiskType,
-    Medication,
-    MedicationSchedule,
-    MedicationIntakeTime,
-    MedicationIndicationType,
-    MedicationIndication,
-    Endoscope,
-    EndoscopeType,
-    EndoscopyProcessor,
-    LabValue,
 )
 
 ####### Metadata ########
 from .metadata import (
-    SensitiveMeta,
+    FFMpegMeta,
+    ModelMeta,
     PdfMeta,
     PdfType,
-    VideoMeta,
-    FFMpegMeta,
+    SensitiveMeta,
     VideoImportMeta,
-    ModelMeta,
+    VideoMeta,
     VideoPredictionMeta,
 )
-
 from .other import (
-    Material,
-    Resource,
-    TransportRoute,
-    Waste,
     BaseValueDistribution,
-    NumericValueDistribution,
-    SingleCategoricalValueDistribution,
-    MultipleCategoricalValueDistribution,
     DateValueDistribution,
+    EmissionFactor,
     Gender,
     InformationSource,
     InformationSourceType,
+    Material,
+    MultipleCategoricalValueDistribution,
+    NumericValueDistribution,
+    Resource,
+    SingleCategoricalValueDistribution,
+    Tag,
+    TransportRoute,
     Unit,
-    EmissionFactor,
-    Tag
+    Waste,
 )
-
 from .requirement import (
     Requirement,
-    RequirementType,
     RequirementOperator,
     RequirementSet,
     RequirementSetType,
+    RequirementType,
 )
-from .rule import (
-    RuleType,
-    Rule,
-    Ruleset,
-    RuleAttributeDType,
-    RuleApplicator,
-)
-
 from .state import (
-    SensitiveMetaState,
-    VideoState,
+    AnonymizationState,
     LabelVideoSegmentState,
-    AnonymizationStatus,
     RawPdfState,
+    SensitiveMetaState,
+    VideoState,
 )
 
 __all__ = [
-
     ####### Administration ########
-        # AI
+    # AI
     "AiModel",
     "ActiveModel",
     "ModelType",
-
     # Case
     "Case",
-    "CaseTemplate",
-    "CaseTemplateRule",
-    "CaseTemplateRuleType",
-    "CaseTemplateRuleValue",
-    "CaseTemplateRuleValueType",
-    "CaseTemplateType",
-
     # Center
     "Center",
     "CenterProduct",
     "CenterResource",
     "CenterWaste",
     "CenterShift",
-
     # Person
     "Person",
     "Patient",
+    "PatientExternalID",
     "Examiner",
     "PortalUserInfo",
     "FirstName",
@@ -202,23 +177,19 @@ __all__ = [
     "Employee",
     "EmployeeType",
     "EmployeeQualification",
-
     # Product
-    'Product',
-    'ProductMaterial',
-    'ProductGroup',
-    'ReferenceProduct',
-    'ProductWeight',
-
+    "Product",
+    "ProductMaterial",
+    "ProductGroup",
+    "ReferenceProduct",
+    "ProductWeight",
     # Qualification
     "Qualification",
     "QualificationType",
-
     # Shift
     "Shift",
     "ShiftType",
     "ScheduledDays",
-    
     ####### Label ########
     "Label",
     "LabelSet",
@@ -228,8 +199,6 @@ __all__ = [
     "LabelVideoSegment",
     "ImageClassificationAnnotation",
     "VideoSegmentationAnnotation",
-
-
     ####### Media ########
     "VideoFile",
     "Frame",
@@ -237,12 +206,10 @@ __all__ = [
     "DocumentType",
     "AnonymExaminationReport",
     "AnonymHistologyReport",
-    'ReportReaderConfig',
-    'ReportReaderFlag',
-    'VideoMetadata',
-    'VideoProcessingHistory',
-
-
+    "ReportReaderConfig",
+    "ReportReaderFlag",
+    "VideoMetadata",
+    "VideoProcessingHistory",
     ######## Medical ########
     # Disease
     "Disease",
@@ -256,6 +223,7 @@ __all__ = [
     "Contraindication",
     # Examination
     "Examination",
+    "ExaminationRequirementSet",
     "ExaminationType",
     "ExaminationIndication",
     "ExaminationIndicationClassificationChoice",
@@ -300,15 +268,12 @@ __all__ = [
     "MedicationIntakeTime",
     "MedicationIndicationType",
     "MedicationIndication",
-
     # Hardware
     "Endoscope",
     "EndoscopeType",
     "EndoscopyProcessor",
-
     # Laboratory
     "LabValue",
-
     ####### Metadata ########
     "SensitiveMeta",
     "PdfMeta",
@@ -318,42 +283,32 @@ __all__ = [
     "VideoImportMeta",
     "ModelMeta",
     "VideoPredictionMeta",
-
     ####### Other #######
-    'Material',
-    'Resource',
-    'TransportRoute',
-    'Waste',
-    'BaseValueDistribution',
-    'NumericValueDistribution',
-    'SingleCategoricalValueDistribution',
-    'MultipleCategoricalValueDistribution',
-    'DateValueDistribution',
+    "Material",
+    "Resource",
+    "TransportRoute",
+    "Waste",
+    "BaseValueDistribution",
+    "NumericValueDistribution",
+    "SingleCategoricalValueDistribution",
+    "MultipleCategoricalValueDistribution",
+    "DateValueDistribution",
     "Gender",
     "InformationSource",
     "InformationSourceType",
     "Unit",
     "EmissionFactor",
     "Tag",
-
     ###### Requirement ######
     "Requirement",
     "RequirementType",
     "RequirementOperator",
     "RequirementSet",
     "RequirementSetType",
-
-    ######## Rule #######
-    "RuleType",
-    "Rule",
-    "Ruleset",
-    "RuleAttributeDType",
-    "RuleApplicator",
-
     ####### State ########
     "SensitiveMetaState",
     "VideoState",
     "LabelVideoSegmentState",
-    "AnonymizationStatus",
+    "AnonymizationState",
     "RawPdfState",
 ]

endoreg_db/models/administration/__init__.py

@@ -1,19 +1,13 @@
 # AI
 from .ai import (
-    AiModel,
     ActiveModel,
+    AiModel,
     ModelType,
 )
 
 # Case
 from .case import (
     Case,
-    CaseTemplate,
-    CaseTemplateRule,
-    CaseTemplateRuleType,
-    CaseTemplateRuleValue,
-    CaseTemplateRuleValueType,
-    CaseTemplateType,
 )
 
 # Center
@@ -21,46 +15,43 @@ from .center import (
     Center,
     CenterProduct,
     CenterResource,
-    CenterWaste,
     CenterShift,
+    CenterWaste,
 )
 
-
-#TODO Review module
-# from .permissions import () 
-
+# TODO Review module
+# from .permissions import ()
 # Person
 from .person import (
-    Person,
-    Examiner, 
-    Patient, 
-    PortalUserInfo,     
+    Employee,
+    EmployeeQualification,
+    EmployeeType,
+    Examiner,
     FirstName,
     LastName,
+    Patient,
+    PatientExternalID,
+    Person,
+    PortalUserInfo,
     Profession,
-    Employee,
-    EmployeeType,
-    EmployeeQualification,
 )
 
 # Product
 from .product import (
     Product,
-    ProductMaterial,
     ProductGroup,
-    ReferenceProduct,
+    ProductMaterial,
     ProductWeight,
+    ReferenceProduct,
 )
-
 from .qualification import (
     Qualification,
     QualificationType,
 )
-
 from .shift import (
+    ScheduledDays,
     Shift,
     ShiftType,
-    ScheduledDays,
 )
 
 __all__ = [
@@ -68,26 +59,18 @@ __all__ = [
     "AiModel",
     "ActiveModel",
     "ModelType",
-
     # Case
     "Case",
-    "CaseTemplate",
-    "CaseTemplateRule",
-    "CaseTemplateRuleType",
-    "CaseTemplateRuleValue",
-    "CaseTemplateRuleValueType",
-    "CaseTemplateType",
-
     # Center
     "Center",
     "CenterProduct",
     "CenterResource",
     "CenterWaste",
     "CenterShift",
-
     # Person
     "Person",
     "Patient",
+    "PatientExternalID",
     "Examiner",
     "PortalUserInfo",
     "FirstName",
@@ -96,21 +79,17 @@ __all__ = [
     "Employee",
     "EmployeeType",
     "EmployeeQualification",
-
     # Product
-    'Product',
-    'ProductMaterial',
-    'ProductGroup',
-    'ReferenceProduct',
-    'ProductWeight',
-
+    "Product",
+    "ProductMaterial",
+    "ProductGroup",
+    "ReferenceProduct",
+    "ProductWeight",
     # Qualification
     "Qualification",
     "QualificationType",
-
     # Shift
     "Shift",
     "ShiftType",
     "ScheduledDays",
 ]
-

endoreg_db/models/administration/ai/active_model.py

@@ -1,5 +1,5 @@
 from django.db import models
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from endoreg_db.models.metadata import ModelMeta
@@ -27,7 +27,7 @@ class ActiveModel(models.Model):
 
     name = models.CharField(max_length=255, unique=True)
     
-    model_meta:Optional[models.ForeignKey["ModelMeta"]] = models.ForeignKey(
+    model_meta:models.ForeignKey["ModelMeta|None"] = models.ForeignKey(
         'ModelMeta', on_delete=models.SET_NULL, 
         blank=True, null=True
     )

endoreg_db/models/administration/ai/ai_model.py

@@ -1,10 +1,9 @@
 """
 Django model for AI models.
 """
-from importlib import metadata
 from django.db import models
 from icecream import ic
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from .model_type import ModelType
@@ -54,7 +53,7 @@ class AiModel(models.Model):
     name = models.CharField(max_length=255, unique=True)
 
     description = models.TextField(blank=True, null=True)
-    model_type:Optional[models.ForeignKey[Union["ModelType", None]]] = models.ForeignKey(
+    model_type = models.ForeignKey(
         "ModelType",
         on_delete=models.CASCADE,
         related_name="ai_models",
@@ -62,14 +61,14 @@ class AiModel(models.Model):
         null=True,
     )
     model_subtype = models.CharField(max_length=255, blank=True, null=True)
-    video_segmentation_labelset:Optional[models.ForeignKey[Union["VideoSegmentationLabelSet", None]]] = models.ForeignKey(
+    video_segmentation_labelset = models.ForeignKey(
         "VideoSegmentationLabelSet",
         on_delete=models.CASCADE,
         related_name="ai_models",
         blank=True,
         null=True,
     )
-    active_meta:Optional[models.ForeignKey[Union["ModelMeta", None]]] = models.ForeignKey(
+    active_meta = models.ForeignKey(
         "ModelMeta",
         on_delete=models.SET_NULL,
         related_name="active_model", 
@@ -79,7 +78,9 @@ class AiModel(models.Model):
 
     if TYPE_CHECKING:
         metadata_versions: models.QuerySet["ModelMeta"]
-
+        model_type:models.ForeignKey["ModelType|None"]
+        active_meta:models.ForeignKey["ModelMeta|None"]
+        video_segmentation_labelset:models.ForeignKey["VideoSegmentationLabelSet|None"]
 
     def get_version(self, version: int) -> "ModelMeta":
         """

endoreg_db/models/administration/case/__init__.py

@@ -1,19 +1,5 @@
 from .case import Case
-from .case_template import (
-    CaseTemplate,
-    CaseTemplateRule,
-    CaseTemplateRuleType,
-    CaseTemplateRuleValue,
-    CaseTemplateRuleValueType,
-    CaseTemplateType,
-)
 
 __all__ = [
     "Case",
-    "CaseTemplate",
-    "CaseTemplateRule",
-    "CaseTemplateRuleType",
-    "CaseTemplateRuleValue",
-    "CaseTemplateRuleValueType",
-    "CaseTemplateType",
-]
+]

endoreg_db/models/administration/case/case.py

@@ -75,9 +75,9 @@ class Case(models.Model):
     )
 
     if TYPE_CHECKING:
-        patient: "Patient"
-        patient_examinations: models.QuerySet["PatientExamination"]
-
+        patient: models.ForeignKey["Patient"]
+        patient_examinations: models.ManyToManyField["PatientExamination", "PatientExamination"]
+        
     class Meta:
         ordering = ['-start_date', 'patient']
         verbose_name = "Case"

endoreg_db/models/administration/case/case_template/__init__.py

@@ -1,15 +1,3 @@
-# Django models to define CaseTemplate and CaseTemplateType models 
-# (each with "name" field which acts as a natural key)
-from .case_template_rule import CaseTemplateRule, CaseTemplateRuleType
-from .case_template_rule_value import CaseTemplateRuleValue, CaseTemplateRuleValueType
-from .case_template_type import CaseTemplateType
-from .case_template import CaseTemplate
+"""Case template models have been deprecated and are no longer available."""
 
-__all__ = [
-    "CaseTemplateRule",
-    "CaseTemplateRuleType",
-    "CaseTemplateRuleValue",
-    "CaseTemplateRuleValueType",
-    "CaseTemplateType",
-    "CaseTemplate",
-]
+__all__: list[str] = []