nci-cidc-api-modules 1.2.28__py3-none-any.whl → 1.2.30__py3-none-any.whl

cidc_api/models/data.py

@@ -1,4 +1,5 @@
 from cidc_api.models.pydantic.stage2 import all_models
+from cidc_api.models.db.stage2 import all_models as all_db_models
 
 standard_data_categories = [model.__data_category__ for model in all_models if hasattr(model, "__data_category__")]
 
@@ -13,3 +14,6 @@ class Dataset(dict):
 
 # Maps data categories like "treatment" to their associated pydantic model
 data_category_to_model = {model.__data_category__: model for model in all_models if hasattr(model, "__data_category__")}
+data_category_to_db_model = {
+    model.__data_category__: model for model in all_db_models if hasattr(model, "__data_category__")
+}

cidc_api/models/db/stage2/additional_treatment_orm.py

@@ -11,6 +11,7 @@ class AdditionalTreatmentORM(BaseORM):
     __tablename__ = "additional_treatment"
     __repr_attrs__ = ["additional_treatment_id", "participant_id", "description"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "additional_treatment"
 
     additional_treatment_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/adverse_event_orm.py

@@ -22,6 +22,7 @@ class AdverseEventORM(BaseORM):
     __tablename__ = "adverse_event"
     __repr_attrs__ = ["adverse_event_id", "participant_id", "event_term"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "adverse_event"
 
     adverse_event_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/baseline_clinical_assessment_orm.py

@@ -11,6 +11,7 @@ class BaselineClinicalAssessmentORM(BaseORM):
     __tablename__ = "baseline_clinical_assessment"
     __repr_attrs__ = ["baseline_clinical_assessment_id", "participant_id"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "baseline_clinical_assessment"
 
     baseline_clinical_assessment_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/comorbidity_orm.py

@@ -11,6 +11,7 @@ class ComorbidityORM(BaseORM):
     __tablename__ = "comorbidity"
     __repr_attrs__ = ["comorbidity_id", "comorbidity_term"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "comorbidity"
 
     comorbidity_id: Mapped[int] = mapped_column(primary_key=True)
     medical_history_id: Mapped[int] = mapped_column(

cidc_api/models/db/stage2/consent_group_orm.py

@@ -16,6 +16,7 @@ class ConsentGroupORM(BaseORM):
         ),
         {"schema": "stage2"},
     )
+    __data_category__ = "consent_group"
 
     consent_group_id: Mapped[int] = mapped_column(primary_key=True)
     trial_id: Mapped[str]

cidc_api/models/db/stage2/demographic_orm.py

@@ -21,12 +21,13 @@ class DemographicORM(BaseORM):
     __tablename__ = "demographic"
     __repr_attrs__ = ["demographic_id", "participant_id", "age_at_enrollment", "sex"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "demographic"
 
     demographic_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))
     age_at_enrollment: Mapped[PositiveInt | None]
     age_at_enrollment_units: Mapped[AgeAtEnrollmentUnits | None]
-    age_90_or_older: Mapped[bool]
+    age_90_or_over: Mapped[bool]
     sex: Mapped[Sex]
     race: Mapped[Race]
     ethnicity: Mapped[Ethnicity]

cidc_api/models/db/stage2/disease_orm.py

@@ -7,7 +7,6 @@ from sqlalchemy.types import JSON
 
 from cidc_api.models.db.base_orm import BaseORM
 from cidc_api.models.types import (
-    PrimaryDiagnosisDiseaseGroup,
     TumorGrade,
     CancerStageSystem,
     CancerStageSystemVersion,
@@ -30,23 +29,23 @@ class DiseaseORM(BaseORM):
         "participant_id",
     ]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "disease"
 
     disease_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))
-    primary_diagnosis_disease_group: Mapped[PrimaryDiagnosisDiseaseGroup]
     primary_disease_site: Mapped[UberonAnatomicalTerm]
-    morphological_code: Mapped[ICDO3MorphologicalCode]
-    morphological_term: Mapped[ICDO3MorphologicalTerm]
+    morphological_code: Mapped[ICDO3MorphologicalCode | None]
+    morphological_term: Mapped[ICDO3MorphologicalTerm | None]
     cancer_type_description: Mapped[str | None]
-    days_since_original_diagnosis: Mapped[NonPositiveInt]
+    days_since_original_diagnosis: Mapped[NonPositiveInt | None]
     tumor_grade: Mapped[TumorGrade | None]
     cancer_stage_system: Mapped[CancerStageSystem]
     cancer_stage_system_version: Mapped[CancerStageSystemVersion | None] = mapped_column(String, nullable=True)
-    cancer_stage: Mapped[CancerStage] = mapped_column(String)
-    t_category: Mapped[TCategory]
-    n_category: Mapped[NCategory]
-    m_category: Mapped[MCategory]
-    metastatic_organ: Mapped[List[UberonAnatomicalTerm]] = mapped_column(JSON, nullable=True)
+    cancer_stage: Mapped[CancerStage | None] = mapped_column(String)
+    t_category: Mapped[TCategory | None]
+    n_category: Mapped[NCategory | None]
+    m_category: Mapped[MCategory | None]
+    metastatic_organ: Mapped[List[UberonAnatomicalTerm] | None] = mapped_column(JSON, nullable=True)
     solely_extramedullary_disease: Mapped[YNU]
     extramedullary_organ: Mapped[List[UberonAnatomicalTerm]] = mapped_column(JSON, nullable=True)
 

cidc_api/models/db/stage2/exposure_orm.py

@@ -11,11 +11,12 @@ class ExposureORM(BaseORM):
     __tablename__ = "exposure"
     __repr_attrs__ = ["exposure_id", "exposure_type", "carcinogen_exposure"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "exposure"
 
     exposure_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))
 
     carcinogen_exposure: Mapped[YNU]
-    exposure_type: Mapped[ExposureType]
+    exposure_type: Mapped[ExposureType | None]
 
     participant: Mapped["ParticipantORM"] = relationship(back_populates="exposures", cascade="all, delete")

cidc_api/models/db/stage2/gvhd_diagnosis_acute_orm.py

@@ -19,6 +19,7 @@ class GVHDDiagnosisAcuteORM(BaseORM):
         {"schema": "stage2"},
     )
     __repr_attrs__ = ["gvhd_diagnosis_acute_id", "pre_or_post_enrollment"]
+    __data_category__ = "gvhd_diagnosis_acute"
 
     gvhd_diagnosis_acute_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/gvhd_diagnosis_chronic_orm.py

@@ -21,6 +21,7 @@ class GVHDDiagnosisChronicORM(BaseORM):
         {"schema": "stage2"},
     )
     __repr_attrs__ = ["gvhd_diagnosis_chronic_id", "pre_or_post_enrollment"]
+    __data_category__ = "gvhd_diagnosis_chronic"
 
     gvhd_diagnosis_chronic_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/gvhd_organ_acute_orm.py

