Merge pull request #2048 from KPatr1ck/import_bug

[CLI][Audio] Fix circular import error in paddlespeech.cli.utils and paddlespeech.audio

paddlespeech/audio/utils/__init__.py

@@ -11,8 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from ...cli.utils import DATA_HOME
+from ...utils.env import DATA_HOME
-from ...cli.utils import MODEL_HOME
+from ...utils.env import MODEL_HOME
 from .download import decompress
 from .download import download_and_decompress
 from .download import load_state_dict_from_url

paddlespeech/cli/asr/infer.py

@@ -26,11 +26,11 @@ import paddle
 import soundfile
 from yacs.config import CfgNode
 
+from ...utils.env import MODEL_HOME
 from ..download import get_path_from_url
 from ..executor import BaseExecutor
 from ..log import logger
 from ..utils import CLI_TIMER
-from ..utils import MODEL_HOME
 from ..utils import stats_wrapper
 from ..utils import timer_register
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer

paddlespeech/cli/st/infer.py

@@ -26,10 +26,10 @@ import soundfile
 from kaldiio import WriteHelper
 from yacs.config import CfgNode
 
+from ...utils.env import MODEL_HOME
 from ..executor import BaseExecutor
 from ..log import logger
 from ..utils import download_and_decompress
-from ..utils import MODEL_HOME
 from ..utils import stats_wrapper
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer
 from paddlespeech.s2t.utils.utility import UpdateConfig

paddlespeech/cli/utils.py

@@ -30,6 +30,7 @@ import yaml
 from paddle.framework import load
 
 from . import download
+from ..utils.env import CONF_HOME
 from .entry import commands
 try:
     from .. import __version__
@@ -161,38 +162,6 @@ def load_state_dict_from_url(url: str, path: str, md5: str=None) -> os.PathLike:
     return load(os.path.join(path, os.path.basename(url)))
 
 
-def _get_user_home():
-    return os.path.expanduser('~')
-
-
-def _get_paddlespcceh_home():
-    if 'PPSPEECH_HOME' in os.environ:
-        home_path = os.environ['PPSPEECH_HOME']
-        if os.path.exists(home_path):
-            if os.path.isdir(home_path):
-                return home_path
-            else:
-                raise RuntimeError(
-                    'The environment variable PPSPEECH_HOME {} is not a directory.'.
-                    format(home_path))
-        else:
-            return home_path
-    return os.path.join(_get_user_home(), '.paddlespeech')
-
-
-def _get_sub_home(directory):
-    home = os.path.join(_get_paddlespcceh_home(), directory)
-    if not os.path.exists(home):
-        os.makedirs(home)
-    return home
-
-
-PPSPEECH_HOME = _get_paddlespcceh_home()
-MODEL_HOME = _get_sub_home('models')
-CONF_HOME = _get_sub_home('conf')
-DATA_HOME = _get_sub_home('datasets')
-
-
 def _md5(text: str):
     '''Calculate the md5 value of the input text.'''
     md5code = hashlib.md5(text.encode())

paddlespeech/cls/models/panns/panns.py

@@ -16,8 +16,8 @@ import os
 import paddle.nn as nn
 import paddle.nn.functional as F
 
-from paddlespeech.audio.utils import MODEL_HOME
 from paddlespeech.audio.utils.download import load_state_dict_from_url
+from paddlespeech.utils.env import MODEL_HOME
 
 __all__ = ['CNN14', 'CNN10', 'CNN6', 'cnn14', 'cnn10', 'cnn6']
 

paddlespeech/resource/resource.py

@@ -18,8 +18,8 @@ from typing import List
 from typing import Optional
 
 from ..cli.utils import download_and_decompress
-from ..cli.utils import MODEL_HOME
 from ..utils.dynamic_import import dynamic_import
+from ..utils.env import MODEL_HOME
 from .model_alias import model_alias
 
 task_supported = ['asr', 'cls', 'st', 'text', 'tts', 'vector']

paddlespeech/server/engine/asr/online/onnx/asr_engine.py

@@ -23,7 +23,6 @@ from yacs.config import CfgNode
 
 from paddlespeech.cli.asr.infer import ASRExecutor
 from paddlespeech.cli.log import logger
-from paddlespeech.cli.utils import MODEL_HOME
 from paddlespeech.resource import CommonTaskResource
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer
 from paddlespeech.s2t.modules.ctc import CTCDecoder
