nci-cidc-api-modules 1.2.4__tar.gz → 1.2.6__tar.gz

{nci_cidc_api_modules-1.2.4/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.2.6}/PKG-INFO

@@ -1,35 +1,35 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.4
+Version: 1.2.6
 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
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: werkzeug>=3.1.3
+Requires-Dist: certifi>=2025.8.3
+Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
 Requires-Dist: flask>=3.1.2
 Requires-Dist: flask-migrate>=4.1.0
 Requires-Dist: flask-sqlalchemy>=3.1.1
-Requires-Dist: sqlalchemy>=2.0.43
+Requires-Dist: google-auth>=2.41.0
+Requires-Dist: google-api-python-client>=2.183.0
+Requires-Dist: google-cloud-bigquery>=3.38.0
+Requires-Dist: google-cloud-pubsub>=2.31.1
+Requires-Dist: google-cloud-secret-manager>=2.24.0
+Requires-Dist: google-cloud-storage>=3.4.0
+Requires-Dist: jinja2>=3.1.6
 Requires-Dist: marshmallow>=4.0.0
 Requires-Dist: marshmallow-sqlalchemy>=1.4.2
-Requires-Dist: google-cloud-storage>=3.3.0
-Requires-Dist: google-cloud-secret-manager>=2.24.0
-Requires-Dist: google-cloud-pubsub>=2.31.1
-Requires-Dist: google-cloud-bigquery>=3.36.0
-Requires-Dist: google-api-python-client>=2.179.0
-Requires-Dist: google-auth>=2.40.3
+Requires-Dist: numpy>=2.3.2
 Requires-Dist: packaging>=25.0
+Requires-Dist: pandas>=2.3.3
 Requires-Dist: pyarrow>=21.0.0
-Requires-Dist: numpy>=2.3.2
-Requires-Dist: pandas>=2.3.1
 Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: requests>=2.32.5
-Requires-Dist: jinja2>=3.1.6
-Requires-Dist: certifi>=2025.8.3
-Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
-Requires-Dist: nci-cidc-schemas==0.28.5
+Requires-Dist: sqlalchemy>=2.0.43
+Requires-Dist: werkzeug>=3.1.3
+Requires-Dist: nci-cidc-schemas==0.28.6
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.2.4 → nci_cidc_api_modules-1.2.6}/cidc_api/models/models.py

@@ -3432,6 +3432,7 @@ class IngestionJobs(CommonColumns):
     version = Column(Integer, nullable=False)
     pending = Column(Boolean, nullable=False, default=False)
     start_date = Column(DateTime, nullable=True)
+    error_status = Column(String, nullable=True)
 
     @staticmethod
     @with_default_session

{nci_cidc_api_modules-1.2.4 → nci_cidc_api_modules-1.2.6/nci_cidc_api_modules.egg-info}/PKG-INFO

@@ -1,35 +1,35 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.4
+Version: 1.2.6
 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
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: werkzeug>=3.1.3
+Requires-Dist: certifi>=2025.8.3
+Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
 Requires-Dist: flask>=3.1.2
 Requires-Dist: flask-migrate>=4.1.0
 Requires-Dist: flask-sqlalchemy>=3.1.1
-Requires-Dist: sqlalchemy>=2.0.43
+Requires-Dist: google-auth>=2.41.0
+Requires-Dist: google-api-python-client>=2.183.0
+Requires-Dist: google-cloud-bigquery>=3.38.0
+Requires-Dist: google-cloud-pubsub>=2.31.1
+Requires-Dist: google-cloud-secret-manager>=2.24.0
+Requires-Dist: google-cloud-storage>=3.4.0
+Requires-Dist: jinja2>=3.1.6
 Requires-Dist: marshmallow>=4.0.0
 Requires-Dist: marshmallow-sqlalchemy>=1.4.2
-Requires-Dist: google-cloud-storage>=3.3.0
-Requires-Dist: google-cloud-secret-manager>=2.24.0
-Requires-Dist: google-cloud-pubsub>=2.31.1
-Requires-Dist: google-cloud-bigquery>=3.36.0
-Requires-Dist: google-api-python-client>=2.179.0
-Requires-Dist: google-auth>=2.40.3
+Requires-Dist: numpy>=2.3.2
 Requires-Dist: packaging>=25.0
+Requires-Dist: pandas>=2.3.3
 Requires-Dist: pyarrow>=21.0.0
-Requires-Dist: numpy>=2.3.2
-Requires-Dist: pandas>=2.3.1
 Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: requests>=2.32.5
