add singleton logging

.gitignore

@@ -174,4 +174,5 @@ test_samples/
 *.mp3
 *.m4a
 .DS_Store/
+.DS_Store
 .vscode/

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")
 

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()

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

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()

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')

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()

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

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
 

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