amended runtimeerrors -> valueerror

Signed-off-by: Enoch Mok <enochmokny@gmail.com>

Author: e-mny

monai/apps/utils.py

@@ -220,8 +220,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.
-
+        ValueError: When the hash validation of the ``url`` downloaded file fails.
     """
     if not filepath:
         filepath = Path(".", _basename(url)).resolve()
@@ -260,20 +259,20 @@ 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(filepath, hash_val, hash_type):
+                raise ValueError(
+                    f"{hash_type} hash check of downloaded file failed: URL={url}, "
+                    f"filepath={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)
             shutil.move(f"{tmp_name}", f"{filepath}")  # copy the downloaded to a user-specified cache.
     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 ValueError(
-            f"{hash_type} hash check of downloaded file failed: URL={url}, "
-            f"filepath={filepath}, expected {hash_type}={hash_val}, "
-            f"The file may be corrupted or tampered with. "
-            "Please retry the download or verify the source."
-        )
 
 
 def _extract_zip(filepath, output_dir):

tests/test_utils.py

@@ -199,7 +199,7 @@ def test_download_url(self):
         """Download a sample TIFF and validate hash handling.
 
         Raises:
-            RuntimeError: When the downloaded file's hash does not match.
+            ValueError: When the downloaded file's hash does not match.
         """
         with tempfile.TemporaryDirectory() as tempdir:
             with skip_if_downloading_fails():
@@ -209,7 +209,7 @@ def test_download_url(self):
                     hash_val=SAMPLE_TIFF_HASH,
                     hash_type=SAMPLE_TIFF_HASH_TYPE,
                 )
-            with self.assertRaises(RuntimeError):
+            with self.assertRaises(ValueError):
                 download_url(
                     url=SAMPLE_TIFF,
                     filepath=os.path.join(tempdir, "model_bad.tiff"),