dicube 0.2.0__cp312-cp312-macosx_10_9_x86_64.whl → 0.2.3__cp312-cp312-macosx_10_9_x86_64.whl

dicube/__init__.py

@@ -64,7 +64,7 @@ def set_num_threads(num_threads: int) -> None:
     _num_threads = num_threads
 
 # Top-level convenience methods
-def load(file_path: str) -> DicomCubeImage:
+def load(file_path: str, skip_meta: bool = False) -> DicomCubeImage:
     """Load a DicomCubeImage from a file.
     
     Args:
@@ -73,8 +73,15 @@ def load(file_path: str) -> DicomCubeImage:
     Returns:
         DicomCubeImage: The loaded image object.
     """
-    return DicomCubeImageIO.load(file_path)
+    return DicomCubeImageIO.load(file_path, skip_meta)
 
+def load_meta(file_path: str) -> DicomMeta:
+    """Load the metadata from a file.
+    
+    Args:
+        file_path (str): Path to the input file.
+    """
+    return DicomCubeImageIO.load_meta(file_path)
 
 def save(
     image: DicomCubeImage,

dicube/core/io.py

@@ -107,18 +107,13 @@ class DicomCubeImageIO:
                 details={"file_path": file_path, "file_type": file_type}
             ) from e
     
+
     @staticmethod
-    def load(file_path: str) -> 'DicomCubeImage':
-        """Load DicomCubeImage from a file.
+    def _get_reader(file_path: str) -> DcbFile:
+        """Get the appropriate reader based on the file path.
         
         Args:
-            file_path (str): Input file path.
-            
-        Returns:
-            DicomCubeImage: The loaded object from the file.
-            
-        Raises:
-            ValueError: When the file format is not supported.
+            file_path (str): Path to the input file.
         """
         # Validate required parameters
         validate_not_none(file_path, "file_path", "load operation", InvalidCubeFileError)
@@ -143,9 +138,44 @@ class DicomCubeImageIO:
                     details={"file_path": file_path, "magic_number": magic},
                     suggestion="Ensure the file is a valid DicomCube file"
                 )
+            return reader
+        
+        except Exception as e:
+            if isinstance(e, (InvalidCubeFileError, CodecError)):
+                raise
+            raise InvalidCubeFileError(
+                f"Failed to load file: {str(e)}",
+                context="load operation",
+                details={"file_path": file_path}
+            ) from e
+
+    @staticmethod
+    def load_meta(file_path: str) -> DicomMeta:
+        """Load the metadata from a file.
+        
+        Args:
+            file_path (str): Path to the input file.
+        """
+        reader = DicomCubeImageIO._get_reader(file_path)
+        return reader.read_meta()
+    
+    @staticmethod
+    def load(file_path: str, skip_meta: bool = False) -> 'DicomCubeImage':
+        """Load DicomCubeImage from a file.
+        
+        Args:
+            file_path (str): Input file path.
+            
+        Returns:
+            DicomCubeImage: The loaded object from the file.
             
+        Raises:
+            ValueError: When the file format is not supported.
+        """
+        reader = DicomCubeImageIO._get_reader(file_path)
+        try:
             # Read file contents
-            dicom_meta = reader.read_meta()
+            dicom_meta = None if skip_meta else reader.read_meta()
             space = reader.read_space()
             pixel_header = reader.read_pixel_header()
             dicom_status = reader.read_dicom_status()
@@ -239,6 +269,12 @@ class DicomCubeImageIO:
             intercept = meta.get_shared_value(CommonTags.RescaleIntercept)
             wind_center = meta.get_shared_value(CommonTags.WindowCenter)
             wind_width = meta.get_shared_value(CommonTags.WindowWidth)
+            try:
+                wind_center = float(wind_center)
+                wind_width = float(wind_width)
+            except:
+                wind_center = None
+                wind_width = None
             
             # Create pixel_header
             pixel_header = PixelDataHeader(
@@ -246,8 +282,8 @@ class DicomCubeImageIO:
                 RescaleIntercept=float(intercept) if intercept is not None else 0.0,
                 OriginalPixelDtype=str(images[0].dtype),
                 PixelDtype=str(images[0].dtype),
-                WindowCenter=float(wind_center) if wind_center is not None else None,
-                WindowWidth=float(wind_width) if wind_width is not None else None,
+                WindowCenter=wind_center,
+                WindowWidth=wind_width,
             )
             
             # Validate PixelDataHeader initialization success

dicube/dicom/dicom_meta.py

@@ -101,9 +101,9 @@ def _display(meta, show_shared=True, show_non_shared=True):
     Returns:
         pandas.DataFrame: Formatted metadata tables.
     """
