nci-cidc-api-modules 1.2.32__tar.gz → 1.2.34__tar.gz

{nci_cidc_api_modules-1.2.32/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.2.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.32
+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
@@ -14,24 +14,25 @@ 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

{nci_cidc_api_modules-1.2.32 → nci_cidc_api_modules-1.2.34}/cidc_api/models/db/stage2/demographic_orm.py

@@ -1,7 +1,9 @@
 from pydantic import NonNegativeFloat, PositiveFloat, PositiveInt
+from typing import List
 
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.types import JSON
 
 from cidc_api.models.db.base_orm import BaseORM
 from cidc_api.models.types import (
@@ -29,7 +31,7 @@ class DemographicORM(BaseORM):
     age_at_enrollment_units: Mapped[AgeAtEnrollmentUnits | None]
     age_90_or_over: Mapped[bool]
     sex: Mapped[Sex]
-    race: Mapped[Race]
+    race: Mapped[List[Race]] = mapped_column(JSON)
     ethnicity: Mapped[Ethnicity]
     height: Mapped[PositiveFloat]
     height_units: Mapped[HeightUnits]

{nci_cidc_api_modules-1.2.32 → nci_cidc_api_modules-1.2.34}/cidc_api/models/pydantic/stage2/base.py

@@ -6,7 +6,11 @@ import copy
 
 class Base(BaseModel):
 
-    model_config = ConfigDict(validate_assignment=True, from_attributes=True, extra="forbid")
+    model_config = ConfigDict(
+        validate_assignment=True,
+        from_attributes=True,
+        # extra="forbid" # TODO: enable me one stage1 models are implemented
+    )
 
     # Validates the new state and updates the object if valid
     def update(self, **kwargs):

{nci_cidc_api_modules-1.2.32 → nci_cidc_api_modules-1.2.34/nci_cidc_api_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.32
+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
@@ -14,24 +14,25 @@ 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

{nci_cidc_api_modules-1.2.32 → nci_cidc_api_modules-1.2.34}/nci_cidc_api_modules.egg-info/requires.txt

@@ -5,22 +5,23 @@ flask-migrate>=4.1.0
 flask-sqlalchemy>=3.1.1
 flask-talisman>=0.7.0
 google-auth==2.43.0
-google-api-python-client>=2.185.0
+google-api-python-client>=2.187.0
 google-cloud-bigquery>=3.38.0
 google-cloud-pubsub>=2.33.0
 google-cloud-secret-manager>=2.25.0
 google-cloud-storage>=3.6.0
 jinja2>=3.1.6
+joserfc>=1.5.0
 marshmallow>=4.1.0
 marshmallow-sqlalchemy>=1.4.2
 numpy>=2.3.5
 packaging>=25.0
 pandas>=2.3.3
 pyarrow>=22.0.0
-pydantic~=2.12.4
+pydantic~=2.12.5
 python-dotenv>=1.2.1
 requests>=2.32.5
 sqlalchemy>=2.0.44
 sqlalchemy-mixins~=2.0.5
-werkzeug>=3.1.3
+werkzeug>=3.1.4
 nci-cidc-schemas==0.28.10

{nci_cidc_api_modules-1.2.32 → nci_cidc_api_modules-1.2.34}/requirements.modules.txt

@@ -4,25 +4,26 @@ flask>=3.1.2
 flask-migrate>=4.1.0
 flask-sqlalchemy>=3.1.1
 flask-talisman>=0.7.0
-google-auth==2.43.0 # There is a bug in 2.42.X that causes local to fail when connecting to dev, if still there downgrade to 2.41.1
-google-api-python-client>=2.185.0
+google-auth==2.43.0
+google-api-python-client>=2.187.0
 google-cloud-bigquery>=3.38.0
 google-cloud-pubsub>=2.33.0
 google-cloud-secret-manager>=2.25.0
 google-cloud-storage>=3.6.0
 jinja2>=3.1.6
+joserfc>=1.5.0
 marshmallow>=4.1.0
 marshmallow-sqlalchemy>=1.4.2
 numpy>=2.3.5
 packaging>=25.0
 pandas>=2.3.3
 pyarrow>=22.0.0
-pydantic~=2.12.4
+pydantic~=2.12.5
 python-dotenv>=1.2.1
 requests>=2.32.5
 sqlalchemy>=2.0.44
 sqlalchemy-mixins~=2.0.5
-werkzeug>=3.1.3
+werkzeug>=3.1.4
 
 # cidc deps
 nci-cidc-schemas==0.28.10