nci-cidc-api-modules 1.2.53__py3-none-any.whl → 1.2.55__py3-none-any.whl

cidc_api/models/pydantic/stage2/specimen.py

@@ -1,32 +1,11 @@
 from datetime import datetime
 
 from cidc_api.models.pydantic.base import Base
-from cidc_api.models.types import (
-    UberonAnatomicalTerm,
-    ICDO3MorphologicalCode,
-    SpecimenType,
-    SpecimenDescription,
-    TumorType,
-    CollectionProcedure,
-    FixationStabilizationType,
-    PrimaryContainerType,
-    VolumeUnits,
-    ProcessedType,
-    ConcentrationUnits,
-    DerivativeType,
-    PBMCRestingPeriodUsed,
-    MaterialUnits,
-    MaterialStorageCondition,
-    QCCondition,
-    ReplacementRequested,
-    ResidualUse,
-    DiagnosisVerification,
-    AssayType,
-)
+from cidc_api.models.types import UberonAnatomicalTerm
 
 
 class Specimen(Base):
-    # __data_category__ = "specimen"
+    __data_category__ = "specimen"
     __cardinality__ = "many"
 
     # The unique internal identifier for the specimen record
@@ -40,173 +19,11 @@ class Specimen(Base):
     # Formatted as CTTTPPPSS.AA for trial code TTT, participant PPP, sample SS, and aliquot AA.
     cimac_id: str
 
-    # The external identifier for the pathology report
-    surgical_pathology_report_id: str | None = None
-
-    # The external identifier for the clinical report
-    clinical_report_id: str | None = None
-
-    # The unique identifier for the specimen from which this specimen was derived
-    parent_specimen_id: str | None = None
-
-    # The unique identifier for the specimen after undergoing processing
-    processed_specimen_id: str | None = None
-
-    # The location within the body from which a specimen was originally obtained as captured in the Uberon anatomical term.
-    # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12083894%20and%20ver_nr=1
-    organ_site_of_collection: UberonAnatomicalTerm | None = None
-
-    # ICD-O-3 code for histology and behavior. e.g. 9665/3"
-    # CDE: TBD
-    histology_behavior: ICDO3MorphologicalCode | None = None
-
-    # Histology description. e.g. Hodgkin lymphoma, nod. scler., grade 1",
-    histology_behavior_description: str | None = None
-
     # Categorical description of timepoint at which the sample was taken.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=5899851%20and%20ver_nr=1
     # Note: CIDC doesn't conform to this CDE's PVs
     collection_event_name: str
 
-    # The type of the specimen
-    specimen_type: SpecimenType | None = None
-
-    # The type of the specimen, if not captured by specimen_type
-    specimen_type_other: str | None = None
-
-    # A general description of the specimen
-    specimen_description: SpecimenDescription | None = None
-
-    # The type of the tumor present in the specimen
-    tumor_type: TumorType | None = None
-
-    # Description of the procedure used to collect the specimen from the participant
-    collection_procedure: CollectionProcedure | None = None
-
-    # Description of the procedure used to collect the specimen from the participant, if not captured by collection_procedure
-    collection_procedure_other: str | None = None
-
-    # The biopsy core number from which the sample was taken.
-    core_number: str | None = None
-
-    # Type of specimen fixation or stabilization that was employed by the site directly after collection.
-    fixation_stabilization_type: FixationStabilizationType | None = None
-
-    # The type of container in which the specimen was shipped
-    primary_container_type: PrimaryContainerType | None = None
-
-    # The type of container in which the specimen was shipped, if not captured by primary_container_type
-    primary_container_type_other: str | None = None
-
-    # Volume of the specimen
-    volume: float | None = None
-
-    # The unit of measure of the volume of the specimen
-    volume_units: VolumeUnits | None = None
-
-    # The type of processing that was performed on the collected specimen by the biobank
-    processed_type: ProcessedType | None = None
-
-    # The volume of the specimen after being processed by the biobank
-    processed_volume: float | None = None
-
-    # The unit of measure of the volume of the specimen after being processed by the biobank
-    processed_volume_units: VolumeUnits | None = None
-
-    # The concentration of the sample after being processed by the biobank
-    processed_concentration: float | None = None
-
-    # The unit of measure of the concentration of the sample after being processed by the biobank
-    processed_concentration_units: ConcentrationUnits | None = None
-
-    # The quantity of the sample after being processed by the biobank
-    processed_quantity: float | None = None
-
-    # The type of the sample derivative
-    derivative_type: DerivativeType | None = None
-
-    # The volume of the sample derivative
-    derivative_volume: float | None = None
-
-    # The unit of measure of the volume of the sample derivative
-    derivative_volume_units: VolumeUnits | None = None
-
-    # The concentration of the sample derivative
-    derivative_concentration: float | None = None
-
-    # The unit of measure of the concentration of the sample derivative
-    derivative_concentration_units: ConcentrationUnits | None = None
-
-    # Score the percentage of tumor (including tumor bed) tissue area of the slide (e.g. vs non-malignant or normal tissue) (0-100)
-    tumor_tissue_total_area_percentage: float | None = None
-
-    # Score the percentage of viable tumor cells comprising the tumor bed area
-    viable_tumor_area_percentage: float | None = None
-
-    # Score the evaluation of stromal elements (this indicates the % area of tumor bed occupied by non-tumor cells,
-    # including inflammatory cells [lymphocytes, histiocytes, etc], endothelial cells, fibroblasts, etc)
-    viable_stroma_area_percentage: float | None = None
-
-    # Score the percentage area of necrosis
-    necrosis_area_percentage: float | None = None
-
-    # Score the percentage area of Fibrosis
-    fibrosis_area_percentage: float | None = None
-
-    # Provides a DNA Integrity Number as an indication of extraction quality (values of 1-10)
-    din: float | None = None
-
-    # Provides an absorbance percentage ratio indicating purity of DNA (values of 0 to 2)
-    a260_a280: float | None = None
-
-    # Provides an absorbance percentage ratio indicating presence of contaminants (values of 0 to 3)
-    a260_a230: float | None = None
-
-    # Receiving site determines the percent recovered cells that are viable after thawing.
-    pbmc_viability: float | None = None
-
-    # Receiving site determines number for PBMCs per vial recovered upon receipt.
-    pbmc_recovery: float | None = None
-
-    # Receiving site indicates if a resting period was used after PBMC recovery.
-    pbmc_resting_period_used: PBMCRestingPeriodUsed | None = None
-
-    # Receiving site indicates how much material was used for assay purposes.
-    material_used: float | None = None
-
-    # Unit of measure for the amount of material used
-    material_used_units: MaterialUnits | None = None
-
-    # Receiving site indicates how much material remains after assay use.
-    material_remaining: float | None = None
-
-    # Unit of measure for the amount of material remaining.
-    material_remaining_units: MaterialUnits | None = None
-
-    # Storage condition of the material once it was received.
-    material_storage_condition: MaterialStorageCondition | None = None
-
-    # Final status of sample after QC and pathology review.
-    qc_condition: QCCondition | None = None
-
-    # Indication if sample replacement is/was requested.
-    replacement_requested: ReplacementRequested | None = None
-
-    # Indication if sample was sent to another location or returned back to biorepository.
-    residual_use: ResidualUse | None = None
-
-    # Additional comments on sample testing
-    comments: str | None = None
-
-    # Indicates whether the local pathology review was consistent with the diagnostic pathology report.
-    diagnosis_verification: DiagnosisVerification | None = None
-
-    # The assay that this sample is expected to be used as input for.
-    intended_assay: AssayType | None = None
-
-    # The datetime that CIDC ingested the sample/manifest
-    date_ingested: datetime | None = None
-
     # Days from enrollment date to date specimen was collected.
     days_to_specimen_collection: int
 

