From bb50b01470a7386170e19c7bc555f89f5632766a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 16:46:31 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .gitignore | 2 +- .prettierignore | 2 +- assets/blackfynn-warning-message.txt | 1 - .../fair-data-innovations-hub-logo.svg | 2 +- docs/test-dataset/code/adjusted-code.py | 2 +- docs/test-dataset/code/some-code.py | 2 +- docs/test-dataset/metadata-files/CHANGES.txt | 2 +- docs/test-dataset/metadata-files/README.txt | 4 +- .../HRW tile 25002-84590.ome.tif | 2 +- entitlements.mac.inherit.plist | 2 +- index.html | 6 +- pyflask/apis/apiCollections.py | 86 +- pyflask/apis/apiCurate.py | 253 +- pyflask/apis/apiDatasets.py | 225 +- pyflask/apis/apiDisseminate.py | 278 +- pyflask/apis/apiManageDatasets.py | 2257 +++++++++++------ pyflask/apis/apiNeuroConv.py | 8 +- pyflask/apis/apiOrganizeDatasets.py | 194 +- pyflask/apis/apiPrepareMetadata.py | 965 ++++--- pyflask/apis/apiStartup.py | 11 +- pyflask/apis/apiTaxonomy.py | 9 +- pyflask/apis/apiUser.py | 57 +- pyflask/apis/apiValidator.py | 3 +- pyflask/apis/apiVersion.py | 22 +- pyflask/app.py | 7 +- pyflask/authentication/__init__.py | 2 +- pyflask/authentication/authenticate.py | 29 +- pyflask/collectionsDataset/__init__.py | 5 +- .../collectionsDataset/collectionsDataset.py | 11 +- pyflask/curate/__init__.py | 4 +- pyflask/curate/curate.py | 286 ++- pyflask/datasets/__init__.py | 8 +- pyflask/datasets/datasets.py | 66 +- pyflask/disseminate/__init__.py | 4 +- pyflask/disseminate/disseminate.py | 132 +- pyflask/errorHandlers/__init__.py | 2 +- pyflask/errorHandlers/fileNotFound.py | 2 +- pyflask/errorHandlers/handleHTTPError.py | 13 +- pyflask/errorHandlers/handlePennsieveError.py | 9 +- .../invalidDataDeliverablesDocument.py | 2 +- pyflask/errorHandlers/invalidFileException.py | 3 +- .../errorHandlers/notBadRequestException.py | 3 +- pyflask/manageDatasets/__init__.py | 6 +- pyflask/manageDatasets/manage_datasets.py | 252 +- pyflask/manageNeuroconv/manage_neuroconv.py | 4 +- pyflask/minimumApiVersion/__init__.py | 3 +- pyflask/minimumApiVersion/apiVersion.py | 3 +- pyflask/namespaces/__init__.py | 2 +- pyflask/namespaces/configureNamespaces.py | 60 +- pyflask/namespaces/namespaceLogger.py | 3 +- pyflask/organizeDatasets/__init__.py | 6 +- pyflask/organizeDatasets/organize_datasets.py | 58 +- pyflask/prepareMetadata/__init__.py | 6 +- pyflask/prepareMetadata/prepare_metadata.py | 252 +- pyflask/pysodaUtils/__init__.py | 10 +- pyflask/pysodaUtils/pysodaUtils.py | 13 +- pyflask/setupUtils/configureAPI.py | 6 +- pyflask/setupUtils/configureLogger.py | 11 +- pyflask/startup/__init__.py | 2 +- pyflask/startup/echo.py | 2 +- pyflask/startup/minimumApiVersion.py | 5 +- pyflask/taxonomy/__init__.py | 2 +- pyflask/taxonomy/taxonomy.py | 2 +- pyflask/users/__init__.py | 2 +- pyflask/users/user.py | 60 +- pyflask/utils/__init__.py | 2 +- pyflask/utils/apiAuthentication.py | 3 +- pyflask/utils/getDataset.py | 9 +- pyflask/utils/metadataStringToList.py | 11 +- pyflask/validator/hooks/hook-frozendict.py | 2 +- pyflask/validator/hooks/hook-idlib.py | 2 +- pyflask/validator/hooks/hook-ontquery.py | 2 +- pyflask/validator/hooks/hook-protc-lib.py | 2 +- pyflask/validator/hooks/hook-protcur.py | 2 +- pyflask/validator/hooks/hook-pyontutils.py | 2 +- pyflask/validator/hooks/hook-pysercomb.py | 2 +- pyflask/validator/hooks/hook-sparcur.py | 2 +- pyflask/validator/validator.py | 49 +- pyflask/validator/validatorUtils/__init__.py | 2 +- .../error_path_report_parser.py | 15 +- scripts/disseminate/disseminate.js | 2 +- scripts/disseminate/prePublishingReview.js | 4 +- scripts/guided-mode/guided-curate-dataset.js | 48 +- scripts/metadata-files/submission.js | 2 +- scripts/organize-dataset/organizeDS.js | 6 +- .../others/analytics/curation-analytics.js | 2 +- .../analytics/upload-session-tracker.js | 8 +- scripts/validator/parse-pipeline-errors.js | 12 +- scripts/validator/parsed-error-translator.js | 4 +- scripts/validator/validation-error-parser.js | 18 +- scripts/validator/validator-categories.js | 8 +- sections/curate/curate.html | 4 +- sections/post_curation/post_curation.html | 2 +- stories/assets/code-brackets.svg | 2 +- stories/assets/colors.svg | 2 +- stories/assets/comments.svg | 2 +- stories/assets/direction.svg | 2 +- stories/assets/flow.svg | 2 +- stories/assets/plugin.svg | 2 +- stories/assets/repo.svg | 2 +- stories/assets/stackalt.svg | 2 +- tools/analytics/helper_functions.py | 166 +- .../soda-sparc-structure.py | 71 +- 103 files changed, 3902 insertions(+), 2331 deletions(-) diff --git a/.gitignore b/.gitignore index df132a464..0e28eb087 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ node_modules build/api pysodadist pyflaskdist -pyflask/ds +pyflask/ds dist src/Users semantic diff --git a/.prettierignore b/.prettierignore index 29908d625..7400c2482 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,2 @@ curate.html -tools/**/* \ No newline at end of file +tools/**/* diff --git a/assets/blackfynn-warning-message.txt b/assets/blackfynn-warning-message.txt index a66675f5d..261000c13 100644 --- a/assets/blackfynn-warning-message.txt +++ b/assets/blackfynn-warning-message.txt @@ -3,4 +3,3 @@ "warning-message-1": "

