Commit @7f37945bdb0162307c26119f51bd58dd27eb710a - yjyoon/whisper_streaming

Dominik Macháček 2024-04-19

checks and changes in logging

- don't set the level for submodules, it's too verbose
- etc.

@7f37945bdb0162307c26119f51bd58dd27eb710a

88a7f3a

7f37945

whisper_online.py

--- whisper_online.py

+++ whisper_online.py


 
     def load_model(self, modelsize=None, cache_dir=None, model_dir=None):
         from faster_whisper import WhisperModel
-        logging.getLogger("faster_whisper").setLevel(logger.level)
+#        logging.getLogger("faster_whisper").setLevel(logger.level)
         if model_dir is not None:
             logger.debug(f"Loading whisper model from model_dir {model_dir}. modelsize and cache_dir parameters are not used.")
             model_size_or_path = model_dir

                             words = []
                             for j in range(i):
                                 words.append(repr(self.new.pop(0)))
-                            words_msg = "\t".join(words)
+                            words_msg = " ".join(words)
                             logger.debug(f"removing last {i} words: {words_msg}")
                             break
 

             #while k>0 and self.commited[k][1] > l:
             #    k -= 1
             #t = self.commited[k][1] 
-            logger.debug(f"chunking segment")
+            logger.debug("chunking segment")
             #self.chunk_at(t)
 
         logger.debug(f"len of buffer now: {len(self.audio_buffer)/self.SAMPLING_RATE:2.2f}")

         # Only for FasterWhisperASR and WhisperTimestampedASR
         size = args.model
         t = time.time()
-        logger.debug(f"Loading Whisper {size} model for {args.lan}...")
+        logger.info(f"Loading Whisper {size} model for {args.lan}...")
         asr = asr_cls(modelsize=size, lan=args.lan, cache_dir=args.model_cache_dir, model_dir=args.model_dir)
         e = time.time()
-        logger.debug(f"done. It took {round(e-t,2)} seconds.")
+        logger.info(f"done. It took {round(e-t,2)} seconds.")
 
     # Apply common configurations
     if getattr(args, 'vad', False):  # Checks if VAD argument is present and True

     online = OnlineASRProcessor(asr,tokenizer,logfile=logfile,buffer_trimming=(args.buffer_trimming, args.buffer_trimming_sec))
 
     return asr, online
-## main:
+
+def set_logging(args,logger,other="_server"):
+    logging.basicConfig(#format='%(name)s 
+            format='%(levelname)s\t%(message)s')
+    logger.setLevel(args.log_level)
+    logging.getLogger("whisper_online"+other).setLevel(args.log_level)
+#    logging.getLogger("whisper_online_server").setLevel(args.log_level)
+
+
 
 if __name__ == "__main__":
 

         logger.error("No or one option from --offline and --comp_unaware are available, not both. Exiting.")
         sys.exit(1)
 
-    if args.log_level:
-        logging.basicConfig(format='whisper-%(levelname)s:%(name)s: %(message)s',
-                            level=getattr(logging, args.log_level))
+#    if args.log_level:
+#        logging.basicConfig(format='whisper-%(levelname)s:%(name)s: %(message)s',
+#                            level=getattr(logging, args.log_level))
+
+    set_logging(args,logger)
 
     audio_path = args.audio_path
 

88a7f3a

7f37945

whisper_online_server.py

--- whisper_online_server.py

+++ whisper_online_server.py


 add_shared_args(parser)
 args = parser.parse_args()
 
-if args.log_level:
-    logging.basicConfig(format='whisper-server-%(levelname)s:%(name)s: %(message)s',
-                        level=getattr(logging, args.log_level))
+set_logging(args,logger,other="")
 
 # setting whisper object by args 
 

         asr.transcribe(a)
         logger.info("Whisper is warmed up.")
     else:
-        logger.warning("The warm up file is not available. "+msg)
+        logger.critical("The warm up file is not available. "+msg)
+        sys.exit(1)
 else:
     logger.warning(msg)
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -106,7 +106,7 @@
106	106
107	107	def load_model(self, modelsize=None, cache_dir=None, model_dir=None):
108	108	from faster_whisper import WhisperModel
109		- logging.getLogger("faster_whisper").setLevel(logger.level)
	109	+# logging.getLogger("faster_whisper").setLevel(logger.level)
