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

Omit slice filter for frame collection QP #5207

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

benjaminpkane
Copy link
Contributor

@benjaminpkane benjaminpkane commented Dec 3, 2024

What changes are proposed in this pull request?

Group slice information is not present in frame samples. Omit the slice filter in this case

How is this patch tested? If it is not, please explain why.

import fiftyone as fo
import fiftyone.zoo as foz


dataset = fo.Dataset("quickstart-video-group")
videos = foz.load_zoo_dataset("quickstart-video")

for video in videos:
    video["group"] = fo.Group().element("only-slice")
    dataset.add_sample(video)
Screen.Recording.2024-12-02.at.7.13.42.PM.mov

What areas of FiftyOne does this PR affect?

  • App: FiftyOne application changes
  • Build: Build and test infrastructure changes
  • Core: Core fiftyone Python library changes
  • Documentation: FiftyOne documentation changes
  • Other

@benjaminpkane benjaminpkane requested review from minhtuev, kaixi-wang and a team December 3, 2024 00:14
@benjaminpkane benjaminpkane self-assigned this Dec 3, 2024
Copy link
Contributor

coderabbitai bot commented Dec 3, 2024

Walkthrough

The changes in this pull request primarily affect the lightning_resolver function and its associated helper functions within the fiftyone/server/lightning.py file. A new variable, is_frames, has been introduced to improve the handling of frame fields in the query resolution process. This modification includes updates to function signatures and return types, allowing for more nuanced query execution based on whether fields are frame fields. The adjustments enhance the overall functionality of lightning queries.

Changes

File Path Change Summary
fiftyone/server/lightning.py - Added is_frames to tuple unpacking in lightning_resolver.
- Updated _resolve_lightning_path_queries to return is_frame_field boolean.
- Modified _do_async_pooled_queries to include is_frames in its signature and adjust query execution logic.

Poem

In the land of code where rabbits play,
New fields of light brighten the way.
With is_frames now in our grasp,
Queries dance and fields clasp.
Hopping through logic, swift and bright,
We celebrate changes, a joyful sight! 🐇✨


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between bf1d29d and b06716a.

📒 Files selected for processing (1)
  • fiftyone/server/lightning.py (7 hunks)
🔇 Additional comments (5)
fiftyone/server/lightning.py (5)

130-130: Addition of is_frames ensures correct processing of frame fields

Including is_frames in the tuple unpacking aligns with the updated return value from _resolve_lightning_path_queries, ensuring that frame field information is properly propagated in the lightning_resolver function.


138-141: Including is_frames in flattened comprehension for accurate query execution

The addition of is_frames in the flattened list comprehension allows subsequent processing to be aware of whether each query pertains to frame fields, which is necessary for conditional logic in query execution.


216-216: Consistent return of is_frame_field across helper functions

All return statements in _resolve_lightning_path_queries now include is_frame_field, ensuring consistent handling of frame fields across different data types.

Also applies to: 234-234, 263-263, 279-279, 296-296


305-309: Updated type annotations to include bool for is_frames

The type annotation for queries in _do_async_pooled_queries is updated to include a bool representing is_frames, ensuring type correctness and clarity.


315-318: Appropriate conditional application of filter based on is_frames

The use of None if is_frames else filter ensures that filters are not applied to frame collections. This conditional application is correct and aligns with the intended behavior of handling frame fields separately.


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.

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

@kaixi-wang kaixi-wang left a comment

Choose a reason for hiding this comment

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

lgtm thanks

@benjaminpkane benjaminpkane merged commit cea9b9a into release/v1.1.0 Dec 3, 2024
12 checks passed
@benjaminpkane benjaminpkane deleted the bugfix/video-groups-qp branch December 3, 2024 00:40
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