Merge pull request #1764 from zh794390558/format

format code

audio/tests/backends/soundfile/test_io.py

@@ -16,9 +16,9 @@ import os
 import unittest
 
 import numpy as np
+import paddleaudio
 import soundfile as sf
 
-import paddleaudio
 from ..base import BackendTest
 
 

audio/tests/benchmark/log_melspectrogram.py

@@ -17,11 +17,10 @@ import urllib.request
 import librosa
 import numpy as np
 import paddle
+import paddleaudio
 import torch
 import torchaudio
 
-import paddleaudio
-
 wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav'
 if not os.path.isfile(os.path.basename(wav_url)):
     urllib.request.urlretrieve(wav_url, os.path.basename(wav_url))

audio/tests/benchmark/melspectrogram.py

@@ -17,11 +17,10 @@ import urllib.request
 import librosa
 import numpy as np
 import paddle
+import paddleaudio
 import torch
 import torchaudio
 
-import paddleaudio
-
 wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav'
 if not os.path.isfile(os.path.basename(wav_url)):
     urllib.request.urlretrieve(wav_url, os.path.basename(wav_url))

audio/tests/benchmark/mfcc.py

@@ -17,11 +17,10 @@ import urllib.request
 import librosa
 import numpy as np
 import paddle
+import paddleaudio
 import torch
 import torchaudio
 
-import paddleaudio
-
 wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav'
 if not os.path.isfile(os.path.basename(wav_url)):
     urllib.request.urlretrieve(wav_url, os.path.basename(wav_url))

audio/tests/features/base.py

@@ -17,7 +17,6 @@ import urllib.request
 
 import numpy as np
 import paddle
-
 from paddleaudio import load
 
 wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav'

audio/tests/features/test_istft.py

@@ -15,9 +15,9 @@ import unittest
 
 import numpy as np
 import paddle
+from paddleaudio.functional.window import get_window
 
 from .base import FeatTest
-from paddleaudio.functional.window import get_window
 from paddlespeech.s2t.transform.spectrogram import IStft
 from paddlespeech.s2t.transform.spectrogram import Stft
 

audio/tests/features/test_kaldi.py

@@ -15,10 +15,10 @@ import unittest
 
 import numpy as np
 import paddle
+import paddleaudio
 import torch
 import torchaudio
 
-import paddleaudio
 from .base import FeatTest
 
 

audio/tests/features/test_librosa.py

@@ -16,11 +16,11 @@ import unittest
 import librosa
 import numpy as np
 import paddle
-
 import paddleaudio
-from .base import FeatTest
 from paddleaudio.functional.window import get_window
 
+from .base import FeatTest
+
 
 class TestLibrosa(FeatTest):
     def initParmas(self):

audio/tests/features/test_log_melspectrogram.py

@@ -15,8 +15,8 @@ import unittest
 
 import numpy as np
 import paddle
-
 import paddleaudio
+
 from .base import FeatTest
 from paddlespeech.s2t.transform.spectrogram import LogMelSpectrogram
 

audio/tests/features/test_spectrogram.py

@@ -15,8 +15,8 @@ import unittest
 
 import numpy as np
 import paddle
-
 import paddleaudio
+
 from .base import FeatTest
 from paddlespeech.s2t.transform.spectrogram import Spectrogram
 

audio/tests/features/test_stft.py

@@ -15,9 +15,9 @@ import unittest
 
 import numpy as np
 import paddle
+from paddleaudio.functional.window import get_window
 
 from .base import FeatTest
-from paddleaudio.functional.window import get_window
 from paddlespeech.s2t.transform.spectrogram import Stft
 
 

demos/audio_searching/src/vpr_search.py

@@ -19,6 +19,7 @@ from fastapi import FastAPI
 from fastapi import File
 from fastapi import Form
 from fastapi import UploadFile
+from logs import LOGGER
 from mysql_helpers import MySQLHelper
 from operations.count import do_count_vpr
 from operations.count import do_get
@@ -31,8 +32,6 @@ from starlette.middleware.cors import CORSMiddleware
 from starlette.requests import Request
 from starlette.responses import FileResponse
 
