monai-weekly 1.7.dev2630__tar.gz → 1.7.dev2632__tar.gz

{monai_weekly-1.7.dev2630/monai_weekly.egg-info → monai_weekly-1.7.dev2632}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monai-weekly
-Version: 1.7.dev2630
+Version: 1.7.dev2632
 Summary: AI Toolkit for Healthcare Imaging
 Home-page: https://project-monai.github.io/
 Author: MONAI Consortium

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/__init__.py

@@ -136,4 +136,4 @@ except Exception:
 
     if MONAIEnvVars.debug():
         raise
-__commit_id__ = "3ee058bdd16dd4a566d23d3f84687c3c35268a36"
+__commit_id__ = "87060c45f8bbe7e1b677e0a9f872abce9890fb7f"

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-07-26T03:05:02+0000",
+ "date": "2026-08-09T02:43:34+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "82bbaeeb45e5490606c4ff4615dd85e0e83fce7c",
- "version": "1.7.dev2630"
+ "full-revisionid": "5a454eec9f1b95c6e263b40f7d237f1fdf8f654c",
+ "version": "1.7.dev2632"
 }
 '''  # END VERSION_JSON
 

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/apps/__init__.py

@@ -13,4 +13,13 @@ from __future__ import annotations
 
 from .datasets import CrossValidation, DecathlonDataset, MedNISTDataset, TciaDataset
 from .mmars import MODEL_DESC, RemoteMMARKeys, download_mmar, get_model_spec, load_from_mmar
-from .utils import SUPPORTED_HASH_TYPES, check_hash, download_and_extract, download_url, extractall, get_logger, logger
+from .utils import (
+    SUPPORTED_HASH_TYPES,
+    HashCheckError,
+    check_hash,
+    download_and_extract,
+    download_url,
+    extractall,
+    get_logger,
+    logger,
+)

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/apps/utils.py

@@ -42,12 +42,24 @@ if TYPE_CHECKING:
 else:
     tqdm, has_tqdm = optional_import("tqdm", "4.47.0", min_version, "tqdm")
 
-__all__ = ["check_hash", "download_url", "extractall", "download_and_extract", "get_logger", "SUPPORTED_HASH_TYPES"]
+__all__ = [
+    "HashCheckError",
+    "check_hash",
+    "download_url",
+    "extractall",
+    "download_and_extract",
+    "get_logger",
+    "SUPPORTED_HASH_TYPES",
+]
 
 DEFAULT_FMT = "%(asctime)s - %(levelname)s - %(message)s"
 SUPPORTED_HASH_TYPES = {"md5": hashlib.md5, "sha1": hashlib.sha1, "sha256": hashlib.sha256, "sha512": hashlib.sha512}
 
 
+class HashCheckError(ValueError):
+    pass
+
+
 def get_logger(
     module_name: str = "monai.apps",
     fmt: str = DEFAULT_FMT,
@@ -220,8 +232,7 @@ def download_url(
         HTTPError: See urllib.request.urlretrieve.
         ContentTooShortError: See urllib.request.urlretrieve.
         IOError: See urllib.request.urlretrieve.
-        RuntimeError: When the hash validation of the ``url`` downloaded file fails.
-
+        HashCheckError: When the hash validation of the ``url`` downloaded file fails.
     """
     if not filepath:
         filepath = Path(".", _basename(url)).resolve()
@@ -229,9 +240,7 @@ def download_url(
     filepath = Path(filepath)
     if filepath.exists():
         if not check_hash(filepath, hash_val, hash_type):
-            raise RuntimeError(
-                f"{hash_type} check of existing file failed: filepath={filepath}, expected {hash_type}={hash_val}."
-            )
+            raise HashCheckError(f"{hash_type} hash check of existing file failed: {filepath=}, expected {hash_type=}.")
         logger.info(f"File exists: {filepath}, skipped downloading.")
         return
     try:
@@ -260,6 +269,13 @@ def download_url(
                 raise RuntimeError(
                     f"Download of file from {url} to {filepath} failed due to network issue or denied permission."
                 )
+            if not check_hash(tmp_name, hash_val, hash_type):
+                raise HashCheckError(
+                    f"{hash_type} hash check of downloaded file failed: {url=}, "
+                    f"{filepath=}, expected {hash_type}={hash_val}, "
+                    f"The file may be corrupted or tampered with. "
+                    "Please retry the download or verify the source."
+                )
             file_dir = filepath.parent
             if file_dir:
                 os.makedirs(file_dir, exist_ok=True)
@@ -267,11 +283,6 @@ def download_url(
     except (PermissionError, NotADirectoryError):  # project-monai/monai issue #3613 #3757 for windows
         pass
     logger.info(f"Downloaded: {filepath}")
-    if not check_hash(filepath, hash_val, hash_type):
-        raise RuntimeError(
-            f"{hash_type} check of downloaded file failed: URL={url}, "
-            f"filepath={filepath}, expected {hash_type}={hash_val}."
-        )
 
 
 def _extract_zip(filepath, output_dir):
@@ -325,10 +336,15 @@ def extractall(
             be False.
 
     Raises:
-        RuntimeError: When the hash validation of the ``filepath`` compressed file fails.
+        HashCheckError: When the hash validation of the ``filepath`` compressed file fails.
         NotImplementedError: When the ``filepath`` file extension is not one of [zip", "tar.gz", "tar"].
 
     """
+    filepath = Path(filepath)
+    if hash_val and not check_hash(filepath, hash_val, hash_type):
+        raise HashCheckError(
+            f"{hash_type} hash check of compressed file failed: " f"{filepath=}, expected {hash_type}={hash_val}."
+        )
     if has_base:
         # the extracted files will be in this folder
         cache_dir = Path(output_dir, _basename(filepath).split(".")[0])
@@ -337,11 +353,6 @@ def extractall(
     if cache_dir.exists() and next(cache_dir.iterdir(), None) is not None:
         logger.info(f"Non-empty folder exists in {cache_dir}, skipped extracting.")
         return
-    filepath = Path(filepath)
-    if hash_val and not check_hash(filepath, hash_val, hash_type):
-        raise RuntimeError(
-            f"{hash_type} check of compressed file failed: " f"filepath={filepath}, expected {hash_type}={hash_val}."
-        )
     logger.info(f"Writing into directory: {output_dir}.")
     _file_type = file_type.lower().strip()
     if filepath.name.endswith("zip") or _file_type == "zip":

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/bundle/utils.py

@@ -21,7 +21,6 @@ from monai.config.deviceconfig import get_config_values
 from monai.utils import optional_import
 
 yaml, _ = optional_import("yaml")
-
 __all__ = [
     "ID_REF_KEY",
     "ID_SEP_KEY",
@@ -39,7 +38,6 @@ MACRO_KEY = "%"  # start of a macro of a config
 MERGE_KEY = "+"  # prefix indicating merge instead of override in case of multiple configs.
 
 _conf_values = get_config_values()
-
 DEFAULT_METADATA = {
     "version": "0.0.1",
     "changelog": {"0.0.1": "Initial version"},
@@ -211,20 +209,15 @@ def load_bundle_config(bundle_path: str, *config_names: str, **load_kw_args: Any
         name, _ = os.path.splitext(os.path.basename(bundle_path))
 
         archive = zipfile.ZipFile(bundle_path, "r")
-
         all_files = archive.namelist()
-
         zip_meta_name = f"{name}/configs/metadata.json"
-
         if zip_meta_name in all_files:
             prefix = f"{name}/configs/"  # zipped directory location for files
         else:
             zip_meta_name = f"{name}/extra/metadata.json"
             prefix = f"{name}/extra/"  # Torchscript location for files
-
         meta_json = json.loads(archive.read(zip_meta_name))
         parser.read_meta(f=meta_json)
-
         for cname in config_names:
             full_cname = prefix + cname
             if full_cname not in all_files:

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/data/meta_tensor.py

@@ -495,7 +495,8 @@ class MetaTensor(MetaObj, torch.Tensor):
             _kwargs: additional kwargs (currently unused).
 
         Returns:
-            data array instance
+            ``MetaTensor`` when a torch dtype is given (metadata is preserved),
+            or ``np.ndarray`` when a numpy dtype is given.
         """
         if isinstance(dtype, str):
             mod_str, *dtype = dtype.split(".", 1)
@@ -506,7 +507,7 @@ class MetaTensor(MetaObj, torch.Tensor):
 
         out_type: type[torch.Tensor] | type[np.ndarray] | None
         if mod_str == "torch":
-            out_type = torch.Tensor
+            out_type = type(self)
         elif mod_str in ("numpy", "np"):
             out_type = np.ndarray
         else:

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632}/monai/handlers/utils.py

@@ -122,15 +122,15 @@ def write_metrics_reports(
 
             # add the average value of all classes to v
             if class_labels is None:
-                class_labels = ["class" + str(i) for i in range(v.shape[1])]
+                labels = ["class" + str(i) for i in range(v.shape[1])]
             else:
-                class_labels = [str(i) for i in class_labels]  # ensure to have a list of str
+                labels = [str(i) for i in class_labels]  # ensure to have a list of str
 
-            class_labels += ["mean"]
+            labels += ["mean"]
             v = np.concatenate([v, np.nanmean(v, axis=1, keepdims=True)], axis=1)
 
             with open(os.path.join(save_dir, f"{k}_raw.csv"), "w") as f:
-                f.write(f"filename{deli}{deli.join(class_labels)}\n")
+                f.write(f"filename{deli}{deli.join(labels)}\n")
                 for i, b in enumerate(v):
                     f.write(
                         f"{images[i] if images is not None else str(i)}{deli}"
@@ -164,7 +164,7 @@ def write_metrics_reports(
                 with open(os.path.join(save_dir, f"{k}_summary.csv"), "w") as f:
                     f.write(f"class{deli}{deli.join(ops)}\n")
                     for i, c in enumerate(np.transpose(v)):
-                        f.write(f"{class_labels[i]}{deli}{deli.join([f'{_compute_op(k, c):.4f}' for k in ops])}\n")
+                        f.write(f"{labels[i]}{deli}{deli.join([f'{_compute_op(k, c):.4f}' for k in ops])}\n")
 
 
 def from_engine(keys: KeysCollection, first: bool = False) -> Callable:

{monai_weekly-1.7.dev2630 → monai_weekly-1.7.dev2632/monai_weekly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monai-weekly
-Version: 1.7.dev2630
+Version: 1.7.dev2632
 Summary: AI Toolkit for Healthcare Imaging
 Home-page: https://project-monai.github.io/
 Author: MONAI Consortium