dicube 0.2.0__cp312-cp312-win_amd64.whl → 0.2.3__cp312-cp312-win_amd64.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.3.dist-info/RECORD

@@ -0,0 +1,35 @@
+dicube/__init__.py,sha256=X2Kgk5AUa9-DMFFLX8kr65sO7Srwfp1uZWiv1VAXGYs,5305
+dicube/codecs/__init__.py,sha256=Tqw2vmQML-pcaNtnyTtj4W4kBqGhV2FTiVAT5bW5FgA,3905
+dicube/codecs/jph/__init__.py,sha256=pWYkTNWYeGZx3khsJBAKRdB2Vgyr0BX5aLDKaanfe_o,407
+dicube/codecs/jph/codec.py,sha256=BMZM3ReemQheraSIYn19aqH-1NrbjQTPAx3iCTms7KU,5620
+dicube/codecs/jph/ojph_complete.cp310-win_amd64.pyd,sha256=aGz3SMVTU7C1rvTrJHW0-LiGJz79Gx0bj9qfTSKSZWc,601600
+dicube/codecs/jph/ojph_complete.cp311-win_amd64.pyd,sha256=oeqav2QNt-_XWPNyO5lAvav7XVwN7crEudYGjSdkBRM,604160
+dicube/codecs/jph/ojph_complete.cp312-win_amd64.pyd,sha256=z88hROaR8ewduzlitaom1tf6xaI8jWwJXfrfxKOFA4I,606720
+dicube/codecs/jph/ojph_complete.cp38-win_amd64.pyd,sha256=0DV-QHwjpYylxfwKB1TF4r3yvrTH7Vgy_EI2kvMqBcQ,601600
+dicube/codecs/jph/ojph_complete.cp39-win_amd64.pyd,sha256=lyOLVaATcN4yAzXZBf0M4cgFXwOw61rq-sLDa9ZXXLI,601600
+dicube/codecs/jph/ojph_decode_complete.cp310-win_amd64.pyd,sha256=OB6_do4EDnsxEcE8dvI2PPdzIiPtpP3ao6p0jytRBWI,639488
+dicube/codecs/jph/ojph_decode_complete.cp311-win_amd64.pyd,sha256=3b8MAfe-dGGFP0A-rUelMF4Icdph6nPZxIzS3_AxIC0,641536
+dicube/codecs/jph/ojph_decode_complete.cp312-win_amd64.pyd,sha256=uXuxL8llEBVxAEnahXRS4OIj6v0sXn14ik8efgoe7QE,644096
+dicube/codecs/jph/ojph_decode_complete.cp38-win_amd64.pyd,sha256=uqXtblbalMSVjOUH3PqmzPO8vi5TfvZteZWo7PsOpBQ,639488
+dicube/codecs/jph/ojph_decode_complete.cp39-win_amd64.pyd,sha256=TPpJOq6eZUNACFcDuUsixS7-BCGTxGCErBCfGyflDZQ,638976
+dicube/core/__init__.py,sha256=TJBS1xA2qVS7xxH6vZKPrd7YiQYtyLfNSs48tlmBCD8,676
+dicube/core/image.py,sha256=WR9GKat0st0ior7zw1wi_5Bpd5cZoHWvsPzjYJAwpcg,14525
+dicube/core/io.py,sha256=nGYifKDO4WRElK95uuz89BzVpoWqd43CZeOJp1nj5lg,17037
+dicube/core/pixel_header.py,sha256=gikXfkjTGVQUqTWUk8Q2xAPsDfWm0iRPcwdIxIImr94,4124
+dicube/dicom/__init__.py,sha256=OGnAHS3pCbb94Vpsc0x3d2gjv5UBAM9oUR3mxQVruYQ,383
+dicube/dicom/dcb_streaming.py,sha256=6b50m5SEHFkdkWYKl6_ClzvPZZJKlJlVNR08sWF-Xdo,9335
+dicube/dicom/dicom_io.py,sha256=EWR-VYXUYEF066dxucSb9E7xPpIReN-BbCeIZSsNskU,5069
+dicube/dicom/dicom_meta.py,sha256=q5xiitigkGPwcH5U5Ih0UNiY-uxNcpOfcPxh1JqNXjg,27689
+dicube/dicom/dicom_status.py,sha256=VYp6q6UbxPkGwJ8_udEBRGSCFeSWedwRuEB4vfREOaE,10375
+dicube/dicom/dicom_tags.py,sha256=BRw099dC-9FvAJ43QKESHBxtGtsGSSodcijJKXcCnsE,4065
+dicube/dicom/merge_utils.py,sha256=ji0twDUBpR261l0pS2i8knetZI5Jg-OEaYsc2G_SBzk,9594
+dicube/dicom/space_from_meta.py,sha256=i6zIXbFaNyz0g6z2oeoO5lzsfaeo4sgz_FI-PrEmqsg,2489
+dicube/exceptions.py,sha256=VNnW7Dd9MwKzSK_y9GQITrsaHYiL-Crwmntzf-YS1sY,6877
+dicube/storage/__init__.py,sha256=6WG1hdok-TkKShXCKFvH9ShoNILq3qvyZ6sNEO_urW4,481
+dicube/storage/dcb_file.py,sha256=tt7aYi4x_gxf4s6De6tSkpiwyoCp1ZcG-Piixai1Jw8,32055
+dicube/storage/pixel_utils.py,sha256=_KrsMoKHsgGc9QFSkmpx5YlDNcTOYPkCSu-zGt3WS7k,10017
+dicube/utils/__init__.py,sha256=r4wAqNWphzYWaeYN9fcoFCX7mTcOtNACzZ4O-dDCQ10,154
+dicube/validation.py,sha256=aFu2lKW9NDl13eKedYhOjw1g50uOf_x0wx3y3g9cLsA,12857
+dicube-0.2.3.dist-info/METADATA,sha256=NWFpkVhrchy-PksUdnOaC3WnpGb35w7XebMFavyqYF8,10627
+dicube-0.2.3.dist-info/WHEEL,sha256=TcMXEVBP2SQds4YZwJ6flDTTNRzCE5owNAganfIqM0g,106
+dicube-0.2.3.dist-info/RECORD,,

