nci-cidc-api-modules 1.1.41__py3-none-any.whl → 1.2.1__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 +10 -2
- {nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/METADATA +26 -26
- {nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/RECORD +6 -6
- {nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/WHEEL +0 -0
- {nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/licenses/LICENSE +0 -0
- {nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/top_level.txt +0 -0
cidc_api/models/models.py
CHANGED
@@ -1345,14 +1345,14 @@ class TrialMetadata(CommonColumns):
|
|
1345
1345
|
if not trial.file_bundle[assay]:
|
1346
1346
|
del trial.file_bundle[assay]
|
1347
1347
|
# Check if trial is ready for submission
|
1348
|
-
setattr(trial, "ready_for_submission", trial.
|
1348
|
+
setattr(trial, "ready_for_submission", trial.determine_ready_for_submission())
|
1349
1349
|
|
1350
1350
|
trials.append(trial)
|
1351
1351
|
|
1352
1352
|
return trials
|
1353
1353
|
|
1354
1354
|
@with_default_session
|
1355
|
-
def
|
1355
|
+
def determine_ready_for_submission(self, session: Session) -> Boolean:
|
1356
1356
|
open_job = IngestionJobs.get_open_job_by_trial(self.trial_id)
|
1357
1357
|
if not open_job:
|
1358
1358
|
return False
|
@@ -3571,3 +3571,11 @@ class FileValidationErrors(CommonColumns):
|
|
3571
3571
|
new_error = FileValidationErrors(file_id=file_id, job_id=job_id, error_message=error_message, location=location)
|
3572
3572
|
new_error.insert(session=session)
|
3573
3573
|
return new_error
|
3574
|
+
|
3575
|
+
@classmethod
|
3576
|
+
@with_default_session
|
3577
|
+
def delete_by_file_ids(cls, file_ids: list[int], session: Session = None):
|
3578
|
+
"""Delete all validation errors for the given list of file_ids."""
|
3579
|
+
if file_ids:
|
3580
|
+
session.query(cls).filter(cls.file_id.in_(file_ids)).delete(synchronize_session=False)
|
3581
|
+
session.commit()
|
@@ -1,35 +1,35 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: nci_cidc_api_modules
|
3
|
-
Version: 1.1
|
3
|
+
Version: 1.2.1
|
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
|
-
Requires-Python: >=3.
|
7
|
+
Requires-Python: >=3.13
|
8
8
|
Description-Content-Type: text/markdown
|
9
9
|
License-File: LICENSE
|
10
|
-
Requires-Dist: werkzeug
|
11
|
-
Requires-Dist: flask
|
12
|
-
Requires-Dist: flask-migrate
|
13
|
-
Requires-Dist: flask-sqlalchemy
|
14
|
-
Requires-Dist: sqlalchemy
|
15
|
-
Requires-Dist: marshmallow
|
16
|
-
Requires-Dist: marshmallow-sqlalchemy
|
17
|
-
Requires-Dist: google-cloud-storage
|
18
|
-
Requires-Dist: google-cloud-secret-manager
|
19
|
-
Requires-Dist: google-cloud-pubsub
|
20
|
-
Requires-Dist: google-cloud-bigquery
|
21
|
-
Requires-Dist: google-api-python-client
|
22
|
-
Requires-Dist: google-auth
|
23
|
-
Requires-Dist: packaging>=
|
24
|
-
Requires-Dist: pyarrow
|
25
|
-
Requires-Dist: numpy
|
26
|
-
Requires-Dist: pandas
|
27
|
-
Requires-Dist: python-dotenv
|
28
|
-
Requires-Dist: requests
|
29
|
-
Requires-Dist: jinja2
|
30
|
-
Requires-Dist: certifi
|
31
|
-
Requires-Dist: cloud-sql-python-connector[pg8000]
|
32
|
-
Requires-Dist: nci-cidc-schemas==0.
|
10
|
+
Requires-Dist: werkzeug>=3.1.3
|
11
|
+
Requires-Dist: flask>=3.1.2
|
12
|
+
Requires-Dist: flask-migrate>=4.1.0
|
13
|
+
Requires-Dist: flask-sqlalchemy>=3.1.1
|
14
|
+
Requires-Dist: sqlalchemy>=2.0.43
|
15
|
+
Requires-Dist: marshmallow>=4.0.0
|
16
|
+
Requires-Dist: marshmallow-sqlalchemy>=1.4.2
|
17
|
+
Requires-Dist: google-cloud-storage>=3.3.0
|
18
|
+
Requires-Dist: google-cloud-secret-manager>=2.24.0
|
19
|
+
Requires-Dist: google-cloud-pubsub>=2.31.1
|
20
|
+
Requires-Dist: google-cloud-bigquery>=3.36.0
|
21
|
+
Requires-Dist: google-api-python-client>=2.179.0
|
22
|
+
Requires-Dist: google-auth>=2.40.3
|
23
|
+
Requires-Dist: packaging>=25.0
|
24
|
+
Requires-Dist: pyarrow>=21.0.0
|
25
|
+
Requires-Dist: numpy>=2.3.2
|
26
|
+
Requires-Dist: pandas>=2.3.1
|
27
|
+
Requires-Dist: python-dotenv>=1.1.1
|
28
|
+
Requires-Dist: requests>=2.32.5
|
29
|
+
Requires-Dist: jinja2>=3.1.6
|
30
|
+
Requires-Dist: certifi>=2025.8.3
|
31
|
+
Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
|
32
|
+
Requires-Dist: nci-cidc-schemas==0.28.2
|
33
33
|
Dynamic: description
|
34
34
|
Dynamic: description-content-type
|
35
35
|
Dynamic: home-page
|
@@ -62,7 +62,7 @@ The next generation of the CIDC API, reworked to use Google Cloud-managed servic
|
|
62
62
|
|
63
63
|
## Install Python dependencies
|
64
64
|
|
65
|
-
Python
|
65
|
+
Use Python version 3.13
|
66
66
|
|
67
67
|
```bash
|
68
68
|
# make a virtual environment in the current direcory called "venv"
|
@@ -5,7 +5,7 @@ cidc_api/config/secrets.py,sha256=jRFj7W43pWuPf9DZQLCKF7WPXf5cUv-BAaS3ASqhV_Q,14
|
|
5
5
|
cidc_api/config/settings.py,sha256=NsJbqW6Vqcz2f79xcAbk4th5tHne_I-RPCbKq_3hpz0,4427
|
6
6
|
cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
|
7
7
|
cidc_api/models/migrations.py,sha256=gp9vtkYbA9FFy2s-7woelAmsvQbJ41LO2_DY-YkFIrQ,11464
|
8
|
-
cidc_api/models/models.py,sha256=
|
8
|
+
cidc_api/models/models.py,sha256=x9EMbMVQHDGN5slYrr3WFsKpVL9fYfK0dQz1SdUunNM,144461
|
9
9
|
cidc_api/models/schemas.py,sha256=6IE2dJoEMcMbi0Vr1V3cYKnPKU0hv9vRKBixOZHe88s,2766
|
10
10
|
cidc_api/models/files/__init__.py,sha256=8BMTnUSHzUbz0lBeEQY6NvApxDD3GMWMduoVMos2g4Y,213
|
11
11
|
cidc_api/models/files/details.py,sha256=sZkGM7iEV4-J6IDQCdiMV6KBDLbPxCOqUMaU3aY9rX8,65153
|
@@ -17,8 +17,8 @@ cidc_api/shared/file_handling.py,sha256=l4wiRkVJLL7QbCoODsLx-uki6Km8QoMmUlRVnUV9
|
|
17
17
|
cidc_api/shared/gcloud_client.py,sha256=ETQ34qKtO7l0svVhiHXxXewiyNjwIMgoeVcqrg-Twtk,36902
|
18
18
|
cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
|
19
19
|
cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
|
20
|
-
nci_cidc_api_modules-1.1.
|
21
|
-
nci_cidc_api_modules-1.1.
|
22
|
-
nci_cidc_api_modules-1.1.
|
23
|
-
nci_cidc_api_modules-1.1.
|
24
|
-
nci_cidc_api_modules-1.1.
|
20
|
+
nci_cidc_api_modules-1.2.1.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
|
21
|
+
nci_cidc_api_modules-1.2.1.dist-info/METADATA,sha256=U5F9jMinwYPPkYteR5lqZF0PECWitEh6pPf_6XQBojE,39537
|
22
|
+
nci_cidc_api_modules-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
23
|
+
nci_cidc_api_modules-1.2.1.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
|
24
|
+
nci_cidc_api_modules-1.2.1.dist-info/RECORD,,
|
File without changes
|
{nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/licenses/LICENSE
RENAMED
File without changes
|
{nci_cidc_api_modules-1.1.41.dist-info → nci_cidc_api_modules-1.2.1.dist-info}/top_level.txt
RENAMED
File without changes
|