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

Improved save annotations action #8501

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

klakhov
Copy link
Contributor

@klakhov klakhov commented Oct 2, 2024

Motivation and context

Inside of save annotations action we do not wait for update job status request to complete. That leads to problems with beforeJobFinish callbacks. Some of them require valid job updated date.

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • [ ] I have created a changelog fragment
  • [ ] I have updated the documentation accordingly
  • [ ] I have added tests to cover my changes
  • [ ] I have linked related issues (see GitHub docs)
  • [ ] I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

Summary by CodeRabbit

  • Bug Fixes
    • Improved the handling of annotation saving by ensuring the job state update completes before proceeding with further actions, enhancing the reliability of the annotation process.

Copy link
Contributor

coderabbitai bot commented Oct 2, 2024

Walkthrough

The changes involve a modification to the saveAnnotationsAsync function in the cvat-ui/src/actions/annotation-actions.ts file. The key update is the addition of the await keyword when dispatching the updateCurrentJobAsync action, ensuring that the function waits for the job state update to complete before proceeding with subsequent operations. No other significant changes were made to the logic or functionality of the code.

Changes

File Change Summary
cvat-ui/src/actions/annotation-actions.ts Added await to the dispatch of updateCurrentJobAsync in saveAnnotationsAsync.

Sequence Diagram(s)

sequenceDiagram
    participant A as User
    participant B as AnnotationService
    participant C as JobUpdater

    A->>B: Save Annotations
    B->>C: Dispatch updateCurrentJobAsync
    C-->>B: Job state updated
    B-->>A: Annotations saved successfully
Loading

Poem

In the land of code where rabbits play,
A change was made, hip-hip-hooray!
With await in place, the flow's so neat,
Now updates finish, oh what a treat!
Hopping along, we code with glee,
For every change brings joy to me! 🐇✨


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

sonarcloud bot commented Oct 2, 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: 0

🧹 Outside diff range and nitpick comments (2)
cvat-ui/src/actions/annotation-actions.ts (2)

1014-1017: Consider adding explicit error handling for job status update.

While the overall error handling in this function is good, it might be beneficial to add explicit error handling for the job status update operation. This could help in identifying and addressing any issues specific to the status update process.

For example:

try {
    await dispatch(updateCurrentJobAsync({ state: JobState.IN_PROGRESS }));
} catch (error) {
    // Log the error or handle it appropriately
    console.error('Failed to update job status:', error);
    // Optionally, you might want to throw the error or handle it in a way that doesn't break the overall save process
}

This addition would provide more granular error handling and potentially improve debugging and error recovery.


Line range hint 1-1024: Reminder: Address unchecked items in the PR checklist

The changes made in this file look good and address the specific issue mentioned in the PR objectives. However, I noticed that several items in the PR checklist remain unchecked, including:

  1. Creation of a changelog fragment
  2. Updates to documentation
  3. Addition of tests to cover the changes made

These are important steps in the development process. Could you please address these items? Specifically:

  1. Create a changelog entry to document this fix.
  2. Update any relevant documentation that might be affected by this change.
  3. Add or update tests to ensure the new behavior is correctly covered.

Completing these steps will help maintain the project's quality and make it easier for other developers to understand and verify the changes.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between e15ce88 and 81417f1.

📒 Files selected for processing (1)
  • cvat-ui/src/actions/annotation-actions.ts (1 hunks)
🔇 Additional comments (1)
cvat-ui/src/actions/annotation-actions.ts (1)

1015-1015: Excellent fix for the job status update issue.

The addition of the await keyword here is crucial. It ensures that the job status update is completed before the function continues execution. This change directly addresses the issue mentioned in the PR objectives and should resolve the problems with the beforeJobFinish callbacks that require a valid job updated date.

This improvement enhances the reliability of the annotation saving process by guaranteeing that all necessary updates are completed before any dependent actions are executed.

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.34%. Comparing base (e15ce88) to head (81417f1).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #8501      +/-   ##
===========================================
- Coverage    74.36%   74.34%   -0.02%     
===========================================
  Files          394      394              
  Lines        42177    42177              
  Branches      3896     3896              
===========================================
- Hits         31364    31358       -6     
- Misses       10813    10819       +6     
Components Coverage Δ
cvat-ui 78.72% <100.00%> (-0.04%) ⬇️
cvat-server 70.48% <ø> (ø)

@bsekachev bsekachev merged commit ff1849f into develop Oct 2, 2024
34 checks passed
@klakhov klakhov deleted the kl/improve-save-annotation-action branch October 3, 2024 14:51
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