nci-cidc-api-modules 1.2.51__tar.gz → 1.2.52__tar.gz

{nci_cidc_api_modules-1.2.51/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.2.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.51
+Version: 1.2.52
 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.52/cidc_api/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.52"

nci_cidc_api_modules-1.2.52/cidc_api/models/pydantic/base.py

@@ -0,0 +1,109 @@
+import copy
+from contextlib import contextmanager
+from typing import Self, ClassVar
+from pydantic import BaseModel, ConfigDict, model_validator, ValidationError
+from pydantic_core import InitErrorDetails
+
+from cidc_api.models.errors import ValueLocError
+from functools import wraps
+
+
+class Base(BaseModel):
+
+    model_config = ConfigDict(
+        validate_assignment=True,
+        from_attributes=True,
+        extra="allow",
+    )
+    forced_validators: ClassVar = []
+
+    # Validates the new state and updates the object if valid
+    def update(self, **kwargs):
+        self.model_validate(self.__dict__ | kwargs)
+        self.__dict__.update(kwargs)
+
+    # CM that delays validation until all fields are applied.
+    # If validation fails the original fields are restored and the ValidationError is raised.
+    @contextmanager
+    def delay_validation(self):
+        original_dict = copy.deepcopy(self.__dict__)
+        self.model_config["validate_assignment"] = False
+        try:
+            yield
+        finally:
+            self.model_config["validate_assignment"] = True
+        try:
+            self.model_validate(self.__dict__)
+        except:
+            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'"""
+        if type(val) == list:
+            return val
+        elif type(val) == str:
+            if not val:
+                return []
+            return val.split("|")
+        elif val == None:
+            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

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/adverse_event.py

@@ -1,9 +1,8 @@
-from typing import Self
-
-from pydantic import Field, 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,
@@ -18,6 +17,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class AdverseEvent(Base):
     __data_category__ = "adverse_event"
     __cardinality__ = "many"
@@ -76,44 +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:
+    @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",
+                loc="event_term,event_code",
             )
-        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
-        ):
+
+    @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",
             )
-        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:
+    @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",
+                "If event_other_specify is provided, please provide system_organ_class.", loc="system_organ_class"
             )
-        return self
 
-    @model_validator(mode="after")
-    def validate_days_to_resolution_of_event_chronology(self) -> Self:
-        if self.days_to_resolution_of_event is not None and self.days_to_onset_of_event is not None:
-            if self.days_to_resolution_of_event < self.days_to_onset_of_event:
+    @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",
                 )
-        return self

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/comorbidity.py

@@ -1,12 +1,13 @@
-from typing import Self, Any
+from typing import Any
 
-from pydantic import model_validator, field_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"
@@ -28,11 +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:
+    @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",
+                loc="comorbidity_code,comorbidity_term,comorbidity_other",
             )
-        return self

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/demographic.py

@@ -1,6 +1,7 @@
-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
@@ -17,6 +18,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class Demographic(Base):
     __data_category__ = "demographic"
     __cardinality__ = "one"
@@ -91,40 +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:
+    @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:
+            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:
+            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_units",
+                    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:
+            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(
                     '"age_at_enrollment" cannot represent a value greater than 90 years of age.',
                     loc="age_at_enrollment",
                 )
-        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:
+    @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_other" must also be provided.',
-                loc="body_surface_area_units_other",
+                'If "body_surface_area" is provided then "body_surface_area_units" must also be provided.'
             )
-        return self

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/disease.py

@@ -1,5 +1,7 @@
-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
@@ -21,6 +23,7 @@ from cidc_api.models.types import (
 )
 
 
+@forced_validators
 class Disease(Base):
     __data_category__ = "disease"
     __cardinality__ = "many"
@@ -93,82 +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:
+    @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
-        ):
+    @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 self.cancer_stage_system == "RISS" and self.cancer_stage_system_version not in get_args(
+        elif cancer_stage_system == "RISS" and cancer_stage_system_version not in get_args(
             CancerStageSystemVersionRISS
         ):
             raise ValueLocError(msg, loc="cancer_stage_system")
-        elif self.cancer_stage_system == "FIGO" and self.cancer_stage_system_version not in get_args(
+        elif cancer_stage_system == "FIGO" and cancer_stage_system_version not in get_args(
             CancerStageSystemVersionFIGO
         ):
             raise ValueLocError(msg, loc="cancer_stage_system")
-        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:
+    @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 "{self.cancer_stage_system}"',
+                f'Please provide cancer_stage_system_version when cancer_stage_system is "{cancer_stage_system}"',
                 loc="cancer_stage_system_version",
             )
-        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:
+    @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 "{self.cancer_stage_system}"',
+                f'Please provide cancer_stage when cancer_stage_system is "{cancer_stage_system}"',
                 loc="cancer_stage",
             )
