nci-cidc-api-modules 1.2.32__py3-none-any.whl → 1.2.33__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. cidc_api/models/db/stage2/demographic_orm.py +3 -1
  2. cidc_api/models/pydantic/stage2/base.py +5 -1
  3. {nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/METADATA +1 -1
  4. {nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/RECORD +7 -7
  5. {nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/WHEEL +0 -0
  6. {nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/licenses/LICENSE +0 -0
  7. {nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/top_level.txt +0 -0
cidc_api/models/db/stage2/demographic_orm.py CHANGED
@@ -1,7 +1,9 @@
1
1
  from pydantic import NonNegativeFloat, PositiveFloat, PositiveInt
2
+ from typing import List
2
3
 
3
4
  from sqlalchemy import ForeignKey
4
5
  from sqlalchemy.orm import Mapped, mapped_column, relationship
6
+ from sqlalchemy.types import JSON
5
7
 
6
8
  from cidc_api.models.db.base_orm import BaseORM
7
9
  from cidc_api.models.types import (
@@ -29,7 +31,7 @@ class DemographicORM(BaseORM):
29
31
  age_at_enrollment_units: Mapped[AgeAtEnrollmentUnits | None]
30
32
  age_90_or_over: Mapped[bool]
31
33
  sex: Mapped[Sex]
32
- race: Mapped[Race]
34
+ race: Mapped[List[Race]] = mapped_column(JSON)
33
35
  ethnicity: Mapped[Ethnicity]
34
36
  height: Mapped[PositiveFloat]
35
37
  height_units: Mapped[HeightUnits]
cidc_api/models/pydantic/stage2/base.py CHANGED
@@ -6,7 +6,11 @@ import copy
6
6
 
7
7
  class Base(BaseModel):
8
8
 
9
- model_config = ConfigDict(validate_assignment=True, from_attributes=True, extra="forbid")
9
+ model_config = ConfigDict(
10
+ validate_assignment=True,
11
+ from_attributes=True,
12
+ # extra="forbid" # TODO: enable me one stage1 models are implemented
13
+ )
10
14
 
11
15
  # Validates the new state and updates the object if valid
12
16
  def update(self, **kwargs):
{nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: nci_cidc_api_modules
3
- Version: 1.2.32
3
+ Version: 1.2.33
4
4
  Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
5
5
  Home-page: https://github.com/NCI-CIDC/cidc-api-gae
6
6
  License: MIT license
{nci_cidc_api_modules-1.2.32.dist-info → nci_cidc_api_modules-1.2.33.dist-info}/RECORD RENAMED
@@ -21,7 +21,7 @@ cidc_api/models/db/stage2/cohort_orm.py,sha256=tcUYBMwKPW3anye8uEoDM4BS54pGMOGnb
21
21
  cidc_api/models/db/stage2/comorbidity_orm.py,sha256=2Eb3-OYKn02Sc3ndM49xH2snucjqY2gmjyAP7JYyccc,921
22
22
  cidc_api/models/db/stage2/consent_group_orm.py,sha256=8j0Aa3FX11LHTIOgXdk3zaRwD4tOkvaRovl_CYH_KsM,1103
23
23
  cidc_api/models/db/stage2/contact_orm.py,sha256=lcfMj0LEcaRKdX2ZInx6n8pYd-rNujqLOPgZYna_d_A,1352
24
- cidc_api/models/db/stage2/demographic_orm.py,sha256=q0mCuMAwZCrhyY-Dam0l4qxRzhdiQbFefMYw0b4YUtk,1609
24
+ cidc_api/models/db/stage2/demographic_orm.py,sha256=Riq6dxJYNnEK6syBVxypXN61iyfJOLWCilR1puZBEqU,1695
25
25
  cidc_api/models/db/stage2/disease_orm.py,sha256=3Wue_ZSlUpgjvXK9q3HxbTXytPBV062BRn7YljoMT6M,1977
26
26
  cidc_api/models/db/stage2/exposure_orm.py,sha256=yHalUVz3wlsNIdScN_TEwN8jYexntZkfV3ikvPSyxmY,813
27
27
  cidc_api/models/db/stage2/file_orm.py,sha256=tPElXh7ABhAenZmHbgu2LyrDzKw-VK-tdZ-yxkb_YN8,1296
@@ -56,7 +56,7 @@ cidc_api/models/pydantic/stage2/administrative_person.py,sha256=KgILOkUra-AmqwFl
56
56
  cidc_api/models/pydantic/stage2/administrative_role_assignment.py,sha256=qsdrBJgDA4GWY-1VAFgbgQWfqSjJZ-OFsIOZDT9CyAE,512
57
57
  cidc_api/models/pydantic/stage2/adverse_event.py,sha256=733qhu5uucvMQH_VDFAc1WlWCcusaXXFswrp1ugM7sk,3856
58
58
  cidc_api/models/pydantic/stage2/arm.py,sha256=ApxukGxatxD7rFDIaeiJsPNHw9-b4tfd8nubQ0JuW4g,457
59
- cidc_api/models/pydantic/stage2/base.py,sha256=Wgya-O1q9lnDBGx8XkgC5NXMNYauDf486s1ZoQSLp64,1397
59
+ cidc_api/models/pydantic/stage2/base.py,sha256=8kWPoN2RsMTb2fn8mSISS6yudTsO-NI6tCK5vz0W30g,1481
60
60
  cidc_api/models/pydantic/stage2/baseline_clinical_assessment.py,sha256=mDTzHT6IsQRy5aTMCSK3twqe3jiYtvZ9D7ZO6hVO3KM,1095
61
61
  cidc_api/models/pydantic/stage2/cohort.py,sha256=-ikJ35QR7JjNfWMv_OFvIqxBVK8zr3nT39Q90UustWk,469
62
62
  cidc_api/models/pydantic/stage2/comorbidity.py,sha256=avCl_9zrM7nzsR0E_g6fMjlQG8qE109NSR_nGGxEKqg,1389
@@ -102,8 +102,8 @@ cidc_api/shared/gcloud_client.py,sha256=ovXGS2ynaBgB_23prj23H10GNN4fectiVF7Hj4LJ
102
102
  cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
103
103
  cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
104
104
  cidc_api/shared/utils.py,sha256=FdZJiynmh6BIzWyCTcUAcUMKCAtzEyp_HLdXEticNcI,237
105
- nci_cidc_api_modules-1.2.32.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
106
- nci_cidc_api_modules-1.2.32.dist-info/METADATA,sha256=8JDKaWWR-K_9Xx2sldOGiF6_c7-mTqO5-pIVT_V0Rrk,39762
107
- nci_cidc_api_modules-1.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
108
- nci_cidc_api_modules-1.2.32.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
109
- nci_cidc_api_modules-1.2.32.dist-info/RECORD,,
105
+ nci_cidc_api_modules-1.2.33.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
106
+ nci_cidc_api_modules-1.2.33.dist-info/METADATA,sha256=jEyZSAAhFgbCPLP85liz3W48ZZDIj4Ni3AIEeBBMBog,39762
107
+ nci_cidc_api_modules-1.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
108
+ nci_cidc_api_modules-1.2.33.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
109
+ nci_cidc_api_modules-1.2.33.dist-info/RECORD,,