diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 13f61ff3..e028d36a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -26,8 +26,12 @@ on: other_params: description: 'Other params in --xxx xxx' required: false + python_version: + description: 'Python version to use, default is 3.10.14' + required: false + default: '3.10.14' -run-name: Docker-${{ inputs.modelscope_branch }}-${{ inputs.image_type }}-${{ inputs.workflow_name }}-by-@${{ github.actor }} +run-name: Docker-${{ inputs.modelscope_branch }}-${{ inputs.image_type }}-${{ inputs.workflow_name }}-${{ inputs.python_version }}-by-@${{ github.actor }} jobs: build: @@ -51,4 +55,4 @@ jobs: run: | set -e source ~/.bashrc - python docker/build_image.py --image_type ${{ github.event.inputs.image_type }} --modelscope_branch ${{ github.event.inputs.modelscope_branch }} --modelscope_version ${{ github.event.inputs.modelscope_version }} --swift_branch ${{ github.event.inputs.swift_branch }} --ci_image ${{ github.event.inputs.ci_image }} ${{ github.event.inputs.other_params }} + python docker/build_image.py --image_type ${{ github.event.inputs.image_type }} --python_version ${{ github.event.inputs.python_version }} --modelscope_branch ${{ github.event.inputs.modelscope_branch }} --modelscope_version ${{ github.event.inputs.modelscope_version }} --swift_branch ${{ github.event.inputs.swift_branch }} --ci_image ${{ github.event.inputs.ci_image }} ${{ github.event.inputs.other_params }} diff --git a/modelscope/utils/hf_util/patcher.py b/modelscope/utils/hf_util/patcher.py index 6a41a5ce..b31b6e1d 100644 --- a/modelscope/utils/hf_util/patcher.py +++ b/modelscope/utils/hf_util/patcher.py @@ -345,7 +345,7 @@ def _patch_pretrained_class(all_imported_modules, wrap=False): else: all_available_modules.append( get_wrapped_class(var, **ignore_file_pattern_kwargs)) - except: # noqa + except Exception: all_available_modules.append(var) else: if has_from_pretrained and not hasattr(var, @@ -370,9 +370,10 @@ def _patch_pretrained_class(all_imported_modules, wrap=False): if has_get_config_dict and not hasattr(var, '_get_config_dict_origin'): var._get_config_dict_origin = var.get_config_dict - var.get_config_dict = classmethod( - partial(patch_get_config_dict, - **ignore_file_pattern_kwargs)) + var.get_config_dict = partial( + patch_pretrained_model_name_or_path, + ori_func=var._get_config_dict_origin, + **ignore_file_pattern_kwargs) all_available_modules.append(var) return all_available_modules @@ -618,6 +619,11 @@ def _patch_hub(): # Patch repocard.validate from huggingface_hub import repocard if not hasattr(repocard.RepoCard, '_validate_origin'): + + def load(*args, **kwargs): # noqa + from huggingface_hub.errors import EntryNotFoundError + raise EntryNotFoundError(message='API not supported.') + repocard.RepoCard._validate_origin = repocard.RepoCard.validate repocard.RepoCard.validate = lambda *args, **kwargs: None repocard.RepoCard._load_origin = repocard.RepoCard.load