-        return self
 
-    @model_validator(mode="after")
-    def validate_t_category_cr(self) -> Self:
-        if self.cancer_stage_system == "AJCC" and not self.t_category:
+    @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 "{self.cancer_stage_system}"',
+                f'Please provide t_category when cancer_stage_system is "{cancer_stage_system}"',
                 loc="t_category",
             )
-        return self
 
-    @model_validator(mode="after")
-    def validate_n_category_cr(self) -> Self:
-        if self.cancer_stage_system == "AJCC" and not self.n_category:
+    @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 "{self.cancer_stage_system}"',
+                f'Please provide n_category when cancer_stage_system is "{cancer_stage_system}"',
                 loc="n_category",
             )
-        return self
 
-    @model_validator(mode="after")
-    def validate_m_category_cr(self) -> Self:
-        if self.cancer_stage_system == "AJCC" and not self.m_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 "{self.cancer_stage_system}"',
+                f'Please provide m_category when cancer_stage_system is "{cancer_stage_system}"',
                 loc="m_category",
             )
-        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:
+    @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

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/exposure.py

@@ -1,12 +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"
@@ -26,11 +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:
+    @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",
             )
-        return self

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/medical_history.py

@@ -1,12 +1,12 @@
-from typing import Self
-
-from pydantic import NonNegativeInt, PositiveFloat, model_validator
+from pydantic import NonNegativeInt, 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 TobaccoSmokingStatus
 
 
+@forced_validators
 class MedicalHistory(Base):
     __data_category__ = "medical_history"
     __cardinality__ = "one"
@@ -30,11 +30,14 @@ class MedicalHistory(Base):
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=16089302%20and%20ver_nr=1
     num_prior_systemic_therapies: NonNegativeInt | None = None
 
-    @model_validator(mode="after")
-    def validate_pack_years_smoked_cr(self) -> Self:
-        if self.tobacco_smoking_status in ["Never Smoker", "Unknown", "Not reported"] and self.pack_years_smoked:
+    @forced_validator
+    @classmethod
+    def validate_pack_years_smoked_cr(cls, data, info) -> None:
+        tobacco_smoking_status = data.get("tobacco_smoking_status", None)
+        pack_years_smoked = data.get("pack_years_smoked", None)
+
+        if tobacco_smoking_status in ["Never Smoker", "Unknown", "Not reported"] and pack_years_smoked:
             raise ValueLocError(
                 "If tobacco_smoking_status indicates non-smoker, please leave pack_years_smoked blank.",
                 loc="pack_years_smoked",
             )
-        return self

{nci_cidc_api_modules-1.2.51 → nci_cidc_api_modules-1.2.52}/cidc_api/models/pydantic/stage1/other_malignancy.py

@@ -1,12 +1,12 @@
-from typing import Self
-
-from pydantic import NonPositiveInt, model_validator
+from pydantic import NonPositiveInt
+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 UberonAnatomicalTerm, ICDO3MorphologicalCode, ICDO3MorphologicalTerm, MalignancyStatus
 
 
+@forced_validators
 class OtherMalignancy(Base):
     __data_category__ = "other_malignancy"
     __cardinality__ = "many"
@@ -37,15 +37,19 @@ class OtherMalignancy(Base):
     # Indicates the participant’s current clinical state regarding the cancer diagnosis.
     other_malignancy_status: MalignancyStatus | None = None
 
-    @model_validator(mode="after")
-    def validate_code_or_term_or_description_cr(self) -> Self:
+    @forced_validator
+    @classmethod
+    def validate_code_or_term_or_description_cr(cls, data, info) -> None:
+        other_malignancy_morphological_term = data.get("other_malignancy_morphological_term", None)
+        other_malignancy_description = data.get("other_malignancy_description", None)
+        other_malignancy_morphological_code = data.get("other_malignancy_morphological_code", None)
+
         if (
-            not self.other_malignancy_morphological_code
-            and not self.other_malignancy_morphological_term
-            and not self.other_malignancy_description
+            not other_malignancy_morphological_code
+            and not other_malignancy_morphological_term
+            and not other_malignancy_description
         ):
             raise ValueLocError(
                 'Please provide at least one of "morphological_code", "morphological_term" or "malignancy_description".',
-                loc="morphological_code",
+                loc="other_malignancy_morphological_code",
             )
-        return self