Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fa9db01
Merge pull request #497 from nf-core/dev
jfy133 Oct 4, 2025
5a2afa6
Integrating gecco_convert into funcscan
SkyLexS Nov 2, 2025
0012b8a
Rearranging the code
SkyLexS Nov 2, 2025
518a7a1
fixing
SkyLexS Nov 2, 2025
f636670
fixing typos
SkyLexS Nov 2, 2025
0fd918f
fixing some error
SkyLexS Nov 3, 2025
a1bcca7
polishing the integration
SkyLexS Nov 4, 2025
8e4f163
fixing warnings
SkyLexS Nov 4, 2025
f5ff043
Merge branch 'nf-core:master' into gecco_convert_dis
SkyLexS Nov 11, 2025
686b2ff
Update for the schema and the function calling
SkyLexS Nov 11, 2025
ed55447
updated output.md
SkyLexS Nov 17, 2025
242592d
added tests
SkyLexS Nov 18, 2025
a5d0119
fixed allOf section for gecco convert
SkyLexS Nov 19, 2025
ecfdfd3
redid the output to include gecco convert
SkyLexS Nov 23, 2025
81b1160
updated changelog.md and readme.md
SkyLexS Nov 25, 2025
43a2964
implemented the changes
SkyLexS Nov 25, 2025
2e62888
removing the unwanted code in the modules config
SkyLexS Nov 25, 2025
c9244b7
fixing lint
SkyLexS Nov 25, 2025
000326b
removed unwanted comment
SkyLexS Dec 1, 2025
d6a9dcb
Implemented schema modification
SkyLexS Dec 4, 2025
8104d87
Linting
SkyLexS Dec 4, 2025
ecd72c7
updated test configs
SkyLexS Dec 8, 2025
fb9a4ff
Linting
SkyLexS Dec 8, 2025
df1e3ac
Update docs/output.md
jfy133 Dec 17, 2025
a9a561a
Fix convert format options to match gecco itself, add validation chec…
jfy133 Dec 17, 2025
47a9254
Update tests
jfy133 Dec 17, 2025
e789973
Merge branch 'gecco_convert_dis' of github.com:SkyLexS/funcscan into …
jfy133 Dec 17, 2025
1ec8cee
Update BAKTA test with final test profile
jfy133 Dec 17, 2025
a06d281
Merge branch 'dev' into gecco_convert_dis
jfy133 Dec 18, 2025
de6c87a
Update conf/modules.config
jfy133 Dec 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,14 @@ process {
].join(' ').trim()
}

withName: GECCO_CONVERT {
publishDir = [
path: { "${params.outdir}/bgc/gecco/${meta.id}" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename },
]
}

