nci-cidc-api-modules 1.2.54__py3-none-any.whl → 1.2.56__py3-none-any.whl

cidc_api/models/pydantic/stage2/radiotherapy_dose.py

@@ -1,7 +1,7 @@
-from typing import Self
-
-from pydantic import NonNegativeInt, NonNegativeFloat, model_validator
+from pydantic import NonNegativeInt, NonNegativeFloat
+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 (
     YN,
@@ -13,6 +13,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class RadiotherapyDose(Base):
     __data_category__ = "radiotherapy_dose"
     __cardinality__ = "many"
@@ -67,14 +68,26 @@ class RadiotherapyDose(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=7063755%20and%20ver_nr=1
     radiation_extent: RadiationExtent
 
-    @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/response.py

@@ -1,11 +1,12 @@
-from typing import Self
-
-from pydantic import NonNegativeInt, model_validator
+from pydantic import NonNegativeInt
+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 SurvivalStatus, YN, YNUNA, CauseOfDeath
+from cidc_api.models.types import SurvivalStatus, YNUNA, YN, CauseOfDeath
 
 
+@forced_validators
 class Response(Base):
     __data_category__ = "response"
     __cardinality__ = "one"
@@ -44,22 +45,40 @@ class Response(Base):
     evaluable_for_efficacy: YN
 
     # Days from enrollment date to the last time the patient's vital status was verified.
-    days_to_last_vital_status: NonNegativeInt | None = None  # TODO: Needs CR check
-
-    @model_validator(mode="after")
-    def validate_cause_of_death_cr(self) -> Self:
-        if self.survival_status == "Dead" and not self.cause_of_death:
-            raise ValueError('If survival_status is "Dead" then cause_of_death is required.')
-        return self
-
-    @model_validator(mode="after")
-    def validate_cause_of_death_cr2(self) -> Self:
-        if self.survival_status == "Alive" and self.cause_of_death:
-            raise ValueError('If survival_status is "Alive", please leave cause_of_death blank.')
-        return self
-
-    @model_validator(mode="after")
-    def validate_days_to_death_cr(self) -> Self:
-        if self.survival_status in ["Alive", "Unknown"] and self.days_to_death:
-            raise ValueError("If survival_status does not indicate death, please leave days_to_death blank.")
-        return self
+    days_to_last_vital_status: NonNegativeInt | None = None
+
+    @forced_validator
+    @classmethod
+    def validate_cause_of_death_cr(cls, data, info) -> None:
+        survival_status = data.get("survival_status", None)
+        cause_of_death = data.get("cause_of_death", None)
+
+        if survival_status == "Dead" and not cause_of_death:
+            raise ValueLocError(
+                'If survival_status is "Dead" then cause_of_death is required.',
+                loc="cause_of_death",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_cause_of_death_cr2(cls, data, info) -> None:
+        survival_status = data.get("survival_status", None)
+        cause_of_death = data.get("cause_of_death", None)
+
+        if survival_status == "Alive" and cause_of_death:
+            raise ValueLocError(
+                'If survival_status is "Alive", please leave cause_of_death blank.',
+                loc="cause_of_death",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_days_to_death_cr(cls, data, info) -> None:
+        survival_status = data.get("survival_status", None)
+        days_to_death = data.get("days_to_death", None)
+
+        if survival_status in ["Alive", "Unknown"] and days_to_death:
+            raise ValueLocError(
+                "If survival_status does not indicate death, please leave days_to_death blank.",
+                loc="days_to_death",
+            )

cidc_api/models/pydantic/stage2/response_by_system.py

@@ -1,8 +1,11 @@
 from typing import Self
 
-from pydantic import PositiveInt, model_validator, NonNegativeInt
+from pydantic import PositiveInt, NonNegativeInt, 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.pydantic.stage1.response import Response
 from cidc_api.models.types import ResponseSystem, ResponseSystemVersion, BestOverallResponse, YNUNA, YN
 
 
@@ -17,6 +20,7 @@ negative_response_values = [
 ]
 
 
+@forced_validators
 class ResponseBySystem(Base):
     __data_category__ = "response_by_system"
     __cardinality__ = "many"
@@ -28,6 +32,9 @@ class ResponseBySystem(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
     participant_id: str | None = None
 
+    # The linked parent response for the participant. Used for cross-model validation.
+    response: Response | 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
     response_system: ResponseSystem
@@ -66,47 +73,148 @@ class ResponseBySystem(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=5143957%20and%20ver_nr=1
     progression_free_survival: PositiveInt | None = None
 
-    @model_validator(mode="after")
-    def validate_response_duration_cr(self) -> Self:
-        if self.best_overall_response in negative_response_values and self.response_duration:
-            raise ValueError(
+    @forced_validator
+    @classmethod
+    def validate_response_duration_cr(cls, data, info) -> None:
+        best_overall_response = data.get("best_overall_response", None)
+        response_duration = data.get("response_duration", None)
+
+        if best_overall_response in negative_response_values and response_duration:
+            raise ValueLocError(
                 "If best_overall_response does not indicate a positive response, "
-                "please leave response_duration blank."
+                "please leave response_duration blank.",
+                loc="response_duration",
             )
-        return self
 
-    @model_validator(mode="after")
-    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(
+    @forced_validator
+    @classmethod
+    def validate_days_to_first_response_cr(cls, data, info) -> None:
+        best_overall_response = data.get("best_overall_response", None)
+        days_to_first_response = data.get("days_to_first_response", None)
+
+        if best_overall_response in negative_response_values and days_to_first_response:
+            raise ValueLocError(
                 "If best_overall_response does not indicate a positive response, "
-                "please leave days_to_first_response blank."
+                "please leave days_to_first_response blank.",
+                loc="days_to_first_response",
             )
-        return self
 
-    @model_validator(mode="after")
-    def validate_days_to_best_response_cr(self) -> Self:
-        if self.best_overall_response in negative_response_values and self.days_to_best_response:
-            raise ValueError(
-                "If best_overall_response does not indicate a positive response, \
-                please leave days_to_best_response blank."
+    @forced_validator
+    @classmethod
+    def validate_days_to_best_response_cr(cls, data, info) -> None:
+        best_overall_response = data.get("best_overall_response", None)
+        days_to_best_response = data.get("days_to_best_response", None)
+
+        if best_overall_response in negative_response_values and days_to_best_response:
+            raise ValueLocError(
+                "If best_overall_response does not indicate a positive response, "
+                "please leave days_to_best_response blank.",
+                loc="days_to_best_response",
             )
-        return self
+
+    @forced_validator
+    @classmethod
+    def validate_days_to_disease_progression_cr(cls, data, info) -> None:
+        progression = data.get("progression", None)
+        days_to_disease_progression = data.get("days_to_disease_progression", None)
+
+        if progression in ["No", "Unknown", "Not Applicable"] and days_to_disease_progression:
+            raise ValueLocError(
+                "If progression does not indicate confirmed progression of the disease, "
+                "please leave days_to_disease_progression blank.",
+                loc="days_to_disease_progression",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_progression_free_survival_cr(cls, data, info) -> None:
+        progression_free_survival_event = data.get("progression_free_survival_event", None)
+        progression_free_survival = data.get("progression_free_survival", None)
+
+        if progression_free_survival_event in ["Unknown", "Not Applicable"] and progression_free_survival:
+            raise ValueLocError(
+                "If progression_free_survival_event is not known, " "please leave progression_free_survival blank.",
+                loc="progression_free_survival",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_days_to_best_response_chronology(cls, data, info) -> None:
+        days_to_first_response = data.get("days_to_first_response", None)
+        days_to_best_response = data.get("days_to_best_response", None)
+
+        if days_to_best_response is not None and days_to_first_response is not None:
+            if int(days_to_best_response) < int(days_to_first_response):
+                raise ValueLocError(
+                    'Violate "days_to_best_response" >= days_to_first_response"',
+                    loc="days_to_best_response",
+                )
+
+    @forced_validator
+    @classmethod
+    def validate_days_to_disease_progression_chronology(cls, data, info) -> None:
+        days_to_disease_progression = data.get("days_to_disease_progression", None)
+        days_to_first_response = data.get("days_to_first_response", None)
+
+        if days_to_first_response is not None and days_to_disease_progression is not None:
+            if int(days_to_first_response) >= int(days_to_disease_progression):
+                raise ValueLocError(
+                    'Violate "days_to_first_response" < "days_to_disease_progression"',
+                    loc="days_to_first_response",
+                )
+
+    @forced_validator
+    @classmethod
+    def validate_days_to_best_response_progression_chronology(cls, data, info) -> None:
+        days_to_disease_progression = data.get("days_to_disease_progression", None)
+        days_to_best_response = data.get("days_to_best_response", None)
+
+        if days_to_best_response is not None and days_to_disease_progression is not None:
+            if int(days_to_best_response) >= int(days_to_disease_progression):
+                raise ValueLocError(
+                    'Violate "days_to_best_response" < "days_to_disease_progression"',
+                    loc="days_to_best_response",
+                )
 
     @model_validator(mode="after")
-    def validate_days_to_disease_progression_cr(self) -> Self:
-        if self.progression in ["No", "Unknown", "Not Applicable"] and self.days_to_disease_progression:
-            raise ValueError(
-                "If progression does not indicate confirmed progression of the disease, \
-                please leave days_to_disease_progress blank."
+    def validate_days_to_last_vital_status_chronology(self) -> Self:
+        if not self.response:
+            return self
+
+        if not self.response.days_to_last_vital_status:
+            return self
+
+        max_value = max(
+            self.response.days_to_last_vital_status or 0,
+            self.days_to_first_response or 0,
+            self.days_to_best_response or 0,
+            self.days_to_disease_progression or 0,
+        )
+        if (self.response.days_to_last_vital_status or 0) != max_value:
+            raise ValueLocError(
+                '"days_to_last_vital_status" is not the max of all events. Rule: days_to_last_vital_status '
+                ">= max(days_to_first_response,days_to_best_response,days_to_disease_progression)",
+                loc="days_to_last_vital_status,days_to_first_response,days_to_best_response,days_to_disease_progression",
             )
         return self
 
     @model_validator(mode="after")
-    def validate_progression_free_survival_cr(self) -> Self:
-        if self.progression_free_survival_event in ["Unknown", "Not Applicable"] and self.progression_free_survival:
-            raise ValueError(
-                "If progression_free_survival_event is not known, \
-                please leave progression_free_survival blank."
+    def validate_days_to_death_chronology(self) -> Self:
+        if not self.response:
+            return self
+        if not self.response.days_to_death:
+            return self
+
+        max_value = max(
+            self.response.days_to_death or 0,
+            self.days_to_first_response or 0,
+            self.days_to_best_response or 0,
+            self.days_to_disease_progression or 0,
+        )
+        if (self.response.days_to_death or 0) != max_value:
+            raise ValueLocError(
+                '"days_to_death" is not the max of all events. Rule: days_to_death'
+                ">= max(days_to_first_response,days_to_best_response,days_to_disease_progression)",
+                loc="days_to_death,days_to_first_response,days_to_best_response,days_to_disease_progression",
             )
         return self

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",
+            )