As you may know Blackfynn will be transitioning to Pennsieve. During this period, any features of SODA that use Blackfynn could be affected.

", "warning-message": "

This version of SODA is ready to work with Pennsieve. You will be required to connect your Pennsieve account with SODA to get started. Click here to learn more.
As we are still thoroughly testing our integration with Pennsieve, we do expect some bugs. Please let us know if you find any at bpatel@calmi2.org.

" } - diff --git a/assets/logo-svg/fair-data-innovations-hub-logo.svg b/assets/logo-svg/fair-data-innovations-hub-logo.svg index a2c563071..5c30c6d7d 100644 --- a/assets/logo-svg/fair-data-innovations-hub-logo.svg +++ b/assets/logo-svg/fair-data-innovations-hub-logo.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/docs/test-dataset/code/adjusted-code.py b/docs/test-dataset/code/adjusted-code.py index d23450ef4..7d80ac164 100644 --- a/docs/test-dataset/code/adjusted-code.py +++ b/docs/test-dataset/code/adjusted-code.py @@ -37,7 +37,7 @@ from validator_soda import pathToJsonStruct, validate_high_level_folder_structure, validate_high_level_metadata_files, \ validate_sub_level_organization, validate_submission_file, validate_dataset_description_file -from pysoda import ( +from pysoda import ( # clear_queue, agent_running, check_forbidden_characters, check_forbidden_characters_bf, bf_dataset_size ) diff --git a/docs/test-dataset/code/some-code.py b/docs/test-dataset/code/some-code.py index f72a3a7ba..0154cd229 100644 --- a/docs/test-dataset/code/some-code.py +++ b/docs/test-dataset/code/some-code.py @@ -1 +1 @@ -print('Hello! This is an example python file.') \ No newline at end of file +print('Hello! This is an example python file.') diff --git a/docs/test-dataset/metadata-files/CHANGES.txt b/docs/test-dataset/metadata-files/CHANGES.txt index 1e3be56d1..592bbd662 100644 --- a/docs/test-dataset/metadata-files/CHANGES.txt +++ b/docs/test-dataset/metadata-files/CHANGES.txt @@ -6,4 +6,4 @@ Changes in submssion in August, 2020 3. Materials and Methods are stated in one Word document loaded in 'protocol" folder 4. New original confocal microscopic images added in the "primary" folder 5. New digital traces added in "derivatives" folder -6. Every microscopic and digital tracing image is accompanied by a png file with the same name for preview \ No newline at end of file +6. Every microscopic and digital tracing image is accompanied by a png file with the same name for preview diff --git a/docs/test-dataset/metadata-files/README.txt b/docs/test-dataset/metadata-files/README.txt index 6d821766e..c3d4bca6b 100644 --- a/docs/test-dataset/metadata-files/README.txt +++ b/docs/test-dataset/metadata-files/README.txt @@ -1,5 +1,5 @@ The dataset contains morphological data only. -Two kinds of images: confocal microscopic and 3D digital neuronal tracing +Two kinds of images: confocal microscopic and 3D digital neuronal tracing The forms with information about mice, samples and microscopy are in the "source" folder Origianl microscopic images without any modification or anotation are in the "primary". -The digital traces are in "derivatives". \ No newline at end of file +The digital traces are in "derivatives". diff --git a/docs/test-dataset/source/experiment images/HRW tile 25002-84590.ome.tif b/docs/test-dataset/source/experiment images/HRW tile 25002-84590.ome.tif index f3a34851d..8e27be7d6 100644 --- a/docs/test-dataset/source/experiment images/HRW tile 25002-84590.ome.tif +++ b/docs/test-dataset/source/experiment images/HRW tile 25002-84590.ome.tif @@ -1 +1 @@ -text \ No newline at end of file +text diff --git a/entitlements.mac.inherit.plist b/entitlements.mac.inherit.plist index ad77a2a1e..6bc22e913 100644 --- a/entitlements.mac.inherit.plist +++ b/entitlements.mac.inherit.plist @@ -11,4 +11,4 @@ com.apple.security.cs.disable-library-validation - \ No newline at end of file + diff --git a/index.html b/index.html index ab7b34f50..71434cfbe 100755 --- a/index.html +++ b/index.html @@ -222,7 +222,7 @@ > - +