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

Adding foldseek to the workflow #185

Merged
merged 16 commits into from
Oct 8, 2024
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [[#177](https://github.com/nf-core/proteinfold/issues/177)]- Fix typo in some instances of model preset `alphafold2_ptm`.
- [[PR #178](https://github.com/nf-core/proteinfold/pull/178)] - Enable running multiple modes in parallel.
- [[#179](https://github.com/nf-core/proteinfold/issues/179)]- Produce an interactive html report for the predicted structures.
- [[#180](https://github.com/nf-core/proteinfold/issues/180)]- Implement Fooldseek.

## [[1.1.1](https://github.com/nf-core/proteinfold/releases/tag/1.1.1)] - 2025-07-30

Expand Down
5 changes: 5 additions & 0 deletions conf/dbs.config
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,9 @@ params {

// Esmfold paths
esmfold_params_path = "${params.esmfold_db}/*"

// Foldseek databases paths
foldseek_db = null
foldseek_db_path = null

}
9 changes: 9 additions & 0 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,13 @@ process {
]
}

withName: 'FOLDSEEK_EASYSEARCH' {
ext.args = { params.foldseek_easysearch_arg ? "$params.foldseek_easysearch_arg" : "--format-mode 3" }
publishDir = [
path: { "${params.outdir}/foldseek_easysearch" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
}

}
21 changes: 20 additions & 1 deletion main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ include { PIPELINE_COMPLETION } from './subworkflows/local/utils_nf
include { getColabfoldAlphafold2Params } from './subworkflows/local/utils_nfcore_proteinfold_pipeline'
include { getColabfoldAlphafold2ParamsPath } from './subworkflows/local/utils_nfcore_proteinfold_pipeline'

include { GENERATE_REPORT } from './modules/local/generate_report'
include { GENERATE_REPORT } from './modules/local/generate_report'
include { FOLDSEEK_EASYSEARCH } from './modules/nf-core/foldseek/easysearch/main'
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
COLABFOLD PARAMETER VALUES
Expand Down Expand Up @@ -206,6 +207,24 @@ workflow NFCORE_PROTEINFOLD {
)
ch_versions = ch_versions.mix(GENERATE_REPORT.out.versions)
}

if (params.foldseek_search == "easysearch"){
Copy link
Member

Choose a reason for hiding this comment

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

Are there plans to implement other foldseek modules such as multimersearch ?

ch_foldseek_db = channel.value([["id": params.foldseek_db],
file(params.foldseek_db_path,
checkIfExists: true)])

FOLDSEEK_EASYSEARCH(
ch_report_input
.map{
if (it[0].model == "esmfold")
[it[0], it[1]]
else
[it[0], it[1][0]]
},
ch_foldseek_db
)
}

emit:
multiqc_report = ch_multiqc // channel: /path/to/multiqc_report.html
versions = ch_versions // channel: [version1, version2, ...]
Expand Down
6 changes: 6 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"installed_by": ["modules"],
"patch": "modules/nf-core/aria2/aria2.diff"
},
"foldseek/easysearch": {
"branch": "master",
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
"installed_by": ["modules"],
"patch": "modules/nf-core/foldseek/easysearch/foldseek-easysearch.diff"
},
"gunzip": {
"branch": "master",
"git_sha": "5c460c5a4736974abde2843294f35307ee2b0e5e",
Expand Down
6 changes: 6 additions & 0 deletions modules/nf-core/foldseek/easysearch/environment.yml

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

42 changes: 42 additions & 0 deletions modules/nf-core/foldseek/easysearch/foldseek-easysearch.diff

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

58 changes: 58 additions & 0 deletions modules/nf-core/foldseek/easysearch/main.nf

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

58 changes: 58 additions & 0 deletions modules/nf-core/foldseek/easysearch/meta.yml

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

66 changes: 66 additions & 0 deletions modules/nf-core/foldseek/easysearch/tests/main.nf.test

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

31 changes: 31 additions & 0 deletions modules/nf-core/foldseek/easysearch/tests/main.nf.test.snap

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

3 changes: 3 additions & 0 deletions modules/nf-core/foldseek/easysearch/tests/tags.yml

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

4 changes: 4 additions & 0 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ params {
// Esmfold paths
esmfold_params_path = null

// Foldseek params
foldseek_search = null
foldseek_easysearch_arg = null

// Process skipping options
skip_multiqc = false
skip_visualisation = false
Expand Down
Loading
Loading