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

fix:handle misc files and folder names mixed with lang folder #246

Merged
merged 1 commit into from
Oct 12, 2024

Conversation

JarbasAl
Copy link
Member

@JarbasAl JarbasAl commented Oct 12, 2024

if the resouces dir contained files or folder that aren't valid lang codes the score calculation would throw an exception

introduced in #241

Summary by CodeRabbit

  • Bug Fixes

    • Improved error handling in language directory location functionality to prevent runtime errors from invalid folder names.
  • New Features

    • Added deprecation log for the resolve_resource_file method to inform users of its new location in ovos_utils.file_utils.
  • Documentation

    • Updated method signatures for clarity without changing parameters.

if the resouces dir contained files or folder that aren't valid lang codes the score calculation would throw an exception
@github-actions github-actions bot added the fix label Oct 12, 2024
Copy link
Contributor

coderabbitai bot commented Oct 12, 2024

Walkthrough

The changes in this pull request primarily focus on enhancing the locate_lang_directories function within the ovos_workshop/resource_files.py file. Key modifications include improved error handling to check if folders are valid directories before calculating tag_distance, thus preventing runtime errors. The resolve_resource_file method now logs a deprecation message to inform users of its relocation to ovos_utils.file_utils, while maintaining backward compatibility. The core functionality of returning the closest language directories remains unchanged.

Changes

File Path Change Summary
ovos_workshop/resource_files.py - Modified locate_lang_directories for better error handling and control flow.
- Added deprecation log to resolve_resource_file method indicating its new location.

Possibly related PRs

  • fix:langcodes #241: The changes in this PR also modify the locate_lang_directories function in ovos_workshop/resource_files.py, enhancing language directory handling and incorporating the tag_distance function for improved language code comparison, which is directly related to the modifications made in the main PR.

Suggested reviewers

  • goldyfruit

Poem

🐇 In the workshop where bunnies play,
We tidy up our code today.
With checks in place, no errors to see,
Language directories flow so free!
A log to guide, a path anew,
Hopping forward, we code with you! 🌟


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

codecov bot commented Oct 12, 2024

Codecov Report

Attention: Patch coverage is 71.42857% with 2 lines in your changes missing coverage. Please review.

Project coverage is 49.15%. Comparing base (7c02206) to head (afae17a).
Report is 28 commits behind head on dev.

Files with missing lines Patch % Lines
ovos_workshop/resource_files.py 71.42% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #246      +/-   ##
==========================================
- Coverage   53.41%   49.15%   -4.27%     
==========================================
  Files          37       37              
  Lines        4362     4360       -2     
==========================================
- Hits         2330     2143     -187     
- Misses       2032     2217     +185     

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

@github-actions github-actions bot added fix and removed fix labels Oct 12, 2024
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)
ovos_workshop/resource_files.py (1)

87-97: Improved error handling for invalid language codes. LGTM!

The changes effectively address the issue of handling miscellaneous files and folder names mixed with language folders. The try-except block catches potential exceptions when calculating tag_distance, allowing the function to continue processing valid language codes.

Consider adding a debug log message when an invalid language code is encountered to help with troubleshooting:

 try:
     score = tag_distance(lang, folder.name)
 except:  # not a valid language code
+    LOG.debug(f"Skipping invalid language code: {folder.name}")
     continue
🧰 Tools
🪛 Ruff

90-90: Do not use bare except

(E722)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between fbb3cc2 and afae17a.

📒 Files selected for processing (1)
  • ovos_workshop/resource_files.py (1 hunks)
🧰 Additional context used
🪛 Ruff
ovos_workshop/resource_files.py

90-90: Do not use bare except

(E722)

🔇 Additional comments (1)
ovos_workshop/resource_files.py (1)

87-97: Summary: Effective solution for handling miscellaneous files and folder names

The changes implemented in the locate_lang_directories function successfully address the issue of handling miscellaneous files and folder names mixed with language folders. By adding error handling for invalid language codes, the function now gracefully skips non-language folders without throwing exceptions.

This improvement enhances the robustness of the resource handling system, allowing it to work correctly even when the resources directory contains files or folders that are not valid language codes.

The implementation is sound and aligns well with the PR objectives. With the minor suggestions provided earlier, this change is ready to be merged.

🧰 Tools
🪛 Ruff

90-90: Do not use bare except

(E722)

@JarbasAl JarbasAl merged commit 13b6dbe into dev Oct 12, 2024
10 of 11 checks passed
@JarbasAl JarbasAl deleted the fix/langcode branch October 12, 2024 19:52
This was referenced Nov 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant