diff --git a/constants.py b/constants.py deleted file mode 100644 index e69de29b..00000000 diff --git a/server_executor_cleaned.py b/server_executor_cleaned.py index 487bf0f8..b9334e52 100644 --- a/server_executor_cleaned.py +++ b/server_executor_cleaned.py @@ -1,8 +1,6 @@ import asyncio -import datetime import io import json -import sys import uuid import wave from concurrent.futures import ThreadPoolExecutor @@ -14,6 +12,7 @@ from aiortc.contrib.media import MediaRelay from av import AudioFifo from loguru import logger from whisper_jax import FlaxWhisperPipline + from utils.run_utils import run_in_executor pcs = set() diff --git a/server_multithreaded.py b/server_multithreaded.py index bf0c371d..b62def09 100644 --- a/server_multithreaded.py +++ b/server_multithreaded.py @@ -1,9 +1,7 @@ import asyncio -from utils.run_utils import config import datetime import io import json -import os import threading import uuid import wave @@ -16,8 +14,9 @@ from aiortc.contrib.media import MediaRelay from av import AudioFifo from sortedcontainers import SortedDict from whisper_jax import FlaxWhisperPipline + from utils.log_utils import logger -from utils.run_utils import Mutex +from utils.run_utils import config, Mutex WHISPER_MODEL_SIZE = config['DEFAULT']["WHISPER_REAL_TIME_MODEL_SIZE"] pcs = set() diff --git a/stream_client.py b/stream_client.py index 22177970..a6b879e2 100644 --- a/stream_client.py +++ b/stream_client.py @@ -1,6 +1,5 @@ import ast import asyncio -from utils.run_utils import config import time import uuid @@ -12,7 +11,7 @@ from aiortc import (RTCPeerConnection, RTCSessionDescription) from aiortc.contrib.media import (MediaPlayer, MediaRelay) from utils.log_utils import logger -from utils.run_utils import Mutex +from utils.run_utils import config, Mutex file_lock = Mutex(open("test_sm_6.txt", "a")) diff --git a/utils/file_utils.py b/utils/file_utils.py index 504f12c5..2c14f00f 100644 --- a/utils/file_utils.py +++ b/utils/file_utils.py @@ -1,10 +1,10 @@ -import configparser import sys import boto3 import botocore -from run_utils import config + from log_utils import logger +from run_utils import config BUCKET_NAME = config["DEFAULT"]["BUCKET_NAME"] diff --git a/utils/text_utilities.py b/utils/text_utilities.py index 4fc292bb..f41cd800 100644 --- a/utils/text_utilities.py +++ b/utils/text_utilities.py @@ -1,5 +1,3 @@ -import configparser - import nltk import torch from nltk.corpus import stopwords @@ -7,13 +5,13 @@ from nltk.tokenize import word_tokenize from sklearn.feature_extraction.text import TfidfVectorizer from sklearn.metrics.pairwise import cosine_similarity from transformers import BartForConditionalGeneration, BartTokenizer -from run_utils import config + from log_utils import logger +from run_utils import config nltk.download('punkt', quiet=True) - def preprocess_sentence(sentence): stop_words = set(stopwords.words('english')) tokens = word_tokenize(sentence.lower()) diff --git a/whisjax.py b/whisjax.py index 8f6c7239..8946953f 100644 --- a/whisjax.py +++ b/whisjax.py @@ -5,7 +5,6 @@ # summarize podcast.mp3 summary.txt import argparse -import configparser import os import re import subprocess diff --git a/whisjax_realtime.py b/whisjax_realtime.py index 48deef2a..d8623ddc 100644 --- a/whisjax_realtime.py +++ b/whisjax_realtime.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -import configparser import time import wave from datetime import datetime @@ -17,7 +16,6 @@ from utils.run_utils import config from utils.text_utilities import post_process_transcription, summarize from utils.viz_utilities import create_talk_diff_scatter_viz, create_wordcloud - WHISPER_MODEL_SIZE = config['DEFAULT']["WHISPER_MODEL_SIZE"] FRAMES_PER_BUFFER = 8000