Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 24.1.7 into main #879

Merged
merged 37 commits into from
Jan 24, 2023
Merged

Merge 24.1.7 into main #879

merged 37 commits into from
Jan 24, 2023

Commits on Nov 2, 2022

  1. Configuration menu
    Copy the full SHA
    f471c59 View commit details
    Browse the repository at this point in the history
  2. [dcm2bids] Remove hardcoded dcm2niix binary to use the value stored i…

    …n the `converter` Config setting (aces#815)
    
    * modifies the dcm2niix command to use the Config converter value instead of hardcoding dcm2niix
    
    * add a check to make sure the converter is a dcm2niix binary
    cmadjar authored Nov 2, 2022
    Configuration menu
    Copy the full SHA
    90e7a9a View commit details
    Browse the repository at this point in the history
  3. Pull 24.0.3 in 24.1 release (aces#820)

    * Reload the mri_upload dictionary before checking if a tarchive has been validated (aces#783)
    
    * reload mri_upload object
    
    * remove debugging exit and print statements
    
    * fix minor bugs when dealing with scans.tsv files (aces#774)
    
    * fix regex search for excluded series description patterns (aces#786)
    
    * fix_return_statement_of_create_imaging_upload_dict_from_upload_id_function (aces#787)
    
    * [dcm2bids] Insert into MRICandidateErrors if there is a Candidate PatientName mismatch (aces#790)
    
    * insert into MRICandidateErrors when candidate mismatch or pname not matching between DICOMs and NIfTI
    
    * remove exit
    
    * fix table name to MRICandidateErrors instead of MriCandidateErrors as apparently, it makes a difference on MariaDB/Linux VMs while it just worked on local install on Mac... (aces#793)
    
    * Set DICOM dates to undef if the date does not follow proper DICOM standard (aces#794)
    
    * set date to undef if it does not follow proper DICOM formats
    
    * fix all dates set to NULL
    
    * Installation and pet fixes (aces#818)
    
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mcgill.ca>
    
    * Update VERSION file for next bug fix release
    
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mail.mcgill.ca>
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mcgill.ca>
    3 people authored Nov 2, 2022
    Configuration menu
    Copy the full SHA
    02333c9 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. Configuration menu
    Copy the full SHA
    0614e8c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. Configuration menu
    Copy the full SHA
    f47421d View commit details
    Browse the repository at this point in the history
  2. Add capability to download file from s3 (aces#826)

    * add capability to download file from s3
    
    * fix flake8 error
    cmadjar authored Nov 8, 2022
    Configuration menu
    Copy the full SHA
    f0810cb View commit details
    Browse the repository at this point in the history
  3. Upload to S3: support object name starting with s3://bucket_name/ for…

    … upload (aces#827)
    
    * add capability to download file from s3
    
    * fix flake8 error
    
    * add ability to remove s3://bucketname/ from the object name before upload
    cmadjar authored Nov 8, 2022
    Configuration menu
    Copy the full SHA
    3644f95 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Configuration menu
    Copy the full SHA
    55c0d8c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    34e8041 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    47c797e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Configuration menu
    Copy the full SHA
    02507c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9c376bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e62ea82 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. fix violation files path when checking if the files are on the filesy…

    …stem before adding them to the list of files to push to S3 (aces#834)
    cmadjar authored Nov 14, 2022
    Configuration menu
    Copy the full SHA
    0d27d49 View commit details
    Browse the repository at this point in the history
  2. Merge 24.0 release into 24.1 release (aces#836)

    * Reload the mri_upload dictionary before checking if a tarchive has been validated (aces#783)
    
    * reload mri_upload object
    
    * remove debugging exit and print statements
    
    * fix minor bugs when dealing with scans.tsv files (aces#774)
    
    * fix regex search for excluded series description patterns (aces#786)
    
    * fix_return_statement_of_create_imaging_upload_dict_from_upload_id_function (aces#787)
    
    * [dcm2bids] Insert into MRICandidateErrors if there is a Candidate PatientName mismatch (aces#790)
    
    * insert into MRICandidateErrors when candidate mismatch or pname not matching between DICOMs and NIfTI
    
    * remove exit
    
    * fix table name to MRICandidateErrors instead of MriCandidateErrors as apparently, it makes a difference on MariaDB/Linux VMs while it just worked on local install on Mac... (aces#793)
    
    * Set DICOM dates to undef if the date does not follow proper DICOM standard (aces#794)
    
    * set date to undef if it does not follow proper DICOM formats
    
    * fix all dates set to NULL
    
    * Installation and pet fixes (aces#818)
    
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mcgill.ca>
    
    * Update VERSION file for next bug fix release
    
    * Project, event validation and protobuf update (aces#823)
    
    * Project, event validation and protobuf update
    
    * Site and project search when creating candidate
    
    * missing import
    
    * correct pscid search
    
    * Events validation
    
    * flake rules update
    
    * review, and NULL value filtered out for site and project
    
    * flake
    
    * flake
    
    Co-authored-by: regisoc <regis.ongaro-carcy@mcin.ca>
    
    * fix conflict
    
    * fix version
    
    * fix version
    
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mail.mcgill.ca>
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mcgill.ca>
    Co-authored-by: regisoc <regis.ongaro-carcy@mcin.ca>
    4 people authored Nov 14, 2022
    Configuration menu
    Copy the full SHA
    4fd75e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. Configuration menu
    Copy the full SHA
    a826be3 View commit details
    Browse the repository at this point in the history
  2. Fix logic of determining file run number when previously inserted fil…

    …es are already pushed to S3 and not on filesystem anymore (aces#846)
    
    * fix bug
    
    * fix listing of filenames
    
    * comment new function
    cmadjar authored Dec 5, 2022
    Configuration menu
    Copy the full SHA
    c9afaa2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    17f6652 View commit details
    Browse the repository at this point in the history
  4. Chunk creation subprocess failure check (aces#848)

    * Chunk creation subprocess failure check
    
    Raise error when the chunk creation subprocess fails.
    Fix aces#843
    
    * Update python/lib/physiological.py
    
    Print actual error message
    
    Co-authored-by: Cécile Madjar <cecile.madjar@mcin.ca>
    
    Co-authored-by: Cécile Madjar <cecile.madjar@mcin.ca>
    regisoc and cmadjar authored Dec 5, 2022
    Configuration menu
    Copy the full SHA
    b224835 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    afe6903 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Configuration menu
    Copy the full SHA
    cef8f87 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. Configuration menu
    Copy the full SHA
    3af8cf6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    115283e View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Configuration menu
    Copy the full SHA
    e8103e7 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2022

  1. Add missing exit codes on the python's side (aces#857)

    * add some missing exit codes
    
    * add some missing exit codes
    cmadjar authored Dec 21, 2022
    Configuration menu
    Copy the full SHA
    049414e View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Configuration menu
    Copy the full SHA
    27f7e63 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Configuration menu
    Copy the full SHA
    bd74369 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Configuration menu
    Copy the full SHA
    a1dc483 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc00fd6 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. fix paths when there are not / at the end of the Config (aces#866)

    Tested on sandbox with Config `data_dir` = `/data/loris/data`
    cmadjar authored Jan 12, 2023
    Configuration menu
    Copy the full SHA
    82c47b8 View commit details
    Browse the repository at this point in the history
  2. fix NoneType error /opt/loris/bin/mri/python/lib/dcm2bids_imaging_pip…

    …eline_lib/dicom_archive_loader_pipeline.py, line 346, in _add_intended_for_to_fieldmap_json_files (aces#867)
    
    Tested on HBCD sandbox on the dataset that caused the issue.
    cmadjar authored Jan 12, 2023
    Configuration menu
    Copy the full SHA
    e77d767 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. Properly update mri_upload 'Inserting' column when different sectio…

    …ns of the pipeline are run (aces#868)
    
    * update mri_upload to inserting=0 when push to s3 pipeline is finished
    
    * fix Inserting flag being properly set when pipeline is running
    cmadjar authored Jan 13, 2023
    Configuration menu
    Copy the full SHA
    9f986c8 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Configuration menu
    Copy the full SHA
    d53b0a7 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Add download from S3 for fmap already pushed to S3 that needs to have…

    … IntendedFor written in them (aces#874)
    
    * add download from S3 for fmap that needs to have IntendedFor written in them
    
    * add print
    cmadjar authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    0bda1a1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4fd8b48 View commit details
    Browse the repository at this point in the history
  3. Merge 24.0.4 into 24.1 release (aces#878)

    * Reload the mri_upload dictionary before checking if a tarchive has been validated (aces#783)
    
    * reload mri_upload object
    
    * remove debugging exit and print statements
    
    * fix minor bugs when dealing with scans.tsv files (aces#774)
    
    * fix regex search for excluded series description patterns (aces#786)
    
    * fix_return_statement_of_create_imaging_upload_dict_from_upload_id_function (aces#787)
    
    * [dcm2bids] Insert into MRICandidateErrors if there is a Candidate PatientName mismatch (aces#790)
    
    * insert into MRICandidateErrors when candidate mismatch or pname not matching between DICOMs and NIfTI
    
    * remove exit
    
    * fix table name to MRICandidateErrors instead of MriCandidateErrors as apparently, it makes a difference on MariaDB/Linux VMs while it just worked on local install on Mac... (aces#793)
    
    * Set DICOM dates to undef if the date does not follow proper DICOM standard (aces#794)
    
    * set date to undef if it does not follow proper DICOM formats
    
    * fix all dates set to NULL
    
    * Installation and pet fixes (aces#818)
    
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mcgill.ca>
    
    * Update VERSION file for next bug fix release
    
    * Project, event validation and protobuf update (aces#823)
    
    * Project, event validation and protobuf update
    
    * Site and project search when creating candidate
    
    * missing import
    
    * correct pscid search
    
    * Events validation
    
    * flake rules update
    
    * review, and NULL value filtered out for site and project
    
    * flake
    
    * flake
    
    Co-authored-by: regisoc <regis.ongaro-carcy@mcin.ca>
    
    * DICOM Archive broken archive link fix (aces#872)
    
    * update version to 24.0.4 (aces#877)
    
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mail.mcgill.ca>
    Co-authored-by: Laetitia Fesselier <laetitia.fesselier@mcgill.ca>
    Co-authored-by: regisoc <regis.ongaro-carcy@mcin.ca>
    4 people authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    ca19cc4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4a28c9b View commit details
    Browse the repository at this point in the history