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

feat: ensembl reference collections #2977

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

mauripops
Copy link

@mauripops mauripops commented Jun 3, 2024

feat: collections optional reference parameter(i.e. bacterial references)

This PR builds on the recently pushed (#2928) where branches and specific url can be defined as parameters. The previous method was unable to find data from bacteria ensembl due to data in it containing one more folder level. There is also a fix for the spec variable in in ensembl-sequence where the release version would not match for branches other than the default.

QC

  • I confirm that:

For all wrappers added by this PR,

  • there is a test case which covers any introduced changes,
  • input: and output: file paths in the resulting rule can be changed arbitrarily,
  • either the wrapper can only use a single core, or the example rule contains a threads: x statement with x being a reasonable default,
  • rule names in the test case are in snake_case and somehow tell what the rule is about or match the tools purpose or name (e.g., map_reads for a step that maps reads),
  • all environment.yaml specifications follow the respective best practices,
  • the environment.yaml pinning has been updated by running snakedeploy pin-conda-envs environment.yaml on a linux machine,
  • wherever possible, command line arguments are inferred and set automatically (e.g. based on file extensions in input: or output:),
  • all fields of the example rules in the Snakefiles and their entries are explained via comments (input:/output:/params: etc.),
  • stderr and/or stdout are logged correctly (log:), depending on the wrapped tool,
  • temporary files are either written to a unique hidden folder in the working directory, or (better) stored where the Python function tempfile.gettempdir() points to (see here; this also means that using any Python tempfile default behavior works),
  • the meta.yaml contains a link to the documentation of the respective tool or command,
  • Snakefiles pass the linting (snakemake --lint),
  • Snakefiles are formatted with snakefmt,
  • Python wrapper scripts are formatted with black.
  • Conda environments use a minimal amount of channels, in recommended ordering. E.g. for bioconda, use (conda-forge, bioconda, nodefaults, as conda-forge should have highest priority and defaults channels are usually not needed because most packages are in conda-forge nowadays).

Summary by CodeRabbit

Release Notes

  • New Features

    • Added optional branch and collection parameters for Ensembl annotation and sequence downloads
    • Introduced new rules for retrieving off-branch annotations and genome sequences
    • Enhanced configuration flexibility for FTP server data retrieval
  • Improvements

    • Updated logging paths for genome and annotation retrieval rules
    • Improved URL construction to support custom collections and branches
  • Testing

    • Added new test cases for off-branch annotation and sequence retrieval

@fgvieira fgvieira changed the title Ensembl reference collections feat: ensembl reference collections Jun 3, 2024
Copy link
Contributor

github-actions bot commented Jan 1, 2025

This PR was marked as stale because it has been open for 6 months with no activity.

@github-actions github-actions bot added the Stale label Jan 1, 2025
Copy link
Contributor

coderabbitai bot commented Jan 1, 2025

📝 Walkthrough

Walkthrough

The pull request introduces enhanced configurability for Ensembl annotation and sequence retrieval processes. The changes add two new optional parameters, branch and collection, to the configuration files for both annotation and sequence entities. These modifications allow users to specify different branches and collections when downloading data from ENSEMBL FTP servers. The implementation includes updates to metadata files, Snakefiles, wrapper scripts, and test cases to support these new parameters, providing more flexibility in retrieving genomic data from specific branches and collections.

Changes

File Change Summary
bio/reference/ensembl-annotation/meta.yaml Added optional branch and collection parameters with example values
bio/reference/ensembl-annotation/test/Snakefile Added get_off_branch_annotation rule, updated log path for get_annotation_gz rule
bio/reference/ensembl-annotation/wrapper.py Added collection variable to modify URL construction
bio/reference/ensembl-sequence/meta.yaml Added optional branch and collection parameters with example values
bio/reference/ensembl-sequence/test/Snakefile Added get_off_branch_genome rule, updated log paths for chromosome retrieval rules
bio/reference/ensembl-sequence/wrapper.py Added collection variable to modify URL construction
test.py Added two new test functions: test_ensembl_sequence_off_branch and test_ensembl_off_branch_annotation_gtf

Sequence Diagram

sequenceDiagram
    participant User
    participant Snakefile
    participant Wrapper
    participant ENSEMBL FTP

    User->>Snakefile: Specify branch and collection
    Snakefile->>Wrapper: Pass branch and collection parameters
    Wrapper->>ENSEMBL FTP: Construct URL with branch/collection
    ENSEMBL FTP-->>Wrapper: Return requested data
    Wrapper->>User: Download and save data
Loading

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (4)
bio/reference/ensembl-sequence/meta.yaml (2)

9-10: LGTM! Consider enhancing parameter documentation.

The new parameters align well with the PR objectives for supporting bacterial references. The examples are clear and helpful.

Consider adding more context about when these parameters should be used, particularly for bacterial references. For example:

-  - branch: branch of ftp server to download cache data if required (optional; e.g. "plants")
-  - collection: collection of ftp server to download cache data if required (optional; e.g. "bacteria_0_collection")
+  - branch: branch of ftp server to download cache data if required (optional; e.g. "plants"). Required for non-default Ensembl divisions.
+  - collection: collection of ftp server to download cache data if required (optional; e.g. "bacteria_0_collection"). Required for bacterial references due to additional folder structure.
🧰 Tools
🪛 yamllint (1.35.1)

[error] 10-10: no new line character at the end of file

(new-line-at-end-of-file)


10-10: Add newline at end of file.

The YAML file is missing a newline character at the end, which is a YAML best practice.

   - collection: collection of ftp server to download cache data if required (optional; e.g. "bacteria_0_collection")
+
🧰 Tools
🪛 yamllint (1.35.1)

[error] 10-10: no new line character at the end of file

(new-line-at-end-of-file)

bio/reference/ensembl-annotation/meta.yaml (2)

9-10: LGTM! Parameters are consistent with ensembl-sequence.

The parameters match those in the ensembl-sequence configuration, maintaining consistency across the codebase.

Consider applying the same documentation improvements suggested for the ensembl-sequence configuration to maintain consistency.

🧰 Tools
🪛 yamllint (1.35.1)

[error] 10-10: no new line character at the end of file

(new-line-at-end-of-file)


10-10: Add newline at end of file.

The YAML file is missing a newline character at the end, which is a YAML best practice.

   - collection: collection of ftp server to download cache data if required (optional; e.g. "bacteria_0_collection")
+
🧰 Tools
🪛 yamllint (1.35.1)

[error] 10-10: no new line character at the end of file

(new-line-at-end-of-file)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9ef3b31 and 47ae26f.

📒 Files selected for processing (7)
  • bio/reference/ensembl-annotation/meta.yaml (1 hunks)
  • bio/reference/ensembl-annotation/test/Snakefile (1 hunks)
  • bio/reference/ensembl-annotation/wrapper.py (2 hunks)
  • bio/reference/ensembl-sequence/meta.yaml (1 hunks)
  • bio/reference/ensembl-sequence/test/Snakefile (2 hunks)
  • bio/reference/ensembl-sequence/wrapper.py (2 hunks)
  • test.py (2 hunks)
✅ Files skipped from review due to trivial changes (1)
  • test.py
🧰 Additional context used
📓 Path-based instructions (2)
bio/reference/ensembl-sequence/wrapper.py (2)

Pattern **/*.py: Do not try to improve formatting.
Do not suggest type annotations for functions that are defined inside of functions or methods.
Do not suggest type annotation of the self argument of methods.
Do not suggest type annotation of the cls argument of classmethods.
Do not suggest return type annotation if a function or method does not contain a return statement.


Pattern **/wrapper.py: Do not complain about use of undefined variable called snakemake.

bio/reference/ensembl-annotation/wrapper.py (2)

Pattern **/*.py: Do not try to improve formatting.
Do not suggest type annotations for functions that are defined inside of functions or methods.
Do not suggest type annotation of the self argument of methods.
Do not suggest type annotation of the cls argument of classmethods.
Do not suggest return type annotation if a function or method does not contain a return statement.


Pattern **/wrapper.py: Do not complain about use of undefined variable called snakemake.

🪛 Ruff (0.8.2)
bio/reference/ensembl-sequence/wrapper.py

22-22: SyntaxError: Expected an identifier

bio/reference/ensembl-annotation/wrapper.py

34-34: SyntaxError: Expected an identifier

🪛 yamllint (1.35.1)
bio/reference/ensembl-annotation/meta.yaml

[error] 10-10: no new line character at the end of file

(new-line-at-end-of-file)

bio/reference/ensembl-sequence/meta.yaml

[error] 10-10: no new line character at the end of file

(new-line-at-end-of-file)

🔇 Additional comments (9)
bio/reference/ensembl-annotation/test/Snakefile (2)

25-28: Confirmed log path update and wrapper usage.

The new log file name "logs/get_annotation_gz.log" and other changes align with the updated rule. Good clarity and separation of logs.


31-42: Validate new rule integration and parameters.

The new get_off_branch_annotation rule nicely showcases how to configure an alternate branch and collection. Please confirm that your tests cover all possible parameter combinations (e.g., missing branch, missing collection, and so on).

bio/reference/ensembl-annotation/wrapper.py (2)

55-55: URL construction appears correct.

Including collection neatly. No further issues are apparent.


34-36: ⚠️ Potential issue

Fix syntax error in snakemake.params.get("collection". "").

Replace the period . with a comma , to correctly specify the default value.

-collection = snakemake.params.get("collection". "")
+collection = snakemake.params.get("collection", "")

Likely invalid or redundant comment.

🧰 Tools
🪛 Ruff (0.8.2)

34-34: SyntaxError: Expected an identifier

bio/reference/ensembl-sequence/test/Snakefile (3)

26-26: Separate logs for single chromosome retrieval.

Using "logs/get_single_genome.log" provides clarity in debugging.


41-44: Improved log naming for multiple chromosome retrieval.

Renaming to "logs/get_multiple_chromosome.log" clarifies scope.


47-59: New off-branch genome rule is well-structured.

The parameters appear consistent with the annotation rules, promoting symmetry across usage. Consider testing additional branches, if feasible.

bio/reference/ensembl-sequence/wrapper.py (2)

60-60: URL prefix includes collection correctly.

The logic for url_prefix accounts for the new collection parameter. Looks good.


22-24: ⚠️ Potential issue

Syntax error in params.get("collection". "").

Change the period to a comma to avoid the parse error.

-collection = snakemake.params.get("collection". "")
+collection = snakemake.params.get("collection", "")

Likely invalid or redundant comment.

🧰 Tools
🪛 Ruff (0.8.2)

22-22: SyntaxError: Expected an identifier

@fgvieira
Copy link
Collaborator

fgvieira commented Jan 4, 2025

Ping @mauripops

@fgvieira fgvieira removed the Stale label Jan 4, 2025
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.

2 participants