From e94452c327c73f1995e6e786d5cce48cf063ae76 Mon Sep 17 00:00:00 2001 From: Yiheng Wang Date: Thu, 10 Apr 2025 15:15:59 +0800 Subject: [PATCH 1/3] update get latest bundle version Signed-off-by: Yiheng Wang --- monai/bundle/scripts.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/monai/bundle/scripts.py b/monai/bundle/scripts.py index 4c17b32c29..33244b84e8 100644 --- a/monai/bundle/scripts.py +++ b/monai/bundle/scripts.py @@ -313,18 +313,7 @@ def _get_ngc_token(api_key, retry=0): def _get_latest_bundle_version_monaihosting(name): - full_url = f"{MONAI_HOSTING_BASE_URL}/{name.lower()}" - if has_requests: - resp = requests.get(full_url) - try: - resp.raise_for_status() - model_info = json.loads(resp.text) - return model_info["model"]["latestVersionIdStr"] - except requests.exceptions.HTTPError: - # for monaihosting bundles, if cannot find the version, get from model zoo model_info.json - return get_bundle_versions(name)["latest_version"] - - raise ValueError("NGC API requires requests package. Please install it.") + return get_bundle_versions(name, repo="MONAI/model-zoo", tag="dev")["latest_version"] def _examine_monai_version(monai_version: str) -> tuple[bool, str]: From a65c3939adf3b9a29ce92333e6db8543380b0208 Mon Sep 17 00:00:00 2001 From: Yiheng Wang Date: Thu, 10 Apr 2025 15:24:16 +0800 Subject: [PATCH 2/3] update repo id Signed-off-by: Yiheng Wang --- monai/bundle/scripts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/bundle/scripts.py b/monai/bundle/scripts.py index 33244b84e8..eb5a60a7c5 100644 --- a/monai/bundle/scripts.py +++ b/monai/bundle/scripts.py @@ -313,7 +313,7 @@ def _get_ngc_token(api_key, retry=0): def _get_latest_bundle_version_monaihosting(name): - return get_bundle_versions(name, repo="MONAI/model-zoo", tag="dev")["latest_version"] + return get_bundle_versions(name, repo="Project-MONAI/model-zoo", tag="dev")["latest_version"] def _examine_monai_version(monai_version: str) -> tuple[bool, str]: From 4c25c8abfbb9adae2eb6407bd92aa77a66ac95b7 Mon Sep 17 00:00:00 2001 From: Yiheng Wang Date: Thu, 10 Apr 2025 15:33:08 +0800 Subject: [PATCH 3/3] update based on comments Signed-off-by: Yiheng Wang --- monai/bundle/scripts.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/monai/bundle/scripts.py b/monai/bundle/scripts.py index eb5a60a7c5..dbfc449edb 100644 --- a/monai/bundle/scripts.py +++ b/monai/bundle/scripts.py @@ -312,10 +312,6 @@ def _get_ngc_token(api_key, retry=0): return token -def _get_latest_bundle_version_monaihosting(name): - return get_bundle_versions(name, repo="Project-MONAI/model-zoo", tag="dev")["latest_version"] - - def _examine_monai_version(monai_version: str) -> tuple[bool, str]: """Examine if the package version is compatible with the MONAI version in the metadata.""" version_dict = get_versions() @@ -419,7 +415,7 @@ def _get_latest_bundle_version( name = _add_ngc_prefix(name) return _get_latest_bundle_version_ngc(name) elif source == "monaihosting": - return _get_latest_bundle_version_monaihosting(name) + return get_bundle_versions(name, repo="Project-MONAI/model-zoo", tag="dev")["latest_version"] elif source == "ngc_private": headers = kwargs.pop("headers", {}) name = _add_ngc_prefix(name)