@@ -31,6 +30,7 @@ from paddlespeech.s2t.transform.transformation import Transformation
 from paddlespeech.s2t.utils.utility import UpdateConfig
 from paddlespeech.server.engine.base_engine import BaseEngine
 from paddlespeech.server.utils import onnx_infer
+from paddlespeech.utils.env import MODEL_HOME
 
 __all__ = ['PaddleASRConnectionHanddler', 'ASRServerExecutor', 'ASREngine']
 

paddlespeech/server/engine/asr/online/paddleinference/asr_engine.py

@@ -23,7 +23,6 @@ from yacs.config import CfgNode
 
 from paddlespeech.cli.asr.infer import ASRExecutor
 from paddlespeech.cli.log import logger
-from paddlespeech.cli.utils import MODEL_HOME
 from paddlespeech.resource import CommonTaskResource
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer
 from paddlespeech.s2t.modules.ctc import CTCDecoder
@@ -31,6 +30,7 @@ from paddlespeech.s2t.transform.transformation import Transformation
 from paddlespeech.s2t.utils.utility import UpdateConfig
 from paddlespeech.server.engine.base_engine import BaseEngine
 from paddlespeech.server.utils.paddle_predictor import init_predictor
+from paddlespeech.utils.env import MODEL_HOME
 
 __all__ = ['PaddleASRConnectionHanddler', 'ASRServerExecutor', 'ASREngine']
 

paddlespeech/server/engine/asr/online/python/asr_engine.py

@@ -23,7 +23,6 @@ from yacs.config import CfgNode
 
 from paddlespeech.cli.asr.infer import ASRExecutor
 from paddlespeech.cli.log import logger
-from paddlespeech.cli.utils import MODEL_HOME
 from paddlespeech.resource import CommonTaskResource
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer
 from paddlespeech.s2t.modules.ctc import CTCDecoder
@@ -36,6 +35,7 @@ from paddlespeech.server.engine.asr.online.ctc_endpoint import OnlineCTCEndpoint
 from paddlespeech.server.engine.asr.online.ctc_search import CTCPrefixBeamSearch
 from paddlespeech.server.engine.base_engine import BaseEngine
 from paddlespeech.server.utils.paddle_predictor import init_predictor
+from paddlespeech.utils.env import MODEL_HOME
 
 __all__ = ['PaddleASRConnectionHanddler', 'ASRServerExecutor', 'ASREngine']
 

paddlespeech/server/engine/asr/paddleinference/asr_engine.py

@@ -21,7 +21,6 @@ from yacs.config import CfgNode
 
 from paddlespeech.cli.asr.infer import ASRExecutor
 from paddlespeech.cli.log import logger
-from paddlespeech.cli.utils import MODEL_HOME
 from paddlespeech.resource import CommonTaskResource
 from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer
 from paddlespeech.s2t.modules.ctc import CTCDecoder
@@ -29,6 +28,7 @@ from paddlespeech.s2t.utils.utility import UpdateConfig
 from paddlespeech.server.engine.base_engine import BaseEngine
 from paddlespeech.server.utils.paddle_predictor import init_predictor
 from paddlespeech.server.utils.paddle_predictor import run_model
+from paddlespeech.utils.env import MODEL_HOME
 
 __all__ = ['ASREngine', 'PaddleASRConnectionHandler']
 

paddlespeech/utils/env.py

@@ -0,0 +1,46 @@
+# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+
+def _get_user_home():
+    return os.path.expanduser('~')
+
+
+def _get_paddlespcceh_home():
+    if 'PPSPEECH_HOME' in os.environ:
+        home_path = os.environ['PPSPEECH_HOME']
+        if os.path.exists(home_path):
+            if os.path.isdir(home_path):
+                return home_path
+            else:
+                raise RuntimeError(
+                    'The environment variable PPSPEECH_HOME {} is not a directory.'.
+                    format(home_path))
+        else:
+            return home_path
+    return os.path.join(_get_user_home(), '.paddlespeech')
+
+
+def _get_sub_home(directory):
+    home = os.path.join(_get_paddlespcceh_home(), directory)
+    if not os.path.exists(home):
+        os.makedirs(home)
+    return home
+
+
+PPSPEECH_HOME = _get_paddlespcceh_home()
+MODEL_HOME = _get_sub_home('models')
+CONF_HOME = _get_sub_home('conf')
+DATA_HOME = _get_sub_home('datasets')