Enhance download_and_extract

Signed-off-by: jerome_Hsieh <[email protected]>

Author: Jerome-Hsieh

monai/apps/utils.py

@@ -301,7 +301,7 @@ def extractall(
     )
 
 
-def _get_filename_from_url(data_url: str):
+def get_filename_from_url(data_url: str):
     try:
         if "drive.google.com" in data_url:
             response = requests.head(data_url, allow_redirects=True)
@@ -359,7 +359,7 @@ def download_and_extract(
             be False.
         progress: whether to display progress bar.
     """
-    url_filename_ext = "".join(Path(_get_filename_from_url(url)).suffixes)
+    url_filename_ext = "".join(Path(get_filename_from_url(url)).suffixes)
     filepath_ext = "".join(Path(_basename(filepath)).suffixes)
     if filepath not in ["", "."]:
         if filepath_ext == "":
@@ -371,6 +371,6 @@ def download_and_extract(
     if filepath_ext and filepath_ext != url_filename_ext:
         raise ValueError(f"File extension mismatch: expected extension {url_filename_ext}, but get {filepath_ext}")
     with tempfile.TemporaryDirectory() as tmp_dir:
-        filename = filepath or Path(tmp_dir, _get_filename_from_url(url)).resolve()
+        filename = filepath or Path(tmp_dir, get_filename_from_url(url)).resolve()
         download_url(url=url, filepath=filename, hash_val=hash_val, hash_type=hash_type, progress=progress)
         extractall(filepath=filename, output_dir=output_dir, file_type=file_type, has_base=has_base)

tests/test_download_and_extract.py

@@ -20,9 +20,10 @@
 from parameterized import parameterized
 
 from monai.apps import download_and_extract, download_url, extractall
-from tests.utils import skip_if_downloading_fails, skip_if_quick, testing_data_config
+from tests.utils import SkipIfNoModule, skip_if_downloading_fails, skip_if_quick, testing_data_config
 
 
+@SkipIfNoModule("requests")
 class TestDownloadAndExtract(unittest.TestCase):
 
     @skip_if_quick