110	110	if model_dir is not None:
111	111	logger.debug(f"Loading whisper model from model_dir {model_dir}. modelsize and cache_dir parameters are not used.")
112	112	model_size_or_path = model_dir
...	...	@@ -277,7 +277,7 @@
277	277	words = []
278	278	for j in range(i):
279	279	words.append(repr(self.new.pop(0)))
280		- words_msg = "\t".join(words)
	280	+ words_msg = " ".join(words)
281	281	logger.debug(f"removing last {i} words: {words_msg}")
282	282	break
283	283
...	...	@@ -405,7 +405,7 @@
405	405	#while k>0 and self.commited[k][1] > l:
406	406	# k -= 1
407	407	#t = self.commited[k][1]
408		- logger.debug(f"chunking segment")
	408	+ logger.debug("chunking segment")
409	409	#self.chunk_at(t)
410	410
411	411	logger.debug(f"len of buffer now: {len(self.audio_buffer)/self.SAMPLING_RATE:2.2f}")
...	...	@@ -577,10 +577,10 @@
577	577	# Only for FasterWhisperASR and WhisperTimestampedASR
578	578	size = args.model
579	579	t = time.time()
580		- logger.debug(f"Loading Whisper {size} model for {args.lan}...")
	580	+ logger.info(f"Loading Whisper {size} model for {args.lan}...")
581	581	asr = asr_cls(modelsize=size, lan=args.lan, cache_dir=args.model_cache_dir, model_dir=args.model_dir)
582	582	e = time.time()
583		- logger.debug(f"done. It took {round(e-t,2)} seconds.")
	583	+ logger.info(f"done. It took {round(e-t,2)} seconds.")
584	584
585	585	# Apply common configurations
586	586	if getattr(args, 'vad', False): # Checks if VAD argument is present and True
...	...	@@ -604,7 +604,15 @@
604	604	online = OnlineASRProcessor(asr,tokenizer,logfile=logfile,buffer_trimming=(args.buffer_trimming, args.buffer_trimming_sec))
605	605
606	606	return asr, online
607		-## main:
	607	+
	608	+def set_logging(args,logger,other="_server"):
	609	+ logging.basicConfig(#format='%(name)s
	610	+ format='%(levelname)s\t%(message)s')
	611	+ logger.setLevel(args.log_level)
	612	+ logging.getLogger("whisper_online"+other).setLevel(args.log_level)
	613	+# logging.getLogger("whisper_online_server").setLevel(args.log_level)
	614	+
	615	+
608	616
609	617	if __name__ == "__main__":
610	618
...	...	@@ -625,9 +633,11 @@
625	633	logger.error("No or one option from --offline and --comp_unaware are available, not both. Exiting.")
626	634	sys.exit(1)
627	635
628		- if args.log_level:
629		- logging.basicConfig(format='whisper-%(levelname)s:%(name)s: %(message)s',
630		- level=getattr(logging, args.log_level))
	636	+# if args.log_level:
	637	+# logging.basicConfig(format='whisper-%(levelname)s:%(name)s: %(message)s',
	638	+# level=getattr(logging, args.log_level))
	639	+
	640	+ set_logging(args,logger)
631	641
632	642	audio_path = args.audio_path
633	643

...	...	@@ -21,9 +21,7 @@
21	21	add_shared_args(parser)
22	22	args = parser.parse_args()
23	23
24		-if args.log_level:
25		- logging.basicConfig(format='whisper-server-%(levelname)s:%(name)s: %(message)s',
26		- level=getattr(logging, args.log_level))
	24	+set_logging(args,logger,other="")
27	25
28	26	# setting whisper object by args
29	27
...	...	@@ -43,7 +41,8 @@
43	41	asr.transcribe(a)
44	42	logger.info("Whisper is warmed up.")
45	43	else:
46		- logger.warning("The warm up file is not available. "+msg)
	44	+ logger.critical("The warm up file is not available. "+msg)
	45	+ sys.exit(1)
47	46	else:
48	47	logger.warning(msg)
49	48

Delete comment