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:fallback match #572

Merged
merged 2 commits into from
Oct 18, 2024
Merged

fix:fallback match #572

merged 2 commits into from
Oct 18, 2024

Conversation

JarbasAl
Copy link
Member

@JarbasAl JarbasAl commented Oct 18, 2024

the priority levels were not being respected, everything matched under fallback_high

Summary by CodeRabbit

  • New Features

    • Improved logic for handling fallback requests, ensuring only skills within the specified priority range are acknowledged.
    • Expanded expected message flow in tests to reflect new fallback handling and timeout scenarios.
  • Bug Fixes

    • Enhanced logging for fallback handling, providing clearer insights into which skills are being considered or skipped.

the priority levels were not being respected, everything matched under fallback_high
Copy link

coderabbitai bot commented Oct 18, 2024

Walkthrough

The changes in ovos_core/intent_services/fallback_service.py focus on the handle_ack function, which now checks skill IDs against a filtered list of skills based on priority, rather than a general registered fallback list. This ensures that only skills within the specified priority range are acknowledged for fallback handling. Additionally, logging statements have been updated to reflect these changes, with adjustments made to the verbosity of the logs for better clarity.

Changes

File Path Change Summary
ovos_core/intent_services/fallback_service.py Modified handle_ack function to check skill IDs against in_range instead of self.registered_fallbacks; updated logging statements for clarity and adjusted log levels.
test/end2end/session/test_fallback.py Updated expected_messages in TestFallbackTimeout class; changed fallback version comment, added new entries for fallback levels, and adjusted message order for timeout handling.

Poem

In the meadow where skills play,
A rabbit hops, brightening the day.
With priorities set, fallbacks in line,
Skills now dance, oh how they shine!
Logs whisper softly, clear and bright,
Guiding the way, through day and night. 🐇✨


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.

@github-actions github-actions bot added the fix label Oct 18, 2024
@JarbasAl JarbasAl requested review from goldyfruit and a team October 18, 2024 05:08
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 75.44%. Comparing base (23f0bab) to head (f84920a).
Report is 40 commits behind head on dev.

Files with missing lines Patch % Lines
ovos_core/intent_services/fallback_service.py 80.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #572      +/-   ##
==========================================
+ Coverage   75.33%   75.44%   +0.10%     
==========================================
  Files          15       15              
  Lines        3094     1572    -1522     
==========================================
- Hits         2331     1186    -1145     
+ Misses        763      386     -377     
Flag Coverage Δ
end2end 55.78% <80.00%> (?)
unittests 52.86% <0.00%> (-22.48%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ 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 18, 2024
Copy link

@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 (1)
ovos_core/intent_services/fallback_service.py (1)

101-107: Approved: Improved fallback handling logic and logging

The changes effectively address the PR objective of respecting priority levels in the matching process. The new condition if skill_id in in_range: ensures that only skills within the specified priority range are considered for fallback handling.

The updated logging provides better insights into the fallback handling process:

  1. Info log for skills in range that will try to handle fallback.
  2. Debug log for skills out of range that are being skipped.
  3. Debug log (previously info) for skills that don't want to handle fallback.

These changes improve both the control flow and the verbosity of logs.

Consider adding a constant for the log level of the "does NOT WANT to try to handle fallback" message. This would make it easier to adjust the verbosity in the future if needed:

NOT_HANDLING_LOG_LEVEL = logging.DEBUG

# ...

LOG.log(NOT_HANDLING_LOG_LEVEL, f"{skill_id} does NOT WANT to try to handle fallback")
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between a26b7b7 and e19cb07.

📒 Files selected for processing (1)
  • ovos_core/intent_services/fallback_service.py (1 hunks)
🧰 Additional context used

@github-actions github-actions bot added fix and removed fix labels Oct 18, 2024
Copy link

@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 (1)
test/end2end/session/test_fallback.py (1)

Line range hint 352-368: LGTM! The changes align well with the PR objectives.

The modifications to the expected_messages list accurately reflect the new fallback behavior, including different priority levels (High and Medium) and timeout handling. This aligns with the PR's goal of ensuring that the matching process adheres to defined priority levels.

Consider adding a brief comment explaining the purpose of the ovos.skills.fallback.force_timeout message for better clarity. For example:

"ovos.skills.fallback.force_timeout",  # Simulates a timeout from the core for testing purposes
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between e19cb07 and f84920a.

📒 Files selected for processing (2)
  • ovos_core/intent_services/fallback_service.py (1 hunks)
  • test/end2end/session/test_fallback.py (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • ovos_core/intent_services/fallback_service.py
🧰 Additional context used

@JarbasAl JarbasAl merged commit 27d891e into dev Oct 18, 2024
7 checks passed
@JarbasAl JarbasAl deleted the fix/fallback branch October 18, 2024 05:55
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