From e7712f496e3dca75e4373353197b0f4a8b704952 Mon Sep 17 00:00:00 2001 From: Barabazs <31799121+Barabazs@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:13:55 +0100 Subject: [PATCH] refactor: update import statements to use explicit module paths across multiple files --- whisperx/SubtitlesProcessor.py | 3 +-- whisperx/__init__.py | 11 +++++++---- whisperx/__main__.py | 2 +- whisperx/alignment.py | 6 +++--- whisperx/asr.py | 7 ++++--- whisperx/audio.py | 2 +- whisperx/diarize.py | 4 ++-- whisperx/transcribe.py | 12 ++++++------ whisperx/vads/__init__.py | 6 +++--- whisperx/vads/pyannote.py | 4 +--- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/whisperx/SubtitlesProcessor.py b/whisperx/SubtitlesProcessor.py index 351b883..1a50ec8 100644 --- a/whisperx/SubtitlesProcessor.py +++ b/whisperx/SubtitlesProcessor.py @@ -1,6 +1,5 @@ import math -from .conjunctions import get_conjunctions, get_comma -from typing import TextIO +from whisperx.conjunctions import get_conjunctions, get_comma def normal_round(n): if n - math.floor(n) < 0.5: diff --git a/whisperx/__init__.py b/whisperx/__init__.py index 92e6d42..8ab8a26 100644 --- a/whisperx/__init__.py +++ b/whisperx/__init__.py @@ -1,4 +1,7 @@ -from .alignment import load_align_model, align -from .audio import load_audio -from .diarize import assign_word_speakers, DiarizationPipeline -from .asr import load_model +from whisperx.alignment import load_align_model as load_align_model, align as align +from whisperx.asr import load_model as load_model +from whisperx.audio import load_audio as load_audio +from whisperx.diarize import ( + assign_word_speakers as assign_word_speakers, + DiarizationPipeline as DiarizationPipeline, +) diff --git a/whisperx/__main__.py b/whisperx/__main__.py index bc9b04a..41412c8 100644 --- a/whisperx/__main__.py +++ b/whisperx/__main__.py @@ -1,4 +1,4 @@ -from .transcribe import cli +from whisperx.transcribe import cli cli() diff --git a/whisperx/alignment.py b/whisperx/alignment.py index 552118e..b77a7f1 100644 --- a/whisperx/alignment.py +++ b/whisperx/alignment.py @@ -13,9 +13,9 @@ import torch import torchaudio from transformers import Wav2Vec2ForCTC, Wav2Vec2Processor -from .audio import SAMPLE_RATE, load_audio -from .utils import interpolate_nans -from .types import ( +from whisperx.audio import SAMPLE_RATE, load_audio +from whisperx.utils import interpolate_nans +from whisperx.types import ( AlignedTranscriptionResult, SingleSegment, SingleAlignedSegment, diff --git a/whisperx/asr.py b/whisperx/asr.py index 70cfa83..c476516 100644 --- a/whisperx/asr.py +++ b/whisperx/asr.py @@ -11,9 +11,10 @@ from faster_whisper.transcribe import TranscriptionOptions, get_ctranslate2_stor from transformers import Pipeline from transformers.pipelines.pt_utils import PipelineIterator -from .audio import N_SAMPLES, SAMPLE_RATE, load_audio, log_mel_spectrogram -from .types import SingleSegment, TranscriptionResult -from .vads import Vad, Silero, Pyannote +from whisperx.audio import N_SAMPLES, SAMPLE_RATE, load_audio, log_mel_spectrogram +from whisperx.types import SingleSegment, TranscriptionResult +from whisperx.vads import Vad, Silero, Pyannote + def find_numeral_symbol_tokens(tokenizer): numeral_symbol_tokens = [] diff --git a/whisperx/audio.py b/whisperx/audio.py index 42f97b8..63a53ca 100644 --- a/whisperx/audio.py +++ b/whisperx/audio.py @@ -7,7 +7,7 @@ import numpy as np import torch import torch.nn.functional as F -from .utils import exact_div +from whisperx.utils import exact_div # hard-coded audio hyperparameters SAMPLE_RATE = 16000 diff --git a/whisperx/diarize.py b/whisperx/diarize.py index 5b685b3..97a7813 100644 --- a/whisperx/diarize.py +++ b/whisperx/diarize.py @@ -4,8 +4,8 @@ from pyannote.audio import Pipeline from typing import Optional, Union import torch -from .audio import load_audio, SAMPLE_RATE -from .types import TranscriptionResult, AlignedTranscriptionResult +from whisperx.audio import load_audio, SAMPLE_RATE +from whisperx.types import TranscriptionResult, AlignedTranscriptionResult class DiarizationPipeline: diff --git a/whisperx/transcribe.py b/whisperx/transcribe.py index ae61ed1..a67787c 100644 --- a/whisperx/transcribe.py +++ b/whisperx/transcribe.py @@ -6,12 +6,12 @@ import warnings import numpy as np import torch -from .alignment import align, load_align_model -from .asr import load_model -from .audio import load_audio -from .diarize import DiarizationPipeline, assign_word_speakers -from .types import AlignedTranscriptionResult, TranscriptionResult -from .utils import ( +from whisperx.alignment import align, load_align_model +from whisperx.asr import load_model +from whisperx.audio import load_audio +from whisperx.diarize import DiarizationPipeline, assign_word_speakers +from whisperx.types import AlignedTranscriptionResult, TranscriptionResult +from whisperx.utils import ( LANGUAGES, TO_LANGUAGE_CODE, get_writer, diff --git a/whisperx/vads/__init__.py b/whisperx/vads/__init__.py index 9dd82bf..834c794 100644 --- a/whisperx/vads/__init__.py +++ b/whisperx/vads/__init__.py @@ -1,3 +1,3 @@ -from whisperx.vads.pyannote import Pyannote -from whisperx.vads.silero import Silero -from whisperx.vads.vad import Vad \ No newline at end of file +from whisperx.vads.pyannote import Pyannote as Pyannote +from whisperx.vads.silero import Silero as Silero +from whisperx.vads.vad import Vad as Vad diff --git a/whisperx/vads/pyannote.py b/whisperx/vads/pyannote.py index 543fb81..62225f0 100644 --- a/whisperx/vads/pyannote.py +++ b/whisperx/vads/pyannote.py @@ -1,6 +1,4 @@ -import hashlib import os -import urllib from typing import Callable, Text, Union from typing import Optional @@ -12,11 +10,11 @@ from pyannote.audio.pipelines import VoiceActivityDetection from pyannote.audio.pipelines.utils import PipelineModel from pyannote.core import Annotation, SlidingWindowFeature from pyannote.core import Segment -from tqdm import tqdm from whisperx.diarize import Segment as SegmentX from whisperx.vads.vad import Vad + def load_vad_model(device, vad_onset=0.500, vad_offset=0.363, use_auth_token=None, model_fp=None): model_dir = torch.hub._get_torch_home()