From f77b8ede746418b5c9448a359938ad7642560ec9 Mon Sep 17 00:00:00 2001 From: KP <109694228@qq.com> Date: Tue, 31 May 2022 18:59:40 +0800 Subject: [PATCH] Fix server issues. --- paddlespeech/resource/resource.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/paddlespeech/resource/resource.py b/paddlespeech/resource/resource.py index fff5f745..369dba90 100644 --- a/paddlespeech/resource/resource.py +++ b/paddlespeech/resource/resource.py @@ -82,7 +82,7 @@ class CommonTaskResource: self.model_tag = model_tag self.version = version self.res_dict = self.pretrained_models[model_tag][version] - self.format_path(self.res_dict) + self._format_path(self.res_dict) self.res_dir = self._fetch(self.res_dict, self._get_model_dir(model_type)) else: @@ -90,19 +90,10 @@ class CommonTaskResource: self.voc_model_tag = model_tag self.voc_version = version self.voc_res_dict = self.pretrained_models[model_tag][version] - self.format_path(self.voc_res_dict) + self._format_path(self.voc_res_dict) self.voc_res_dir = self._fetch(self.voc_res_dict, self._get_model_dir(model_type)) - @staticmethod - def format_path(res_dict: Dict[str, str]): - for k, v in res_dict.items(): - if '/' in v: - if v.startswith('https://') or v.startswith('http://'): - continue - else: - res_dict[k] = os.path.join(*(v.split('/'))) - @staticmethod def get_model_class(model_name) -> List[object]: """Dynamic import model class. @@ -231,3 +222,12 @@ class CommonTaskResource: os.PathLike: Directory of model resource. """ return download_and_decompress(res_dict, target_dir) + + @staticmethod + def _format_path(res_dict: Dict[str, str]): + for k, v in res_dict.items(): + if isinstance(v, str) and '/' in v: + if v.startswith('https://') or v.startswith('http://'): + continue + else: + res_dict[k] = os.path.join(*(v.split('/')))