cidc_api/models/pydantic/stage2/surgery.py

@@ -1,11 +1,13 @@
-from typing import Self
+from pydantic import NonNegativeInt
+from cidc_api.models.pydantic.base import forced_validator, forced_validators
 
-from pydantic import NonNegativeInt, model_validator
 
+from cidc_api.models.errors import ValueLocError
 from cidc_api.models.pydantic.base import Base
 from cidc_api.models.types import SurgicalProcedure, UberonAnatomicalTerm, YNU
 
 
+@forced_validators
 class Surgery(Base):
     __data_category__ = "surgery"
     __cardinality__ = "many"
@@ -42,8 +44,14 @@ class Surgery(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=13362284%20and%20ver_nr=1
     extent_of_residual_disease: str | None = None
 
-    @model_validator(mode="after")
-    def validate_procedure_other_cr(self) -> Self:
-        if self.procedure == "Other, specify" and not self.procedure_other:
-            raise ValueError('If procedure is "Other, specify", please provide procedure_other.')
-        return self
+    @forced_validator
+    @classmethod
+    def validate_procedure_other_cr(cls, data, info) -> None:
+        procedure = data.get("procedure", None)
+        procedure_other = data.get("procedure_other", None)
+
+        if procedure == "Other, specify" and not procedure_other:
+            raise ValueLocError(
+                'If procedure is "Other, specify", please provide procedure_other.',
+                loc="procedure_other",
+            )

cidc_api/models/pydantic/stage2/therapy_agent_dose.py

@@ -1,11 +1,12 @@
-from typing import Self
-
-from pydantic import NonNegativeInt, NonNegativeFloat, PositiveFloat, model_validator
+from pydantic import NonNegativeInt, NonNegativeFloat, PositiveFloat
+from cidc_api.models.pydantic.base import forced_validator, forced_validators
 
+from cidc_api.models.errors import ValueLocError
 from cidc_api.models.pydantic.base import Base
 from cidc_api.models.types import YNU, TherapyAgentDoseUnits
 
 
+@forced_validators
 class TherapyAgentDose(Base):
     __data_category__ = "therapy_agent_dose"
     __cardinality__ = "many"
@@ -54,14 +55,26 @@ class TherapyAgentDose(Base):
     # Description of the dose changes, misses, or delays.
     changes_delays_description: str | None = None
 
-    @model_validator(mode="after")
-    def validate_changes_delays_description_cr(self) -> Self:
-        if self.dose_changes_delays == "Yes" and not self.changes_delays_description:
-            raise ValueError('If dose_changes_delays is "Yes", please provide changes_delays_description.')
-        return self
-
-    @model_validator(mode="after")
-    def validate_planned_dose_units_cr(self) -> Self:
-        if self.planned_dose and not self.planned_dose_units:
-            raise ValueError("If planned_dose is provided, please provide planned_dose_units.")
-        return self
+    @forced_validator
+    @classmethod
+    def validate_changes_delays_description_cr(cls, data, info) -> None:
+        dose_changes_delays = data.get("dose_changes_delays", None)
+        changes_delays_description = data.get("changes_delays_description", None)
+
+        if dose_changes_delays == "Yes" and not changes_delays_description:
+            raise ValueLocError(
+                'If dose_changes_delays is "Yes", please provide changes_delays_description.',
+                loc="changes_delays_description",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_planned_dose_units_cr(cls, data, info) -> None:
+        planned_dose = data.get("planned_dose", None)
+        planned_dose_units = data.get("planned_dose_units", None)
+
+        if planned_dose and not planned_dose_units:
+            raise ValueLocError(
+                "If planned_dose is provided, please provide planned_dose_units.",
+                loc="planned_dose_units",
+            )

cidc_api/models/pydantic/stage2/treatment.py

@@ -1,11 +1,11 @@
-from typing import Self
-
-from pydantic import model_validator
+from cidc_api.models.pydantic.base import forced_validator, forced_validators
 
+from cidc_api.models.errors import ValueLocError
 from cidc_api.models.pydantic.base import Base
 from cidc_api.models.types import YNU, OffTreatmentReason
 
 
+@forced_validators
 class Treatment(Base):
     __data_category__ = "treatment"
     __cardinality__ = "many"
@@ -17,10 +17,10 @@ class Treatment(Base):
     participant_id: str | None = None
 
     # The unique internal identifier for the associated Arm record
-    arm_id: int | None = None
+    arm: str | None = None
 
     # The unique internal identifier for the associated Cohort record
-    cohort_id: int | None = None
+    cohort: str | None = None
 
     # A unique identifier used to describe a distinct, specific intervention or
     # treatment that a group or subgroup of participants in a clinical trial receives.
@@ -37,14 +37,28 @@ class Treatment(Base):
     # If "Other" is selected for "off_treatment_reason", provide a description of the reason.
     off_treatment_reason_other: str | None = None
 
-    @model_validator(mode="after")
-    def validate_off_treatment_reason_cr(self) -> Self:
-        if self.off_treatment == "Yes" and not self.off_treatment_reason:
-            raise ValueError('If off_treatment is "Yes", please provide off_treatment_reason.')
-        return self
-
-    @model_validator(mode="after")
-    def validate_off_treatment_reason_other_cr(self) -> Self:
-        if self.off_treatment_reason == "Other" and not self.off_treatment_reason_other:
-            raise ValueError('If off_treatment_reason is "Other", please provide off_treatment_reason_other.')
-        return self
+    @forced_validator
+    @classmethod
+    def validate_off_treatment_reason_cr(cls, data, info) -> None:
+        off_treatment = data.get("off_treatment", None)
+        off_treatment_reason = data.get("off_treatment_reason", None)
+
+        if off_treatment == "Yes" and not off_treatment_reason:
+            raise ValueLocError(
+                'If off_treatment is "Yes", please provide off_treatment_reason.',
+                loc="off_treatment_reason",
+            )
+        return off_treatment_reason
+
+    @forced_validator
+    @classmethod
+    def validate_off_treatment_reason_other_cr(cls, data, info) -> None:
+        off_treatment_reason = data.get("off_treatment_reason", None)
+        off_treatment_reason_other = data.get("off_treatment_reason_other", None)
+
+        if off_treatment_reason == "Other" and not off_treatment_reason_other:
+            raise ValueLocError(
+                'If off_treatment_reason is "Other", please provide off_treatment_reason_other.',
+                loc="off_treatment_reason_other",
+            )
+        return off_treatment_reason_other

cidc_api/models/types.py

@@ -3,19 +3,19 @@ from typing import Annotated, Literal
 from pydantic import AfterValidator
 from sqlalchemy.types import TypeDecorator, Unicode
 
-from cidc_api.reference.icdo3 import is_ICDO3_code, is_ICDO3_term
-from cidc_api.reference.uberon import is_uberon_term
-from cidc_api.reference.ctcae import (
+from cidc_api.code_systems.icdo3 import is_ICDO3_code, is_ICDO3_term
+from cidc_api.code_systems.uberon import is_uberon_term
+from cidc_api.code_systems.ctcae import (
     is_ctcae_event_term,
     is_ctcae_event_code,
     is_ctcae_severity_grade,
     is_ctcae_system_organ_class,
 )
-from cidc_api.reference.icd10cm import (
+from cidc_api.code_systems.icd10cm import (
     is_ICD10CM_code,
     is_ICD10CM_term,
 )
-from cidc_api.reference.gvhd import is_gvhd_organ
+from cidc_api.code_systems.gvhd import is_gvhd_organ
 
 # As python Enums are rather cumbersome when we only want a list of permissible values for a string, use Literal instead
 
@@ -468,6 +468,12 @@ MCategory = Literal[
 ]
 
 
+YN = Literal[
+    "Yes",
+    "No",
+]
+
+
 YNU = Literal[
     "Yes",
     "No",

cidc_api/telemetry.py

@@ -43,19 +43,19 @@ resource = Resource(attributes={"service.name": f"CIDC-{ENV}"})
 provider = TracerProvider(resource=resource)
 
 
-if ENV == "dev" and not TESTING:
-    from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
-
-    COLLECTOR_ENDPOINT = "127.0.0.1"
-    COLLECTOR_GRPC_PORT = 6004
-
-    # send spans to local exporter
-    # 1. download latest version from https://github.com/open-telemetry/opentelemetry-collector-releases/releases (otelcol-contrib_0.140.1_darwin_arm64)
-    # 2. start exporter from otel folder with `./otelcol-contrib --config=config.yaml`
-    # 3. download and start Jeager (all-in-one image)  - https://www.jaegertracing.io/download/
-    exporter = OTLPSpanExporter(endpoint=f"http://{COLLECTOR_ENDPOINT}:{COLLECTOR_GRPC_PORT}", insecure=True)
-    processor = BatchSpanProcessor(exporter)
-    provider.add_span_processor(processor)
+# if ENV == "dev" and not TESTING:
+#     from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+
+#     COLLECTOR_ENDPOINT = "127.0.0.1"
+#     COLLECTOR_GRPC_PORT = 6004
+
+#     # send spans to local exporter
+#     # 1. download latest version from https://github.com/open-telemetry/opentelemetry-collector-releases/releases (otelcol-contrib_0.140.1_darwin_arm64)
+#     # 2. start exporter from otel folder with `./otelcol-contrib --config=config.yaml`
+#     # 3. download and start Jeager (all-in-one image)  - https://www.jaegertracing.io/download/
+#     exporter = OTLPSpanExporter(endpoint=f"http://{COLLECTOR_ENDPOINT}:{COLLECTOR_GRPC_PORT}", insecure=True)
+#     processor = BatchSpanProcessor(exporter)
+#     provider.add_span_processor(processor)
 
 if ENV == "dev-int":
     from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter

{nci_cidc_api_modules-1.2.53.dist-info → nci_cidc_api_modules-1.2.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.53
+Version: 1.2.55
 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

nci_cidc_api_modules-1.2.55.dist-info/RECORD

@@ -0,0 +1,163 @@
+boot.py,sha256=a5zD_ORheoOy3CuEIwjM9jcR4_Phngz6nc-E6RYIEj8,585
+cidc_api/__init__.py,sha256=w_Cy0hYe3h0VvVjywA1usJthx3ML2-hIuBZUa0GHWxg,23
+cidc_api/telemetry.py,sha256=SRPXhN1O4P2jYaRN_K4hAhFURygrzzRrkQsGZmghUUQ,3355
+cidc_api/config/__init__.py,sha256=5mX8GAPxUKV84iS-aGOoE-4m68LsOCGCDptXNdlgvj0,148
+cidc_api/config/db.py,sha256=MHBQH2Ccf2J5cDpMwHJ704_ovl6i38DSF4Mktdfbr0g,2353
+cidc_api/config/logging.py,sha256=abhVYtn8lfhIt0tyV2WHFgSmp_s2eeJh7kodB6LH4J0,1149
+cidc_api/config/secrets.py,sha256=jRFj7W43pWuPf9DZQLCKF7WPXf5cUv-BAaS3ASqhV_Q,1481
+cidc_api/config/settings.py,sha256=IlOSJhSyYYK4XQQ4uBdD58kXO-a2AHPWTSN1AT95b9Y,4545
+cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
+cidc_api/models/code_systems.py,sha256=YR-SGg1UnCElHjibUauAFAs9ENLd7tT28V3sc-NQ4xk,918
+cidc_api/models/dataset.py,sha256=pz5CAzKioKCuArcXqD5MaLm-MnSRlr4I2VgNapGGjPA,3021
+cidc_api/models/errors.py,sha256=UncRrh-4v0CR5mpLO0erWD1y9ctus3Nk6XOSvrTjfco,338
+cidc_api/models/migrations.py,sha256=UlS5How3J4ryaRuZT6F5VQtAKikkl0LTv9MgMO_ltiQ,11161
+cidc_api/models/models.py,sha256=RycbGNQHIud9mqCyIH_yrnN7PVSFwbUCjP6pe6sX5VA,154106
+cidc_api/models/schemas.py,sha256=6IE2dJoEMcMbi0Vr1V3cYKnPKU0hv9vRKBixOZHe88s,2766
+cidc_api/models/types.py,sha256=V0N3RrrnP5bgj44bv3Aet1Mw424KgkcAOfv3QJRyRQI,30112
+cidc_api/models/db/stage1/__init__.py,sha256=zsxOSoogzL_xZ8B5OwcwLXvAmm6g2GYx1Zf6LLw8dq8,1917
+cidc_api/models/db/stage1/additional_treatment_orm.py,sha256=Oe1wfYEOlMKAvNrOTCCnyXeEqAZtHSLk6d4ChIL2J58,1200
+cidc_api/models/db/stage1/adverse_event_orm.py,sha256=vhDDVMaksvXflH8unJJDlHL_8_SCFqWy0GWwxKSpge8,2194
+cidc_api/models/db/stage1/base_orm.py,sha256=izKizTf2W1fCK2CRUeyuErJbOaxNp6d299n4gqKWHDQ,246
+cidc_api/models/db/stage1/baseline_clinical_assessment_orm.py,sha256=mkORk5bDijV6MBooKdJRwIY4yJ8VGe_KycMFDy3q4hg,1185
+cidc_api/models/db/stage1/comorbidity_orm.py,sha256=BQ-YVE_aADogBOPh55ViDGncos1HUq-54SHEpvvJHEc,1155
+cidc_api/models/db/stage1/consent_group_orm.py,sha256=1pZeIgE5vuNEnkRR3mJIXHYBtNjvhmFBbkdkZtwpnuQ,1147
+cidc_api/models/db/stage1/demographic_orm.py,sha256=ETD2n20zlpXF17TSfKnHjBE5A_JK-JeBJvxu95RGU14,1973
+cidc_api/models/db/stage1/disease_orm.py,sha256=NF15-JkzAp0N-ZbDokkKJvXJgaUmPsrzBl9e9rKhkFY,2239
+cidc_api/models/db/stage1/exposure_orm.py,sha256=TaW6yARrFpceT5G-tmlVJZyYi6RrxrvaoQMhjae9LWQ,1085
+cidc_api/models/db/stage1/gvhd_diagnosis_acute_orm.py,sha256=fWSMgNl8Bqg5E22zukx1b0tvfE_r61uKNKOxvK4MW28,1715
+cidc_api/models/db/stage1/gvhd_diagnosis_chronic_orm.py,sha256=u3xWBv0zSaGjQ_0dJkQjiE4etROgDzKEgyX5AoBVi_E,1797
+cidc_api/models/db/stage1/gvhd_organ_acute_orm.py,sha256=mqLg8MKOqZmtl1_Pnai_3BnRepVE8IMfMv2515vIzUE,1112
+cidc_api/models/db/stage1/gvhd_organ_chronic_orm.py,sha256=qJWG9xW9QuqwqF1dRmlZ6IG-9OyOWkyfSoji8rNORK4,1136
+cidc_api/models/db/stage1/medical_history_orm.py,sha256=qD1AenmV6FXrcmncw4f4Pd6UAoemxSUyOmrDJmAs1lY,1556
+cidc_api/models/db/stage1/other_malignancy_orm.py,sha256=32KIqAd8eO-3Pur5fPT8eAfwdQNGnY_cF-EkgMMjk8k,1577
+cidc_api/models/db/stage1/participant_orm.py,sha256=U4D819R3shshqaJA0ZXKmPyZDppQye0yUTRl9LVR6Ic,3564
+cidc_api/models/db/stage1/prior_treatment_orm.py,sha256=C0d00d3_WKD9jvPUUbeP8LmFb1ipX0EuIZxpdvfAink,1565
+cidc_api/models/db/stage1/radiotherapy_dose_orm.py,sha256=ggeMDCv2PnO58GCJqYMAWnlEUwn0DCW8g0QK-0TmNHw,1780
+cidc_api/models/db/stage1/response_by_system_orm.py,sha256=uDS0MFt5Kt0waOYsaqD-JjwEnDYKuoJwNVJ89iP6wQk,1800
+cidc_api/models/db/stage1/response_orm.py,sha256=WjiktcP0vM0vyIWC1IyFv2Xjgok1KI6N5H668xLPeRk,1437
+cidc_api/models/db/stage1/specimen_orm.py,sha256=u1DCzDkxRqBbjupVLoo3fODIIeEBy_tVJTNSJSUk8Co,1139
+cidc_api/models/db/stage1/stem_cell_transplant_orm.py,sha256=el2QydxpxFnWVUhYibSAtJmgVAeahdGsQOuyzjR578g,1371
+cidc_api/models/db/stage1/surgery_orm.py,sha256=LaodgOnH4BJwt0Svvd37Q2RmdxNqa1spl1l8NKX8gjI,1292
+cidc_api/models/db/stage1/therapy_agent_dose_orm.py,sha256=lwL1asNtJ70JRLTm5SXH7S8DZiQ0-oHGmc1sA5MbXR8,1580
+cidc_api/models/db/stage1/treatment_orm.py,sha256=qEuGOJATfOBJyKVmBaDEg0nRK2j65_HlmOoelkAvzec,1899
+cidc_api/models/db/stage1/trial_orm.py,sha256=orXC7srYEU_CY9m9VNE_1-iYP559Oqe6g8-NqdHXbto,1282
+cidc_api/models/db/stage2/__init__.py,sha256=R33BM1VDKJya5uuyYnPoGFVfhSViclIOklSoHH-EtBQ,2691
+cidc_api/models/db/stage2/additional_treatment_orm.py,sha256=bq_E9h-AeYjhaYHaKUHmQ1k_OSP1OtNeu6bupA-ZKP4,1198
+cidc_api/models/db/stage2/administrative_person_orm.py,sha256=49Mon6yLXjTRM-pypTL2R0qlIT1eJRqSaMGKNubjVak,1290
+cidc_api/models/db/stage2/administrative_role_assignment_orm.py,sha256=vi8Xwe3Xz7QlRSTO4zVSd-42YMAfBnY3RNWFrh90f-Y,1292
+cidc_api/models/db/stage2/adverse_event_orm.py,sha256=RkD5KkcJOIhbSvl2JCQfFhOM9J8UbiHQXZ7KzTfF6c8,2194
+cidc_api/models/db/stage2/arm_orm.py,sha256=Mf-BpyvthpwjmaLWXcqaqt50jqC1rQ9NXPyy2wDXA1k,761
+cidc_api/models/db/stage2/base_orm.py,sha256=nk9q0wlHxbuC7vzMtPCsnqeIRQufh3MCniMxu-h7__w,246
+cidc_api/models/db/stage2/baseline_clinical_assessment_orm.py,sha256=xD_I5nO_KBXsjk7ArPeLn-sPXgz0qMx97lxD1XehRYg,1185
+cidc_api/models/db/stage2/cohort_orm.py,sha256=hoAA9O0_D3KB9wPmGKX01vh7Ux-MUiHd-HYZaEjkJzY,767
+cidc_api/models/db/stage2/comorbidity_orm.py,sha256=UsywhrqhksKVpMzGfuoGFx8QQibnFUOFk-kVVlb1lW4,1155
+cidc_api/models/db/stage2/consent_group_orm.py,sha256=Mus0WPzzavctDzvgaRNSJQbQfMxoLi1pjV4lfFaUOsE,1135
+cidc_api/models/db/stage2/contact_orm.py,sha256=I8QrSpbegMhU3mBM39CROvSplEg-8p7HrH-UIXQiy1M,1623
+cidc_api/models/db/stage2/demographic_orm.py,sha256=XZl41qhe7tjUQWBAQgJKK0DH0P4iQT5CO5DzZWckcC8,1973
+cidc_api/models/db/stage2/disease_orm.py,sha256=LRQnLWZ5CZLXa6CelIZQSIlnk_1eWZknE5NLAkjd0QY,2239
+cidc_api/models/db/stage2/exposure_orm.py,sha256=oy2CLsy-vCWNrvsVNX9Zg1XfCWfdycxPygAdr0RXnto,1085
+cidc_api/models/db/stage2/file_orm.py,sha256=KsPsbzqnzCEhNUMxqfv__WUjT4EEd1CcO4RRQAc0pbo,1277
+cidc_api/models/db/stage2/gvhd_diagnosis_acute_orm.py,sha256=xWuPk7IYHzUugOWqKd9TlGJQZde1RvUv-JwlJCnTNUQ,1715
+cidc_api/models/db/stage2/gvhd_diagnosis_chronic_orm.py,sha256=_FbdzIj5l2Z1Fn_IFPoXlO4X7VpdB2UUjlGBHtlrEfs,1797
+cidc_api/models/db/stage2/gvhd_organ_acute_orm.py,sha256=vj8iIIFWLADBk6LcDQtUuvXL_ioTzD1kzJi_RCRa48k,1112
+cidc_api/models/db/stage2/gvhd_organ_chronic_orm.py,sha256=5omEAkkwssr7iyXqJcN8v0f_gN0jf2gE7fIR03okgx4,1136
+cidc_api/models/db/stage2/institution_orm.py,sha256=agQlh7GU5o_g3vMZLQWxjt_1VK6gSA_FBhAalVLrjw4,1272
+cidc_api/models/db/stage2/medical_history_orm.py,sha256=xfoNHXrBLGReK7NDW_aA_AAQVV-hbHt7OaUPUqbxT78,1556
+cidc_api/models/db/stage2/other_clinical_endpoint_orm.py,sha256=Rh9IAfrLujiFHoKiibRgQqV14R3H7lLbycdog6MpPEk,1415
+cidc_api/models/db/stage2/other_malignancy_orm.py,sha256=nAxoqOHiL3we57Wp1-0XWwlFwtJvOGlC97-qinsVNvc,1577
+cidc_api/models/db/stage2/participant_orm.py,sha256=43lPE7dEa3k896a78XXVyrbHhguglBS97w6aW0PqUwk,3737
+cidc_api/models/db/stage2/prior_treatment_orm.py,sha256=nmn8ieu-DuqPrRRggWCZJPvW-jMIz_Uqj28me3j-fzY,1565
+cidc_api/models/db/stage2/publication_orm.py,sha256=rRgZo1peEL8lD3w7Z9K14XfdaYFRUg1kHzelShhT_QU,1102
+cidc_api/models/db/stage2/radiotherapy_dose_orm.py,sha256=iifeysOVvCJ9IE7Vv5vQM2GLPP76OwUeHrsU6GEm8G8,1780
+cidc_api/models/db/stage2/response_by_system_orm.py,sha256=mBcBLhmaQzVgCwa4PB6EaGMDJVMS3ymcfXm010Ltmx0,1800
+cidc_api/models/db/stage2/response_orm.py,sha256=JqEzswK8Ye51mBJzudn2snF7mxohypIvaXqXfPQ8oUs,1437
+cidc_api/models/db/stage2/shipment_orm.py,sha256=vBSPn444wjQJu5C17HaJWzNbUTmSkC9M086kyWSSQdw,2031
+cidc_api/models/db/stage2/shipment_specimen_orm.py,sha256=jtCnO8om-8a_lSVheglrr-ek-vN3M4dQRkBvtLqVK24,1153
+cidc_api/models/db/stage2/specimen_orm.py,sha256=D7GK-WcJMUUAy9Tl81ymaEn0zQbaaBxOdtMRkRzDvFU,1300
+cidc_api/models/db/stage2/stem_cell_transplant_orm.py,sha256=4QzS_Y5Jz2cinDJ3qKAZqpYfGHwmNXXBfmT1rTxdRNA,1371
+cidc_api/models/db/stage2/surgery_orm.py,sha256=4NISeVDr9s7128FEwU0u6RzozBLTZ5KKuuhfseJKYU8,1292
+cidc_api/models/db/stage2/therapy_agent_dose_orm.py,sha256=obAA7uvTWvSc_1E80_9cPE8c_2BjBtPzMRkS9h0XXBc,1580
+cidc_api/models/db/stage2/treatment_orm.py,sha256=WGLvAVR1SlGpT-j11eAtq2waNHhCN-ywE43mDZWdK_Y,2193
+cidc_api/models/db/stage2/trial_orm.py,sha256=ijQLs1JjalXcS-s0HDv2_O2HoPL7Xvv_9AXtGeFc6BU,2821
+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=vieZ3z_tYB29NqtvNzvKqajVwxM5ZLLZKeyQTq5lheU,33776
+cidc_api/models/pydantic/base.py,sha256=sL_0PwEH2vS8BMT_w-zL7CPeaU-R7ih5afRigX6k2DM,4069
+cidc_api/models/pydantic/stage1/__init__.py,sha256=H-NDjCd8isHTgZ7sqz-MIbzC-PpW1kEtR-x-Dyc8r6Q,1667
+cidc_api/models/pydantic/stage1/additional_treatment.py,sha256=TFVzjd1NPLSfH9UnL2W3aZhpZSzDsg97j9IK8t882YA,1050
+cidc_api/models/pydantic/stage1/adverse_event.py,sha256=PanE03MgP70M_i3glCeBCtScuG4zIpyKiJZfeNAOOBc,5176
+cidc_api/models/pydantic/stage1/baseline_clinical_assessment.py,sha256=5FYvtOVf_nIK1h3xTs3vQgJe2ivQSVHt_wfrTSDgVxU,1119
+cidc_api/models/pydantic/stage1/comorbidity.py,sha256=IfxFb0dZAdCY--Ze5kiZ3CrzVKJtuknpcpvrQ3ki-gI,1769
+cidc_api/models/pydantic/stage1/consent_group.py,sha256=aP_nd0GKK6K7VH-6IZRSDDX2RxFM_j9B36FIRGwysOU,1216
+cidc_api/models/pydantic/stage1/demographic.py,sha256=UY3I6nJXsTVPNubQOsF6lQuciLioZl7gKk_Oo6AyoSA,6794
+cidc_api/models/pydantic/stage1/disease.py,sha256=G8d2iqsMhmDA3uxjOitxzmlFKIRxyUMp-o-H7eUfZFg,9250
+cidc_api/models/pydantic/stage1/exposure.py,sha256=bd9gUmOQ7ge-xvoxD17pX95MKxfHKD2xNaFEJAMAkn4,1571
+cidc_api/models/pydantic/stage1/gvhd_diagnosis_acute.py,sha256=jVMoWuLfspOZtOpC7rg1EzdvEAg8qEabcTaS6RRobZ8,1395
+cidc_api/models/pydantic/stage1/gvhd_diagnosis_chronic.py,sha256=SRwkAL07YyIZM4bYCqm01aKqSvj3yRmpsqFKxAZEZoM,1382
+cidc_api/models/pydantic/stage1/gvhd_organ_acute.py,sha256=VxlNGRJYjm9tW2lyLll8pD0t9JZs18gicnH-Ci_nR2I,771
+cidc_api/models/pydantic/stage1/gvhd_organ_chronic.py,sha256=Fnp1Qm-ZDDtDLrgOAnEOUnQVNWI9WrTSomiFPStGmjc,810
+cidc_api/models/pydantic/stage1/medical_history.py,sha256=z-cE_ChyWUKTvWjVhKMUAYvap9YfpZn6Z2BiHhBXx6g,2000
+cidc_api/models/pydantic/stage1/other_malignancy.py,sha256=VIzhbkauaDfZdPxhTYpqNtwYBxE_4osE9wyZ67LQJx4,2622
+cidc_api/models/pydantic/stage1/participant.py,sha256=QfRkK2okY7nM84y9QMK12kZLURBGk-HNWWHL4pQZjec,2655
+cidc_api/models/pydantic/stage1/prior_treatment.py,sha256=axhyPHwYCoIvcIonjyPJ95HUyaAXqIuOd6hhoDM3LJU,2101
+cidc_api/models/pydantic/stage1/radiotherapy_dose.py,sha256=8TbBqx_BYzwygQE-LxlSEK2ntIAFlTpAq_GS479TabI,3839
+cidc_api/models/pydantic/stage1/response.py,sha256=hq5_eJ2BEaVH8pdU444p3AKHuZMdLsoDZcMA3XQa8Rw,3491
+cidc_api/models/pydantic/stage1/response_by_system.py,sha256=vW0Xj_hYRa3W-JbqJgvty559_B9x5UIySaAOhIDVMOs,9853
+cidc_api/models/pydantic/stage1/specimen.py,sha256=scDekZ-RtXOQTTLburhqT3RF4KM34iY9NAV1wYi_HSg,1281
+cidc_api/models/pydantic/stage1/stem_cell_transplant.py,sha256=XsDVUksqbIprPxHwLlwHGyji4jsIFNMcIk-S0H4rDnQ,1228
+cidc_api/models/pydantic/stage1/surgery.py,sha256=sHPzYMNusYIQrC6gjWopwxo0j9BNOq_Tcl6HKAMvuAQ,2421
+cidc_api/models/pydantic/stage1/therapy_agent_dose.py,sha256=XX7JM4CdvTuAsbI5rI4wYDcbevP46BetTk_z7N_EL-M,3527
+cidc_api/models/pydantic/stage1/treatment.py,sha256=eEjCcmkLdPmS2kg9dtUm3pt9apo1sRypBbte_xUVAYU,2607
+cidc_api/models/pydantic/stage1/trial.py,sha256=EfY7HZEn7HT_N5-g4hkYtAM5BQ3yiMRCtj4rm12UQ7U,1909
+cidc_api/models/pydantic/stage2/__init__.py,sha256=OQRG5wFkNsyAU_0KI1W5PDn8pBDe1EJDcgKZ19shh_g,2331
+cidc_api/models/pydantic/stage2/additional_treatment.py,sha256=TFVzjd1NPLSfH9UnL2W3aZhpZSzDsg97j9IK8t882YA,1050
+cidc_api/models/pydantic/stage2/administrative_person.py,sha256=3UYRgGLP7RukwZYTvQEnviDxBvWXj1uqditsoLJOw0s,1552
+cidc_api/models/pydantic/stage2/administrative_role_assignment.py,sha256=kWUciVSnczjejdBSlynsVxSQ4dytDdgw9OxSvgzParg,536
+cidc_api/models/pydantic/stage2/adverse_event.py,sha256=PanE03MgP70M_i3glCeBCtScuG4zIpyKiJZfeNAOOBc,5176
+cidc_api/models/pydantic/stage2/arm.py,sha256=I_gyRUkjyA-Eds3BOu-PUlBGdeGeKiG92ERM8WqA2n8,481
+cidc_api/models/pydantic/stage2/baseline_clinical_assessment.py,sha256=5FYvtOVf_nIK1h3xTs3vQgJe2ivQSVHt_wfrTSDgVxU,1119
+cidc_api/models/pydantic/stage2/cohort.py,sha256=NVlgp8D93nXGPDMSyrAJe-QbmrQfudyuTsc400WyOpg,493
+cidc_api/models/pydantic/stage2/comorbidity.py,sha256=IfxFb0dZAdCY--Ze5kiZ3CrzVKJtuknpcpvrQ3ki-gI,1769
+cidc_api/models/pydantic/stage2/consent_group.py,sha256=aP_nd0GKK6K7VH-6IZRSDDX2RxFM_j9B36FIRGwysOU,1216
+cidc_api/models/pydantic/stage2/contact.py,sha256=Nfyy5Zn-n9_LiXG-CzC7OsQo7JrzdPcYjZIielpZiM0,883
+cidc_api/models/pydantic/stage2/demographic.py,sha256=UY3I6nJXsTVPNubQOsF6lQuciLioZl7gKk_Oo6AyoSA,6794
+cidc_api/models/pydantic/stage2/disease.py,sha256=G8d2iqsMhmDA3uxjOitxzmlFKIRxyUMp-o-H7eUfZFg,9250
+cidc_api/models/pydantic/stage2/exposure.py,sha256=bd9gUmOQ7ge-xvoxD17pX95MKxfHKD2xNaFEJAMAkn4,1571
+cidc_api/models/pydantic/stage2/file.py,sha256=MjZQAII_QqakLBhyfP1bq_Mn6au4yvVuwY0p0A5c664,1336
+cidc_api/models/pydantic/stage2/gvhd_diagnosis_acute.py,sha256=jVMoWuLfspOZtOpC7rg1EzdvEAg8qEabcTaS6RRobZ8,1395
+cidc_api/models/pydantic/stage2/gvhd_diagnosis_chronic.py,sha256=SRwkAL07YyIZM4bYCqm01aKqSvj3yRmpsqFKxAZEZoM,1382
+cidc_api/models/pydantic/stage2/gvhd_organ_acute.py,sha256=VxlNGRJYjm9tW2lyLll8pD0t9JZs18gicnH-Ci_nR2I,771
+cidc_api/models/pydantic/stage2/gvhd_organ_chronic.py,sha256=Fnp1Qm-ZDDtDLrgOAnEOUnQVNWI9WrTSomiFPStGmjc,810
+cidc_api/models/pydantic/stage2/institution.py,sha256=41Lod9ryjB3x2jySHp_g3b7g1sj41Q4zwcNsGgXMGZ4,268
+cidc_api/models/pydantic/stage2/medical_history.py,sha256=z-cE_ChyWUKTvWjVhKMUAYvap9YfpZn6Z2BiHhBXx6g,2000
+cidc_api/models/pydantic/stage2/other_clinical_endpoint.py,sha256=bxZV3qIrrieX4xy3HbKyHdgfpwBcT-abQNlSodVCMns,1093
+cidc_api/models/pydantic/stage2/other_malignancy.py,sha256=VIzhbkauaDfZdPxhTYpqNtwYBxE_4osE9wyZ67LQJx4,2622
+cidc_api/models/pydantic/stage2/participant.py,sha256=QfRkK2okY7nM84y9QMK12kZLURBGk-HNWWHL4pQZjec,2655
+cidc_api/models/pydantic/stage2/prior_treatment.py,sha256=axhyPHwYCoIvcIonjyPJ95HUyaAXqIuOd6hhoDM3LJU,2101
+cidc_api/models/pydantic/stage2/publication.py,sha256=GBuvqBf0lyOoopN1S-3qX310xFxhixk7oDJLuGzLuiw,1817
+cidc_api/models/pydantic/stage2/radiotherapy_dose.py,sha256=8TbBqx_BYzwygQE-LxlSEK2ntIAFlTpAq_GS479TabI,3839
+cidc_api/models/pydantic/stage2/response.py,sha256=hq5_eJ2BEaVH8pdU444p3AKHuZMdLsoDZcMA3XQa8Rw,3491
+cidc_api/models/pydantic/stage2/response_by_system.py,sha256=vW0Xj_hYRa3W-JbqJgvty559_B9x5UIySaAOhIDVMOs,9853
+cidc_api/models/pydantic/stage2/shipment.py,sha256=dsZcDPikCRS3cjr58EGHHJ2gjir78J4cdHh_1SwFyrQ,1595
+cidc_api/models/pydantic/stage2/shipment_specimen.py,sha256=exR7joXsH3Xd-o5vJV_Z-az33Edr8BBm5LCDv01iMI4,488
+cidc_api/models/pydantic/stage2/specimen.py,sha256=scDekZ-RtXOQTTLburhqT3RF4KM34iY9NAV1wYi_HSg,1281
+cidc_api/models/pydantic/stage2/stem_cell_transplant.py,sha256=XsDVUksqbIprPxHwLlwHGyji4jsIFNMcIk-S0H4rDnQ,1228
+cidc_api/models/pydantic/stage2/surgery.py,sha256=sHPzYMNusYIQrC6gjWopwxo0j9BNOq_Tcl6HKAMvuAQ,2421
+cidc_api/models/pydantic/stage2/therapy_agent_dose.py,sha256=XX7JM4CdvTuAsbI5rI4wYDcbevP46BetTk_z7N_EL-M,3527
+cidc_api/models/pydantic/stage2/treatment.py,sha256=eEjCcmkLdPmS2kg9dtUm3pt9apo1sRypBbte_xUVAYU,2607
+cidc_api/models/pydantic/stage2/trial.py,sha256=PftvFY27s3quVBg1Sau1JdskUSMM0huIeGP-018fi5o,4020
+cidc_api/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cidc_api/shared/assay_handling.py,sha256=zzWSqQ-ddLVzX5IuHvsaSib2H1lnjXpo9LbxaoqaHHs,2897
+cidc_api/shared/auth.py,sha256=EIP9AKokLNrI79Fkpv3P7WdzaddJIsuGGICc1W494X0,9110
+cidc_api/shared/email_layout.html,sha256=pBoTNw3ACHH-ncZFaNvcy5bXMqPwizR78usb0uCYtIc,7670
+cidc_api/shared/emails.py,sha256=8kNFEaSnKpY-GX_iE59QUhSp3c4_uzy3SpHYt2QjuqI,6121
+cidc_api/shared/file_handling.py,sha256=9MZXx5RfXO3A_pXf8Ulb7DQEuyp9j12eO9ad-PcTBXo,5908
+cidc_api/shared/gcloud_client.py,sha256=EJ2ZzZ0gwDOZx18PEzXil4F-jpruacShkVIoecw8qzY,40751
+cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
+cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
+cidc_api/shared/utils.py,sha256=-gLnzxCR9E6h0plt2xrNisUG5_Y6GhhVwz3DgDIzpvs,367
+nci_cidc_api_modules-1.2.55.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.2.55.dist-info/METADATA,sha256=YILYITn86Z9qxxYBWpgS7WujFQ1fbIiQ4VrOUoevit0,40301
+nci_cidc_api_modules-1.2.55.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nci_cidc_api_modules-1.2.55.dist-info/top_level.txt,sha256=BSJqF6ura8-bWCKZvarvQEKvidMM05lH0bLQsNOrI0o,14
+nci_cidc_api_modules-1.2.55.dist-info/RECORD,,

cidc_api/models/data.py

@@ -1,28 +0,0 @@
-from cidc_api.models.pydantic.stage1 import all_models as stage1_all_models
-from cidc_api.models.pydantic.stage2 import all_models as stage2_all_models
-from cidc_api.models.db.stage1 import all_models as stage1_all_db_models
-from cidc_api.models.db.stage2 import all_models as stage2_all_db_models
-
-standard_data_categories = [
-    model.__data_category__ for model in stage1_all_models if hasattr(model, "__data_category__")
-]
-
-
-# A class to hold the representation of a trial's dataset all at once
-class Dataset(dict):
-    def __init__(self, *args, **kwargs):
-        for data_category in standard_data_categories:
-            self[data_category] = []
-        super().__init__(*args, **kwargs)
-
-
-# Maps data categories like "treatment" to their associated pydantic model
-data_category_to_model = {
-    "stage1": {model.__data_category__: model for model in stage1_all_models if hasattr(model, "__data_category__")},
-    "stage2": {model.__data_category__: model for model in stage2_all_models if hasattr(model, "__data_category__")},
-}
-
-data_category_to_db_model = {
-    "stage1": {model.__data_category__: model for model in stage1_all_db_models if hasattr(model, "__data_category__")},
-    "stage2": {model.__data_category__: model for model in stage2_all_db_models if hasattr(model, "__data_category__")},
-}