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

cidc_api/models/db/stage2/trial_orm.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
-from datetime import datetime
 from typing import List
+from datetime import datetime
 
-from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.types import JSON
 

cidc_api/models/pydantic/stage1/adverse_event.py

@@ -1,7 +1,7 @@
 from pydantic import NonNegativeInt
 
 from cidc_api.models.pydantic.base import Base
-from cidc_api.reference.ctcae import is_ctcae_other_term
+from cidc_api.code_systems.ctcae import is_ctcae_other_term
 from cidc_api.models.pydantic.base import forced_validator, forced_validators
 from cidc_api.models.errors import ValueLocError
 from cidc_api.models.types import (
@@ -13,6 +13,7 @@ from cidc_api.models.types import (
     SystemOrganClass,
     AttributionCause,
     AttributionLikelihood,
+    YN,
     YNU,
 )
 
@@ -53,7 +54,7 @@ class AdverseEvent(Base):
     system_organ_class: SystemOrganClass | None = None
 
     # Indicator to identify whether a participant exited the study prematurely due to the adverse event being described.
-    discontinuation_due_to_event: bool
+    discontinuation_due_to_event: YN
 
     # Days from enrollment date to date of onset of the adverse event.
     days_to_onset_of_event: NonNegativeInt

cidc_api/models/pydantic/stage1/demographic.py

@@ -15,6 +15,7 @@ from cidc_api.models.types import (
     Occupation,
     Education,
     AgeAtEnrollmentUnits,
+    YN,
 )
 
 
@@ -39,7 +40,7 @@ class Demographic(Base):
 
     # 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_over: bool
+    age_90_or_over: YN
 
     # 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
@@ -100,13 +101,13 @@ class Demographic(Base):
         age_90_or_over = data.get("age_90_or_over", None)
         age_at_enrollment = int(data.get("age_at_enrollment", None) or 0)
 
-        if age_90_or_over == True or age_90_or_over == "Yes":
+        if age_90_or_over == "Yes":
             if age_at_enrollment or age_at_enrollment_units:
                 raise ValueLocError(
                     'If "age_90_or_over" is "Yes" then "age_at_enrollment" and "age_at_enrollment_units" must be blank.',
                     loc="age_at_enrollment",
                 )
-        elif age_90_or_over == False or age_90_or_over == "No":
+        elif age_90_or_over == "No":
             if not age_at_enrollment or not age_at_enrollment_units:
                 raise ValueLocError(
                     'If "age_90_or_over" is "No" then "age_at_enrollment" and "age_at_enrollment_units" are required.',
@@ -120,7 +121,7 @@ class Demographic(Base):
         age_90_or_over = data.get("age_90_or_over", None)
         age_at_enrollment = int(data.get("age_at_enrollment", None) or 0)
 
-        if not age_90_or_over == True or age_90_or_over == "Yes":
+        if age_90_or_over == "No":
             age_in_years = age_at_enrollment if age_at_enrollment_units == "Years" else age_at_enrollment / 365.25
             if age_in_years >= 90:
                 raise ValueLocError(

cidc_api/models/pydantic/stage1/radiotherapy_dose.py

@@ -4,6 +4,7 @@ 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,
     YNU,
     RadiotherapyProcedure,
     UberonAnatomicalTerm,
@@ -38,7 +39,7 @@ class RadiotherapyDose(Base):
 
     # Indicates whether the record represents the total dose for a radiotherapy treatment course (which may be either
     # a multi-fractionated or a single-fraction dose).
-    is_total_dose: bool
+    is_total_dose: YN
 
     # The number of fractions a participant received to deliver the radiation dose.
     number_of_fractions: NonNegativeInt | None = None

cidc_api/models/pydantic/stage1/response.py

@@ -3,7 +3,7 @@ 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, YNUNA, CauseOfDeath
+from cidc_api.models.types import SurvivalStatus, YNUNA, YN, CauseOfDeath
 
 
 @forced_validators
@@ -39,10 +39,10 @@ class Response(Base):
     cause_of_death: CauseOfDeath | None = None
 
     # Indicates whether participant was evaluable for toxicity (adverse events, DLT, etc.) overall.
-    evaluable_for_toxicity: bool
+    evaluable_for_toxicity: YN
 
     # Indicates whether participant was evaluable for efficacy (for example, response, PFS, OS, etc.) overall.
-    evaluable_for_efficacy: bool
+    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

cidc_api/models/pydantic/stage1/response_by_system.py

@@ -6,7 +6,7 @@ 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
+from cidc_api.models.types import ResponseSystem, ResponseSystemVersion, BestOverallResponse, YNUNA, YN
 
 
 negative_response_values = [
@@ -52,7 +52,7 @@ class ResponseBySystem(Base):
     duration_of_stable_disease: NonNegativeInt | None = None
 
     # Indicates whether a patient achieved a durable clinical benefit.
-    durable_clinical_benefit: bool | None = None
+    durable_clinical_benefit: YN | None = None
 
     # Number of days between enrollment date and the date of first response to trial treatment.
     days_to_first_response: PositiveInt | None = None

cidc_api/models/pydantic/stage1/trial.py

@@ -3,7 +3,7 @@ from pydantic import BeforeValidator
 from typing import List, Annotated
 
 from cidc_api.models.pydantic.base import Base
-from cidc_api.models.types import PrimaryPurposeType, AgeGroup
+from cidc_api.models.types import TrialOrganization, TrialFundingAgency, AssayType, AgeGroup, PrimaryPurposeType
 
 
 class Trial(Base):

cidc_api/models/pydantic/stage2/adverse_event.py

@@ -1,9 +1,9 @@
-from typing import Self
-
-from pydantic import NonNegativeInt, model_validator
+from pydantic import NonNegativeInt
 
 from cidc_api.models.pydantic.base import Base
-from cidc_api.reference.ctcae import is_ctcae_other_term
+from cidc_api.code_systems.ctcae import is_ctcae_other_term
+from cidc_api.models.pydantic.base import forced_validator, forced_validators
+from cidc_api.models.errors import ValueLocError
 from cidc_api.models.types import (
     CTCAEEventTerm,
     CTCAEEventCode,
@@ -13,10 +13,12 @@ from cidc_api.models.types import (
     SystemOrganClass,
     AttributionCause,
     AttributionLikelihood,
+    YN,
     YNU,
 )
 
 
+@forced_validators
 class AdverseEvent(Base):
     __data_category__ = "adverse_event"
     __cardinality__ = "many"
@@ -52,7 +54,7 @@ class AdverseEvent(Base):
     system_organ_class: SystemOrganClass | None = None
 
     # Indicator to identify whether a participant exited the study prematurely due to the adverse event being described.
-    discontinuation_due_to_event: bool
+    discontinuation_due_to_event: YN
 
     # Days from enrollment date to date of onset of the adverse event.
     days_to_onset_of_event: NonNegativeInt
@@ -75,26 +77,52 @@ class AdverseEvent(Base):
     # The individual therapy (therapy agent, radiotherapy, surgery, stem cell transplant) in the treatment that is attributed to the adverse event.
     individual_therapy: str | None = None
 
-    @model_validator(mode="after")
-    def validate_term_and_code_cr(self) -> Self:
-        if not self.event_term and not self.event_code:
-            raise ValueError("Please provide event_term or event_code or both")
-        return self
-
-    @model_validator(mode="after")
-    def validate_event_other_specify_cr(self) -> Self:
-        if (
-            self.severity_grade_system == "CTCAE"
-            and is_ctcae_other_term(self.event_term)
-            and not self.event_other_specify
-        ):
-            raise ValueError(
-                'If severity_grade_system is "CTCAE" and the event_code or event_term are of type "Other, specify", please provide event_other_specify'
+    @forced_validator
+    @classmethod
+    def validate_term_and_code_cr(cls, data, info) -> None:
+        event_code = data.get("event_code", None)
+        event_term = data.get("event_term", None)
+
+        if not event_term and not event_code:
+            raise ValueLocError(
+                "Please provide event_term or event_code or both",
+                loc="event_term,event_code",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_event_other_specify_cr(cls, data, info) -> None:
+        event_other_specify = data.get("event_other_specify", None)
+        severity_grade_system = data.get("severity_grade_system", None)
+        event_term = data.get("event_term", None)
+
+        if severity_grade_system == "CTCAE" and is_ctcae_other_term(event_term) and not event_other_specify:
+            raise ValueLocError(
+                'If severity_grade_system is "CTCAE" and the event_code or event_term are of type '
+                '"Other, specify", please provide event_other_specify',
+                loc="event_other_specify",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_system_organ_class_cr(cls, data, info) -> None:
+        event_other_specify = data.get("event_other_specify", None)
+        system_organ_class = data.get("system_organ_class", None)
+
+        if event_other_specify and not system_organ_class:
+            raise ValueLocError(
+                "If event_other_specify is provided, please provide system_organ_class.", loc="system_organ_class"
             )
-        return self
 
-    @model_validator(mode="after")
-    def validate_system_organ_class_cr(self) -> Self:
-        if self.event_other_specify and not self.system_organ_class:
-            raise ValueError("If event_other_specify is provided, please provide system_organ_class.")
-        return self
+    @forced_validator
+    @classmethod
+    def validate_days_to_resolution_of_event_chronology(cls, data, info) -> None:
+        days_to_onset_of_event = data.get("days_to_onset_of_event", None)
+        days_to_resolution_of_event = data.get("days_to_resolution_of_event", None)
+
+        if days_to_resolution_of_event is not None and days_to_onset_of_event is not None:
+            if int(days_to_resolution_of_event) < int(days_to_onset_of_event):
+                raise ValueLocError(
+                    'Violate "days_to_onset_of_event" <= "days_to_resolution_of_event"',
+                    loc="days_to_resolution_of_event",
+                )

cidc_api/models/pydantic/stage2/comorbidity.py

@@ -1,11 +1,13 @@
-from typing import Self
+from typing import Any
 
-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 ICD10CMCode, ICD10CMTerm
 
 
+@forced_validators
 class Comorbidity(Base):
     __data_category__ = "comorbidity"
     __cardinality__ = "many"
@@ -27,10 +29,15 @@ class Comorbidity(Base):
     # A descriptive string that names or briefly describes the comorbidity.
     comorbidity_other: str | None = None
 
-    @model_validator(mode="after")
-    def validate_code_or_term_or_other_cr(self) -> Self:
-        if not self.comorbidity_code and not self.comorbidity_term and not self.comorbidity_other:
-            raise ValueError(
-                'Please provide at least one of "comorbidity_code", "comorbidity_term" or "comorbidity_other".'
+    @forced_validator
+    @classmethod
+    def validate_code_or_term_or_other_cr(cls, data, info) -> None:
+        comorbidity_term = data.get("comorbidity_term", None)
+        comorbidity_other = data.get("comorbidity_other", None)
+        comorbidity_code = data.get("comorbidity_code", None)
+
+        if not comorbidity_code and not comorbidity_term and not comorbidity_other:
+            raise ValueLocError(
+                'Please provide at least one of "comorbidity_code", "comorbidity_term" or "comorbidity_other".',
+                loc="comorbidity_code,comorbidity_term,comorbidity_other",
             )
-        return self

cidc_api/models/pydantic/stage2/demographic.py

@@ -1,7 +1,9 @@
-from typing import Self, Annotated, List
+from typing import Annotated, List
 
-from pydantic import PositiveInt, NonNegativeFloat, PositiveFloat, model_validator, field_validator, BeforeValidator
+from pydantic import PositiveInt, NonNegativeFloat, PositiveFloat, BeforeValidator
+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 (
     Sex,
@@ -13,9 +15,11 @@ from cidc_api.models.types import (
     Occupation,
     Education,
     AgeAtEnrollmentUnits,
+    YN,
 )
 
 
+@forced_validators
 class Demographic(Base):
     __data_category__ = "demographic"
     __cardinality__ = "one"
@@ -36,7 +40,7 @@ class Demographic(Base):
 
     # 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_over: bool
+    age_90_or_over: YN
 
     # 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
@@ -90,34 +94,48 @@ class Demographic(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=2681552%20and%20ver_nr=1
     highest_level_of_education: Education | None = None
 
-    @model_validator(mode="after")
-    def validate_age_at_enrollment_cr(self) -> Self:
-        if self.age_90_or_over:
-            if self.age_at_enrollment or self.age_at_enrollment_units:
-                raise ValueError(
-                    'If "age_90_or_over" is "Yes" then "age_at_enrollment" and "age_at_enrollment_units" must be blank.'
+    @forced_validator
+    @classmethod
+    def validate_age_at_enrollment_cr(cls, data, info) -> None:
+        age_at_enrollment_units = data.get("age_at_enrollment_units", None)
+        age_90_or_over = data.get("age_90_or_over", None)
+        age_at_enrollment = int(data.get("age_at_enrollment", None) or 0)
+
+        if age_90_or_over == "Yes":
+            if age_at_enrollment or age_at_enrollment_units:
+                raise ValueLocError(
+                    'If "age_90_or_over" is "Yes" then "age_at_enrollment" and "age_at_enrollment_units" must be blank.',
+                    loc="age_at_enrollment",
                 )
-        else:
-            if not self.age_at_enrollment or not self.age_at_enrollment_units:
-                raise ValueError(
-                    'If "age_90_or_over" is "No" then "age_at_enrollment" and "age_at_enrollment_units" are required.'
+        elif age_90_or_over == "No":
+            if not age_at_enrollment or not age_at_enrollment_units:
+                raise ValueLocError(
+                    'If "age_90_or_over" is "No" then "age_at_enrollment" and "age_at_enrollment_units" are required.',
+                    loc="age_at_enrollment",
                 )
-        return self
 
-    @model_validator(mode="after")
-    def validate_age_at_enrollment_value(self) -> Self:
-        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
-            )
+    @forced_validator
+    @classmethod
+    def validate_age_at_enrollment_value(cls, data, info) -> None:
+        age_at_enrollment_units = data.get("age_at_enrollment_units", None)
+        age_90_or_over = data.get("age_90_or_over", None)
+        age_at_enrollment = int(data.get("age_at_enrollment", None) or 0)
+
+        if age_90_or_over == "No":
+            age_in_years = age_at_enrollment if age_at_enrollment_units == "Years" else 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
-
-    @model_validator(mode="after")
-    def validate_body_surface_area_units_cr(self) -> Self:
-        if self.body_surface_area and not self.body_surface_area_units:
-            raise ValueError(
-                'If "body_surface_area" is provided then "body_surface_area_units_other" must also be provided.'
+                raise ValueLocError(
+                    '"age_at_enrollment" cannot represent a value greater than 90 years of age.',
+                    loc="age_at_enrollment",
+                )
+
+    @forced_validator
+    @classmethod
+    def validate_body_surface_area_units_cr(cls, data, info) -> None:
+        body_surface_area = data.get("body_surface_area", None)
+        body_surface_area_units = data.get("body_surface_area_units", None)
+
+        if body_surface_area and not body_surface_area_units:
+            raise ValueLocError(
+                'If "body_surface_area" is provided then "body_surface_area_units" must also be provided.'
             )
-        return self

cidc_api/models/pydantic/stage2/disease.py

@@ -1,6 +1,9 @@
-from pydantic import NonPositiveInt, model_validator, BeforeValidator
-from typing import List, Self, Annotated, get_args
+from pydantic import NonPositiveInt, BeforeValidator
+from cidc_api.models.pydantic.base import forced_validator, forced_validators
 
+from typing import List, Self, Annotated, get_args, Any
+
+from cidc_api.models.errors import ValueLocError
 from cidc_api.models.pydantic.base import Base
 from cidc_api.models.types import (
     TumorGrade,
@@ -20,6 +23,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class Disease(Base):
     __data_category__ = "disease"
     __cardinality__ = "many"
@@ -92,67 +96,105 @@ class Disease(Base):
 
     extramedullary_organ: Annotated[List[UberonAnatomicalTerm] | None, BeforeValidator(Base.split_list)] = []
 
-    @model_validator(mode="after")
-    def validate_code_or_term_or_description_cr(self) -> Self:
-        if not self.morphological_code and not self.morphological_term and not self.cancer_type_description:
-            raise ValueError(
-                'Please provide at least one of "morphological_code", "morphological_term" or "cancer_type_description".'
+    @forced_validator
+    @classmethod
+    def validate_code_or_term_or_description_cr(cls, data, info) -> None:
+        morphological_term = data.get("morphological_term", None)
+        cancer_type_description = data.get("cancer_type_description", None)
+        morphological_code = data.get("morphological_code", None)
+
+        if not morphological_code and not morphological_term and not cancer_type_description:
+            raise ValueLocError(
+                'Please provide at least one of "morphological_code", "morphological_term" or "cancer_type_description".',
+                loc="morphological_code",
             )
-        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(
+    @forced_validator
+    @classmethod
+    def validate_cancer_stage_system_version(cls, data, info) -> None:
+        cancer_stage_system_version = data.get("cancer_stage_system_version", None)
+        cancer_stage_system = data.get("cancer_stage_system", None)
+
+        msg = f"{cancer_stage_system_version} is not applicable to {cancer_stage_system}"
+        if cancer_stage_system == "AJCC" and cancer_stage_system_version not in get_args(CancerStageSystemVersionAJCC):
+            raise ValueLocError(msg, loc="cancer_stage_system")
+        elif cancer_stage_system == "RISS" and 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(
+            raise ValueLocError(msg, loc="cancer_stage_system")
+        elif cancer_stage_system == "FIGO" and 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:
-            raise ValueError(
-                f'Please provide cancer_stage_system_version when cancer_stage_system is "{self.cancer_stage_system}"'
+            raise ValueLocError(msg, loc="cancer_stage_system")
+
+    @forced_validator
+    @classmethod
+    def validate_cancer_stage_system_version_cr(cls, data, info) -> None:
+        cancer_stage_system = data.get("cancer_stage_system", None)
+        cancer_stage_system_version = data.get("cancer_stage_system_version", None)
+
+        if cancer_stage_system != "Not Applicable" and not cancer_stage_system_version:
+            raise ValueLocError(
+                f'Please provide cancer_stage_system_version when cancer_stage_system is "{cancer_stage_system}"',
+                loc="cancer_stage_system_version",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_cancer_stage_cr(cls, data, info) -> None:
+        cancer_stage_system = data.get("cancer_stage_system", None)
+        cancer_stage = data.get("cancer_stage", None)
+
+        if cancer_stage_system != "Not Applicable" and not cancer_stage:
+            raise ValueLocError(
+                f'Please provide cancer_stage when cancer_stage_system is "{cancer_stage_system}"',
+                loc="cancer_stage",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_t_category_cr(cls, data, info) -> None:
+        cancer_stage_system = data.get("cancer_stage_system", None)
+        t_category = data.get("t_category", None)
+
+        if cancer_stage_system == "AJCC" and not t_category:
+            raise ValueLocError(
+                f'Please provide t_category when cancer_stage_system is "{cancer_stage_system}"',
+                loc="t_category",
             )
-        return self
-
-    @model_validator(mode="after")
-    def validate_cancer_stage_cr(self) -> Self:
-        if self.cancer_stage_system != "Not Applicable" and not self.cancer_stage:
-            raise ValueError(f'Please provide cancer_stage when cancer_stage_system is "{self.cancer_stage_system}"')
-        return self
-
-    @model_validator(mode="after")
-    def validate_t_category_cr(self) -> Self:
-        if self.cancer_stage_system == "AJCC" and not self.t_category:
-            raise ValueError(f'Please provide t_category when cancer_stage_system is "{self.cancer_stage_system}"')
-        return self
-
-    @model_validator(mode="after")
-    def validate_n_category_cr(self) -> Self:
-        if self.cancer_stage_system == "AJCC" and not self.n_category:
-            raise ValueError(f'Please provide n_category when cancer_stage_system is "{self.cancer_stage_system}"')
-        return self
-
-    @model_validator(mode="after")
-    def validate_m_category_cr(self) -> Self:
-        if self.cancer_stage_system == "AJCC" and not self.m_category:
-            raise ValueError(f'Please provide m_category when cancer_stage_system is "{self.cancer_stage_system}"')
-        return self
-
-    @model_validator(mode="after")
-    def validate_extramedullary_organ_cr(self) -> Self:
-        if self.solely_extramedullary_disease in ["No", "Unknown"] and self.extramedullary_organ:
-            raise ValueError(
-                "If solely_extramedullary_disease indicates no disease, please leave extramedullary_organ blank."
+
+    @forced_validator
+    @classmethod
+    def validate_n_category_cr(cls, data, info) -> None:
+        cancer_stage_system = data.get("cancer_stage_system", None)
+        n_category = data.get("n_category", None)
+
+        if cancer_stage_system == "AJCC" and not n_category:
+            raise ValueLocError(
+                f'Please provide n_category when cancer_stage_system is "{cancer_stage_system}"',
+                loc="n_category",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_m_category_cr(cls, data, info) -> None:
+        cancer_stage_system = data.get("cancer_stage_system", None)
+        m_category = data.get("m_category", None)
+
+        if cancer_stage_system == "AJCC" and not m_category:
+            raise ValueLocError(
+                f'Please provide m_category when cancer_stage_system is "{cancer_stage_system}"',
+                loc="m_category",
+            )
+
+    @forced_validator
+    @classmethod
+    def validate_extramedullary_organ_cr(cls, data, info) -> None:
+        solely_extramedullary_disease = data.get("solely_extramedullary_disease", None)
+        extramedullary_organ = data.get("extramedullary_organ", None)
+
+        if solely_extramedullary_disease in ["No", "Unknown"] and extramedullary_organ:
+            raise ValueLocError(
+                "If solely_extramedullary_disease indicates no disease, please leave extramedullary_organ blank.",
+                loc="extramedullary_organ",
             )
-        return self

cidc_api/models/pydantic/stage2/exposure.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, ExposureType
 
 
+@forced_validators
 class Exposure(Base):
     __data_category__ = "exposure"
     __cardinality__ = "many"
@@ -25,8 +25,14 @@ class Exposure(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15753203%20and%20ver_nr=1
     exposure_type: ExposureType | None = None
 
-    @model_validator(mode="after")
-    def validate_exposure_type_cr(self) -> Self:
-        if self.carcinogen_exposure in ["No", "Unknown"] and self.exposure_type:
-            raise ValueError("If carcinogen_exposure indicates non exposure, please leave exposure_type blank.")
-        return self
+    @forced_validator
+    @classmethod
+    def validate_exposure_type_cr(cls, data, info) -> None:
+        carcinogen_exposure = data.get("carcinogen_exposure", None)
+        exposure_type = data.get("exposure_type", None)
+
+        if carcinogen_exposure in ["No", "Unknown"] and exposure_type:
+            raise ValueLocError(
+                "If carcinogen_exposure indicates non exposure, please leave exposure_type blank.",
+                loc="exposure_type",
+            )