@@ -9,6 +9,7 @@ class GVHDOrganAcuteORM(BaseORM):
     __tablename__ = "gvhd_organ_acute"
     __repr_attrs__ = ["gvhd_organ_acute_id", "organ"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "gvhd_organ_acute"
 
     gvhd_organ_acute_id: Mapped[int] = mapped_column(primary_key=True)
     gvhd_diagnosis_acute_id: Mapped[int] = mapped_column(

cidc_api/models/db/stage2/gvhd_organ_chronic_orm.py

@@ -9,6 +9,7 @@ class GVHDOrganChronicORM(BaseORM):
     __tablename__ = "gvhd_organ_chronic"
     __repr_attrs__ = ["gvhd_organ_chronic_id", "organ"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "gvhd_organ_chronic"
 
     gvhd_organ_chronic_id: Mapped[int] = mapped_column(primary_key=True)
     gvhd_diagnosis_chronic_id: Mapped[int] = mapped_column(

cidc_api/models/db/stage2/medical_history_orm.py

@@ -12,6 +12,7 @@ class MedicalHistoryORM(BaseORM):
     __tablename__ = "medical_history"
     __repr_attrs__ = ["medical_history_id"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "medical_history"
 
     medical_history_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/other_malignancy_orm.py

@@ -12,6 +12,7 @@ class OtherMalignancyORM(BaseORM):
     __tablename__ = "other_malignancy"
     __repr_attrs__ = ["other_malignancy_id", "primary_disease_site"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "other_malignancy"
 
     other_malignancy_id: Mapped[int] = mapped_column(primary_key=True)
     medical_history_id: Mapped[int] = mapped_column(

cidc_api/models/db/stage2/participant_orm.py

@@ -4,7 +4,7 @@ from sqlalchemy import ForeignKey, ForeignKeyConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from cidc_api.models.db.base_orm import BaseORM
-from cidc_api.models.types import OffStudyReason
+from cidc_api.models.types import OffStudyReason, YNU
 
 
 class ParticipantORM(BaseORM):
@@ -16,17 +16,18 @@ class ParticipantORM(BaseORM):
         ),
         {"schema": "stage2"},
     )
+    __data_category__ = "participant"
 
     participant_id: Mapped[int] = mapped_column(primary_key=True)
     trial_id: Mapped[str]
     version: Mapped[str]
 
-    native_participant_id: Mapped[str]
+    native_participant_id: Mapped[str | None]
     cimac_participant_id: Mapped[str] = mapped_column(unique=True)
     consent_group_id: Mapped[Optional[int]] = mapped_column(
         ForeignKey("stage2.consent_group.consent_group_id", ondelete="CASCADE")
     )
-    off_study: Mapped[bool]
+    off_study: Mapped[YNU]
     off_study_reason: Mapped[Optional[OffStudyReason]]
     off_study_reason_other: Mapped[Optional[str]]
 

cidc_api/models/db/stage2/prior_treatment_orm.py

@@ -12,6 +12,7 @@ class PriorTreatmentORM(BaseORM):
     __tablename__ = "prior_treatment"
     __repr_attrs__ = ["prior_treatment_id", "type"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "prior_treatment"
 
     prior_treatment_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/radiotherapy_dose_orm.py

@@ -18,6 +18,7 @@ class RadiotherapyDoseORM(BaseORM):
     __tablename__ = "radiotherapy_dose"
     __repr_attrs__ = ["radiotherapy_dose_id", "procedure"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "radiotherapy_dose"
 
     radiotherapy_dose_id: Mapped[int] = mapped_column(primary_key=True)
     treatment_id: Mapped[int] = mapped_column(ForeignKey("stage2.treatment.treatment_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/response_by_system_orm.py

@@ -10,6 +10,7 @@ class ResponseBySystemORM(BaseORM):
     __tablename__ = "response_by_system"
     __repr_attrs__ = ["response_by_system_id", "participant_id"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "response_by_system"
 
     response_by_system_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/response_orm.py

@@ -11,6 +11,7 @@ class ResponseORM(BaseORM):
     __tablename__ = "response"
     __repr_attrs__ = ["response_id", "participant_id"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "response"
 
     response_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/stem_cell_transplant_orm.py

@@ -12,6 +12,7 @@ class StemCellTransplantORM(BaseORM):
     __tablename__ = "stem_cell_transplant"
     __repr_attrs__ = ["stem_cell_transplant_id"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "stem_cell_transplant"
 
     stem_cell_transplant_id: Mapped[int] = mapped_column(primary_key=True)
     treatment_id: Mapped[int] = mapped_column(ForeignKey("stage2.treatment.treatment_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/surgery_orm.py

@@ -12,6 +12,7 @@ class SurgeryORM(BaseORM):
     __tablename__ = "surgery"
     __repr_attrs__ = ["surgery_id", "procedure"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "surgery"
 
     surgery_id: Mapped[int] = mapped_column(primary_key=True)
     treatment_id: Mapped[int] = mapped_column(ForeignKey("stage2.treatment.treatment_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/therapy_agent_dose_orm.py

@@ -12,6 +12,7 @@ class TherapyAgentDoseORM(BaseORM):
     __tablename__ = "therapy_agent_dose"
     __repr_attrs__ = ["therapy_agent_dose_id", "therapy_agent_name"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "therapy_agent_dose"
 
     therapy_agent_dose_id: Mapped[int] = mapped_column(primary_key=True)
     treatment_id: Mapped[int] = mapped_column(ForeignKey("stage2.treatment.treatment_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/treatment_orm.py

@@ -11,6 +11,7 @@ class TreatmentORM(BaseORM):
     __tablename__ = "treatment"
     __repr_attrs__ = ["treatment_id", "participant_id", "treatment_description"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "treatment"
 
     treatment_id: Mapped[int] = mapped_column(primary_key=True)
     participant_id: Mapped[int] = mapped_column(ForeignKey("stage2.participant.participant_id", ondelete="CASCADE"))

cidc_api/models/db/stage2/trial_orm.py

@@ -6,13 +6,14 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.types import JSON
 
 from cidc_api.models.db.base_orm import BaseORM
-from cidc_api.models.types import TrialStatus, AssayType, TrialOrganization, TrialFundingAgency
+from cidc_api.models.types import AssayType, TrialOrganization, TrialFundingAgency
 
 
 class TrialORM(BaseORM):
     __tablename__ = "trial"
     __repr_attrs__ = ["trial_id", "version"]
     __table_args__ = {"schema": "stage2"}
+    __data_category__ = "study"
 
     trial_id: Mapped[str] = mapped_column(primary_key=True)
     version: Mapped[str] = mapped_column(primary_key=True)
@@ -24,7 +25,6 @@ class TrialORM(BaseORM):
     trial_description: Mapped[Optional[str]]
     trial_organization: Mapped[Optional[TrialOrganization]]
     grant_or_affiliated_network: Mapped[Optional[TrialFundingAgency]]
-    trial_status: Mapped[TrialStatus]
     biobank_institution_id: Mapped[Optional[int]]
     justification: Mapped[Optional[str]]
     dates_of_conduct_start: Mapped[datetime]

cidc_api/models/models.py

@@ -3399,6 +3399,7 @@ class PreprocessedFiles(CommonColumns):
                 (cls.file_category == latest_subquery.c.file_category)
                 & (cls._created == latest_subquery.c.latest_created),
             )
+            .order_by(cls.file_category)
             .all()
         )
         return latest_files

cidc_api/models/pydantic/stage2/additional_treatment.py

@@ -10,7 +10,9 @@ class AdditionalTreatment(Base):
     additional_treatment_id: int | None = None
 
     # The unique internal identifier for the associated Participant record
-    participant_id: int | None = None
+    participant_id: str | None = (
+        None  # TODO: fix all stage2 models for participant_id to not be nullable, after s1 models are complete
+    )
 
     # Number of days from the enrollment date to the first recorded administration or occurrence of the treatment modality.
     days_to_start: NonNegativeInt | None = None

cidc_api/models/pydantic/stage2/adverse_event.py

@@ -25,7 +25,7 @@ class AdverseEvent(Base):
     adverse_event_id: int | None = None
 
     # The unique internal identifier of the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The unique internal identifier of the attributed treatment, if any
     treatment_id: int | None = None

cidc_api/models/pydantic/stage2/base.py

@@ -28,3 +28,15 @@ class Base(BaseModel):
         except:
             self.__dict__.update(original_dict)
             raise
+
+    @classmethod
+    def split_list(cls, val):
+        """Listify fields that are multi-valued in input data, e.g. 'lung|kidney'"""
+        if type(val) == list:
+            return val
+        elif type(val) == str:
+            if not val:
+                return []
+            return val.split("|")
+        else:
+            raise ValueError("Field value must be string or list")

cidc_api/models/pydantic/stage2/baseline_clinical_assessment.py

@@ -10,7 +10,7 @@ class BaselineClinicalAssessment(Base):
     baseline_clinical_assessment_id: int | None = None
 
     # The unique identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The numerical score that represents the functional capabilities of a participant at the
     # enrollment date using the Eastern Cooperative Oncology Group Performance Status assessment.

cidc_api/models/pydantic/stage2/demographic.py

@@ -1,6 +1,6 @@
-from typing import Self
+from typing import Self, Annotated, List
 
-from pydantic import PositiveInt, NonNegativeFloat, PositiveFloat, model_validator, field_validator
+from pydantic import PositiveInt, NonNegativeFloat, PositiveFloat, model_validator, field_validator, BeforeValidator
 
 from .base import Base
 from cidc_api.models.types import (
@@ -25,7 +25,7 @@ class Demographic(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The age of the subject when the subject enrolled in the study.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15742605%20and%20ver_nr=1
@@ -34,9 +34,9 @@ class Demographic(Base):
     # Unit of measurement for the age of the participant. e.g. "Years"
     age_at_enrollment_units: AgeAtEnrollmentUnits | None = None
 
-    # Indicates whether the participant is 90 years old or older. (for PHI purposes)
+    # Indicates whether the participant is 90 years old or over. (for PHI purposes)
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15354920%20and%20ver_nr=1
-    age_90_or_older: bool
+    age_90_or_over: bool
 
     # A textual description of a person's sex at birth. e.g. "Male"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=7572817%20and%20ver_nr=3
@@ -44,7 +44,7 @@ class Demographic(Base):
 
     # The race of the participant. e.g. "White"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=2192199%20and%20ver_nr=1
-    race: Race
+    race: Annotated[List[Race], BeforeValidator(Base.split_list)]
 
     # The ethnicity of the participant. e.g. "Hispanic or Latino"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=2192217%20and%20ver_nr=2
@@ -92,23 +92,24 @@ class Demographic(Base):
 
     @model_validator(mode="after")
     def validate_age_at_enrollment_cr(self) -> Self:
-        if self.age_90_or_older:
+        if self.age_90_or_over:
             if self.age_at_enrollment or self.age_at_enrollment_units:
                 raise ValueError(
-                    'If "age_90_or_older" is "Yes" then "age_at_enrollment" and "age_at_enrollment_units" must be blank.'
+                    'If "age_90_or_over" is "Yes" then "age_at_enrollment" and "age_at_enrollment_units" must be blank.'
                 )
         else:
             if not self.age_at_enrollment or not self.age_at_enrollment_units:
                 raise ValueError(
-                    'If "age_90_or_older" is "No" then "age_at_enrollment" and "age_at_enrollment_units" are required.'
+                    'If "age_90_or_over" is "No" then "age_at_enrollment" and "age_at_enrollment_units" are required.'
                 )
         return self
 
     @model_validator(mode="after")
     def validate_age_at_enrollment_value(self) -> Self:
-        age_in_years = (
-            self.age_at_enrollment if self.age_at_enrollment_units == "Years" else self.age_at_enrollment / 365.25
-        )
-        if age_in_years >= 90:
-            raise ValueError('"age_at_enrollment" cannot represent a value greater than 90 years of age.')
+        if not self.age_90_or_over:
+            age_in_years = (
+                self.age_at_enrollment if self.age_at_enrollment_units == "Years" else self.age_at_enrollment / 365.25
+            )
+            if age_in_years >= 90:
+                raise ValueError('"age_at_enrollment" cannot represent a value greater than 90 years of age.')
         return self

cidc_api/models/pydantic/stage2/disease.py

@@ -1,12 +1,14 @@
-from pydantic import NonPositiveInt, model_validator
-from typing import List, Self
+from pydantic import NonPositiveInt, model_validator, BeforeValidator
+from typing import List, Self, Annotated, get_args
 
 from .base import Base
 from cidc_api.models.types import (
-    PrimaryDiagnosisDiseaseGroup,
     TumorGrade,
     CancerStageSystem,
     CancerStageSystemVersion,
+    CancerStageSystemVersionAJCC,
+    CancerStageSystemVersionRISS,
+    CancerStageSystemVersionFIGO,
     CancerStage,
     TCategory,
     NCategory,
@@ -27,12 +29,7 @@ class Disease(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
-
-    # A term describing the main condition for evaluation and treatment as captured in the Disease or Diagnosis (C2991)
-    # branch of the National Cancer Institute Thesaurus (NCIt) hierarchy tree. e.g. "Melanoma"
-    # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=14905532%20and%20ver_nr=1
-    primary_diagnosis_disease_group: PrimaryDiagnosisDiseaseGroup
+    participant_id: str | None = None
 
     # The location within the body from where the disease of interest originated as captured in the Uberon identifier. e.g. "lung"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=14883047%20and%20ver_nr=1
@@ -40,18 +37,18 @@ class Disease(Base):
 
     # The ICD-O-3 morphology code that describes the tumor's histology, behavior, and grade-differentiation. e.g. "8480/6"
     # CDE: TBD
-    morphological_code: ICDO3MorphologicalCode
+    morphological_code: ICDO3MorphologicalCode | None
 
     # The ICD-O-3 morphology term that describes the tumor's type. e.g. "Mucinous adenoma"
     # CDE: TBD
-    morphological_term: ICDO3MorphologicalTerm
+    morphological_term: ICDO3MorphologicalTerm | None
 
     # Words that broadly describe the cancer's characteristics and type. e.g. "Inflitrating Ductal Carcinoma"
     # CDE: TBD
     cancer_type_description: str | None = None
 
     # The number of days elapsed since the participant was first diagnosed with this condition.
-    days_since_original_diagnosis: NonPositiveInt
+    days_since_original_diagnosis: NonPositiveInt | None
 
     # Words that express the degree of abnormality of cancer cells as a measure of differentiation and aggressiveness. e.g. "G1 Low Grade"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=11325685%20and%20ver_nr=2
@@ -68,32 +65,32 @@ class Disease(Base):
     # CDE(AJCC): https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=3440332%20and%20ver_nr=1
     # CDE(FIGO): TBD
     # CDE(RISS): TBD
-    cancer_stage: CancerStage
+    cancer_stage: CancerStage | None = None
 
     # Extent of the primary cancer based on evidence obtained from clinical assessment parameters determined prior to treatment. e.g. "T0"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=3440328%20and%20ver_nr=1
     # TODO: Verify this CDE
-    t_category: TCategory
+    t_category: TCategory | None = None
 
     # Extent of the regional lymph node involvement for the cancer based on evidence obtained from clinical assessment parameters
     # determined prior to treatment. e.g. "N0"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=3440330%20and%20ver_nr=1
     # TODO: Verify this CDE
-    n_category: NCategory
+    n_category: NCategory | None = None
 
     # Extent of the distant metastasis for the cancer based on evidence obtained from clinical assessment parameters determined
     # prior to treatment. e.g. "M0"
     # CDE: https://teams.microsoft.com/l/message/19:1c292b63-5df1-4f29-b177-86aed53f393d_f224ae83-209b-4cd9-a7ef-83d9d2120a27@unq.gbl.spaces/1758827414202?context=%7B%22contextType%22%3A%22chat%22%7D
     # TODO: Verify this CDE
-    m_category: MCategory
+    m_category: MCategory | None = None
 
     # The organ site where a tumor develops outside of the bone marrow as specified in the Uberon antatomical term.
-    metastatic_organ: List[UberonAnatomicalTerm] = []
+    metastatic_organ: Annotated[List[UberonAnatomicalTerm] | None, BeforeValidator(Base.split_list)] = []
 
     # Indicates if participant has a hematological malignancy that is only extramedullary. e.g. "Yes"
     solely_extramedullary_disease: YNU
 
-    extramedullary_organ: List[UberonAnatomicalTerm] = []
+    extramedullary_organ: Annotated[List[UberonAnatomicalTerm] | None, BeforeValidator(Base.split_list)] = []
 
     @model_validator(mode="after")
     def validate_code_or_term_or_description_cr(self) -> Self:
@@ -103,6 +100,23 @@ class Disease(Base):
             )
         return self
 
+    @model_validator(mode="after")
+    def validate_cancer_stage_system_version(self) -> Self:
+        msg = f"{self.cancer_stage_system_version} is not applicable to {self.cancer_stage_system}"
+        if self.cancer_stage_system == "AJCC" and self.cancer_stage_system_version not in get_args(
+            CancerStageSystemVersionAJCC
+        ):
+            raise ValueError(msg)
+        elif self.cancer_stage_system == "RISS" and self.cancer_stage_system_version not in get_args(
+            CancerStageSystemVersionRISS
+        ):
+            raise ValueError(msg)
+        elif self.cancer_stage_system == "FIGO" and self.cancer_stage_system_version not in get_args(
+            CancerStageSystemVersionFIGO
+        ):
+            raise ValueError(msg)
+        return self
+
     @model_validator(mode="after")
     def validate_cancer_stage_system_version_cr(self) -> Self:
         if self.cancer_stage_system != "Not Applicable" and not self.cancer_stage_system_version:

cidc_api/models/pydantic/stage2/exposure.py

@@ -14,7 +14,7 @@ class Exposure(Base):
     exposure_id: int | None = None
 
     # The unique identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # An indication of whether the subject was exposed to any chemical, biological or physical agents
     # that increase the risk of neoplasms in humans or animals.
@@ -23,7 +23,7 @@ class Exposure(Base):
 
     # The type of potentially harmful environmental agents to which an individual was exposed.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15753203%20and%20ver_nr=1
-    exposure_type: ExposureType
+    exposure_type: ExposureType | None = None
 
     @model_validator(mode="after")
     def validate_exposure_type_cr(self) -> Self:

cidc_api/models/pydantic/stage2/gvhd_diagnosis_acute.py

@@ -15,7 +15,7 @@ class GVHDDiagnosisAcute(Base):
     gvhd_diagnosis_acute_id: int | None = None
 
     # The unique internal identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The clinical grading system used to stage involvement of affected organs (skin, liver, GI tract)
     # in acute GVHD and assign an overall severity grade (I–IV) based on predefined criteria.

cidc_api/models/pydantic/stage2/gvhd_diagnosis_chronic.py

@@ -15,7 +15,7 @@ class GVHDDiagnosisChronic(Base):
     gvhd_diagnosis_chronic_id: int | None = None
 
     # The unique internal identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The standardized clinical system used to evaluate and grade the extent and severity
     # of organ involvement in chronic GVHD, resulting in an overall disease severity score.

cidc_api/models/pydantic/stage2/medical_history.py

@@ -14,7 +14,7 @@ class MedicalHistory(Base):
     medical_history_id: int | None = None
 
     # The unique identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # Text representation of a person's status relative to smoking tobacco in the form of cigarettes,
     # based on questions about current and former use of cigarettes.

cidc_api/models/pydantic/stage2/participant.py

@@ -3,6 +3,7 @@ from typing import Self
 from pydantic import model_validator
 
 from .base import Base
+from cidc_api.models.types import YNU
 from cidc_api.models.types import OffStudyReason
 
 
@@ -12,20 +13,20 @@ class Participant(Base):
 
     # The unique internal identifier for the participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The participant identifier assigned by the clinical trial team overseeing the study
-    native_participant_id: str
+    native_participant_id: str | None = None
 
     # The globally unique participant identifier assigned by the CIMAC network. e.g. C8P29A7
-    cimac_participant_id: str
+    cimac_participant_id: str | None = None
 
     # The unique identifier for the associated trial that the participant is participating in
     trial_id: int | None = None
 
     # Indicates if the individual is no longer actively participating in the clinical trial.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=14834973%20and%20ver_nr=1
-    off_study: bool
+    off_study: YNU
 
     # An explanation describing why an individual is no longer participating in the clinical trial.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=13362265%20and%20ver_nr=1
@@ -36,7 +37,7 @@ class Participant(Base):
 
     @model_validator(mode="after")
     def off_study_reason_cr(self) -> Self:
-        if self.off_study and not self.off_study_reason:
+        if self.off_study == "Yes" and not self.off_study_reason:
             raise ValueError('If "off_study" is "Yes" then "off_study_reason" is required.')
         return self
 

cidc_api/models/pydantic/stage2/prior_treatment.py

@@ -14,7 +14,7 @@ class PriorTreatment(Base):
     prior_treatment_id: int | None = None
 
     # A unique internal identifier for the associated participant record
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # Number of days from the enrollment date to the first recorded administration or occurrence of
     # the treatment modality.

cidc_api/models/pydantic/stage2/radiotherapy_dose.py

@@ -17,7 +17,7 @@ class RadiotherapyDose(Base):
     __cardinality__ = "many"
 
     # The unique internal identifier for the radiotherapy dose record
-    therapy_agent_dose_id: int | None = None
+    radiotherapy_dose_id: int | None = None
 
     # The unique internal identifier for the associated treatment record
     treatment_id: int | None = None

cidc_api/models/pydantic/stage2/response.py

@@ -15,7 +15,7 @@ class Response(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The response to a question that describes a participant's survival status.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=2847330%20and%20ver_nr=1

cidc_api/models/pydantic/stage2/response_by_system.py

@@ -26,7 +26,7 @@ class ResponseBySystem(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # A standardized method used to evaluate and categorize the participant’s clinical response to treatment based on predefined criteria.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=13381490%20and%20ver_nr=1
@@ -67,8 +67,8 @@ class ResponseBySystem(Base):
     def validate_response_duration_cr(self) -> Self:
         if self.best_overall_response in negative_response_values and self.response_duration:
             raise ValueError(
-                "If best_overall_response does not indicate a positive response, \
-                please leave response_duration blank."
+                "If best_overall_response does not indicate a positive response, "
+                "please leave response_duration blank."
             )
         return self
 
@@ -76,8 +76,8 @@ class ResponseBySystem(Base):
     def validate_days_to_first_response_cr(self) -> Self:
         if self.best_overall_response in negative_response_values and self.days_to_first_response:
             raise ValueError(
-                "If best_overall_response does not indicate a positive response, \
-                please leave days_to_first_response blank."
+                "If best_overall_response does not indicate a positive response, "
+                "please leave days_to_first_response blank."
             )
         return self
 

cidc_api/models/pydantic/stage2/specimen.py

@@ -26,7 +26,7 @@ from cidc_api.models.types import (
 
 
 class Specimen(Base):
-    __data_category__ = "specimen"
+    # __data_category__ = "specimen"
     __cardinality__ = "many"
 
     # The unique internal identifier for the specimen record
@@ -34,7 +34,7 @@ class Specimen(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The unique specimen identifier assigned by the CIMAC-CIDC Network.
     # Formatted as CTTTPPPSS.AA for trial code TTT, participant PPP, sample SS, and aliquot AA.

cidc_api/models/pydantic/stage2/treatment.py

@@ -14,7 +14,7 @@ class Treatment(Base):
     treatment_id: int | None = None
 
     # The unique internal identifier for the associated Participant record
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The unique internal identifier for the associated Arm record
     arm_id: int | None = None

cidc_api/models/pydantic/stage2/trial.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import List
 
 from .base import Base
-from cidc_api.models.types import TrialOrganization, TrialFundingAgency, TrialStatus, AssayType
+from cidc_api.models.types import TrialOrganization, TrialFundingAgency, AssayType
 
 
 class Trial(Base):
@@ -11,7 +11,7 @@ class Trial(Base):
 
     # The unique identifier for the clinical trial. e.g. "GU16-287","BACCI"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=5054234%20and%20ver_nr=1
-    trial_id: str
+    trial_id: str | None = None  # TODO: Fix stage2 trial_id to not be nullable, once stage 1 models are complete
 
     # The version number of the trial dataset. e.g. "1.0"
     version: str | None = None
@@ -45,10 +45,6 @@ class Trial(Base):
     # e.g. "Duke University - Duke Cancer Institute LAO"
     grant_or_affiliated_network: TrialFundingAgency | None = None
 
-    # What stage the trial is at in its process.
-    # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15607838%20and%20ver_nr=1
-    trial_status: TrialStatus
-
     # The id of the primary organization responsible for storing biospecimens from this study.
     biobank_institution_id: int | None = None
 

cidc_api/models/types.py

@@ -53,13 +53,6 @@ TrialFundingAgency = Literal[
 ]
 
 
-TrialStatus = Literal[
-    "Active Study",
-    "Completed Study",
-    "Provisional Study",
-]
-
-
 AssayType = Literal[
     "Olink",
     "WES",
@@ -217,24 +210,6 @@ FileFormat = Literal[
 ]
 
 
-PrimaryDiagnosisDiseaseGroup = Literal[
-    "Ovarian epithelial cancer",
-    "Esophageal cancer, NOS",
-    "Primary peritoneal carcinoma",
-    "Gastric cancer, NOS",
-    "Fallopian tube carcinoma",
-    "Invasive breast carcinoma",
-    "Small cell lung cancer",
-    "Prostate cancer, NOS",
-    "Non-small cell lung cancer, NOS",
-    "Myeloma, NOS",
-    "Melanoma",
-    "Adenocarcinoma of the gastroesophageal junction",
-    "Acute myeloid leukemia, NOS",
-    "Colorectal cancer, NOS",
-]
-
-
 TumorGrade = Literal[
     "G1 Low Grade",
     "G2 Intermediate Grade",
@@ -255,12 +230,20 @@ CancerStageSystem = Literal[
 ]
 
 
-CancerStageSystemVersionAJCC = Literal["8",]
+CancerStageSystemVersionAJCC = Literal["8th Edition",]
 
-CancerStageSystemVersionRISS = Literal["2"]
+CancerStageSystemVersionRISS = Literal["10.1200/JCO.2015.61.2267"]
 
-
-CancerStageSystemVersionFIGO = Literal["2021"]
+CancerStageSystemVersionFIGO = Literal[
+    "10.1002/ijgo.14923",
+    "10.1002/ijgo.13881",
+    "10.1002/ijgo.13867",
+    "10.1002/ijgo.13865",
+    "10.1002/ijgo.13866",
+    "10.1002/ijgo.13878",
+    "10.1002/ijgo.13877",
+    "10.1002/ijgo.12613",
+]
 
 CancerStageSystemVersion = CancerStageSystemVersionAJCC | CancerStageSystemVersionFIGO | CancerStageSystemVersionRISS
 

{nci_cidc_api_modules-1.2.28.dist-info → nci_cidc_api_modules-1.2.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.28
+Version: 1.2.30
 Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
 Home-page: https://github.com/NCI-CIDC/cidc-api-gae
 License: MIT license
@@ -12,6 +12,7 @@ Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.5
 Requires-Dist: flask>=3.1.2
 Requires-Dist: flask-migrate>=4.1.0
 Requires-Dist: flask-sqlalchemy>=3.1.1
+Requires-Dist: flask-talisman>=0.7.0
 Requires-Dist: google-auth==2.43.0
 Requires-Dist: google-api-python-client>=2.185.0
 Requires-Dist: google-cloud-bigquery>=3.38.0

{nci_cidc_api_modules-1.2.28.dist-info → nci_cidc_api_modules-1.2.30.dist-info}/RECORD

@@ -4,90 +4,90 @@ cidc_api/config/logging.py,sha256=abhVYtn8lfhIt0tyV2WHFgSmp_s2eeJh7kodB6LH4J0,11
 cidc_api/config/secrets.py,sha256=jRFj7W43pWuPf9DZQLCKF7WPXf5cUv-BAaS3ASqhV_Q,1481
 cidc_api/config/settings.py,sha256=ttOGvk_6zVMn4dtxIZ2-0w3wF2fpAUVfGpVZbKJ2b6s,4653
 cidc_api/models/__init__.py,sha256=cTyK0Z1ttLo9itwZVRFr-d6aX-zX633YhqipqPgoGfE,115
-cidc_api/models/data.py,sha256=evv9JJcW3U_g-74MgKdxtB_gGJBTRQjtnsVKwa3DzFE,638
+cidc_api/models/data.py,sha256=uLkgAJ6tCtsi3bOGt8I9esYrZqgbsTYM1rGfL2gx5sY,837
 cidc_api/models/migrations.py,sha256=UlS5How3J4ryaRuZT6F5VQtAKikkl0LTv9MgMO_ltiQ,11161
-cidc_api/models/models.py,sha256=2ENATE2dbl93uaKSqveqAVuhv1SvxOkcw4pWDTolng0,148484
+cidc_api/models/models.py,sha256=zGOvQMe86kLqC_bbB9ezrBYL9QNA_4GrtYhRGGeqOcU,148525
 cidc_api/models/schemas.py,sha256=6IE2dJoEMcMbi0Vr1V3cYKnPKU0hv9vRKBixOZHe88s,2766
-cidc_api/models/types.py,sha256=9dInLZ6gN39zhEe3xhBXyz2xVMr11CeE1-GCOmT_OjY,29928
+cidc_api/models/types.py,sha256=gnP8HmGRqTo0dc0RZCBa1W8NUD2Ppsm4C0OHZzlPjVI,29580
 cidc_api/models/db/base_orm.py,sha256=EV78qFBcOR7spK_PhjbkpsGcmcP33AQItX61SidDa_8,813
 cidc_api/models/db/stage2/__init__.py,sha256=R33BM1VDKJya5uuyYnPoGFVfhSViclIOklSoHH-EtBQ,2691
-cidc_api/models/db/stage2/additional_treatment_orm.py,sha256=THBNW7X6h5IyhFrKOCo81fUEgRDFV6NoBmS34740B3s,865
+cidc_api/models/db/stage2/additional_treatment_orm.py,sha256=Gb-KdVGiL0yDzdQL-BqM5cNke7N9T84y0mLwqElUl8U,912
 cidc_api/models/db/stage2/administrative_person_orm.py,sha256=erXyILdFI7o0RrCW0jB9dyGP6Kdz4vCSXM49EVhA_hQ,1020
 cidc_api/models/db/stage2/administrative_role_assignment_orm.py,sha256=a8GN66njTPZb3HQAxgTklo3MW--S-uq1HTz3GZfLSJ0,1283
-cidc_api/models/db/stage2/adverse_event_orm.py,sha256=TfyfyKM-3QBc9BHMSdS1L4hH-esXiQWtw0VnpzXZadM,1928
+cidc_api/models/db/stage2/adverse_event_orm.py,sha256=eo_6ZTEYdyaiS5EGR_LSWpMvVjuOAjh7KQh3I7JFeuA,1968
 cidc_api/models/db/stage2/arm_orm.py,sha256=YAX1NhA3kiQLzT582G6wDawWv6qor--B_GkIRe4LQDs,697
-cidc_api/models/db/stage2/baseline_clinical_assessment_orm.py,sha256=Y0hIyhO9hZ6CHn3ZaPtyppBs02LzXoTvZbBhuvikpmw,893
+cidc_api/models/db/stage2/baseline_clinical_assessment_orm.py,sha256=V_9-9Q7-1jQtjkTmRCXmUEq4mXb8upCIsUElUy3IfT8,948
 cidc_api/models/db/stage2/cohort_orm.py,sha256=tcUYBMwKPW3anye8uEoDM4BS54pGMOGnbjlEleZozSI,700
-cidc_api/models/db/stage2/comorbidity_orm.py,sha256=9YQI_7PJUvcOvi6b3w6z6Kedi4UxaT9WE17eojl7kCA,883
-cidc_api/models/db/stage2/consent_group_orm.py,sha256=KFHD9HSGfmQnhjlPMZPZ7nwOcsxw5CisKqfK1lWtql4,1063
+cidc_api/models/db/stage2/comorbidity_orm.py,sha256=2Eb3-OYKn02Sc3ndM49xH2snucjqY2gmjyAP7JYyccc,921
+cidc_api/models/db/stage2/consent_group_orm.py,sha256=8j0Aa3FX11LHTIOgXdk3zaRwD4tOkvaRovl_CYH_KsM,1103
 cidc_api/models/db/stage2/contact_orm.py,sha256=lcfMj0LEcaRKdX2ZInx6n8pYd-rNujqLOPgZYna_d_A,1352
-cidc_api/models/db/stage2/demographic_orm.py,sha256=GspDappa5hgOIu3o9BSjQSM7kBZViYcZIHpNa3ZLaqo,1551
-cidc_api/models/db/stage2/disease_orm.py,sha256=xXh77B70DpEkdQzSCqlQL6y3uOXOGP1YbPsxwEWfhco,1995
-cidc_api/models/db/stage2/exposure_orm.py,sha256=CFYCgtEM07QwSaa2frRLq2beClsAXbG2pekUz_-B74Q,771
+cidc_api/models/db/stage2/demographic_orm.py,sha256=Gk3UTVmuKEDGvnl5yOxZYBHz4lKK3vcdLK2Rc2AGszo,1588
+cidc_api/models/db/stage2/disease_orm.py,sha256=3Wue_ZSlUpgjvXK9q3HxbTXytPBV062BRn7YljoMT6M,1977
+cidc_api/models/db/stage2/exposure_orm.py,sha256=yHalUVz3wlsNIdScN_TEwN8jYexntZkfV3ikvPSyxmY,813
 cidc_api/models/db/stage2/file_orm.py,sha256=tPElXh7ABhAenZmHbgu2LyrDzKw-VK-tdZ-yxkb_YN8,1296
-cidc_api/models/db/stage2/gvhd_diagnosis_acute_orm.py,sha256=meqNKGmbJh7cUBlzyzRqxvu9ChvyDF0JICj7GyO8vDs,1415
-cidc_api/models/db/stage2/gvhd_diagnosis_chronic_orm.py,sha256=Ff6a5HRYbdBMnV_riYAF2btE52E5wXOo40HV0cDXHmc,1509
-cidc_api/models/db/stage2/gvhd_organ_acute_orm.py,sha256=DNzR2LmGu5IeS6iIkAL-AXEEj8ot0fIoQAS7m2giOy4,797
-cidc_api/models/db/stage2/gvhd_organ_chronic_orm.py,sha256=-IeTmLVB4jJYgzF2BN8PdaVou_OrxjDB2O4xzGd_So8,819
+cidc_api/models/db/stage2/gvhd_diagnosis_acute_orm.py,sha256=M7MV423sElaWTwh2ziR5CKXc08xlDqaxUiphgM09Sf4,1462
+cidc_api/models/db/stage2/gvhd_diagnosis_chronic_orm.py,sha256=Mot6vDSV7i-0yGe_0RReUJkcSk3lwF3Nk46HFhDHofU,1558
+cidc_api/models/db/stage2/gvhd_organ_acute_orm.py,sha256=rOnvmqZbLEKd_1uKGVX-tH14p9OpCD58Gt5DtDJG8VQ,840
+cidc_api/models/db/stage2/gvhd_organ_chronic_orm.py,sha256=L5GL-zHkOnkNnUU6ItO8CJAWWgvNEVVyS7owEJGih-g,864
 cidc_api/models/db/stage2/institution_orm.py,sha256=cvNaAbtdFq2WCIVusHlfTjd-mEYBEMaPfkwgxmdfMn8,1246
-cidc_api/models/db/stage2/medical_history_orm.py,sha256=TABx11mdwEJtUpoo8g1FBzoTTj6NT0sa_VVyVwdYzEM,1265
+cidc_api/models/db/stage2/medical_history_orm.py,sha256=lZlAhU6jiZiUSlttgj92YekOhzet0BArsrUcTtO0qvE,1307
 cidc_api/models/db/stage2/other_clinical_endpoint_orm.py,sha256=acBUKPYGceC74JI7r_WNZ_nidnoQZC-PWj_C1qgADSk,1151
-cidc_api/models/db/stage2/other_malignancy_orm.py,sha256=kUs5fLeGpDC1gNi8wDqWQ6yEWzCsujK_mhPmx0YXCIs,1226
-cidc_api/models/db/stage2/participant_orm.py,sha256=yVrOxKDDMJ_FCs1owt4nZXMALQxzeNZ79RoVzF7K_A8,3719
-cidc_api/models/db/stage2/prior_treatment_orm.py,sha256=RcKjYTNutWb1iIbWkHofV1ckr9wxs4A17UzV5BdqEpo,1234
+cidc_api/models/db/stage2/other_malignancy_orm.py,sha256=4s9F9PjLz31W91RN0zvRbmX6x4vrZ3W1s6h6-Kv1Q1A,1269
+cidc_api/models/db/stage2/participant_orm.py,sha256=OZ4iylGCeeximcMgWqviCaHfuMmkbzGJPUTrWiIrwkQ,3768
+cidc_api/models/db/stage2/prior_treatment_orm.py,sha256=KeQaijkvPouyf8FYIo6TMMkstXfk2RjwTRZHdAslXNU,1276
 cidc_api/models/db/stage2/publication_orm.py,sha256=fBmdxEihYRqqdBGNDdELn6wEZuLxpvIFPtmDTkKbxzc,1100
-cidc_api/models/db/stage2/radiotherapy_dose_orm.py,sha256=UlvNsWTrdDHg1Bdm4yphPN4ntY4BAlTOgYWYU4bWPuA,1501
-cidc_api/models/db/stage2/response_by_system_orm.py,sha256=w8Loh5Z1mbu6NoJNPHX6Mr4Sx6g6i0M7UPqxps2zdDw,1422
-cidc_api/models/db/stage2/response_orm.py,sha256=QsKa0cbI4DlCRy_dilfo5AWZttdGkDS3NVbQVK0n7LU,1134
+cidc_api/models/db/stage2/radiotherapy_dose_orm.py,sha256=_VV9T0_6h1iHSZnfAPsW3PO0Y-jbJnbwsOT4SbJXPyY,1545
+cidc_api/models/db/stage2/response_by_system_orm.py,sha256=HsYtVs7QGw2mqxJeSdrBlraImAwoScqk1dT3UP--7UI,1467
+cidc_api/models/db/stage2/response_orm.py,sha256=1xcfM-shreNDokHc4glz8OCHoyNSpBjinxrzLFgbhWM,1169
 cidc_api/models/db/stage2/shipment_orm.py,sha256=u7y6hKtmg6DhW8G_tFHj-gFgsqigd8QPrPZu8ZFeMe4,2042
 cidc_api/models/db/stage2/shipment_specimen_orm.py,sha256=SiIEi5t-BOISgCEgYM9CGqBmr6iLV3HwqXzrTmjJSv8,913
 cidc_api/models/db/stage2/specimen_orm.py,sha256=Iv6UomXRvl3Is-TxWFQwafTAfZYRiIW76WPtNoDpuNE,4124
-cidc_api/models/db/stage2/stem_cell_transplant_orm.py,sha256=G59Wm-RjOavNc6d5-wW43Z2hteaY7g8NfWGIADC1D74,1077
-cidc_api/models/db/stage2/surgery_orm.py,sha256=Jo5abObgZfkEkiMGKFuNGzOWqVwNSGTUdtbfS1VPxRo,1023
-cidc_api/models/db/stage2/therapy_agent_dose_orm.py,sha256=dgLZnWjt5RRGE7OkMis_tUUEsBvK9eZwHa_6IFMDf_g,1303
-cidc_api/models/db/stage2/treatment_orm.py,sha256=-SW99MTRDM2Qou0Dsv_fIAsDvj322_5CPgDPgT9FAlQ,1927
-cidc_api/models/db/stage2/trial_orm.py,sha256=JOA9dA8UXMkB04gBH3huepvSpTdn3DSJzKH-jyCJCRY,2773
+cidc_api/models/db/stage2/stem_cell_transplant_orm.py,sha256=MkOJCW154T6iK0Pos3nv44m90cyg_dnG_i6lMgXObcU,1124
+cidc_api/models/db/stage2/surgery_orm.py,sha256=XAkq2HHvi0kmZmJgdvE4obBGcFx0p2Nruj5zrMZvFH8,1057
+cidc_api/models/db/stage2/therapy_agent_dose_orm.py,sha256=I9fYC-x8jc8XQFFXz4zVFERKac_bVihgp4Q_cHF-Tc0,1348
+cidc_api/models/db/stage2/treatment_orm.py,sha256=m9udq26_1tQ_xUYHhGsA-pYut9p043zCvDQO5IaPx2o,1963
+cidc_api/models/db/stage2/trial_orm.py,sha256=6F9UJdrispKuZtss29nYRVTlYZFTQIvPTuvZ2HOXn5E,2754
 cidc_api/models/files/__init__.py,sha256=8BMTnUSHzUbz0lBeEQY6NvApxDD3GMWMduoVMos2g4Y,213
 cidc_api/models/files/details.py,sha256=sZkGM7iEV4-J6IDQCdiMV6KBDLbPxCOqUMaU3aY9rX8,65153
 cidc_api/models/files/facets.py,sha256=rG99wUpHvWHkcRDxTcXz40502Er47l_5hKzP-ORvXGE,33621
 cidc_api/models/pydantic/stage2/__init__.py,sha256=OQRG5wFkNsyAU_0KI1W5PDn8pBDe1EJDcgKZ19shh_g,2331
-cidc_api/models/pydantic/stage2/additional_treatment.py,sha256=HlsexyUh38hW9CTT3cxP6A9xeHa5JX8Cwvh5fi4MH9s,963
+cidc_api/models/pydantic/stage2/additional_treatment.py,sha256=5bBcV85oiE-PgmuE1sheuNFcZW41GH-TK4IUxIr3dPk,1078
 cidc_api/models/pydantic/stage2/administrative_person.py,sha256=KgILOkUra-AmqwFlj6XNappfMNi4KuhZ98So1R8p-eY,1528
 cidc_api/models/pydantic/stage2/administrative_role_assignment.py,sha256=qsdrBJgDA4GWY-1VAFgbgQWfqSjJZ-OFsIOZDT9CyAE,512
-cidc_api/models/pydantic/stage2/adverse_event.py,sha256=7fGeczRqw2sFK-QMWWIJFhgtYROMkf5w4jTfmAh0_cg,3856
+cidc_api/models/pydantic/stage2/adverse_event.py,sha256=733qhu5uucvMQH_VDFAc1WlWCcusaXXFswrp1ugM7sk,3856
 cidc_api/models/pydantic/stage2/arm.py,sha256=ApxukGxatxD7rFDIaeiJsPNHw9-b4tfd8nubQ0JuW4g,457
-cidc_api/models/pydantic/stage2/base.py,sha256=AhlFc9qwc8HIRgrxN944DAhugS-FfTGsyQ4YivdT2Ds,951
-cidc_api/models/pydantic/stage2/baseline_clinical_assessment.py,sha256=ajPQkgWndWz1o6xFn6VYSPTvXKT9CaHBR5l0GyqhCG8,1095
+cidc_api/models/pydantic/stage2/base.py,sha256=0KTN8HJrwr8gQ8ORnWh4WQPueWmqlJ6Bl7EPa7sr3J4,1333
+cidc_api/models/pydantic/stage2/baseline_clinical_assessment.py,sha256=mDTzHT6IsQRy5aTMCSK3twqe3jiYtvZ9D7ZO6hVO3KM,1095
 cidc_api/models/pydantic/stage2/cohort.py,sha256=-ikJ35QR7JjNfWMv_OFvIqxBVK8zr3nT39Q90UustWk,469
 cidc_api/models/pydantic/stage2/comorbidity.py,sha256=avCl_9zrM7nzsR0E_g6fMjlQG8qE109NSR_nGGxEKqg,1389
 cidc_api/models/pydantic/stage2/consent_group.py,sha256=ldIfJUk6DLCj24Vs_tOXUp_6mpncx63j_yL90jNtwvI,1192
 cidc_api/models/pydantic/stage2/contact.py,sha256=pRKcv34MWMN3WrRD5WmHDoCprzRnIyC5fDMb1qDhHMk,859
-cidc_api/models/pydantic/stage2/demographic.py,sha256=6voG-QXK1q89TtTfS9S3CLiEUPWEn4ZXbmlu3_pH8nU,5461
-cidc_api/models/pydantic/stage2/disease.py,sha256=-K8HscdLbQ2Cr9NpLqri4R8jB0FAw7Ed-W7KJSZkXdM,6960
-cidc_api/models/pydantic/stage2/exposure.py,sha256=Klpw7WrMVQabfBUFWVPIiOQexCoD05uTHauGxLGl8Lw,1268
+cidc_api/models/pydantic/stage2/demographic.py,sha256=dZO6LoxxCBIUMNqnJCTCZrrPil6vE6nTXymfz4B8gls,5597
+cidc_api/models/pydantic/stage2/disease.py,sha256=4qxud-X0yegT4pvU5_Dj8YwwsANHzxbqkH7XFYfrkAE,7626
+cidc_api/models/pydantic/stage2/exposure.py,sha256=PNqslfg36tphxz8sM51pu0CB6wAULzYQuEDRAS7AcHU,1282
 cidc_api/models/pydantic/stage2/file.py,sha256=lWVLS763at46OsNX6xOIUEkV2V69yjeVPJXIIwvXl5o,1312
-cidc_api/models/pydantic/stage2/gvhd_diagnosis_acute.py,sha256=x_koFtb99nQcnzuQxIvuPsZClUozorsZf8w8oHspt5E,1371
-cidc_api/models/pydantic/stage2/gvhd_diagnosis_chronic.py,sha256=KMNanB40GNdNYDeRgctq3Fm3okT77ypq4kcfw_rVpwc,1358
+cidc_api/models/pydantic/stage2/gvhd_diagnosis_acute.py,sha256=Pvb8al3iqY0BOn4FwdUYt-DjotuqlqPuzEA3g8QYQc4,1371
+cidc_api/models/pydantic/stage2/gvhd_diagnosis_chronic.py,sha256=E4ke4QGdhVRRcrCTvm0xz-TnL9hyKSXppG1Hi0HswzA,1358
 cidc_api/models/pydantic/stage2/gvhd_organ_acute.py,sha256=WY2pXpNmXTnAxpumxomv3bQmx7GjKRCDNeOLYpgssF8,747
 cidc_api/models/pydantic/stage2/gvhd_organ_chronic.py,sha256=sCphdwBgidbZxPRQr9CGRmU9-RGwy13d2UPoVR-7BcY,786
 cidc_api/models/pydantic/stage2/institution.py,sha256=L7YLzPQzXP_WxfxonhE50soubB13b30M0LiPU8JiIOY,244
-cidc_api/models/pydantic/stage2/medical_history.py,sha256=uSp9tDp_7Xa5tU_18hkpJQ-HPJUuqjciDZARTERM2bs,1673
+cidc_api/models/pydantic/stage2/medical_history.py,sha256=jC1eRsXdYXwrlBFDrXaiCwgkHoATzSR9krLbMwsjdUA,1673
 cidc_api/models/pydantic/stage2/other_clinical_endpoint.py,sha256=hn_Ngjl1ZD-IsmO_dFFcohsyJL8gmBKCCPBpXljoHqc,1069
 cidc_api/models/pydantic/stage2/other_malignancy.py,sha256=eR5tVylBVSjy2r2BUg98mXrf1Mbo03LZe6RcDx7DhX4,1996
-cidc_api/models/pydantic/stage2/participant.py,sha256=W3T5P8B4b9J5dQFZcc-90XTSXzRqdjp0jaLZfMRcF5c,2011
-cidc_api/models/pydantic/stage2/prior_treatment.py,sha256=ZLb3MMRb0yWHhf4Tq5WwEMYsLDmrQUV3De7egIZm6_Y,2248
+cidc_api/models/pydantic/stage2/participant.py,sha256=GS-_o3FG3sFLOn3rm9okAwKffjGjzzao4JAPi2AQDbI,2085
+cidc_api/models/pydantic/stage2/prior_treatment.py,sha256=-Ty2XTrfFxAOGVGlrXxx5z5NI4wyMROAWe__nEXBbiw,2248
 cidc_api/models/pydantic/stage2/publication.py,sha256=C8o2jxooZ8ykmUWrMkWDw5CGIEOeK-8Rgitoac9MKs0,1793
-cidc_api/models/pydantic/stage2/radiotherapy_dose.py,sha256=t8tSGVTwb8USRhfO80XVTo-UHbroWBt0bHH-DsvBszE,3304
-cidc_api/models/pydantic/stage2/response.py,sha256=WIl3TbVjHxp9fHPtFccsnfUVkmNdM7aw94ewI2CPm3Q,3118
-cidc_api/models/pydantic/stage2/response_by_system.py,sha256=QP3rYjmaYRLJPSQIkQQ6k3Z3bygH1yLtKVOOFQaIHm0,4705
+cidc_api/models/pydantic/stage2/radiotherapy_dose.py,sha256=kfEqfJwBG7TCGupSGMdDpmZ4HGYsdqRDHIgIAzTXEVk,3303
+cidc_api/models/pydantic/stage2/response.py,sha256=kASwYxi9zbuqCSh6FR2BA-er-VGwP23s1_NRmA4Khoo,3118
+cidc_api/models/pydantic/stage2/response_by_system.py,sha256=YIBoC2GBBordRIU3Sc7uH5OZNBAV8DenNYDXU8svbpA,4707
 cidc_api/models/pydantic/stage2/shipment.py,sha256=leRVcQyEkgX2G5jqn0QmSbmIYqiM8W7OE362xLGwEOM,1571
 cidc_api/models/pydantic/stage2/shipment_specimen.py,sha256=LJglK70mbENQ8lwWe8EJTNYoJSGNXkFUHf7yAMY1zso,464
-cidc_api/models/pydantic/stage2/specimen.py,sha256=PDBzNNPdPVIPFPPVZO_e0McY00K0FQMGOlASjQoUJSc,8350
+cidc_api/models/pydantic/stage2/specimen.py,sha256=aMxvPmKH6Ij3rPOejpCc2RvDBYRslz_DjzUq1iRIts8,8352
 cidc_api/models/pydantic/stage2/stem_cell_transplant.py,sha256=RnMKMbydxSX4NRyJfHwH8wdmB8PE6Kno1LIj8i6xgoM,1205
 cidc_api/models/pydantic/stage2/surgery.py,sha256=OOMDGIt0XA4HHXiQjGTVb0zIsQR9uKH1M9GxUOPH5iA,2125
 cidc_api/models/pydantic/stage2/therapy_agent_dose.py,sha256=LgmDXBpDVIR3BxZDHZs4ruX5tSotfan-pU2CUPzddf0,2997
-cidc_api/models/pydantic/stage2/treatment.py,sha256=q8WORTyHSbU7yZvZLvag1dhDc-OAYnY8LPGUbpTzIcw,2015
-cidc_api/models/pydantic/stage2/trial.py,sha256=dYXq-psXUiWVJC2seOndtpMYA1TdIQVbVG8lC9t-oAM,3653
+cidc_api/models/pydantic/stage2/treatment.py,sha256=x_WluGqNsNI4RUdnXeqLt6_ABzRlRX6hjv0LDOgGzz4,2015
+cidc_api/models/pydantic/stage2/trial.py,sha256=O3PLFh95aZsgOF_V96gP6FsrDazn6v7RD7Nse0Vje9g,3539
 cidc_api/reference/ctcae.py,sha256=H5JvDQ5R5kYbK37UxjhmXMnKD3d40HmG0DONxfhNxnE,871
 cidc_api/reference/gvhd.py,sha256=r5jbHEa5yos0tmghjiruAeXI-r-4lU81JKCUpMHtO14,194
 cidc_api/reference/icd10cm.py,sha256=K1vbTQB75uAQeKgj0U9izhtMKVb2vqp69_hyx3z_jro,300
@@ -102,8 +102,8 @@ cidc_api/shared/gcloud_client.py,sha256=ovXGS2ynaBgB_23prj23H10GNN4fectiVF7Hj4LJ
 cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
 cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
 cidc_api/shared/utils.py,sha256=FdZJiynmh6BIzWyCTcUAcUMKCAtzEyp_HLdXEticNcI,237
-nci_cidc_api_modules-1.2.28.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.2.28.dist-info/METADATA,sha256=dBc6ThsKAfENROM1iAm4LCDKQjM8_lqe7PC0c1R6MOQ,39725
-nci_cidc_api_modules-1.2.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nci_cidc_api_modules-1.2.28.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.2.28.dist-info/RECORD,,
+nci_cidc_api_modules-1.2.30.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.2.30.dist-info/METADATA,sha256=UKoLBKoBadpOOjKlpGCqBeIOpHmWrXcU1safhHNbnfA,39762
+nci_cidc_api_modules-1.2.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nci_cidc_api_modules-1.2.30.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
+nci_cidc_api_modules-1.2.30.dist-info/RECORD,,