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: Fix error when image changed during segmentation #1218

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Conversation

Czaki
Copy link
Collaborator

@Czaki Czaki commented Oct 22, 2024

fix PARTSEG-WK
fix PARTSEG-WN

Summary by Sourcery

Fix error handling in the segmentation process by checking for image changes during execution and correct logging format strings across the codebase.

Bug Fixes:

  • Fix error handling when the image changes during segmentation by adding a check for image change in the segmentation thread.
  • Correct logging format strings to use direct string interpolation instead of using the 'extra' parameter.

Summary by CodeRabbit

  • New Features

    • Enhanced flexibility in exporting data to Zenodo with a new parameter for the API URL.
  • Bug Fixes

    • Improved error handling for file export functions to ensure proper notifications when files are missing.
    • Added checks to prevent errors when no image is present during processing.
  • Documentation

    • Updated logging practices for clearer output and easier debugging.
  • Refactor

    • Simplified logging statements across various modules for consistency and clarity.

@Czaki Czaki added this to the 0.16.0 milestone Oct 22, 2024
Copy link
Contributor

sourcery-ai bot commented Oct 22, 2024

Reviewer's Guide by Sourcery

This pull request addresses two issues (PARTSEG-WK and PARTSEG-WN) related to error handling during image segmentation and improves logging format across multiple files. The changes primarily focus on updating the logging format, adding a check for image changes during segmentation, and refactoring some code for better error handling and consistency.

Sequence diagram for image segmentation error handling

sequenceDiagram
    participant User
    participant SegmentationThread
    participant Logger
    User->>SegmentationThread: Start segmentation
    SegmentationThread->>Logger: Log error if no image
    SegmentationThread->>SegmentationThread: Check if image changed
    alt Image changed
        SegmentationThread->>Logger: Log image change
        SegmentationThread->>User: Return without segmentation
    else Image not changed
        SegmentationThread->>User: Emit execution_done
    end
Loading

File-Level Changes

Change Details Files
Update logging format to use % formatting instead of dict-based formatting
  • Replace '%(mod_name)' with '%s' in logging statements
  • Update logging.info() calls to use the new format
  • Remove 'extra' parameter from logging calls
package/PartSeg/common_gui/advanced_tabs.py
package/PartSeg/common_backend/segmentation_thread.py
package/PartSeg/_roi_analysis/export_batch.py
Add check for image changes during segmentation calculation
  • Introduce a condition to check if the image has changed during calculation
  • Return early if the image has changed to prevent processing outdated data
package/PartSeg/common_backend/segmentation_thread.py
Improve error handling and code consistency
  • Add a check for the existence of 'reload_list' attribute before iterating
  • Refactor logging statement in segmentation_thread.py for better readability
package/PartSeg/common_gui/advanced_tabs.py
package/PartSeg/common_backend/segmentation_thread.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

coderabbitai bot commented Oct 22, 2024

Walkthrough

The pull request introduces several modifications across three files in the PartSeg package. Key changes include updates to logging formats for clarity, the addition of a new parameter in the export_to_zenodo function, and enhanced error handling in both the export_to_archive and export_to_zenodo functions. Additionally, the SegmentationThread class's run method has been modified to improve error handling and control flow, while the reload_algorithm_action method in the DevelopTab class has been updated for better logging practices and robustness.

Changes

File Path Change Summary
package/PartSeg/_roi_analysis/export_batch.py - Updated logging format in sleep_with_rate.
- Added zenodo_url parameter to export_to_zenodo.
- Improved error handling in export_to_archive and export_to_zenodo.
package/PartSeg/common_backend/segmentation_thread.py - Updated logging format in run method.
- Added check for _image before emitting execution_done signal.
package/PartSeg/common_gui/advanced_tabs.py - Simplified logging in reload_algorithm_action.
- Added check for reload_list existence before iteration.

Possibly related PRs

Poem

In the code where rabbits play,
Logging shines a brighter way.
With checks and tweaks, we hop along,
Exporting data, singing our song.
Zenodo's path now clear and bright,
In every function, we take flight! 🐇✨


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

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @Czaki - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

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)
package/PartSeg/common_backend/segmentation_thread.py (1)

66-69: Improved handling of image changes during calculation.

The addition of this check effectively addresses the PR objective by preventing the emission of potentially incorrect results when the image changes during segmentation. This enhances the thread's robustness and prevents race conditions.

Consider adding a log message or emitting a signal to indicate that the calculation was aborted due to an image change. This would improve debugging and provide better feedback to the calling code. For example:

if self._image is not None:
    logging.info("Image changed during calculation. Aborting.")
    self.info_signal.emit("Calculation aborted: Image changed")
    return
