nci-cidc-api-modules 1.0.19__tar.gz → 1.0.22__tar.gz

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 (36) hide show
  1. {nci_cidc_api_modules-1.0.19/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.0.22}/PKG-INFO +2 -2
  2. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/models.py +7 -4
  3. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22/nci_cidc_api_modules.egg-info}/PKG-INFO +2 -2
  4. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/nci_cidc_api_modules.egg-info/requires.txt +1 -1
  5. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/requirements.modules.txt +1 -1
  6. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/LICENSE +0 -0
  7. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/MANIFEST.in +0 -0
  8. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/README.md +0 -0
  9. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/config/__init__.py +0 -0
  10. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/config/db.py +0 -0
  11. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/config/logging.py +0 -0
  12. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/config/secrets.py +0 -0
  13. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/config/settings.py +0 -0
  14. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/csms/__init__.py +0 -0
  15. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/csms/auth.py +0 -0
  16. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/__init__.py +0 -0
  17. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/csms_api.py +0 -0
  18. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/files/__init__.py +0 -0
  19. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/files/details.py +0 -0
  20. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/files/facets.py +0 -0
  21. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/migrations.py +0 -0
  22. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/schemas.py +0 -0
  23. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/shared/__init__.py +0 -0
  24. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/shared/auth.py +0 -0
  25. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/shared/emails.py +0 -0
  26. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/shared/gcloud_client.py +0 -0
  27. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/shared/jose.py +0 -0
  28. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/shared/rest_utils.py +0 -0
  29. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/nci_cidc_api_modules.egg-info/SOURCES.txt +0 -0
  30. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/nci_cidc_api_modules.egg-info/dependency_links.txt +0 -0
  31. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/nci_cidc_api_modules.egg-info/not-zip-safe +0 -0
  32. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/nci_cidc_api_modules.egg-info/top_level.txt +0 -0
  33. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/pyproject.toml +0 -0
  34. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/setup.cfg +0 -0
  35. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/setup.py +0 -0
  36. {nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/tests/test_api.py +0 -0
{nci_cidc_api_modules-1.0.19/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.0.22}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nci_cidc_api_modules
3
- Version: 1.0.19
3
+ Version: 1.0.22
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
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
28
28
  Requires-Dist: requests==2.32.3
29
29
  Requires-Dist: jinja2==3.1.4
30
30
  Requires-Dist: certifi==2024.7.4
31
- Requires-Dist: nci-cidc-schemas==0.26.35
31
+ Requires-Dist: nci-cidc-schemas==0.26.36
32
32
 
33
33
  # NCI CIDC API <!-- omit in TOC -->
34
34
 
{nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/cidc_api/models/models.py RENAMED
@@ -129,7 +129,6 @@ from ..shared.gcloud_client import (
129
129
  )
130
130
  from ..config.logging import get_logger
131
131
 
132
-
133
132
  os.environ["TZ"] = "UTC"
134
133
  logger = get_logger(__name__)
135
134
 
@@ -2196,9 +2195,13 @@ class UploadJobs(CommonColumns):
2196
2195
 
2197
2196
  @classmethod
2198
2197
  @with_default_session
2199
- def find_by_trial_id(cls, trial_id: str, session):
2200
- uploads = session.query(UploadJobs).filter_by(trial_id=trial_id)
2201
- return uploads
2198
+ def find_first_manifest_job(cls, trial_id: str, session):
2199
+ return (
2200
+ session.query(UploadJobs)
2201
+ .filter_by(trial_id=trial_id, gcs_xlsx_uri="")
2202
+ .order_by(text("id ASC"))
2203
+ .first()
2204
+ )
2202
2205
 
2203
2206
  @with_default_session
2204
2207
  def ingestion_success(
{nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22/nci_cidc_api_modules.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nci_cidc_api_modules
3
- Version: 1.0.19
3
+ Version: 1.0.22
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
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
28
28
  Requires-Dist: requests==2.32.3
29
29
  Requires-Dist: jinja2==3.1.4
30
30
  Requires-Dist: certifi==2024.7.4
31
- Requires-Dist: nci-cidc-schemas==0.26.35
31
+ Requires-Dist: nci-cidc-schemas==0.26.36
32
32
 
33
33
  # NCI CIDC API <!-- omit in TOC -->
34
34
 
{nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/nci_cidc_api_modules.egg-info/requires.txt RENAMED
@@ -19,4 +19,4 @@ python-dotenv==0.10.3
19
19
  requests==2.32.3
20
20
  jinja2==3.1.4
21
21
  certifi==2024.7.4
22
- nci-cidc-schemas==0.26.35
22
+ nci-cidc-schemas==0.26.36
{nci_cidc_api_modules-1.0.19 → nci_cidc_api_modules-1.0.22}/requirements.modules.txt RENAMED
@@ -19,4 +19,4 @@ python-dotenv==0.10.3
19
19
  requests==2.32.3
20
20
  jinja2==3.1.4
21
21
  certifi==2024.7.4
22
- nci-cidc-schemas==0.26.35
22
+ nci-cidc-schemas==0.26.36