nci-cidc-api-modules 1.0.27__py3-none-any.whl → 1.0.29__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.
- cidc_api/models/models.py +14 -0
- {nci_cidc_api_modules-1.0.27.dist-info → nci_cidc_api_modules-1.0.29.dist-info}/METADATA +3 -3
- {nci_cidc_api_modules-1.0.27.dist-info → nci_cidc_api_modules-1.0.29.dist-info}/RECORD +6 -6
- {nci_cidc_api_modules-1.0.27.dist-info → nci_cidc_api_modules-1.0.29.dist-info}/WHEEL +1 -1
- {nci_cidc_api_modules-1.0.27.dist-info → nci_cidc_api_modules-1.0.29.dist-info}/LICENSE +0 -0
- {nci_cidc_api_modules-1.0.27.dist-info → nci_cidc_api_modules-1.0.29.dist-info}/top_level.txt +0 -0
cidc_api/models/models.py
CHANGED
|
@@ -1375,6 +1375,20 @@ class TrialMetadata(CommonColumns):
|
|
|
1375
1375
|
)
|
|
1376
1376
|
setattr(trial, "num_samples", sample_counts.get(trial.trial_id, 0))
|
|
1377
1377
|
|
|
1378
|
+
if include_file_bundles and hasattr(trial, "file_bundle"):
|
|
1379
|
+
for assay in trial.file_bundle:
|
|
1380
|
+
size_results = {}
|
|
1381
|
+
for files_list_key in trial.file_bundle[assay]:
|
|
1382
|
+
ids = trial.file_bundle[assay][files_list_key]
|
|
1383
|
+
size_results[f"{files_list_key}_size"] = (
|
|
1384
|
+
DownloadableFiles.get_total_bytes(
|
|
1385
|
+
filter_=lambda q: q.filter(
|
|
1386
|
+
DownloadableFiles.id.in_(ids)
|
|
1387
|
+
)
|
|
1388
|
+
)
|
|
1389
|
+
)
|
|
1390
|
+
trial.file_bundle[assay].update(size_results)
|
|
1391
|
+
|
|
1378
1392
|
trials.append(trial)
|
|
1379
1393
|
|
|
1380
1394
|
return trials
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: nci_cidc_api_modules
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.29
|
|
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
|
|
7
7
|
Requires-Python: >=3.9
|
|
8
8
|
Description-Content-Type: text/markdown
|
|
9
9
|
License-File: LICENSE
|
|
10
|
-
Requires-Dist: werkzeug ==3.0.
|
|
10
|
+
Requires-Dist: werkzeug ==3.0.6
|
|
11
11
|
Requires-Dist: flask ==2.2.5
|
|
12
12
|
Requires-Dist: flask-migrate ==2.5.2
|
|
13
13
|
Requires-Dist: flask-sqlalchemy ==2.5.1
|
|
@@ -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.
|
|
31
|
+
Requires-Dist: nci-cidc-schemas ==0.26.38
|
|
32
32
|
|
|
33
33
|
# NCI CIDC API <!-- omit in TOC -->
|
|
34
34
|
|
|
@@ -8,7 +8,7 @@ cidc_api/csms/auth.py,sha256=25Yma2Kz3KLENAPSeBYacFuSZXng-EDgmgInKBsRyP0,3191
|
|
|
8
8
|
cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
|
|
9
9
|
cidc_api/models/csms_api.py,sha256=Wp4b53vwOqSlOIaoAYGlI1p8ZfXRXmVJ6MLcsvzq0LA,31664
|
|
10
10
|
cidc_api/models/migrations.py,sha256=gp9vtkYbA9FFy2s-7woelAmsvQbJ41LO2_DY-YkFIrQ,11464
|
|
11
|
-
cidc_api/models/models.py,sha256=
|
|
11
|
+
cidc_api/models/models.py,sha256=PHfajlTGXVMHJ4SSqoZwYX8NmtkeL14sq7d4--n1an8,125827
|
|
12
12
|
cidc_api/models/schemas.py,sha256=7tDYtmULuzTt2kg7RorWhte06ffalgpQKrFiDRGcPEQ,2711
|
|
13
13
|
cidc_api/models/files/__init__.py,sha256=8BMTnUSHzUbz0lBeEQY6NvApxDD3GMWMduoVMos2g4Y,213
|
|
14
14
|
cidc_api/models/files/details.py,sha256=h6R0p_hi-ukHsO7HV-3Wukccp0zRLJ1Oie_JNA_7Pl0,62274
|
|
@@ -19,8 +19,8 @@ cidc_api/shared/emails.py,sha256=5dyuKlpcg1M4P_RrAt0ss2hiCqb-Y7p2XXR1d9uBXg8,486
|
|
|
19
19
|
cidc_api/shared/gcloud_client.py,sha256=7dDs0crLMJKdIp4IDSfrZBMB3h-zvWNieB81azoeLO4,33746
|
|
20
20
|
cidc_api/shared/jose.py,sha256=QO30uIhbYDwzPEWWJXz0PfyV7E1AZHReEZJUVT70UJY,1844
|
|
21
21
|
cidc_api/shared/rest_utils.py,sha256=LMfBpvJRjkfQjCzVXuhTTe4Foz4wlvaKg6QntyR-Hkc,6648
|
|
22
|
-
nci_cidc_api_modules-1.0.
|
|
23
|
-
nci_cidc_api_modules-1.0.
|
|
24
|
-
nci_cidc_api_modules-1.0.
|
|
25
|
-
nci_cidc_api_modules-1.0.
|
|
26
|
-
nci_cidc_api_modules-1.0.
|
|
22
|
+
nci_cidc_api_modules-1.0.29.dist-info/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
|
|
23
|
+
nci_cidc_api_modules-1.0.29.dist-info/METADATA,sha256=rmJORWrqsRApIivfppJ8UwTYz8OsAFPtl2yNTs4wUt8,40673
|
|
24
|
+
nci_cidc_api_modules-1.0.29.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
|
|
25
|
+
nci_cidc_api_modules-1.0.29.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
|
|
26
|
+
nci_cidc_api_modules-1.0.29.dist-info/RECORD,,
|
|
File without changes
|
{nci_cidc_api_modules-1.0.27.dist-info → nci_cidc_api_modules-1.0.29.dist-info}/top_level.txt
RENAMED
|
File without changes
|