Skip to content

fix: ensure that exceptions print storage queries instead of local copies of remote files#3258

Merged
johanneskoester merged 1 commit intomainfrom
fix/ambiguous-rule-exception-printing
Jan 23, 2025
Merged

fix: ensure that exceptions print storage queries instead of local copies of remote files#3258
johanneskoester merged 1 commit intomainfrom
fix/ambiguous-rule-exception-printing

Conversation

@johanneskoester
Copy link
Copy Markdown
Contributor

@johanneskoester johanneskoester commented Jan 21, 2025

QC

  • The PR contains a test case for the changes or the changes are already covered by an existing test case.
  • The documentation (docs/) is updated to reflect the changes or this is not necessary (e.g. if the change does neither modify the language nor the behavior or functionalities of Snakemake).

Summary by CodeRabbit

  • Bug Fixes

    • Improved error message formatting for ambiguous rules, missing rules, and incomplete files
    • Enhanced handling of file paths in error reporting
  • Refactor

    • Updated pretty_print_iofile function to support more flexible input types
    • Added property management for AnnotatedString class flags

These changes improve the clarity and robustness of error messaging and internal type handling in the Snakemake library.

@sonarqubecloud
Copy link
Copy Markdown

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Jan 21, 2025

📝 Walkthrough

Walkthrough

The pull request introduces modifications to error handling and file path representation in the Snakemake library. The changes focus on enhancing the formatting and clarity of error messages in snakemake/exceptions.py by incorporating a new pretty_print_iofile utility function. Simultaneously, the snakemake/io.py file is updated to improve the flexibility of the pretty_print_iofile function and add a new flags property to the AnnotatedString class.

Changes

File Changes
snakemake/exceptions.py - Added import of pretty_print_iofile from snakemake.io
- Updated AmbiguousRuleException to use pretty_print_iofile(filename) in error message
- Updated MissingRuleException to use pretty_print_iofile(file) in error message
- Updated IncompleteFilesException to use map(pretty_print_iofile, files)
snakemake/io.py - Modified pretty_print_iofile to accept Union[_IOFile, str]
- Added type checking with isinstance(iofile, _IOFile)
- Added flags property getter and setter to AnnotatedString class

Sequence Diagram

sequenceDiagram
    participant Exceptions
    participant IO
    participant PrettyPrint
    
    Exceptions->>IO: Import pretty_print_iofile
    IO->>PrettyPrint: Create utility function
    PrettyPrint-->>IO: Return formatted file path
    IO-->>Exceptions: Provide formatted error messages
Loading

The sequence diagram illustrates how the pretty_print_iofile function is imported and used across different components to standardize file path formatting in error messages.


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 7a75043 and 8c13014.

