From 7ea6cb28b260c4b8aeeaf103a47efc7fd5f97982 Mon Sep 17 00:00:00 2001 From: Jee Jee Li Date: Mon, 12 May 2025 18:46:45 +0800 Subject: [PATCH] [Misc] Improve modelscope import error (#17983) Signed-off-by: Jee Jee Li --- vllm/transformers_utils/__init__.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index 01d5bb4b57489..b556976a51ba7 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -3,17 +3,21 @@ from vllm.envs import VLLM_USE_MODELSCOPE if VLLM_USE_MODELSCOPE: - # Patch here, before each import happens - import modelscope - from packaging import version + try: + # Patch here, before each import happens + import modelscope + from packaging import version - # patch_hub begins from modelscope>=1.18.1 - if version.parse(modelscope.__version__) <= version.parse('1.18.0'): + # patch_hub begins from modelscope>=1.18.1 + if version.parse(modelscope.__version__) <= version.parse('1.18.0'): + raise ImportError( + 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' + 'install by `pip install modelscope -U`') + from modelscope.utils.hf_util import patch_hub + + # Patch hub to download models from modelscope to speed up. + patch_hub() + except ImportError as err: raise ImportError( - 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' - 'install by `pip install modelscope -U`') - - from modelscope.utils.hf_util import patch_hub - - # Patch hub to download models from modelscope to speed up. - patch_hub() + "Please install modelscope>=1.18.1 via " + "`pip install modelscope>=1.18.1` to use ModelScope.") from err