-Requires-Dist: jinja2>=3.1.6
-Requires-Dist: certifi>=2025.8.3
-Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
-Requires-Dist: nci-cidc-schemas==0.28.5
+Requires-Dist: sqlalchemy>=2.0.43
+Requires-Dist: werkzeug>=3.1.3
+Requires-Dist: nci-cidc-schemas==0.28.6
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.2.4 → nci_cidc_api_modules-1.2.6}/nci_cidc_api_modules.egg-info/requires.txt

@@ -1,23 +1,23 @@
-werkzeug>=3.1.3
+certifi>=2025.8.3
+cloud-sql-python-connector[pg8000]>=1.18.4
 flask>=3.1.2
 flask-migrate>=4.1.0
 flask-sqlalchemy>=3.1.1
-sqlalchemy>=2.0.43
+google-auth>=2.41.0
+google-api-python-client>=2.183.0
+google-cloud-bigquery>=3.38.0
+google-cloud-pubsub>=2.31.1
+google-cloud-secret-manager>=2.24.0
+google-cloud-storage>=3.4.0
+jinja2>=3.1.6
 marshmallow>=4.0.0
 marshmallow-sqlalchemy>=1.4.2
-google-cloud-storage>=3.3.0
-google-cloud-secret-manager>=2.24.0
-google-cloud-pubsub>=2.31.1
-google-cloud-bigquery>=3.36.0
-google-api-python-client>=2.179.0
-google-auth>=2.40.3
+numpy>=2.3.2
 packaging>=25.0
+pandas>=2.3.3
 pyarrow>=21.0.0
-numpy>=2.3.2
-pandas>=2.3.1
 python-dotenv>=1.1.1
 requests>=2.32.5
-jinja2>=3.1.6
-certifi>=2025.8.3
-cloud-sql-python-connector[pg8000]>=1.18.4
-nci-cidc-schemas==0.28.5
+sqlalchemy>=2.0.43
+werkzeug>=3.1.3
+nci-cidc-schemas==0.28.6

{nci_cidc_api_modules-1.2.4 → nci_cidc_api_modules-1.2.6}/requirements.modules.txt

@@ -1,23 +1,25 @@
-werkzeug>=3.1.3
+certifi>=2025.8.3
+cloud-sql-python-connector[pg8000]>=1.18.4
 flask>=3.1.2
 flask-migrate>=4.1.0
 flask-sqlalchemy>=3.1.1
-sqlalchemy>=2.0.43
+google-auth>=2.41.0
+google-api-python-client>=2.183.0
+google-cloud-bigquery>=3.38.0
+google-cloud-pubsub>=2.31.1
+google-cloud-secret-manager>=2.24.0
+google-cloud-storage>=3.4.0
+jinja2>=3.1.6
 marshmallow>=4.0.0
 marshmallow-sqlalchemy>=1.4.2
-google-cloud-storage>=3.3.0
-google-cloud-secret-manager>=2.24.0
-google-cloud-pubsub>=2.31.1
-google-cloud-bigquery>=3.36.0
-google-api-python-client>=2.179.0
-google-auth>=2.40.3
+numpy>=2.3.2
 packaging>=25.0
+pandas>=2.3.3
 pyarrow>=21.0.0
-numpy>=2.3.2
-pandas>=2.3.1
 python-dotenv>=1.1.1
 requests>=2.32.5
-jinja2>=3.1.6
-certifi>=2025.8.3
-cloud-sql-python-connector[pg8000]>=1.18.4
-nci-cidc-schemas==0.28.5
+sqlalchemy>=2.0.43
+werkzeug>=3.1.3
+
+# cidc deps
+nci-cidc-schemas==0.28.6

{nci_cidc_api_modules-1.2.4 → nci_cidc_api_modules-1.2.6}/tests/test_api.py

@@ -257,6 +257,10 @@ def test_resource_and_item_get(resource, config, cidc_api, clean_db, monkeypatch
     if "GET" in config["allowed_methods"]:
         assert response.status_code == 200
         item = response.json["_items"][0]
+        # With the admin user, there's a chance that the first user is not the user we want.
+        # This line ensures we get the sample user and not the admin user
+        if resource == "users":
+            item = next((user for user in response.json["_items"] if user["email"] == "test-admin@example.com"), None)
         # trial_metadata is an exception - it prunes metadata_json
         # on resource-level GET queries
         if resource == "trial_metadata":