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

style: enable TorchFix in pre-commit #4230

Merged
merged 3 commits into from
Oct 23, 2024
Merged

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Oct 18, 2024

Enable TorchFix.

Need to resolve the following issues before merging:

Summary by CodeRabbit

  • New Features

    • Integrated flake8 for enhanced code quality checks.
    • Added ruff-format hook for improved linting.
    • Implemented consistent license header insertion for various file types.
  • Bug Fixes

    • Updated check-added-large-files hook to enforce a maximum file size of 1024 KB.
  • Documentation

    • Updated linting configuration with new rules under [tool.flake8].

Signed-off-by: Jinzhe Zeng <[email protected]>
Signed-off-by: Jinzhe Zeng <[email protected]>
Copy link
Contributor

coderabbitai bot commented Oct 18, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes involve significant modifications to the .pre-commit-config.yaml file, where a new repository for flake8 has been added along with its hook and dependencies. The ruff hook has been updated to include a new ruff-format hook, and existing hooks have been modified to enforce file size limits and ensure consistent license header insertion across multiple file types. The overall configuration enhances linting and code quality checks.

Changes

File Change Summary
.pre-commit-config.yaml Added new repository flake8 with hook and dependencies; updated ruff hook to include ruff-format; modified check-added-large-files for size limits; added multiple insert-license hooks for various file types.

Sequence Diagram(s)

sequenceDiagram
    participant Developer
    participant Pre-Commit
    participant Flake8
    participant Ruff
    participant LicenseInserter

    Developer->>Pre-Commit: Commit code
    Pre-Commit->>Flake8: Run flake8 checks
    Flake8-->>Pre-Commit: Return linting results
    Pre-Commit->>Ruff: Run ruff checks
    Ruff-->>Pre-Commit: Return ruff results
    Pre-Commit->>LicenseInserter: Insert license headers
    LicenseInserter-->>Pre-Commit: Confirm license insertion
    Pre-Commit-->>Developer: Provide results
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 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

🧹 Outside diff range and nitpick comments (2)
.pre-commit-config.yaml (2)

41-48: LGTM: Excellent addition of flake8 with TorchFix

The inclusion of flake8 with TorchFix is a great improvement:

  1. It directly addresses the PR objective of enabling TorchFix.
  2. The use of flake8-pyproject allows for centralized configuration in pyproject.toml.
  3. Pinning the version (7.1.1) ensures reproducibility.

Consider adding a comment explaining the purpose of each additional dependency, especially torchfix, to improve maintainability:

additional_dependencies:
  - torchfix==0.6.0  # Assists with PyTorch-related code fixes
  - flake8-pyproject==1.2.3  # Allows flake8 configuration in pyproject.toml

Line range hint 37-40: LGTM: Good addition of ruff-format

The inclusion of the ruff-format hook is a valuable addition:

  1. It enhances code formatting consistency across the project.
  2. The exclusion of 3rdparty files prevents modifying external code.
  3. Supporting multiple file types ensures comprehensive coverage.

For consistency with the ruff hook above, consider moving the types_or specification to the ruff-format hook:

- id: ruff-format
  exclude: ^source/3rdparty
  types_or: [python, pyi, jupyter]

This makes the configuration for both hooks more parallel and easier to maintain.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between cc4b23d and b096290.

📒 Files selected for processing (2)
  • .pre-commit-config.yaml (1 hunks)
  • pyproject.toml (1 hunks)
🧰 Additional context used
🔇 Additional comments (4)
.pre-commit-config.yaml (2)

Line range hint 9-15: LGTM: Improved file size limit enforcement

The changes to the check-added-large-files hook are beneficial:

  1. Setting a 1024 KB limit helps maintain a manageable repository size.
  2. The exclusion of specific .pbtxt files allows for necessary exceptions.

This update aligns well with best practices for repository management.


Line range hint 1-180: Overall assessment: Excellent improvements to pre-commit configuration

The changes to .pre-commit-config.yaml significantly enhance the project's code quality checks:

  1. The addition of flake8 with TorchFix directly addresses the PR's main objective.
  2. The inclusion of ruff-format improves code formatting consistency.
  3. Updates to existing hooks, like check-added-large-files, improve repository management.

These changes collectively contribute to better code quality, consistency, and maintainability. The configuration is well-structured and aligns with best practices for pre-commit hook setup.

pyproject.toml (2)

Line range hint 1-428: Changes align well with PR objectives

The addition of the [tool.flake8] section with TorchFix rules (TOR0, TOR1, TOR2) directly addresses the PR objective of enabling TorchFix in pre-commit. The changes are minimal and focused, which is commendable as it reduces the risk of unintended side effects.


422-428: LGTM. Consider adding rule descriptions and verifying rule completeness.

The addition of the [tool.flake8] section with TorchFix rules aligns well with the PR objective. Good job on enabling these rules.

To improve clarity and maintainability:

  1. Consider adding comments to briefly explain what each selected rule (TOR0, TOR1, TOR2) checks for. This will help future contributors understand the purpose of these rules without needing to look them up externally.

  2. Verify if these three rules cover all the necessary TorchFix checks for your project. If there are other relevant TorchFix rules, consider including them as well.

To verify the completeness of TorchFix rules, you can run:

Compare the output with the rules currently selected in the configuration.

Copy link

codecov bot commented Oct 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.57%. Comparing base (911f41b) to head (b7f86c9).
Report is 6 commits behind head on devel.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #4230      +/-   ##
==========================================
- Coverage   84.58%   84.57%   -0.01%     
==========================================
  Files         547      547              
  Lines       51327    51327              
  Branches     3047     3047              
==========================================
- Hits        43413    43410       -3     
  Misses       6967     6967              
- Partials      947      950       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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: 1

🧹 Outside diff range and nitpick comments (1)
.pre-commit-config.yaml (1)

46-48: Pin the flake8-pyproject version more strictly.

The dependency flake8-pyproject==1.2.3 is pinned, but consider using ~=1.2.3 to allow patch updates while preventing breaking changes.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between b096290 and b7f86c9.

📒 Files selected for processing (1)
  • .pre-commit-config.yaml (1 hunks)
🧰 Additional context used
🔇 Additional comments (1)
.pre-commit-config.yaml (1)

41-48: Verify compatibility with ruff.

Since both ruff and flake8+torchfix are enabled, ensure they don't conflict:

  1. Ruff already includes many flake8 rules
  2. Consider using ruff's PyTorch-specific rules instead, if available

Let's check ruff's configuration:

.pre-commit-config.yaml Show resolved Hide resolved
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Oct 23, 2024
Merged via the queue into deepmodeling:devel with commit 0fa1b43 Oct 23, 2024
60 checks passed
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.

3 participants