Fangjun Kuang
Committed by GitHub

small fixes to python api examples (#269)

@@ -82,8 +82,7 @@ def get_args(): @@ -82,8 +82,7 @@ def get_args():
82 return parser.parse_args() 82 return parser.parse_args()
83 83
84 84
85 -def create_recognizer():  
86 - args = get_args() 85 +def create_recognizer(args):
87 assert_file_exists(args.encoder) 86 assert_file_exists(args.encoder)
88 assert_file_exists(args.decoder) 87 assert_file_exists(args.decoder)
89 assert_file_exists(args.joiner) 88 assert_file_exists(args.joiner)
@@ -110,7 +109,18 @@ def create_recognizer(): @@ -110,7 +109,18 @@ def create_recognizer():
110 109
111 110
112 def main(): 111 def main():
113 - recognizer = create_recognizer() 112 + args = get_args()
  113 +
  114 + devices = sd.query_devices()
  115 + if len(devices) == 0:
  116 + print("No microphone devices found")
  117 + sys.exit(0)
  118 +
  119 + print(devices)
  120 + default_input_device_idx = sd.default.device[0]
  121 + print(f'Use default device: {devices[default_input_device_idx]["name"]}')
  122 +
  123 + recognizer = create_recognizer(args)
114 print("Started! Please speak") 124 print("Started! Please speak")
115 125
116 # The model is using 16 kHz, we use 48 kHz here to demonstrate that 126 # The model is using 16 kHz, we use 48 kHz here to demonstrate that
@@ -145,10 +155,6 @@ def main(): @@ -145,10 +155,6 @@ def main():
145 155
146 156
147 if __name__ == "__main__": 157 if __name__ == "__main__":
148 - devices = sd.query_devices()  
149 - print(devices)  
150 - default_input_device_idx = sd.default.device[0]  
151 - print(f'Use default device: {devices[default_input_device_idx]["name"]}')  
152 158
153 try: 159 try:
154 main() 160 main()
@@ -10,7 +10,7 @@ import argparse @@ -10,7 +10,7 @@ import argparse
10 import sys 10 import sys
11 from pathlib import Path 11 from pathlib import Path
12 12
13 -from typing import List, Tuple 13 +from typing import List
14 import sentencepiece as spm 14 import sentencepiece as spm
15 15
16 try: 16 try:
@@ -136,8 +136,7 @@ def get_args(): @@ -136,8 +136,7 @@ def get_args():
136 return parser.parse_args() 136 return parser.parse_args()
137 137
138 138
139 -def create_recognizer():  
140 - args = get_args() 139 +def create_recognizer(args):
141 assert_file_exists(args.encoder) 140 assert_file_exists(args.encoder)
142 assert_file_exists(args.decoder) 141 assert_file_exists(args.decoder)
143 assert_file_exists(args.joiner) 142 assert_file_exists(args.joiner)
@@ -185,13 +184,22 @@ def encode_contexts(args, contexts: List[str]) -> List[List[int]]: @@ -185,13 +184,22 @@ def encode_contexts(args, contexts: List[str]) -> List[List[int]]:
185 def main(): 184 def main():
186 args = get_args() 185 args = get_args()
187 186
  187 + devices = sd.query_devices()
  188 + if len(devices) == 0:
  189 + print("No microphone devices found")
  190 + sys.exit(0)
  191 +
  192 + print(devices)
  193 + default_input_device_idx = sd.default.device[0]
  194 + print(f'Use default device: {devices[default_input_device_idx]["name"]}')
  195 +
188 contexts_list = [] 196 contexts_list = []
189 contexts = [x.strip().upper() for x in args.contexts.split("/") if x.strip()] 197 contexts = [x.strip().upper() for x in args.contexts.split("/") if x.strip()]
190 if contexts: 198 if contexts:
191 print(f"Contexts list: {contexts}") 199 print(f"Contexts list: {contexts}")
192 contexts_list = encode_contexts(args, contexts) 200 contexts_list = encode_contexts(args, contexts)
193 201
194 - recognizer = create_recognizer() 202 + recognizer = create_recognizer(args)
195 print("Started! Please speak") 203 print("Started! Please speak")
196 204
197 # The model is using 16 kHz, we use 48 kHz here to demonstrate that 205 # The model is using 16 kHz, we use 48 kHz here to demonstrate that
@@ -217,11 +225,6 @@ def main(): @@ -217,11 +225,6 @@ def main():
217 225
218 226
219 if __name__ == "__main__": 227 if __name__ == "__main__":
220 - devices = sd.query_devices()  
221 - print(devices)  
222 - default_input_device_idx = sd.default.device[0]  
223 - print(f'Use default device: {devices[default_input_device_idx]["name"]}')  
224 -  
225 try: 228 try:
226 main() 229 main()
227 except KeyboardInterrupt: 230 except KeyboardInterrupt: