diff --git a/funasr/auto/auto_frontend.py b/funasr/auto/auto_frontend.py index 501d1ab71..562d5f856 100644 --- a/funasr/auto/auto_frontend.py +++ b/funasr/auto/auto_frontend.py @@ -19,7 +19,7 @@ from funasr.utils.load_utils import load_bytes from funasr.download.file import download_from_url from funasr.auto.auto_model import prepare_data_iterator from funasr.utils.timestamp_tools import timestamp_sentence -from funasr.download.download_from_hub import download_model +from funasr.download.download_model_from_hub import download_model from funasr.utils.vad_utils import slice_padding_audio_samples from funasr.train_utils.set_all_random_seed import set_all_random_seed from funasr.train_utils.load_pretrained_model import load_pretrained_model diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py index 1b39e3fdb..e027e070e 100644 --- a/funasr/auto/auto_model.py +++ b/funasr/auto/auto_model.py @@ -20,7 +20,7 @@ from funasr.utils.load_utils import load_bytes from funasr.download.file import download_from_url from funasr.utils.timestamp_tools import timestamp_sentence from funasr.utils.timestamp_tools import timestamp_sentence_en -from funasr.download.download_from_hub import download_model +from funasr.download.download_model_from_hub import download_model from funasr.utils.vad_utils import slice_padding_audio_samples from funasr.utils.vad_utils import merge_vad from funasr.utils.load_utils import load_audio_text_image_video diff --git a/funasr/bin/compute_audio_cmvn.py b/funasr/bin/compute_audio_cmvn.py index e8ced5141..79c94c6e6 100644 --- a/funasr/bin/compute_audio_cmvn.py +++ b/funasr/bin/compute_audio_cmvn.py @@ -7,7 +7,7 @@ import logging from omegaconf import DictConfig, OmegaConf from funasr.register import tables -from funasr.download.download_from_hub import download_model +from funasr.download.download_model_from_hub import download_model from funasr.train_utils.set_all_random_seed import set_all_random_seed diff --git a/funasr/bin/train.py b/funasr/bin/train.py index 1a3048153..2729b80af 100644 --- a/funasr/bin/train.py +++ b/funasr/bin/train.py @@ -27,7 +27,7 @@ from funasr.optimizers import optim_classes from funasr.train_utils.trainer import Trainer from funasr.schedulers import scheduler_classes from funasr.train_utils.initialize import initialize -from funasr.download.download_from_hub import download_model +from funasr.download.download_model_from_hub import download_model from funasr.models.lora.utils import mark_only_lora_as_trainable from funasr.train_utils.set_all_random_seed import set_all_random_seed from funasr.train_utils.load_pretrained_model import load_pretrained_model diff --git a/funasr/bin/train_ds.py b/funasr/bin/train_ds.py index 6c0f174c2..415904ed3 100644 --- a/funasr/bin/train_ds.py +++ b/funasr/bin/train_ds.py @@ -27,7 +27,7 @@ from funasr.optimizers import optim_classes from funasr.train_utils.trainer_ds import Trainer from funasr.schedulers import scheduler_classes from funasr.train_utils.initialize import initialize -from funasr.download.download_from_hub import download_model +from funasr.download.download_model_from_hub import download_model from funasr.models.lora.utils import mark_only_lora_as_trainable from funasr.train_utils.set_all_random_seed import set_all_random_seed from funasr.train_utils.load_pretrained_model import load_pretrained_model diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_model_from_hub.py similarity index 100% rename from funasr/download/download_from_hub.py rename to funasr/download/download_model_from_hub.py diff --git a/funasr/utils/dynamic_import.py b/funasr/utils/dynamic_import.py index 531b96bd4..e0a056bd3 100644 --- a/funasr/utils/dynamic_import.py +++ b/funasr/utils/dynamic_import.py @@ -28,13 +28,16 @@ def import_module_from_path(file_path: str): file_path = download_from_url(file_path) file_dir = os.path.dirname(file_path) - file_name = os.path.basename(file_path) + # file_name = os.path.basename(file_path) module_name = file_path.split("/")[-1].replace(".py", "") if len(file_dir) < 1: file_dir = "./" sys.path.append(file_dir) - importlib.import_module(module_name) - print(f"Loading remote code successfully: {file_path}") + try: + importlib.import_module(module_name) + print(f"Loading remote code successfully: {file_path}") + except Exception as e: + print(f"Loading remote code failed: {file_path}, {e}") #