Dominik Macháček
commited on
Commit
·
b50f687
1
Parent(s):
7286dfd
checks and changes in logging
Browse files- don't set the level for submodules, it's too verbose
- etc.
- whisper_online.py +19 -9
- whisper_online_server.py +3 -4
whisper_online.py
CHANGED
@@ -106,7 +106,7 @@ class FasterWhisperASR(ASRBase):
|
|
106 |
|
107 |
def load_model(self, modelsize=None, cache_dir=None, model_dir=None):
|
108 |
from faster_whisper import WhisperModel
|
109 |
-
logging.getLogger("faster_whisper").setLevel(logger.level)
|
110 |
if model_dir is not None:
|
111 |
logger.debug(f"Loading whisper model from model_dir {model_dir}. modelsize and cache_dir parameters are not used.")
|
112 |
model_size_or_path = model_dir
|
@@ -277,7 +277,7 @@ class HypothesisBuffer:
|
|
277 |
words = []
|
278 |
for j in range(i):
|
279 |
words.append(repr(self.new.pop(0)))
|
280 |
-
words_msg = "
|
281 |
logger.debug(f"removing last {i} words: {words_msg}")
|
282 |
break
|
283 |
|
@@ -405,7 +405,7 @@ class OnlineASRProcessor:
|
|
405 |
#while k>0 and self.commited[k][1] > l:
|
406 |
# k -= 1
|
407 |
#t = self.commited[k][1]
|
408 |
-
logger.debug(
|
409 |
#self.chunk_at(t)
|
410 |
|
411 |
logger.debug(f"len of buffer now: {len(self.audio_buffer)/self.SAMPLING_RATE:2.2f}")
|
@@ -577,10 +577,10 @@ def asr_factory(args, logfile=sys.stderr):
|
|
577 |
# Only for FasterWhisperASR and WhisperTimestampedASR
|
578 |
size = args.model
|
579 |
t = time.time()
|
580 |
-
logger.
|
581 |
asr = asr_cls(modelsize=size, lan=args.lan, cache_dir=args.model_cache_dir, model_dir=args.model_dir)
|
582 |
e = time.time()
|
583 |
-
logger.
|
584 |
|
585 |
# Apply common configurations
|
586 |
if getattr(args, 'vad', False): # Checks if VAD argument is present and True
|
@@ -604,7 +604,15 @@ def asr_factory(args, logfile=sys.stderr):
|
|
604 |
online = OnlineASRProcessor(asr,tokenizer,logfile=logfile,buffer_trimming=(args.buffer_trimming, args.buffer_trimming_sec))
|
605 |
|
606 |
return asr, online
|
607 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
608 |
|
609 |
if __name__ == "__main__":
|
610 |
|
@@ -625,9 +633,11 @@ if __name__ == "__main__":
|
|
625 |
logger.error("No or one option from --offline and --comp_unaware are available, not both. Exiting.")
|
626 |
sys.exit(1)
|
627 |
|
628 |
-
if args.log_level:
|
629 |
-
logging.basicConfig(format='whisper-%(levelname)s:%(name)s: %(message)s',
|
630 |
-
level=getattr(logging, args.log_level))
|
|
|
|
|
631 |
|
632 |
audio_path = args.audio_path
|
633 |
|
|
|
106 |
|
107 |
def load_model(self, modelsize=None, cache_dir=None, model_dir=None):
|
108 |
from faster_whisper import WhisperModel
|
109 |
+
# logging.getLogger("faster_whisper").setLevel(logger.level)
|
110 |
if model_dir is not None:
|
111 |
logger.debug(f"Loading whisper model from model_dir {model_dir}. modelsize and cache_dir parameters are not used.")
|
112 |
model_size_or_path = model_dir
|
|
|
277 |
words = []
|
278 |
for j in range(i):
|
279 |
words.append(repr(self.new.pop(0)))
|
280 |
+
words_msg = " ".join(words)
|
281 |
logger.debug(f"removing last {i} words: {words_msg}")
|
282 |
break
|
283 |
|
|
|
405 |
#while k>0 and self.commited[k][1] > l:
|
406 |
# k -= 1
|
407 |
#t = self.commited[k][1]
|
408 |
+
logger.debug("chunking segment")
|
409 |
#self.chunk_at(t)
|
410 |
|
411 |
logger.debug(f"len of buffer now: {len(self.audio_buffer)/self.SAMPLING_RATE:2.2f}")
|
|
|
577 |
# Only for FasterWhisperASR and WhisperTimestampedASR
|
578 |
size = args.model
|
579 |
t = time.time()
|
580 |
+
logger.info(f"Loading Whisper {size} model for {args.lan}...")
|
581 |
asr = asr_cls(modelsize=size, lan=args.lan, cache_dir=args.model_cache_dir, model_dir=args.model_dir)
|
582 |
e = time.time()
|
583 |
+
logger.info(f"done. It took {round(e-t,2)} seconds.")
|
584 |
|
585 |
# Apply common configurations
|
586 |
if getattr(args, 'vad', False): # Checks if VAD argument is present and True
|
|
|
604 |
online = OnlineASRProcessor(asr,tokenizer,logfile=logfile,buffer_trimming=(args.buffer_trimming, args.buffer_trimming_sec))
|
605 |
|
606 |
return asr, online
|
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 |
+
|
616 |
|
617 |
if __name__ == "__main__":
|
618 |
|
|
|
633 |
logger.error("No or one option from --offline and --comp_unaware are available, not both. Exiting.")
|
634 |
sys.exit(1)
|
635 |
|
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)
|
641 |
|
642 |
audio_path = args.audio_path
|
643 |
|
whisper_online_server.py
CHANGED
@@ -21,9 +21,7 @@ parser.add_argument("--warmup-file", type=str, dest="warmup_file",
|
|
21 |
add_shared_args(parser)
|
22 |
args = parser.parse_args()
|
23 |
|
24 |
-
|
25 |
-
logging.basicConfig(format='whisper-server-%(levelname)s:%(name)s: %(message)s',
|
26 |
-
level=getattr(logging, args.log_level))
|
27 |
|
28 |
# setting whisper object by args
|
29 |
|
@@ -43,7 +41,8 @@ if args.warmup_file:
|
|
43 |
asr.transcribe(a)
|
44 |
logger.info("Whisper is warmed up.")
|
45 |
else:
|
46 |
-
logger.
|
|
|
47 |
else:
|
48 |
logger.warning(msg)
|
49 |
|
|
|
21 |
add_shared_args(parser)
|
22 |
args = parser.parse_args()
|
23 |
|
24 |
+
set_logging(args,logger,other="")
|
|
|
|
|
25 |
|
26 |
# setting whisper object by args
|
27 |
|
|
|
41 |
asr.transcribe(a)
|
42 |
logger.info("Whisper is warmed up.")
|
43 |
else:
|
44 |
+
logger.critical("The warm up file is not available. "+msg)
|
45 |
+
sys.exit(1)
|
46 |
else:
|
47 |
logger.warning(msg)
|
48 |
|