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

boot.py

@@ -0,0 +1,14 @@
+from os import mkdir, path
+import shutil
+
+TEMPLATES_DIR = path.join("/tmp", "templates")
+
+
+# set up the directories for holding generated templates
+def set_up_templates_directories():
+    if path.exists(TEMPLATES_DIR):
+        shutil.rmtree(TEMPLATES_DIR)
+    mkdir(TEMPLATES_DIR)
+    for family in ["assays", "manifests", "analyses"]:
+        family_dir = path.join(TEMPLATES_DIR, family)
+        mkdir(family_dir)

cidc_api/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.45"
+__version__ = "1.2.53"

cidc_api/config/settings.py

@@ -5,11 +5,11 @@ Any 'UPPER_CASE' variables will be exported as a key-value pair
 in the `SETTINGS` dictionary defined at the bottom of this file.
 """
 
-import shutil
-from os import environ, path, mkdir
+from os import environ, path
 
 from dotenv import load_dotenv
 
+from boot import TEMPLATES_DIR as templates_dir
 from .db import get_sqlalchemy_database_uri, cloud_connector
 from .secrets import get_secrets_manager
 
@@ -36,14 +36,7 @@ PAGINATION_PAGE_SIZE = 25
 MAX_PAGINATION_PAGE_SIZE = 200
 INACTIVE_USER_DAYS = 60
 MAX_THREADPOOL_WORKERS = 32
-TEMPLATES_DIR = path.join("/tmp", "templates")
-# Also, set up the directories for holding generated templates
-if path.exists(TEMPLATES_DIR):
-    shutil.rmtree(TEMPLATES_DIR)
-mkdir(TEMPLATES_DIR)
-for family in ["assays", "manifests", "analyses"]:
-    family_dir = path.join(TEMPLATES_DIR, family)
-    mkdir(family_dir)
+TEMPLATES_DIR = templates_dir
 
 ### Configure prism encrypt ###
 if not TESTING:
@@ -85,6 +78,7 @@ GOOGLE_GRANT_DOWNLOAD_PERMISSIONS_TOPIC = environ["GOOGLE_GRANT_DOWNLOAD_PERMISS
 GOOGLE_HL_CLINICAL_VALIDATION_TOPIC = environ["GOOGLE_HL_CLINICAL_VALIDATION_TOPIC"]
 GOOGLE_DL_CLINICAL_VALIDATION_TOPIC = environ["GOOGLE_DL_CLINICAL_VALIDATION_TOPIC"]
 GOOGLE_ASSAY_METADATA_VALIDATION_TOPIC = environ["GOOGLE_ASSAY_METADATA_VALIDATION_TOPIC"]
+GOOGLE_CLINICAL_DATA_INGESTION_PROCESSING_TOPIC = "ingestion"
 GOOGLE_AND_OPERATOR = " && "
 GOOGLE_OR_OPERATOR = " || "
 

cidc_api/models/errors.py

@@ -0,0 +1,7 @@
+class ValueLocError(ValueError):
+    """A special case of ValueError that allows us to carry along the 'loc' location where a pydantic
+    validation error occured."""
+
+    def __init__(self, *args, loc: str, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.loc = (loc,)  # Make a tuple to match pydantic's loc structure

cidc_api/models/models.py

@@ -36,6 +36,7 @@ __all__ = [
     "ADMIN_FILE_CATEGORIES",
     "FINAL_JOB_STATUS",
     "INGESTION_JOB_STATUSES",
+    "INGESTION_PHASE_STATUSES",
     "ASSAY_JOB_COLORS",
     "CLINICAL_JOB_COLORS",
 ]
@@ -1048,11 +1049,11 @@ class Permissions(CommonColumns):
             user_email_list.append(user.email)
             grant_lister_access(user.email)
 
-        if upload.upload_type in prism.SUPPORTED_SHIPPING_MANIFESTS:
+        if upload.upload_type in prism.SUPPORTED_MANIFESTS:
             # Passed with empty user email list because they will be queried for in CFn
             grant_download_access([], upload.trial_id, "participants info")
             grant_download_access([], upload.trial_id, "samples info")
-        elif upload.upload_type not in prism.SUPPORTED_WEIRD_MANIFESTS:
+        else:
             grant_download_access(user_email_list, upload.trial_id, upload.upload_type)
 
     @staticmethod
@@ -3448,6 +3449,8 @@ INGESTION_JOB_STATUSES = [
     "PUBLISHED",
 ]
 
+INGESTION_PHASE_STATUSES = ["NOT STARTED", "SUCCESS", "FAILED"]
+
 # Business decision to pass hex codes from the backend though that should be done by the front end...
 CLINICAL_JOB_COLORS = {
     "DRAFT": "",
@@ -3492,6 +3495,13 @@ class IngestionJobs(CommonColumns):
     intake_path = Column(String, nullable=True)
     uploader_email = Column(String, nullable=True)
     is_template_downloaded = Column(Boolean, nullable=True)
+    master_aa_version = Column(Integer, nullable=True)
+    ingestion_phase_status = Column(
+        "ingestion_phase_status",
+        Enum(*INGESTION_PHASE_STATUSES, name="ingestion_phase_status"),
+        nullable=False,
+        default=INGESTION_PHASE_STATUSES[0],
+    )
 
     @staticmethod
     @with_default_session
@@ -3502,6 +3512,7 @@ class IngestionJobs(CommonColumns):
         error_status: str = None,
         pending: Boolean = False,
         job_type: str = "clinical",
+        ingestion_phase_status=INGESTION_PHASE_STATUSES[0],
         assay_type: str = None,
         batch_id: str = None,
         submission_id: str = None,
@@ -3523,6 +3534,7 @@ class IngestionJobs(CommonColumns):
             intake_path=intake_path,
             start_date=start_date,
             uploader_email=uploader_email,
+            ingestion_phase_status=ingestion_phase_status,
         )
         new_job.insert(session=session)
         return new_job

cidc_api/models/pydantic/base.py

@@ -1,7 +1,11 @@
-from pydantic import BaseModel, ConfigDict
+import copy
 from contextlib import contextmanager
+from typing import Self, ClassVar
+from pydantic import BaseModel, ConfigDict, model_validator, ValidationError
+from pydantic_core import InitErrorDetails
 
-import copy
+from cidc_api.models.errors import ValueLocError
+from functools import wraps
 
 
 class Base(BaseModel):
@@ -11,6 +15,7 @@ class Base(BaseModel):
         from_attributes=True,
         extra="allow",
     )
+    forced_validators: ClassVar = []
 
     # Validates the new state and updates the object if valid
     def update(self, **kwargs):
@@ -33,6 +38,8 @@ class Base(BaseModel):
             self.__dict__.update(original_dict)
             raise
 
+        # CM that delays validation until all fields are applied.
+
     @classmethod
     def split_list(cls, val):
         """Listify fields that are multi-valued in input data, e.g. 'lung|kidney'"""
@@ -46,3 +53,57 @@ class Base(BaseModel):
             return []
         else:
             raise ValueError("Field value must be string or list")
+
+    @model_validator(mode="wrap")
+    @classmethod
+    def check_all_forced_validators(cls, data, handler, info) -> Self:
+        """This base validator ensures all registered forced_validator(s) get called along with
+        normal model field validators no matter what the outcome of either is. Normal field_validator
+        and model_validator decorators don't guarantee this. We want to collect as many errors as we can.
+
+        Collects errors from both attempts and raises them in a combined ValidationError."""
+
+        validation_errors = []
+        # When assigning attributes to an already-hydrated model, data is an instance of the model
+        # instead of a dict and handler is an AssignmentValidatorCallable instead of a ValidatorCallable(!!)
+        extracted_data = data.model_dump() if not isinstance(data, dict) else data
+
+        for validator in cls.forced_validators:
+            try:
+                func_name = validator.__name__
+                func = getattr(cls, func_name)
+                func(extracted_data, info)
+            except (ValueError, ValueLocError) as e:
+                validation_errors.append(
+                    InitErrorDetails(
+                        type="value_error",
+                        loc=e.loc,
+                        input=extracted_data,
+                        ctx={"error": e},
+                    )
+                )
+        try:
+            # Instantiate the model to ensure all other normal field validations are called
+            retval = handler(data)
+        except ValidationError as e:
+            validation_errors.extend(e.errors())
+        if validation_errors:
+            raise ValidationError.from_exception_data(title=cls.__name__, line_errors=validation_errors)
+        return retval
+
+
+def forced_validator(func):
+    """A method marked with this decorator is added to the class list of forced_validators"""
+    func._is_forced_validator = True  # Tag the function object with a custom attribute
+    return func
+
+
+def forced_validators(cls):
+    """A class marked with this decorator accumulates its methods marked with force_validator into a list
+    for later invocation."""
+
+    cls.forced_validators = []
+    for obj in cls.__dict__.values():
+        if getattr(obj, "_is_forced_validator", False):
+            cls.forced_validators.append(obj)
+    return cls

cidc_api/models/pydantic/stage1/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.models.pydantic.base import forced_validator, forced_validators
+from cidc_api.models.errors import ValueLocError
 from cidc_api.models.types import (
     CTCAEEventTerm,
     CTCAEEventCode,
@@ -17,6 +17,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class AdverseEvent(Base):
     __data_category__ = "adverse_event"
     __cardinality__ = "many"
@@ -75,26 +76,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/stage1/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/stage1/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,
@@ -16,6 +18,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class Demographic(Base):
     __data_category__ = "demographic"
     __cardinality__ = "one"
@@ -90,34 +93,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 == True or 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 == False or 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 not age_90_or_over == True or age_90_or_over == "Yes":
+            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/stage1/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