-from logs import LOGGER
-
 app = FastAPI()
 app.add_middleware(
     CORSMiddleware,

examples/voxceleb/sv0/local/data_prepare.py

@@ -14,9 +14,9 @@
 import argparse
 
 import paddle
+from paddleaudio.datasets.voxceleb import VoxCeleb
 from yacs.config import CfgNode
 
-from paddleaudio.datasets.voxceleb import VoxCeleb
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.io.augment import build_augment_pipeline
 from paddlespeech.vector.training.seeding import seed_everything

examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py

@@ -21,9 +21,9 @@ import os
 from typing import List
 
 import tqdm
+from paddleaudio import load as load_audio
 from yacs.config import CfgNode
 
-from paddleaudio import load as load_audio
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.utils.vector_utils import get_chunks
 

examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py

@@ -22,9 +22,9 @@ import os
 import random
 
 import tqdm
+from paddleaudio import load as load_audio
 from yacs.config import CfgNode
 
-from paddleaudio import load as load_audio
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.utils.vector_utils import get_chunks
 

paddlespeech/cli/cls/infer.py

@@ -21,6 +21,8 @@ from typing import Union
 import numpy as np
 import paddle
 import yaml
+from paddleaudio import load
+from paddleaudio.features import LogMelSpectrogram
 
 from ..executor import BaseExecutor
 from ..log import logger
@@ -28,8 +30,6 @@ from ..utils import cli_register
 from ..utils import stats_wrapper
 from .pretrained_models import model_alias
 from .pretrained_models import pretrained_models
-from paddleaudio import load
-from paddleaudio.features import LogMelSpectrogram
 from paddlespeech.s2t.utils.dynamic_import import dynamic_import
 
 __all__ = ['CLSExecutor']

paddlespeech/cli/utils.py

@@ -24,11 +24,11 @@ from typing import Any
 from typing import Dict
 
 import paddle
+import paddleaudio
 import requests
 import yaml
 from paddle.framework import load
 
-import paddleaudio
 from . import download
 from .entry import commands
 try:

paddlespeech/cli/vector/infer.py

@@ -22,6 +22,8 @@ from typing import Union
 
 import paddle
 import soundfile
+from paddleaudio.backends import load as load_audio
+from paddleaudio.compliance.librosa import melspectrogram
 from yacs.config import CfgNode
 
 from ..executor import BaseExecutor
@@ -30,8 +32,6 @@ from ..utils import cli_register
 from ..utils import stats_wrapper
 from .pretrained_models import model_alias
 from .pretrained_models import pretrained_models
-from paddleaudio.backends import load as load_audio
-from paddleaudio.compliance.librosa import melspectrogram
 from paddlespeech.s2t.utils.dynamic_import import dynamic_import
 from paddlespeech.vector.io.batch import feature_normalize
 from paddlespeech.vector.modules.sid_model import SpeakerIdetification

paddlespeech/cls/exps/panns/deploy/predict.py

@@ -16,11 +16,10 @@ import os
 
 import numpy as np
 from paddle import inference
-from scipy.special import softmax
-
 from paddleaudio.backends import load as load_audio
 from paddleaudio.datasets import ESC50
 from paddleaudio.features import melspectrogram
+from scipy.special import softmax
 
 # yapf: disable
 parser = argparse.ArgumentParser()

paddlespeech/cls/exps/panns/export_model.py

@@ -15,8 +15,8 @@ import argparse
 import os
 
 import paddle
-
 from paddleaudio.datasets import ESC50
+
 from paddlespeech.cls.models import cnn14
 from paddlespeech.cls.models import SoundClassifier
 

paddlespeech/cls/exps/panns/predict.py

@@ -17,10 +17,10 @@ import os
 import paddle
 import paddle.nn.functional as F
 import yaml
-
 from paddleaudio.backends import load as load_audio
 from paddleaudio.features import LogMelSpectrogram
 from paddleaudio.utils import logger
+
 from paddlespeech.cls.models import SoundClassifier
 from paddlespeech.s2t.utils.dynamic_import import dynamic_import
 

paddlespeech/cls/exps/panns/train.py

@@ -16,10 +16,10 @@ import os
 
 import paddle
 import yaml
-
 from paddleaudio.features import LogMelSpectrogram
 from paddleaudio.utils import logger
 from paddleaudio.utils import Timer
+
 from paddlespeech.cls.models import SoundClassifier
 from paddlespeech.s2t.utils.dynamic_import import dynamic_import
 

paddlespeech/cls/models/panns/panns.py

@@ -15,7 +15,6 @@ import os
 
 import paddle.nn as nn
 import paddle.nn.functional as F
-
 from paddleaudio.utils.download import load_state_dict_from_url
 from paddleaudio.utils.env import MODEL_HOME
 

paddlespeech/s2t/transform/spectrogram.py

@@ -15,9 +15,8 @@
 import librosa
 import numpy as np
 import paddle
-from python_speech_features import logfbank
-
 import paddleaudio.compliance.kaldi as kaldi
+from python_speech_features import logfbank
 
 
 def stft(x,

paddlespeech/server/engine/tts/online/onnx/tts_engine.py

@@ -124,7 +124,6 @@ class TTSServerExecutor(TTSExecutor):
         self.pretrained_models = pretrained_models
         self.model_alias = model_alias
 
-    
     def _get_pretrained_path(self, tag: str) -> os.PathLike:
         """
         #Download and returns pretrained resources path of current task.
@@ -141,7 +140,6 @@ class TTSServerExecutor(TTSExecutor):
             'Use pretrained model stored in: {}'.format(decompressed_path))
         return decompressed_path
 
-
     def _init_from_path(
             self,
             am: str='fastspeech2_csmsc_onnx',

paddlespeech/server/util.py

@@ -24,11 +24,11 @@ from typing import Any
 from typing import Dict
 
 import paddle
+import paddleaudio
 import requests
 import yaml
 from paddle.framework import load
 
-import paddleaudio
 from . import download
 from .entry import client_commands
 from .entry import server_commands

paddlespeech/vector/exps/ecapa_tdnn/extract_emb.py

@@ -16,10 +16,10 @@ import os
 import time
 
 import paddle
-from yacs.config import CfgNode
-
 from paddleaudio.backends import load as load_audio
 from paddleaudio.compliance.librosa import melspectrogram
+from yacs.config import CfgNode
+
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.io.batch import feature_normalize
 from paddlespeech.vector.models.ecapa_tdnn import EcapaTdnn

paddlespeech/vector/exps/ecapa_tdnn/test.py

@@ -18,10 +18,10 @@ import numpy as np
 import paddle
 from paddle.io import BatchSampler
 from paddle.io import DataLoader
+from paddleaudio.metric import compute_eer
 from tqdm import tqdm
 from yacs.config import CfgNode
 
-from paddleaudio.metric import compute_eer
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.io.batch import batch_feature_normalize
 from paddlespeech.vector.io.dataset import CSVDataset

paddlespeech/vector/exps/ecapa_tdnn/train.py

@@ -20,9 +20,9 @@ import paddle
 from paddle.io import BatchSampler
 from paddle.io import DataLoader
 from paddle.io import DistributedBatchSampler
+from paddleaudio.compliance.librosa import melspectrogram
 from yacs.config import CfgNode
 
-from paddleaudio.compliance.librosa import melspectrogram
 from paddlespeech.s2t.utils.log import Log
 from paddlespeech.vector.io.augment import build_augment_pipeline
 from paddlespeech.vector.io.augment import waveform_augment

paddlespeech/vector/io/dataset.py

@@ -15,9 +15,9 @@ from dataclasses import dataclass
 from dataclasses import fields
 
 from paddle.io import Dataset
-
 from paddleaudio import load as load_audio
 from paddleaudio.compliance.librosa import melspectrogram
+
 from paddlespeech.s2t.utils.log import Log
 logger = Log(__name__).getlog()
 

paddlespeech/vector/io/dataset_from_json.py

@@ -16,7 +16,6 @@ from dataclasses import dataclass
 from dataclasses import fields
 
 from paddle.io import Dataset
-
 from paddleaudio import load as load_audio
 from paddleaudio.compliance.librosa import melspectrogram
 from paddleaudio.compliance.librosa import mfcc

tests/unit/server/online/tts/check_server/change_yaml.py

@@ -4,6 +4,7 @@ import os
 
 import yaml
 
+
 def change_value(args):
     yamlfile = args.config_file
     change_type = args.change_type