package/PartSeg/_roi_analysis/export_batch.py (1)

Line range hint 409-521: Improved flexibility with new zenodo_url parameter in export_to_zenodo function

The addition of the zenodo_url parameter enhances the function's flexibility by allowing users to specify different Zenodo API endpoints (e.g., production vs. sandbox) without modifying the code. This change is backwards-compatible and improves the function's reusability.

The error message has been updated to use the dynamic zenodo_url, which provides more accurate information to the user.

Consider improving the error message formatting for better readability:

-            f" You could create token at "
-            f"{zenodo_url.replace('api/deposit/depositions', 'account/settings/applications/')}"
-            f" {initial_request.status_code} {initial_request.json()['message']}"
+            f" You can create a token at "
+            f"{zenodo_url.replace('api/deposit/depositions', 'account/settings/applications/')}."
+            f" Status code: {initial_request.status_code}. Message: {initial_request.json()['message']}"
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between bc5eabd and f78b9c0.

📒 Files selected for processing (3)
  • package/PartSeg/_roi_analysis/export_batch.py (1 hunks)
  • package/PartSeg/common_backend/segmentation_thread.py (2 hunks)
  • package/PartSeg/common_gui/advanced_tabs.py (1 hunks)
🧰 Additional context used
🔇 Additional comments (6)
package/PartSeg/common_backend/segmentation_thread.py (2)

52-54: Improved logging format and added stack trace information.

The changes to the logging statement are beneficial:

  1. Using positional placeholders (%s) instead of named ones simplifies the logging format.
  2. Adding stack_info=True provides valuable stack trace information for debugging.

These improvements align with Python logging best practices and enhance error traceability.


Line range hint 1-180: Summary: Effective implementation addressing PR objectives

The changes in this file successfully address the PR objective of fixing errors when the image changes during segmentation. The modifications improve error handling, logging, and thread robustness. The code quality is good, and the changes are well-implemented.

Key improvements:

  1. Enhanced logging with better formatting and additional stack trace information.
  2. Added a check to prevent emitting results when the image changes during calculation.

These changes contribute to a more stable and reliable segmentation process in the PartSeg application.

package/PartSeg/common_gui/advanced_tabs.py (2)

69-69: Improved logging format for better readability.

The logging statements have been updated to use a simpler string formatting method. This change enhances code readability and maintainability while adhering to Python's recommended logging practices.

Also applies to: 71-71, 74-74, 77-77


84-86: Enhanced robustness with conditional check for reload_list.

A conditional check has been added to ensure the reload_list attribute exists before iterating over it. This defensive programming practice prevents potential AttributeErrors, improving the overall robustness of the code.

package/PartSeg/_roi_analysis/export_batch.py (2)

395-395: Improved logging format in sleep_with_rate function

The change from %(sleep_time) to %s in the logging statement simplifies the code and aligns it with Python's standard logging practices. This modification enhances readability without affecting functionality.


Line range hint 1-521: Summary of changes in export_batch.py

The modifications in this file focus on two main areas:

  1. Improving the logging format in the sleep_with_rate function for better readability.
  2. Enhancing the flexibility of the export_to_zenodo function by adding a configurable Zenodo API endpoint.

These changes improve code quality and maintainability without introducing new risks or breaking existing functionality. While they don't directly address the PR's objective of fixing errors related to image changes during segmentation, they contribute to the overall improvement of the codebase.

To ensure these changes don't have unintended consequences, please run the existing test suite, particularly any tests related to Zenodo exports and rate limiting functionality.

@Czaki Czaki changed the title fix: error when image changed during segmentaion fix: Fix error when image changed during segmentation Oct 22, 2024
Copy link

codecov bot commented Oct 22, 2024

Codecov Report

Attention: Patch coverage is 20.00000% with 8 lines in your changes missing coverage. Please review.

Project coverage is 93.13%. Comparing base (bc5eabd) to head (f78b9c0).
Report is 19 commits behind head on develop.

Files with missing lines Patch % Lines
package/PartSeg/common_gui/advanced_tabs.py 0.00% 7 Missing ⚠️
...kage/PartSeg/common_backend/segmentation_thread.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1218      +/-   ##
===========================================
- Coverage    93.15%   93.13%   -0.03%     
===========================================
  Files          210      210              
  Lines        33169    33172       +3     
===========================================
- Hits         30898    30894       -4     
- Misses        2271     2278       +7     

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

@Czaki Czaki merged commit a9e6c57 into develop Oct 22, 2024
57 of 62 checks passed
@Czaki Czaki deleted the fix_errors branch October 22, 2024 12:39
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.

1 participant