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

Modify input parameters to integrate with IRIDA-Next UI #15

Merged
merged 28 commits into from
Jul 25, 2024

Conversation

sgsutcliffe
Copy link
Collaborator

@sgsutcliffe sgsutcliffe commented Jun 28, 2024

One of the main uses of staramrnf will be to be integrated with IRIDA-Next and so I am reformatting the input formatting to be properly integrated with IRIDA-Next user-interface. Changes should not impact the function of the pipeline.

PR checklist

  • This comment contains a description of changes (with reason).
  • If you've fixed a bug or added code that should be tested, add tests!
  • If you've added a new tool - have you followed the pipeline conventions in the contribution docs
  • If necessary, also make a PR on the nf-core/staramr branch on the nf-core/test-datasets repository.
  • Make sure your code lints (nf-core lint).
  • Ensure the test suite passes (nextflow run . -profile test,docker --outdir <OUTDIR>).
  • Usage Documentation in docs/usage.md is updated.
  • Output Documentation in docs/output.md is updated.
  • CHANGELOG.md is updated.
  • README.md is updated (including new tool citations and authors/contributors).

@sgsutcliffe
Copy link
Collaborator Author

The first change I made was to change the input column contigs to fastq_1 for the assembled genome that is input for staramr. This will break some nf-tests that point to an input file from dev branch but this will allow the IRIDA-Next UI to autopopulate the genome with whatever genome was uploaded.

…q_1' to work with IRIDA-Next UI"

This reverts commit 7f4ddab.
@sgsutcliffe
Copy link
Collaborator Author

Changing contigs to fastq_1 worked but wasn't the right solution. See IRIDA Next Nextflow Pipeline Documentation, rather than using a fastq_1 file type I should create one for contigs

@sgsutcliffe
Copy link
Collaborator Author

The CLI arguments added to match the Galaxy staramr UI

@sgsutcliffe sgsutcliffe requested a review from apetkau July 10, 2024 13:48
Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great Steven. Thanks so much 😄 . I have a few comments below.

I am also wondering if you could add some additional test cases where you adjust some of the parameters and then verify they were properly used in the staramr command. The output file settings.txt contains a copy of the full command-line string for staramr, so verifying that adjusted parameters for staramr could be done in test cases by reading this file and checking if the first line (the staramr command line) contains a string like e.g., --genome-size-lower-bound 4000000).

Example settings.txt:

command_line = staramr search --pointfinder-organism salmonella --genome-size-lower-bound 4000000 file.fasta

nextflow.config Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great. Thanks so much @sgsutcliffe 😄 . I have a few additional comments for you.

tests/main.nf.test Show resolved Hide resolved
nextflow_schema.json Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
@sgsutcliffe
Copy link
Collaborator Author

In addition to changing the MLST default name from "None" to "Automatic" I modified the function convert to be more flexible and accept species metadata from Kraken2.

nextflow.config Show resolved Hide resolved
nextflow.config Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
nextflow_schema.json Show resolved Hide resolved
nextflow_schema.json Show resolved Hide resolved
nextflow_schema.json Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
nextflow_schema.json Outdated Show resolved Hide resolved
Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much for your changes Steven. I have a few more comments for you.

@sgsutcliffe
Copy link
Collaborator Author

Removing the genomes param, is a default from nf-core template, and needs some additional files modified to allow it to be removed. See the iridanextexample

Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much for all your amazing changes Steven :). One more in-line comment I have below.

nextflow_schema.json Show resolved Hide resolved
Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks great. Thanks so much Steven 😄

Copy link

@kylacochrane kylacochrane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great Steven!

@sgsutcliffe sgsutcliffe merged commit 32adf64 into dev Jul 25, 2024
4 checks passed
@sgsutcliffe sgsutcliffe deleted the modify-parameters-iridanext-UI branch July 25, 2024 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants