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] read annotation into NIMADs #914

Merged
merged 2 commits into from
Mar 10, 2025
Merged

Conversation

jdkent
Copy link
Member

@jdkent jdkent commented Mar 10, 2025

Closes #913

Changes proposed in this pull request:

  • initialize variable
  • use the correct syntax for reading annotation
  • add metadata attribute to analysis

Summary by Sourcery

Bug Fixes:

  • Fixes an issue where annotations were not being read into NiMADS objects.

Copy link
Contributor

sourcery-ai bot commented Mar 10, 2025

Reviewer's Guide by Sourcery

This pull request fixes an issue where the _annotations variable was not initialized in the Studyset class, leading to errors when reading annotations. It also adds a metadata attribute to the Analysis class to store metadata associated with the analysis. The annotation reading syntax in the example was also corrected.

No diagrams generated as the changes look simple and do not need a visual representation.

File-Level Changes

Change Details Files
Initialized the _annotations attribute in the Studyset class and corrected the syntax for reading annotations during Studyset initialization.
  • Initialized self._annotations = [] in the Studyset class's __init__ method.
  • Modified the Studyset initialization to correctly pass the annotations.
nimare/nimads.py
examples/01_datasets/05_plot_nimads.py
Added a metadata attribute to the Analysis class.
  • Added self.metadata = source.get("metadata", {}) or {} to the Analysis class's __init__ method.
nimare/nimads.py

Assessment against linked issues

Issue Objective Addressed Explanation
#913 Annotations should be successfully read into NiMARE from NiMADS data.

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. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the 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 exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

@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 @jdkent - I've reviewed your changes - here's some feedback:

Overall Comments:

  • It looks like you're initializing self._annotations in the Studyset class constructor regardless of whether annotations are provided; consider removing the conditional logic.
  • Consider adding a test case that specifically covers the metadata attribute in the Analysis class.
Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 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.

@@ -292,6 +293,7 @@ def __init__(self, source):
]
self.images = [Image(i) for i in source["images"]]
self.points = [Point(p) for p in source["points"]]
self.metadata = source.get("metadata", {}) or {}
Copy link
Contributor

Choose a reason for hiding this comment

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

suggestion (bug_risk): Evaluate the use of 'or {}' with metadata initialization.

The expression source.get("metadata", {}) already provides a default empty dict when the key is missing, so the additional 'or {}' will override any false-y but valid metadata value. Consider whether this behavior is intentional or if an explicit test for None might be more appropriate.

Suggested implementation:

        tmp = source.get("metadata")
        self.metadata = {} if tmp is None else tmp

Review any other parts of the code that may depend on metadata being always a dictionary to ensure this change doesn't impact expected false-y values.

Copy link

codecov bot commented Mar 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.23%. Comparing base (3e5becf) to head (6a32b0e).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #914   +/-   ##
=======================================
  Coverage   88.23%   88.23%           
=======================================
  Files          48       48           
  Lines        6382     6383    +1     
=======================================
+ Hits         5631     5632    +1     
  Misses        751      751           

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

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jdkent jdkent merged commit e36e4aa into neurostuff:main Mar 10, 2025
23 checks passed
@jdkent jdkent added the bug Issues noting problems and PRs fixing those problems. label Mar 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issues noting problems and PRs fixing those problems.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Annotation not being read into NiMARE
1 participant