📒 Files selected for processing (2)
  • snakemake/exceptions.py (3 hunks)
  • snakemake/io.py (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
snakemake/exceptions.py (1)

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.

snakemake/io.py (1)

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.

⏰ Context from checks skipped due to timeout of 90000ms (30)
  • GitHub Check: testing (10, 3.12)
  • GitHub Check: testing (10, 3.11)
  • GitHub Check: testing (9, 3.12)
  • GitHub Check: testing (9, 3.11)
  • GitHub Check: testing (8, 3.12)
  • GitHub Check: testing (8, 3.11)
  • GitHub Check: testing (7, 3.12)
  • GitHub Check: testing (7, 3.11)
  • GitHub Check: testing (6, 3.12)
  • GitHub Check: testing (6, 3.11)
  • GitHub Check: testing (5, 3.12)
  • GitHub Check: testing-windows (10)
  • GitHub Check: testing (5, 3.11)
  • GitHub Check: testing-windows (9)
  • GitHub Check: testing (4, 3.12)
  • GitHub Check: testing-windows (8)
  • GitHub Check: testing (4, 3.11)
  • GitHub Check: testing-windows (7)
  • GitHub Check: testing (3, 3.12)
  • GitHub Check: testing-windows (6)
  • GitHub Check: testing (3, 3.11)
  • GitHub Check: testing-windows (5)
  • GitHub Check: testing (2, 3.12)
  • GitHub Check: testing-windows (4)
  • GitHub Check: testing (2, 3.11)
  • GitHub Check: testing-windows (3)
  • GitHub Check: testing (1, 3.12)
  • GitHub Check: testing-windows (2)
  • GitHub Check: testing (1, 3.11)
  • GitHub Check: testing-windows (1)
🔇 Additional comments (4)
snakemake/exceptions.py (3)

357-359: LGTM: Import and usage of pretty_print_iofile is correct.

The change ensures that storage queries are properly displayed in ambiguous rule error messages.


396-400: LGTM: Import and usage of pretty_print_iofile improves error message clarity.

The change ensures that storage queries are properly displayed in missing rule error messages, with improved message formatting.


423-433: LGTM: Import and usage of pretty_print_iofile for file list formatting.

The change ensures that storage queries are properly displayed in incomplete files error messages.

snakemake/io.py (1)

881-885: LGTM: Function signature and implementation are well-designed.

The updated pretty_print_iofile function correctly handles both storage and non-storage cases, with proper type hints and clear logic.

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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.

@johanneskoester johanneskoester merged commit e5d8ec1 into main Jan 23, 2025
@johanneskoester johanneskoester deleted the fix/ambiguous-rule-exception-printing branch January 23, 2025 12:39
johanneskoester pushed a commit that referenced this pull request Feb 12, 2025
🤖 I have created a release *beep* *boop*
---


##
[8.28.0](v8.27.1...v8.28.0)
(2025-02-12)


### Features

* do not fail if --cache is active but no SNAKEMAKE_OUTPUT_CACHE env var
is defined. Instead, print a warning that explains the options.
([#3270](#3270))
([9610f7c](9610f7c))


### Bug Fixes

* do not use outdated metadata for rerun triggers (only warn about it)
([#3259](#3259))
([d766a48](d766a48))
* ensure that exceptions print storage queries instead of local copies
of remote files
([#3258](#3258))
([e5d8ec1](e5d8ec1))
* fix error message of evaluate helper function
([#3282](#3282))
([9483a64](9483a64))
* Revert cleaning of env vars in apptainer
([#3285](#3285))
([e79a51b](e79a51b))


### Performance Improvements

* compare checksums of input files &lt;= 1MB (before (10KB)
([#3267](#3267))
([ba017bb](ba017bb))
* query updated input files in parallel
([#3266](#3266))
([bc4fcee](bc4fcee))


### Documentation

* Adds instructions for using syntax highlighting with lazy.nvim
([#3246](#3246))
([7a75043](7a75043))
* Fix typos in basic API example
([#3277](#3277))
([8782219](8782219))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
kjohnsen pushed a commit to kjohnsen/snakemake that referenced this pull request Dec 15, 2025
…pies of remote files (snakemake#3258)

<!--Add a description of your PR here-->

### QC
<!-- Make sure that you can tick the boxes below. -->

* [x] The PR contains a test case for the changes or the changes are
already covered by an existing test case.
* [x] The documentation (`docs/`) is updated to reflect the changes or
this is not necessary (e.g. if the change does neither modify the
language nor the behavior or functionalities of Snakemake).


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Bug Fixes**
- Improved error message formatting for ambiguous rules, missing rules,
and incomplete files
	- Enhanced handling of file paths in error reporting

- **Refactor**
- Updated `pretty_print_iofile` function to support more flexible input
types
	- Added property management for `AnnotatedString` class flags

These changes improve the clarity and robustness of error messaging and
internal type handling in the Snakemake library.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
kjohnsen pushed a commit to kjohnsen/snakemake that referenced this pull request Dec 15, 2025
🤖 I have created a release *beep* *boop*
---


##
[8.28.0](snakemake/snakemake@v8.27.1...v8.28.0)
(2025-02-12)


### Features

* do not fail if --cache is active but no SNAKEMAKE_OUTPUT_CACHE env var
is defined. Instead, print a warning that explains the options.
([snakemake#3270](snakemake#3270))
([9610f7c](snakemake@9610f7c))


### Bug Fixes

* do not use outdated metadata for rerun triggers (only warn about it)
([snakemake#3259](snakemake#3259))
([d766a48](snakemake@d766a48))
* ensure that exceptions print storage queries instead of local copies
of remote files
([snakemake#3258](snakemake#3258))
([e5d8ec1](snakemake@e5d8ec1))
* fix error message of evaluate helper function
([snakemake#3282](snakemake#3282))
([9483a64](snakemake@9483a64))
* Revert cleaning of env vars in apptainer
([snakemake#3285](snakemake#3285))
([e79a51b](snakemake@e79a51b))


### Performance Improvements

* compare checksums of input files &lt;= 1MB (before (10KB)
([snakemake#3267](snakemake#3267))
([ba017bb](snakemake@ba017bb))
* query updated input files in parallel
([snakemake#3266](snakemake#3266))
([bc4fcee](snakemake@bc4fcee))


### Documentation

* Adds instructions for using syntax highlighting with lazy.nvim
([snakemake#3246](snakemake#3246))
([7a75043](snakemake@7a75043))
* Fix typos in basic API example
([snakemake#3277](snakemake#3277))
([8782219](snakemake@8782219))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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.

1 participant