dicube-0.2.0.dist-info/RECORD

@@ -1,45 +0,0 @@
-dicube/__init__.py,sha256=XI_Zeif8FOQ-i_G7LabwVFpubzDniXSFb-8H_WdYW8c,5059
-dicube/codecs/__init__.py,sha256=Tqw2vmQML-pcaNtnyTtj4W4kBqGhV2FTiVAT5bW5FgA,3905
-dicube/codecs/jph/__init__.py,sha256=pWYkTNWYeGZx3khsJBAKRdB2Vgyr0BX5aLDKaanfe_o,407
-dicube/codecs/jph/codec.py,sha256=BMZM3ReemQheraSIYn19aqH-1NrbjQTPAx3iCTms7KU,5620
-dicube/codecs/jph/ojph_complete.cp310-win32.pyd,sha256=OQXH1naFlfAvI8YxSyVTBp283w2Rutcdf9VVQBk-syk,507904
-dicube/codecs/jph/ojph_complete.cp310-win_amd64.pyd,sha256=_CWtaFatb_fKoho6VniTI7rrHkaYZvgV9LJBQY3ZvO4,601600
-dicube/codecs/jph/ojph_complete.cp311-win32.pyd,sha256=eut4wirUngtvETMSqbycD9c-BYLDs-DMKGUf845CaGk,510464
-dicube/codecs/jph/ojph_complete.cp311-win_amd64.pyd,sha256=DKd-ukJ3oPsdxeEHDthV3ulQsUhxguORE3M8jKqkbWw,604160
-dicube/codecs/jph/ojph_complete.cp312-win32.pyd,sha256=_rkhszkkpOElaA5NQa8NLmRXSCuO9ZmcH-nRB8_UNLU,513536
-dicube/codecs/jph/ojph_complete.cp312-win_amd64.pyd,sha256=pXnM2utR7p8NAh3qtVWfwWHMQFEeHfzKh1KxhvLuiPg,606720
-dicube/codecs/jph/ojph_complete.cp38-win32.pyd,sha256=Y3Nterl5act9QSkyfny-K0u6OkJnDg6KVMob14XdzQs,507904
-dicube/codecs/jph/ojph_complete.cp38-win_amd64.pyd,sha256=vjlAPdq-rTif10Ya8hRuj1KUrlU7djCMrwz3i1Z9egY,601600
-dicube/codecs/jph/ojph_complete.cp39-win32.pyd,sha256=kEecz7Uixzn3CMawNsaYWQfyu0asV4hCNIMnvE2zjkw,507904
-dicube/codecs/jph/ojph_complete.cp39-win_amd64.pyd,sha256=ddRbfp0hZsgtvZocoUi_-VThW6IRC652C-NtsCXXqTs,601600
-dicube/codecs/jph/ojph_decode_complete.cp310-win32.pyd,sha256=mhGLqPbJ5CmrfM22Azb769s2HgY-jzJ9Qp3eqR2Uu3U,543744
-dicube/codecs/jph/ojph_decode_complete.cp310-win_amd64.pyd,sha256=5XQMaFven0b_3mks6FW8uV4XcJhO4C4uwvrOWkDAJ4o,639488
-dicube/codecs/jph/ojph_decode_complete.cp311-win32.pyd,sha256=pJD_-yZQrMNk25Pg1-g60TNALAvTRu8LEsE6t84RAVo,546304
-dicube/codecs/jph/ojph_decode_complete.cp311-win_amd64.pyd,sha256=z7pJRIrPLcdn-tkzxoAfZcNIQgP1YMlM2pIAQJWB09c,641536
-dicube/codecs/jph/ojph_decode_complete.cp312-win32.pyd,sha256=lUNNuTmDmg0aXXHG4XSrfxaJ5vq9gC_oXaqRXz8R4dM,549888
-dicube/codecs/jph/ojph_decode_complete.cp312-win_amd64.pyd,sha256=oVEwfMS1BoYcOUtN4fFdCO8exXY11ss-MSyI2vHB75U,644096
-dicube/codecs/jph/ojph_decode_complete.cp38-win32.pyd,sha256=Drd29pmHMr6xKAEOYHbxIOzvvKi7HwUqphVFkBDUDcY,543232
-dicube/codecs/jph/ojph_decode_complete.cp38-win_amd64.pyd,sha256=KxoPWOvvtfNJD0mhiTLL6rjiGHRDS5tNTLz3gygYEiY,639488
-dicube/codecs/jph/ojph_decode_complete.cp39-win32.pyd,sha256=_VR1xg2e90wHJQNoH50JDiEy2ZjGRU3SYU50DWMuxbE,543232
-dicube/codecs/jph/ojph_decode_complete.cp39-win_amd64.pyd,sha256=3G4xvyYCFAjzssGskezMAjzMMiexSr2P2r1v539CmC8,638976
-dicube/core/__init__.py,sha256=TJBS1xA2qVS7xxH6vZKPrd7YiQYtyLfNSs48tlmBCD8,676
-dicube/core/image.py,sha256=WR9GKat0st0ior7zw1wi_5Bpd5cZoHWvsPzjYJAwpcg,14525
-dicube/core/io.py,sha256=kMGiT20Gmkb55tFXxIDiU6RS3owHkqF7xk4IVq78eNU,15915
-dicube/core/pixel_header.py,sha256=gikXfkjTGVQUqTWUk8Q2xAPsDfWm0iRPcwdIxIImr94,4124
-dicube/dicom/__init__.py,sha256=OGnAHS3pCbb94Vpsc0x3d2gjv5UBAM9oUR3mxQVruYQ,383
-dicube/dicom/dcb_streaming.py,sha256=6b50m5SEHFkdkWYKl6_ClzvPZZJKlJlVNR08sWF-Xdo,9335
-dicube/dicom/dicom_io.py,sha256=EWR-VYXUYEF066dxucSb9E7xPpIReN-BbCeIZSsNskU,5069
-dicube/dicom/dicom_meta.py,sha256=PgVeIWoYE7udQ3M26ytX1r3ic9leL35MMVfEJhTk-3Q,27552
-dicube/dicom/dicom_status.py,sha256=VYp6q6UbxPkGwJ8_udEBRGSCFeSWedwRuEB4vfREOaE,10375
-dicube/dicom/dicom_tags.py,sha256=BRw099dC-9FvAJ43QKESHBxtGtsGSSodcijJKXcCnsE,4065
-dicube/dicom/merge_utils.py,sha256=ji0twDUBpR261l0pS2i8knetZI5Jg-OEaYsc2G_SBzk,9594
-dicube/dicom/space_from_meta.py,sha256=i6zIXbFaNyz0g6z2oeoO5lzsfaeo4sgz_FI-PrEmqsg,2489
-dicube/exceptions.py,sha256=VNnW7Dd9MwKzSK_y9GQITrsaHYiL-Crwmntzf-YS1sY,6877
-dicube/storage/__init__.py,sha256=6WG1hdok-TkKShXCKFvH9ShoNILq3qvyZ6sNEO_urW4,481
-dicube/storage/dcb_file.py,sha256=tt7aYi4x_gxf4s6De6tSkpiwyoCp1ZcG-Piixai1Jw8,32055
-dicube/storage/pixel_utils.py,sha256=_KrsMoKHsgGc9QFSkmpx5YlDNcTOYPkCSu-zGt3WS7k,10017
-dicube/utils/__init__.py,sha256=r4wAqNWphzYWaeYN9fcoFCX7mTcOtNACzZ4O-dDCQ10,154
-dicube/validation.py,sha256=aFu2lKW9NDl13eKedYhOjw1g50uOf_x0wx3y3g9cLsA,12857
-dicube-0.2.0.dist-info/METADATA,sha256=xDYbYiX9NKyLH0bAbBNOsziAxvXHyyQyELP8RlGA5ys,10581
-dicube-0.2.0.dist-info/WHEEL,sha256=TcMXEVBP2SQds4YZwJ6flDTTNRzCE5owNAganfIqM0g,106
-dicube-0.2.0.dist-info/RECORD,,