From 58c9cdf6766b8165387e46a07b7e0386dd87a9eb Mon Sep 17 00:00:00 2001 From: Gokul Mohanarangan Date: Tue, 11 Jul 2023 11:01:22 +0530 Subject: [PATCH] add singleton logging --- .gitignore | 1 + client.py | 4 ---- server_executor_cleaned.py | 4 +--- server_multithreaded.py | 5 +---- stream_client.py | 3 +-- utils/{file_utilities.py => file_utils.py} | 2 +- utils/log_utils.py | 14 ++++++++++++++ utils/text_utilities.py | 2 +- whisjax.py | 4 ++-- whisjax_realtime.py | 4 ++-- 10 files changed, 24 insertions(+), 19 deletions(-) rename utils/{file_utilities.py => file_utils.py} (97%) create mode 100644 utils/log_utils.py diff --git a/.gitignore b/.gitignore index 5c2931cb..fd3e8b20 100644 --- a/.gitignore +++ b/.gitignore @@ -174,4 +174,5 @@ test_samples/ *.mp3 *.m4a .DS_Store/ +.DS_Store .vscode/ diff --git a/client.py b/client.py index 98db7922..709d9f44 100644 --- a/client.py +++ b/client.py @@ -1,6 +1,5 @@ import argparse import asyncio -import logging import signal from aiortc.contrib.signaling import (add_signaling_arguments, @@ -8,9 +7,6 @@ from aiortc.contrib.signaling import (add_signaling_arguments, from stream_client import StreamClient -logger = logging.getLogger("pc") - - async def main(): parser = argparse.ArgumentParser(description="Data channels ping/pong") diff --git a/server_executor_cleaned.py b/server_executor_cleaned.py index ca42a1b0..ffbed6cb 100644 --- a/server_executor_cleaned.py +++ b/server_executor_cleaned.py @@ -2,7 +2,7 @@ import asyncio import datetime import io import json -import logging +from loguru import logger import sys import uuid import wave @@ -17,8 +17,6 @@ from whisper_jax import FlaxWhisperPipline from utils.server_utils import run_in_executor -logger = logging.getLogger(__name__) - transcription = "" pcs = set() diff --git a/server_multithreaded.py b/server_multithreaded.py index e656a892..a1c74a68 100644 --- a/server_multithreaded.py +++ b/server_multithreaded.py @@ -3,7 +3,7 @@ import configparser import datetime import io import json -import logging +from utils.log_utils import logger import os import threading import uuid @@ -11,7 +11,6 @@ import wave from concurrent.futures import ThreadPoolExecutor import jax.numpy as jnp -from aiohttp import webq from aiortc import MediaStreamTrack, RTCPeerConnection, RTCSessionDescription from aiortc.contrib.media import (MediaRelay) @@ -27,8 +26,6 @@ config = configparser.ConfigParser() config.read('config.ini') WHISPER_MODEL_SIZE = config['DEFAULT']["WHISPER_MODEL_SIZE"] - -logger = logging.getLogger("pc") pcs = set() relay = MediaRelay() data_channel = None diff --git a/stream_client.py b/stream_client.py index d660f079..68fc4709 100644 --- a/stream_client.py +++ b/stream_client.py @@ -1,7 +1,7 @@ import ast import asyncio import configparser -import logging +from utils.log_utils import logger import time import uuid @@ -14,7 +14,6 @@ from aiortc.contrib.media import (MediaPlayer, MediaRelay) from utils.server_utils import Mutex -logger = logging.getLogger("pc") file_lock = Mutex(open("test_sm_6.txt", "a")) config = configparser.ConfigParser() diff --git a/utils/file_utilities.py b/utils/file_utils.py similarity index 97% rename from utils/file_utilities.py rename to utils/file_utils.py index e6c1fe9a..70108a49 100644 --- a/utils/file_utilities.py +++ b/utils/file_utils.py @@ -2,7 +2,7 @@ import configparser import boto3 import botocore -from loguru import logger +from log_utils import logger config = configparser.ConfigParser() config.read('config.ini') diff --git a/utils/log_utils.py b/utils/log_utils.py new file mode 100644 index 00000000..3b874363 --- /dev/null +++ b/utils/log_utils.py @@ -0,0 +1,14 @@ +from loguru import logger + + +class SingletonLogger: + __instance = None + + @staticmethod + def get_logger(): + if not SingletonLogger.__instance: + SingletonLogger.__instance = logger + return SingletonLogger.__instance + + +logger = SingletonLogger.get_logger() diff --git a/utils/text_utilities.py b/utils/text_utilities.py index 0515ba36..cfa6c9dd 100644 --- a/utils/text_utilities.py +++ b/utils/text_utilities.py @@ -2,7 +2,7 @@ import configparser import nltk import torch -from loguru import logger +from log_utils import logger from nltk.corpus import stopwords from nltk.tokenize import word_tokenize from sklearn.feature_extraction.text import TfidfVectorizer diff --git a/whisjax.py b/whisjax.py index bb98d1af..36dfb785 100644 --- a/whisjax.py +++ b/whisjax.py @@ -18,10 +18,10 @@ import moviepy.editor import moviepy.editor import nltk import yt_dlp as youtube_dl -from loguru import logger +from utils.log_utils import logger from whisper_jax import FlaxWhisperPipline -from utils.file_utilities import upload_files, download_files +from utils.file_utils import upload_files, download_files from utils.text_utilities import summarize, post_process_transcription from utils.viz_utilities import create_wordcloud, create_talk_diff_scatter_viz diff --git a/whisjax_realtime.py b/whisjax_realtime.py index 8db8444d..24185186 100644 --- a/whisjax_realtime.py +++ b/whisjax_realtime.py @@ -7,12 +7,12 @@ from datetime import datetime import jax.numpy as jnp import pyaudio -from loguru import logger +from utils.log_utils import logger from pynput import keyboard from termcolor import colored from whisper_jax import FlaxWhisperPipline -from utils.file_utilities import upload_files +from utils.file_utils import upload_files from utils.text_utilities import summarize, post_process_transcription from utils.viz_utilities import create_wordcloud, create_talk_diff_scatter_viz