withName: HAMRONIZATION_ABRICATE {
publishDir = [
path: { "${params.outdir}/arg/hamronization/abricate" },
Expand Down
7 changes: 7 additions & 0 deletions modules/nf-core/gecco/convert/environment.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 56 additions & 0 deletions modules/nf-core/gecco/convert/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

117 changes: 117 additions & 0 deletions modules/nf-core/gecco/convert/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ params {
bgc_gecco_pfilter = 1E-9
bgc_gecco_edgedistance = 0
bgc_gecco_mask = false
run_gecco_convert = false
gecco_convert_mode = 'clusters'
gecco_convert_format = 'gff'
Copy link
Member

Choose a reason for hiding this comment

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

todo

Suggested change
run_gecco_convert = false
gecco_convert_mode = 'clusters'
gecco_convert_format = 'gff'
bgc_gecco_runconvert = false
bgc_gecco_convertmode = 'clusters'
bgc_gecco_convertformat = 'gff'

For consistency with the rest of the parameter system.

Make sure to update the parameters throughout the code base too


bgc_run_hmmsearch = false
bgc_hmmsearch_models = null
Expand All @@ -258,7 +261,7 @@ params {
bgc_hmmsearch_savedomains = false

// Schema validation default options
validate_params = true
validate_params = true
}

// Load base.config by default for all pipelines
Expand Down
31 changes: 31 additions & 0 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,34 @@
},
"fa_icon": "fas fa-angle-double-right"
},

"gecco_options": {
"title": "GECCO biosynthetic gene cluster prediction options",
"type": "object",
"description": "Parameters for running GECCO BGC prediction",
"default": "",
"properties": {
"run_gecco_convert": {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"run_gecco_convert": {
"bgc_gecco_runconvert": {

"type": "boolean",
"default": false,
"description": "Enable conversion of contig FASTA files to GECCO-compatible format.",
"help_text": "GECCO requires contig FASTA files to be in a specific format. Enabling this option will convert the input FASTA files to the required format before running GECCO.\n\n> Modifies tool parameter(s):\n> - gecco convert: `--enable`"
Copy link
Member

Choose a reason for hiding this comment

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

suggestion(blocking)
Unless I misunderstand #450 , this phrasing is confusing to me.

I thought (and the code says) you run GECCO_CONVERT after GECCO_RUN to convert the files to other formats for downstream processes, not to convert input files into one that GECCO accepts.

Could you please reprhase or re-explain to me the purposes of the GECCO_CONVERT module (I'm not that familiar1)

},
"gecco_convert_mode": {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"gecco_convert_mode": {
"bgc_gecco_convertmode": {

"type": "string",
"default": "clusters",
"description": "Mode for converting contig FASTA files for GECCO.",
"help_text": "Select the mode for converting contig FASTA files. 'default' uses standard conversion settings, while 'custom' allows for user-defined parameters.\n\n> Modifies tool parameter(s):\n> - gecco convert: `--mode`"
Copy link
Member

Choose a reason for hiding this comment

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

suggestion(if-minor)

If there are different options, please use the pipe-separated list to indicate this (in the nf-core pipelines schema build interface, if you press the gear next to the parameter entry you should see the box to enter it in.

Copy link
Member

Choose a reason for hiding this comment

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

What does custom mean here though - where does a user specify the additional paramaeters?

},
"gecco_convert_format": {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"gecco_convert_format": {
"bgc_gecco_convertformat": {

"type": "string",
"default": "gff",
"description": "Output format for converted contig files.",
"help_text": "Specify the output format for the converted contig files. Options include 'fasta' and 'genbank'.\n\n> Modifies tool parameter(s):\n> - gecco convert: `--format`"
}
},
"fa_icon": "fas fa-angle-double-right"
},
"bgc_hmmsearch": {
"title": "BGC: hmmsearch",
"type": "object",
Expand Down Expand Up @@ -1703,6 +1731,9 @@
{
"$ref": "#/$defs/bgc_gecco"
},
{
"$ref": "#/$defs/gecco_options"
},
{
"$ref": "#/$defs/bgc_hmmsearch"
},
Expand Down
13 changes: 13 additions & 0 deletions subworkflows/local/bgc.nf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ include { DEEPBGC_PIPELINE } from '../../modules/nf-core/d
include { COMBGC } from '../../modules/local/combgc'
include { TABIX_BGZIP as BGC_TABIX_BGZIP } from '../../modules/nf-core/tabix/bgzip/main'
include { MERGE_TAXONOMY_COMBGC } from '../../modules/local/merge_taxonomy_combgc'
include { GECCO_CONVERT } from '../../modules/nf-core/gecco/convert/main'

workflow BGC {
take:
Expand Down Expand Up @@ -104,6 +105,18 @@ workflow BGC {
ch_bgcresults_for_combgc = ch_bgcresults_for_combgc.mix(ch_geccoresults_for_combgc)
}

// GECCO CONVERT
if (params.run_gecco_convert) {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if (params.run_gecco_convert) {
if (params.bgc_gecco_runconvert) {

ch_gecco_clusters_and_gbk = GECCO_RUN.out.clusters
.join(GECCO_RUN.out.gbk)
.map { meta, clusters_file, gbk_file ->
[ meta, clusters_file, gbk_file ]
}
ch_gecco_mode = Channel.value( params.gecco_convert_mode)
ch_gecco_format = Channel.value( params.gecco_convert_format)

GECCO_CONVERT(ch_gecco_clusters_and_gbk, ch_gecco_mode, ch_gecco_format)
}
// HMMSEARCH
if (params.bgc_run_hmmsearch) {
if (params.bgc_hmmsearch_models) {
Expand Down
Loading