+
     import pandas as pd
     from .dicom_tags import CommonTags
-
     # Prepare shared and non-shared data
     shared_data = []
     non_shared_data = {}
@@ -137,7 +137,7 @@ def _display(meta, show_shared=True, show_non_shared=True):
     # Process each tag
     for tag_key in meta.keys():
         tag = Tag(int(tag_key[:4], 16), int(tag_key[4:], 16))
-        tag_name = datadict.dicom_dict_summary.get(tag, {}).get("name", f"({tag.group:04X},{tag.element:04X})")
+        tag_name = datadict.keyword_for_tag(tag)
         vr = meta.get_vr(tag)
         
         if meta.is_shared(tag):
@@ -198,7 +198,7 @@ def _display(meta, show_shared=True, show_non_shared=True):
                 for tag in non_shared_tags
             }
             name_row = {
-                f"({tag.group:04X},{tag.element:04X})": non_shared_data[tag.key]["Name"]
+                f"({tag.group:04X},{tag.element:04X})": non_shared_data[get_tag_key(tag)]["Name"]
                 for tag in non_shared_tags
             }
 
@@ -206,7 +206,7 @@ def _display(meta, show_shared=True, show_non_shared=True):
             values_rows = []
             for idx in range(meta.slice_count):
                 row = {
-                    f"({tag.group:04X},{tag.element:04X})": non_shared_data[tag.key]["Values"][idx]
+                    f"({tag.group:04X},{tag.element:04X})": non_shared_data[get_tag_key(tag)]["Values"][idx]
                     for tag in non_shared_tags
                 }
                 values_rows.append(row)
@@ -288,8 +288,11 @@ class DicomMeta:
         # Convert each dataset to a dict representation
         dicts = []
         for ds in datasets:
-            dicts.append(ds.to_json_dict())
-
+            tmp = ds.to_json_dict(
+                bulk_data_threshold=10240, bulk_data_element_handler=lambda x: None
+            )
+            tmp.pop(get_tag_key(CommonTags.PixelData), None)
+            dicts.append(tmp)
         # Merge the dictionaries
         merged_data = _merge_dataset_list(dicts)
         return cls(merged_data, filenames)

