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: remove deprecated pydicom.dicomdir.DicomDir variable type option #130

Merged
merged 3 commits into from
Oct 23, 2024

Conversation

strixy16
Copy link
Collaborator

@strixy16 strixy16 commented Oct 23, 2024

Inclusion of this variable type was causing an error when running latest version of med-imagetools.

Summary by CodeRabbit

  • New Features

    • Simplified input requirements for metadata extraction, now exclusively accepting FileDataset instances.
  • Bug Fixes

    • Clarified handling of modality keys for improved accuracy in metadata extraction.

Copy link
Contributor

coderabbitai bot commented Oct 23, 2024

Walkthrough

The changes involve modifications to the all_modalities_metadata function within the src/imgtools/utils/dicomutils.py file. The function's parameter type has been updated to accept only pydicom.dataset.FileDataset, removing the previous allowance for pydicom.dicomdir.DicomDir. The internal logic for handling modality metadata remains largely intact, with clarifications made to how modality keys are processed and metadata is initialized based on modality type.

Changes

File Path Change Summary
src/imgtools/utils/dicomutils.py Updated all_modalities_metadata function signature to accept only pydicom.dataset.FileDataset. Logic for modality metadata handling clarified but remains largely unchanged.

Poem

In the land of DICOM, so bright and clear,
A function was polished, bringing us cheer.
With types now refined, it’s simpler to see,
The metadata flows like a soft melody.
Hopping through data, with joy we will play,
Thank you, dear coder, for brightening our day! 🐇✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between d19c2bd and e000fb7.

📒 Files selected for processing (1)
  • src/imgtools/utils/dicomutils.py (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/imgtools/utils/dicomutils.py

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
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)
src/imgtools/utils/dicomutils.py (2)

Line range hint 2-2: Remove unused Union import

Since the function signature no longer uses a Union type, the Union import from typing can be removed.

-from typing import Dict, TypeVar, Union
+from typing import Dict, TypeVar

62-62: Add function documentation

Consider adding a docstring to document the function's purpose, parameters, and return value structure. This is particularly important after removing DicomDir support to guide users.

 def all_modalities_metadata(dicom_data: pydicom.dataset.FileDataset) -> Dict[str, T]:
+    """Extract common metadata from a DICOM dataset.
+
+    Args:
+        dicom_data (pydicom.dataset.FileDataset): The DICOM dataset to extract metadata from
+
+    Returns:
+        Dict[str, T]: Dictionary containing metadata with keys for common DICOM attributes
+        including PixelSize when available
+    """
     metadata = get_modality_metadata(dicom_data, 'ALL')
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 272078c and d19c2bd.

📒 Files selected for processing (1)
  • src/imgtools/utils/dicomutils.py (1 hunks)
🧰 Additional context used
🔇 Additional comments (3)
src/imgtools/utils/dicomutils.py (3)

Line range hint 63-70: Implementation remains robust after type change

The function implementation uses defensive attribute checks and standard DICOM attributes, making it compatible with the FileDataset-only type signature. The core logic remains sound.


62-62: Add BREAKING CHANGE note to commit message

This change removes support for DicomDir objects which could affect downstream code. Consider updating the commit message to include a BREAKING CHANGE note:

fix: remove deprecated pydicom.dicomdir.DicomDir variable type option

BREAKING CHANGE: all_modalities_metadata now only accepts pydicom.dataset.FileDataset
objects. Support for pydicom.dicomdir.DicomDir has been removed.

Let's check for potential downstream impacts:


62-62: Verify impact of removing DicomDir support

The signature change to only accept FileDataset aligns with removing deprecated functionality. However, we should verify that this change doesn't break existing code.

Let's verify all usage patterns of this function:

✅ Verification successful

Let me gather more context about the usage pattern by examining the calling function and its implementation.


Based on the gathered information, I can now generate the final response:

Signature change to FileDataset appears safe

The codebase analysis shows:

  • No explicit DicomDir usage or type hints found in the file
  • all_modalities_metadata is only called from get_modality_metadata which doesn't enforce any specific DICOM type
  • The implementation works with standard DICOM metadata fields that are common to FileDataset

The rationale for this verification:

  1. No evidence of DicomDir specific usage in the codebase
  2. The function is only used internally by get_modality_metadata which processes standard DICOM metadata fields
  3. The signature change aligns with removing deprecated functionality without breaking existing code patterns
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any instances where DicomDir objects might be passed to all_modalities_metadata

# Search for imports or usage of DicomDir
echo "Checking for DicomDir usage patterns..."
rg -l "DicomDir"

# Search for direct calls to all_modalities_metadata
echo "Checking function call patterns..."
ast-grep --pattern 'all_modalities_metadata($$$)'

Length of output: 327


Script:

#!/bin/bash
# Check the implementation of get_modality_metadata and surrounding context
echo "Checking get_modality_metadata implementation..."
rg -A 10 -B 10 "def get_modality_metadata" src/imgtools/utils/dicomutils.py

# Check if there are any DicomDir type hints or assertions in the file
echo "Checking for DicomDir type hints..."
rg "DicomDir" src/imgtools/utils/dicomutils.py

Length of output: 1042

Copy link

codecov bot commented Oct 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 45.69%. Comparing base (272078c) to head (e000fb7).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #130   +/-   ##
=======================================
  Coverage   45.69%   45.69%           
=======================================
  Files          30       30           
  Lines        2867     2867           
=======================================
  Hits         1310     1310           
  Misses       1557     1557           

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

@jjjermiah jjjermiah merged commit 56ef37e into main Oct 23, 2024
31 checks passed
@jjjermiah jjjermiah deleted the fix-pydicom-dicomdir branch October 23, 2024 19:38
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.

pydicom.dicomdir.DicomDir deprecated, breaks dicomutils.all_modalities_metadata
2 participants