nci-cidc-api-modules 1.2.29__py3-none-any.whl → 1.2.34__py3-none-any.whl

cidc_api/models/pydantic/stage2/disease.py

@@ -1,12 +1,14 @@
-from pydantic import NonPositiveInt, model_validator
-from typing import List, Self
+from pydantic import NonPositiveInt, model_validator, BeforeValidator
+from typing import List, Self, Annotated, get_args
 
 from .base import Base
 from cidc_api.models.types import (
-    PrimaryDiagnosisDiseaseGroup,
     TumorGrade,
     CancerStageSystem,
     CancerStageSystemVersion,
+    CancerStageSystemVersionAJCC,
+    CancerStageSystemVersionRISS,
+    CancerStageSystemVersionFIGO,
     CancerStage,
     TCategory,
     NCategory,
@@ -27,12 +29,7 @@ class Disease(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
-
-    # A term describing the main condition for evaluation and treatment as captured in the Disease or Diagnosis (C2991)
-    # branch of the National Cancer Institute Thesaurus (NCIt) hierarchy tree. e.g. "Melanoma"
-    # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=14905532%20and%20ver_nr=1
-    primary_diagnosis_disease_group: PrimaryDiagnosisDiseaseGroup
+    participant_id: str | None = None
 
     # The location within the body from where the disease of interest originated as captured in the Uberon identifier. e.g. "lung"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=14883047%20and%20ver_nr=1
@@ -40,18 +37,18 @@ class Disease(Base):
 
     # The ICD-O-3 morphology code that describes the tumor's histology, behavior, and grade-differentiation. e.g. "8480/6"
     # CDE: TBD
-    morphological_code: ICDO3MorphologicalCode
+    morphological_code: ICDO3MorphologicalCode | None
 
     # The ICD-O-3 morphology term that describes the tumor's type. e.g. "Mucinous adenoma"
     # CDE: TBD
-    morphological_term: ICDO3MorphologicalTerm
+    morphological_term: ICDO3MorphologicalTerm | None
 
     # Words that broadly describe the cancer's characteristics and type. e.g. "Inflitrating Ductal Carcinoma"
     # CDE: TBD
     cancer_type_description: str | None = None
 
     # The number of days elapsed since the participant was first diagnosed with this condition.
-    days_since_original_diagnosis: NonPositiveInt
+    days_since_original_diagnosis: NonPositiveInt | None
 
     # Words that express the degree of abnormality of cancer cells as a measure of differentiation and aggressiveness. e.g. "G1 Low Grade"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=11325685%20and%20ver_nr=2
@@ -68,32 +65,32 @@ class Disease(Base):
     # CDE(AJCC): https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=3440332%20and%20ver_nr=1
     # CDE(FIGO): TBD
     # CDE(RISS): TBD
-    cancer_stage: CancerStage
+    cancer_stage: CancerStage | None = None
 
     # Extent of the primary cancer based on evidence obtained from clinical assessment parameters determined prior to treatment. e.g. "T0"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=3440328%20and%20ver_nr=1
     # TODO: Verify this CDE
-    t_category: TCategory
+    t_category: TCategory | None = None
 
     # Extent of the regional lymph node involvement for the cancer based on evidence obtained from clinical assessment parameters
     # determined prior to treatment. e.g. "N0"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=3440330%20and%20ver_nr=1
     # TODO: Verify this CDE
-    n_category: NCategory
+    n_category: NCategory | None = None
 
     # Extent of the distant metastasis for the cancer based on evidence obtained from clinical assessment parameters determined
     # prior to treatment. e.g. "M0"
     # CDE: https://teams.microsoft.com/l/message/19:1c292b63-5df1-4f29-b177-86aed53f393d_f224ae83-209b-4cd9-a7ef-83d9d2120a27@unq.gbl.spaces/1758827414202?context=%7B%22contextType%22%3A%22chat%22%7D
     # TODO: Verify this CDE
-    m_category: MCategory
+    m_category: MCategory | None = None
 
     # The organ site where a tumor develops outside of the bone marrow as specified in the Uberon antatomical term.
-    metastatic_organ: List[UberonAnatomicalTerm] = []
+    metastatic_organ: Annotated[List[UberonAnatomicalTerm] | None, BeforeValidator(Base.split_list)] = []
 
     # Indicates if participant has a hematological malignancy that is only extramedullary. e.g. "Yes"
     solely_extramedullary_disease: YNU
 
-    extramedullary_organ: List[UberonAnatomicalTerm] = []
+    extramedullary_organ: Annotated[List[UberonAnatomicalTerm] | None, BeforeValidator(Base.split_list)] = []
 
     @model_validator(mode="after")
     def validate_code_or_term_or_description_cr(self) -> Self:
@@ -103,6 +100,23 @@ class Disease(Base):
             )
         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(
+            CancerStageSystemVersionRISS
+        ):
+            raise ValueError(msg)
+        elif self.cancer_stage_system == "FIGO" and self.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:

cidc_api/models/pydantic/stage2/exposure.py

@@ -14,7 +14,7 @@ class Exposure(Base):
     exposure_id: int | None = None
 
     # The unique identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # An indication of whether the subject was exposed to any chemical, biological or physical agents
     # that increase the risk of neoplasms in humans or animals.
@@ -23,7 +23,7 @@ class Exposure(Base):
 
     # The type of potentially harmful environmental agents to which an individual was exposed.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15753203%20and%20ver_nr=1
-    exposure_type: ExposureType
+    exposure_type: ExposureType | None = None
 
     @model_validator(mode="after")
     def validate_exposure_type_cr(self) -> Self:

cidc_api/models/pydantic/stage2/gvhd_diagnosis_acute.py

@@ -15,7 +15,7 @@ class GVHDDiagnosisAcute(Base):
     gvhd_diagnosis_acute_id: int | None = None
 
     # The unique internal identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The clinical grading system used to stage involvement of affected organs (skin, liver, GI tract)
     # in acute GVHD and assign an overall severity grade (I–IV) based on predefined criteria.

cidc_api/models/pydantic/stage2/gvhd_diagnosis_chronic.py

@@ -15,7 +15,7 @@ class GVHDDiagnosisChronic(Base):
     gvhd_diagnosis_chronic_id: int | None = None
 
     # The unique internal identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The standardized clinical system used to evaluate and grade the extent and severity
     # of organ involvement in chronic GVHD, resulting in an overall disease severity score.

cidc_api/models/pydantic/stage2/medical_history.py

@@ -14,7 +14,7 @@ class MedicalHistory(Base):
     medical_history_id: int | None = None
 
     # The unique identifier for the associated participant
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # Text representation of a person's status relative to smoking tobacco in the form of cigarettes,
     # based on questions about current and former use of cigarettes.

cidc_api/models/pydantic/stage2/other_malignancy.py

@@ -17,28 +17,32 @@ class OtherMalignancy(Base):
     medical_history_id: int | None = None
 
     # The location within the body from where the prior malignancy originated as captured in the Uberon anatomical term.
-    primary_disease_site: UberonAnatomicalTerm
+    other_malignancy_primary_disease_site: UberonAnatomicalTerm
 
     # The ICD-O-3 code which identifies the specific appearance of cells and tissues (normal and abnormal) used
     # to define the presence and nature of disease.
-    morphological_code: ICDO3MorphologicalCode | None = None
+    other_malignancy_morphological_code: ICDO3MorphologicalCode | None = None
 
     # The ICD-O-3 textual label which identifies the specific appearance of cells and tissues (normal and abnormal) used
     # to define the presence and nature of disease.
-    morphological_term: ICDO3MorphologicalTerm | None = None
+    other_malignancy_morphological_term: ICDO3MorphologicalTerm | None = None
 
     # Description of the cancer type as recorded in the trial.
-    malignancy_description: str | None = None
+    other_malignancy_description: str | None = None
 
     # Number of days since original diagnosis from the enrollment date. This may be a negative number.
-    days_since_diagnosis: NonPositiveInt | None = None
+    other_malignancy_days_since_diagnosis: NonPositiveInt | None = None
 
     # Indicates the participant’s current clinical state regarding the cancer diagnosis.
-    malignancy_status: MalignancyStatus | None = None
+    other_malignancy_status: MalignancyStatus | None = None
 
     @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.malignancy_description:
+        if (
+            not self.other_malignancy_morphological_code
+            and not self.other_malignancy_morphological_term
+            and not self.other_malignancy_description
+        ):
             raise ValueError(
                 'Please provide at least one of "morphological_code", "morphological_term" or "malignancy_description".'
             )

cidc_api/models/pydantic/stage2/participant.py

@@ -3,6 +3,7 @@ from typing import Self
 from pydantic import model_validator
 
 from .base import Base
+from cidc_api.models.types import YNU
 from cidc_api.models.types import OffStudyReason
 
 
@@ -12,20 +13,20 @@ class Participant(Base):
 
     # The unique internal identifier for the participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The participant identifier assigned by the clinical trial team overseeing the study
-    native_participant_id: str
+    native_participant_id: str | None = None
 
     # The globally unique participant identifier assigned by the CIMAC network. e.g. C8P29A7
-    cimac_participant_id: str
+    cimac_participant_id: str | None = None
 
     # The unique identifier for the associated trial that the participant is participating in
     trial_id: int | None = None
 
     # Indicates if the individual is no longer actively participating in the clinical trial.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=14834973%20and%20ver_nr=1
-    off_study: bool
+    off_study: YNU
 
     # An explanation describing why an individual is no longer participating in the clinical trial.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=13362265%20and%20ver_nr=1
@@ -36,7 +37,7 @@ class Participant(Base):
 
     @model_validator(mode="after")
     def off_study_reason_cr(self) -> Self:
-        if self.off_study and not self.off_study_reason:
+        if self.off_study == "Yes" and not self.off_study_reason:
             raise ValueError('If "off_study" is "Yes" then "off_study_reason" is required.')
         return self
 

cidc_api/models/pydantic/stage2/prior_treatment.py

@@ -1,6 +1,6 @@
-from typing import Self
+from typing import Self, Annotated, List
 
-from pydantic import NonPositiveInt, NonNegativeInt, model_validator
+from pydantic import NonPositiveInt, NegativeInt, model_validator, BeforeValidator
 
 from .base import Base
 from cidc_api.models.types import PriorTreatmentType, ConditioningRegimenType, StemCellDonorType
@@ -14,39 +14,39 @@ class PriorTreatment(Base):
     prior_treatment_id: int | None = None
 
     # A unique internal identifier for the associated participant record
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # Number of days from the enrollment date to the first recorded administration or occurrence of
     # the treatment modality.
-    days_to_start: NonPositiveInt | None = None
+    prior_treatment_days_to_start: NonPositiveInt | None = None
 
     # Number of days from the enrollment date to the last recorded administration or occurrence of
     # the treatment modality.
-    days_to_end: NonPositiveInt | None = None
+    prior_treatment_days_to_end: NonPositiveInt | None = None
 
     # Specifies the category or kind of prior treatment modality a participant received.
-    type: PriorTreatmentType
+    prior_treatment_type: Annotated[List[PriorTreatmentType], BeforeValidator(Base.split_list)]
 
     # Description of the prior treatment such as its full generic name if it is a type of therapy agent,
     # radiotherapy procedure name and location, or surgical procedure name and location.
-    description: str | None = None
+    prior_treatment_description: str | None = None
 
     # Best response from any response assessment system to the prior treatment if available or applicable.
-    best_response: str | None = None
+    prior_treatment_best_response: str | None = None
 
     # If the prior treatment is "Conditioning therapy" received before a stem cell transplant, specifies what
     # type of conditioning regimen used.
-    conditioning_regimen_type: ConditioningRegimenType | None = None
+    prior_treatment_conditioning_regimen_type: ConditioningRegimenType | None = None
 
     # If prior treatment is "Stem cell transplant", indicates what stem cell donor type used.
-    stem_cell_donor_type: StemCellDonorType | None = None
+    prior_treatment_stem_cell_donor_type: StemCellDonorType | None = None
 
     # If prior treatment is "Stem cell transplant", indicates the number of days from the transplant
     # date to the start of the current treatment.
-    days_from_transplant_to_treatment_initiation: NonNegativeInt | None = None
+    prior_treatment_days_to_prior_transplant: NegativeInt | None = None
 
     @model_validator(mode="after")
     def validate_description_cr(self) -> Self:
-        if self.type == "Other therapy" and not self.description:
+        if "Other therapy" in self.prior_treatment_type and not self.prior_treatment_description:
             raise ValueError('If type is "Other therapy", please provide description.')
         return self

cidc_api/models/pydantic/stage2/radiotherapy_dose.py

@@ -17,7 +17,7 @@ class RadiotherapyDose(Base):
     __cardinality__ = "many"
 
     # The unique internal identifier for the radiotherapy dose record
-    therapy_agent_dose_id: int | None = None
+    radiotherapy_dose_id: int | None = None
 
     # The unique internal identifier for the associated treatment record
     treatment_id: int | None = None

cidc_api/models/pydantic/stage2/response.py

@@ -15,14 +15,14 @@ class Response(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The response to a question that describes a participant's survival status.
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=2847330%20and%20ver_nr=1
     survival_status: SurvivalStatus
 
     # Number of days from enrollment date to death date.
-    overall_survival: NonNegativeInt | None = None
+    overall_survival: NonNegativeInt
 
     # Indicator for whether there was an abscopal effect on disease after local therapy.
     abscopal_response: YNUNA | None = None
@@ -43,14 +43,8 @@ class Response(Base):
     # Indicates whether participant was evaluable for efficacy (for example, response, PFS, OS, etc.) overall.
     evaluable_for_efficacy: bool
 
-    # Days from enrollment date to the last time patient had follow-up.
-    days_to_last_follow_up: NonNegativeInt | None = None
-
-    @model_validator(mode="after")
-    def validate_overall_survival_cr(self) -> Self:
-        if self.survival_status != "Unknown" and not self.overall_survival:
-            raise ValueError('If survival_status is not "Unknown" then overall_survival is required.')
-        return self
+    # Days from enrollment date to the last time the patient's vital status was verified.
+    days_to_last_vital_status: NonNegativeInt | None = None
 
     @model_validator(mode="after")
     def validate_cause_of_death_cr(self) -> Self:

cidc_api/models/pydantic/stage2/response_by_system.py

@@ -1,6 +1,6 @@
 from typing import Self
 
-from pydantic import PositiveInt, model_validator
+from pydantic import PositiveInt, model_validator, NonNegativeInt
 
 from .base import Base
 from cidc_api.models.types import ResponseSystem, ResponseSystemVersion, BestOverallResponse, YNUNA
@@ -26,7 +26,7 @@ class ResponseBySystem(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | 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
@@ -41,6 +41,9 @@ class ResponseBySystem(Base):
     # Days from first response to progression.
     response_duration: PositiveInt | None = None
 
+    # The number of days from the start of the treatment to the first signs of disease progression.
+    duration_of_stable_disease: NonNegativeInt | None = None
+
     # Indicates whether a patient achieved a durable clinical benefit.
     durable_clinical_benefit: bool | None = None
 
@@ -67,8 +70,8 @@ class ResponseBySystem(Base):
     def validate_response_duration_cr(self) -> Self:
         if self.best_overall_response in negative_response_values and self.response_duration:
             raise ValueError(
-                "If best_overall_response does not indicate a positive response, \
-                please leave response_duration blank."
+                "If best_overall_response does not indicate a positive response, "
+                "please leave response_duration blank."
             )
         return self
 
@@ -76,8 +79,8 @@ class ResponseBySystem(Base):
     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(
-                "If best_overall_response does not indicate a positive response, \
-                please leave days_to_first_response blank."
+                "If best_overall_response does not indicate a positive response, "
+                "please leave days_to_first_response blank."
             )
         return self
 

cidc_api/models/pydantic/stage2/specimen.py

@@ -26,7 +26,7 @@ from cidc_api.models.types import (
 
 
 class Specimen(Base):
-    __data_category__ = "specimen"
+    # __data_category__ = "specimen"
     __cardinality__ = "many"
 
     # The unique internal identifier for the specimen record
@@ -34,7 +34,7 @@ class Specimen(Base):
 
     # The unique internal identifier for the associated participant
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=12220014%20and%20ver_nr=1
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The unique specimen identifier assigned by the CIMAC-CIDC Network.
     # Formatted as CTTTPPPSS.AA for trial code TTT, participant PPP, sample SS, and aliquot AA.

cidc_api/models/pydantic/stage2/treatment.py

@@ -14,7 +14,7 @@ class Treatment(Base):
     treatment_id: int | None = None
 
     # The unique internal identifier for the associated Participant record
-    participant_id: int | None = None
+    participant_id: str | None = None
 
     # The unique internal identifier for the associated Arm record
     arm_id: int | None = None

cidc_api/models/pydantic/stage2/trial.py

@@ -1,8 +1,9 @@
 from datetime import datetime
-from typing import List
+from pydantic import BeforeValidator
+from typing import List, Annotated
 
 from .base import Base
-from cidc_api.models.types import TrialOrganization, TrialFundingAgency, TrialStatus, AssayType
+from cidc_api.models.types import TrialOrganization, TrialFundingAgency, AssayType, AgeGroup
 
 
 class Trial(Base):
@@ -11,11 +12,20 @@ class Trial(Base):
 
     # The unique identifier for the clinical trial. e.g. "GU16-287","BACCI"
     # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=5054234%20and%20ver_nr=1
-    trial_id: str
+    trial_id: str | None = None  # TODO: Fix stage2 trial_id to not be nullable, once stage 1 models are complete
 
     # The version number of the trial dataset. e.g. "1.0"
     version: str | None = None
 
+    # A broad textual description of the primary endpoint(s) of the trial.
+    primary_endpoint: str | None = None
+
+    # The identifiable class of the study participant based upon their age.
+    age_group: Annotated[List[AgeGroup], BeforeValidator(Base.split_list)]
+
+    # Clinical and/or molecular characteristics of the cancer(s) in the study population.
+    study_population: str | None = None
+
     # ClinicalTrials.gov identifier. e.g. "NCT03731260"
     # TODO need cde from janice, they will make one
     nct_id: str | None = None
@@ -45,10 +55,6 @@ class Trial(Base):
     # e.g. "Duke University - Duke Cancer Institute LAO"
     grant_or_affiliated_network: TrialFundingAgency | None = None
 
-    # What stage the trial is at in its process.
-    # CDE: https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=15607838%20and%20ver_nr=1
-    trial_status: TrialStatus
-
     # The id of the primary organization responsible for storing biospecimens from this study.
     biobank_institution_id: int | None = None
 

cidc_api/models/types.py

@@ -20,6 +20,12 @@ from cidc_api.reference.gvhd import is_gvhd_organ
 # As python Enums are rather cumbersome when we only want a list of permissible values for a string, use Literal instead
 
 
+AgeGroup = Literal[
+    "Adolescent and Young Adult",
+    "Adult",
+    "Pediatric",
+]
+
 TrialOrganization = Literal[
     "ECOG-ACRIN",
     "SWOG",
@@ -53,13 +59,6 @@ TrialFundingAgency = Literal[
 ]
 
 
-TrialStatus = Literal[
-    "Active Study",
-    "Completed Study",
-    "Provisional Study",
-]
-
-
 AssayType = Literal[
     "Olink",
     "WES",
@@ -217,24 +216,6 @@ FileFormat = Literal[
 ]
 
 
-PrimaryDiagnosisDiseaseGroup = Literal[
-    "Ovarian epithelial cancer",
-    "Esophageal cancer, NOS",
-    "Primary peritoneal carcinoma",
-    "Gastric cancer, NOS",
-    "Fallopian tube carcinoma",
-    "Invasive breast carcinoma",
-    "Small cell lung cancer",
-    "Prostate cancer, NOS",
-    "Non-small cell lung cancer, NOS",
-    "Myeloma, NOS",
-    "Melanoma",
-    "Adenocarcinoma of the gastroesophageal junction",
-    "Acute myeloid leukemia, NOS",
-    "Colorectal cancer, NOS",
-]
-
-
 TumorGrade = Literal[
     "G1 Low Grade",
     "G2 Intermediate Grade",
@@ -255,12 +236,20 @@ CancerStageSystem = Literal[
 ]
 
 
-CancerStageSystemVersionAJCC = Literal["8",]
+CancerStageSystemVersionAJCC = Literal["8th Edition",]
 
-CancerStageSystemVersionRISS = Literal["2"]
+CancerStageSystemVersionRISS = Literal["10.1200/JCO.2015.61.2267"]
 
-
-CancerStageSystemVersionFIGO = Literal["2021"]
+CancerStageSystemVersionFIGO = Literal[
+    "10.1002/ijgo.14923",
+    "10.1002/ijgo.13881",
+    "10.1002/ijgo.13867",
+    "10.1002/ijgo.13865",
+    "10.1002/ijgo.13866",
+    "10.1002/ijgo.13878",
+    "10.1002/ijgo.13877",
+    "10.1002/ijgo.12613",
+]
 
 CancerStageSystemVersion = CancerStageSystemVersionAJCC | CancerStageSystemVersionFIGO | CancerStageSystemVersionRISS
 

{nci_cidc_api_modules-1.2.29.dist-info → nci_cidc_api_modules-1.2.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.29
+Version: 1.2.34
 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
@@ -12,25 +12,27 @@ Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.5
 Requires-Dist: flask>=3.1.2
 Requires-Dist: flask-migrate>=4.1.0
 Requires-Dist: flask-sqlalchemy>=3.1.1
+Requires-Dist: flask-talisman>=0.7.0
 Requires-Dist: google-auth==2.43.0
-Requires-Dist: google-api-python-client>=2.185.0
+Requires-Dist: google-api-python-client>=2.187.0
 Requires-Dist: google-cloud-bigquery>=3.38.0
 Requires-Dist: google-cloud-pubsub>=2.33.0
 Requires-Dist: google-cloud-secret-manager>=2.25.0
 Requires-Dist: google-cloud-storage>=3.6.0
 Requires-Dist: jinja2>=3.1.6
+Requires-Dist: joserfc>=1.5.0
 Requires-Dist: marshmallow>=4.1.0
 Requires-Dist: marshmallow-sqlalchemy>=1.4.2
 Requires-Dist: numpy>=2.3.5
 Requires-Dist: packaging>=25.0
 Requires-Dist: pandas>=2.3.3
 Requires-Dist: pyarrow>=22.0.0
-Requires-Dist: pydantic~=2.12.4
+Requires-Dist: pydantic~=2.12.5
 Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: requests>=2.32.5
 Requires-Dist: sqlalchemy>=2.0.44
 Requires-Dist: sqlalchemy-mixins~=2.0.5
-Requires-Dist: werkzeug>=3.1.3
+Requires-Dist: werkzeug>=3.1.4
 Requires-Dist: nci-cidc-schemas==0.28.10
 Dynamic: description
 Dynamic: description-content-type