{dicube-0.2.0.dist-info → dicube-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dicube
-Version: 0.2.0
+Version: 0.2.3
 Summary: Medical Image Storage Library with DICOM compatibility
 Author: Fangzhou Liao
 License: MIT
@@ -38,6 +38,7 @@ Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: build>=0.8.0; extra == "dev"
 Requires-Dist: pylibjpeg>=2.0; extra == "dev"
 Requires-Dist: pylibjpeg-openjpeg>=2.0; extra == "dev"
+Requires-Dist: nibabel>=3.2.0; extra == "dev"
 Provides-Extra: all
 Requires-Dist: pybind11>=2.10.0; extra == "all"
 Requires-Dist: nibabel>=3.2.0; extra == "all"

{dicube-0.2.0.dist-info → dicube-0.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dicube/__init__.py,sha256=TK2-JGOB_aPa6ilHw4WUc9l5Whc3Fb-tlZSPzbf5HIw,4886
+dicube/__init__.py,sha256=aXkL9me2X6Msreu30ui2wbdguLV_kqe7UH23nmSFd4E,5125
 dicube/exceptions.py,sha256=YrwBD93oWI4yhvFfO-SOPCNMQ4z_1FSVL2gCVSnx-LU,6689
 dicube/validation.py,sha256=Edmx3yKhRShdzvM7uRK6N9j58GNV8rUv_k9w43JcaMs,12478
 dicube/codecs/__init__.py,sha256=NNus-iAv4JXsNH1kALf5vnLYnESFBoYaN72yJ7kQoqk,3754
@@ -14,7 +14,7 @@ dicube/codecs/jph/ojph_complete.cpython-311-darwin.so,sha256=SmXvkyjn1iCLHfLcmav
 dicube/codecs/jph/ojph_decode_complete.cpython-311-darwin.so,sha256=1aXbLZWb6nDX4e2S73dcWW8BnMUytk5AtWIzyxt4aiM,449096
 dicube/codecs/jph/ojph_decode_complete.cpython-39-darwin.so,sha256=OMAfYyAQra6xF_Zv5Y-LGBkg68MYpTK4qwB8lWqlf6U,448968
 dicube/codecs/jph/codec.py,sha256=d4bAoVAatSrWiC1k7gQLzWODZZTGo_1xeRRXO0NAtqo,5460
-dicube/core/io.py,sha256=WpzcjRtalIhi0P7EFwR5i2YLoZKz3_V_IlMOKvfDXFY,15514
+dicube/core/io.py,sha256=cR7OrFk7k2lXsUy-Yi9VgkApeOEv7GBtjrX1GSFW12g,16600
 dicube/core/__init__.py,sha256=tU9vaPHbTkF8V78T8D6werr0nC7k6bMPIlatEIEdHU4,656
 dicube/core/pixel_header.py,sha256=x3-gNiyL4lFRQ6c1TVdvsm2mG36xCQx78hq4vjYkqJI,4005
 dicube/core/image.py,sha256=DAyBwKlWeCU6oDWsmdSdAzVW3IieHNLUINIAhS_ZtRg,14177
@@ -23,13 +23,13 @@ dicube/storage/__init__.py,sha256=q36sJqdI9acURBXjOW_g3QiyHw0XLGFCukMsQ-qioZc,46
 dicube/storage/dcb_file.py,sha256=GfOx2C6fexKojxwzak3_Q0K3gRBHB_UTMNVBY4NPRzg,31232
 dicube/storage/pixel_utils.py,sha256=-xMMnjSMzYk6WRvLAPktMELhSXJPmLBnt5wxKgOw5zg,9759
 dicube/dicom/dcb_streaming.py,sha256=Acsdusc6jIKuu1kd-VuDOoteZGdpt3UmwsxF-HQYZtM,9088
-dicube/dicom/dicom_meta.py,sha256=Iv-kEcV39vhK2qgSqGpqDhgg28RuUm8ddzSdpToIVPc,26813
+dicube/dicom/dicom_meta.py,sha256=Fvhid95Gu4qqRX9zMDbIDX1t--KIYyIRvfSUQnERGis,26947
 dicube/dicom/dicom_io.py,sha256=EBa72RGHfifFKygBwCWf6r2YCTNxE9onO8d65ws_5VU,4917
 dicube/dicom/dicom_status.py,sha256=NXi-sj3mhyaFGfpechewTjhI201vziVsyfLotsLr3Fs,10117
 dicube/dicom/__init__.py,sha256=9b7liSXx5vlpEYAr59GZGkcUw16kULELTX5SlLfcXPw,371
 dicube/dicom/merge_utils.py,sha256=6flzoK_6gzpvv4WSTaWq4SjVdr1gh3gtUPMsRfKDSNM,9312
 dicube/dicom/space_from_meta.py,sha256=__B7UTmvgV1N-LMJg9O_ObHgNWa39mbRF4ZSkQXm3Vs,2420
 dicube/dicom/dicom_tags.py,sha256=sOjrK9SoAhGqynF0e3YH70j8wbtvwGRezV-tM0wp40Q,3945
-dicube-0.2.0.dist-info/RECORD,,
-dicube-0.2.0.dist-info/WHEEL,sha256=wU0uEto50UFyZnJeUzxIxZzOotEliaXdZ5JHA-mW1ew,115
-dicube-0.2.0.dist-info/METADATA,sha256=xDYbYiX9NKyLH0bAbBNOsziAxvXHyyQyELP8RlGA5ys,10581
+dicube-0.2.3.dist-info/RECORD,,
+dicube-0.2.3.dist-info/WHEEL,sha256=wU0uEto50UFyZnJeUzxIxZzOotEliaXdZ5JHA-mW1ew,115
+dicube-0.2.3.dist-info/METADATA,sha256=NWFpkVhrchy-PksUdnOaC3WnpGb35w7XebMFavyqYF8,10627