mj-new commited on
Commit
10babf5
1 Parent(s): da5bc42

Updated prompts handling

Browse files
Files changed (1) hide show
  1. app.py +24 -13
app.py CHANGED
@@ -55,10 +55,29 @@ def save_recording_and_meta(project_name, recording, prompt_text, language_code,
55
  #, name, age, gender):
56
  # TODO save user data in the next version
57
 
 
 
 
58
  # check if prompt number is set
59
  if prompt_number == None:
60
  prompt_number = 1
 
 
 
 
 
 
 
 
 
 
61
 
 
 
 
 
 
 
62
  speaker_metadata={}
63
  speaker_metadata['name'] = spk_name if spk_name != None else 'unknown'
64
  speaker_metadata['gender'] = spk_gender if spk_gender != None else 'unknown'
@@ -68,7 +87,7 @@ def save_recording_and_meta(project_name, recording, prompt_text, language_code,
68
  speaker_metadata['nativity'] = spk_nativity if spk_nativity != None else 'unknown'
69
 
70
  # TODO get ISO-693-1 codes
71
- prompt_text =prompt_text.strip()
72
 
73
  SAVE_ROOT_DIR = os.path.join(LOCAL_DIR, project_name, today_ymd, spk_name)
74
 
@@ -97,7 +116,7 @@ def save_recording_and_meta(project_name, recording, prompt_text, language_code,
97
  'audio_file': audio_fn,
98
  'language_code':language_code,
99
  'prompt_number':prompt_number,
100
- 'prompt':prompt_text,
101
  'name': speaker_metadata['name'],
102
  'age': speaker_metadata['age'],
103
  'gender': speaker_metadata['gender'],
@@ -131,20 +150,12 @@ def save_recording_and_meta(project_name, recording, prompt_text, language_code,
131
 
132
  output = print(f"Recording {audio_fn} and meta file {meta_fn} successfully saved to repo!")
133
 
134
- # increment prompt number
135
- prompt_number = prompt_number + 1
136
 
137
  # check if this is the last prompt
138
- if prompt_number == len(promptset)+1:
139
- prompt_number = 0
140
- prompt = "All prompts recorded. Thank you! You can close the app now:)"
141
- else:
142
- # get next prompt
143
- prompt = promptset[prompt_number]
144
-
145
- prompts_left_info = prompts_left_info - 1
146
 
147
- return [prompt, prompt_number, None, prompts_left_info]
148
 
149
 
150
  def whisper_model_change(radio_whisper_model):
 
55
  #, name, age, gender):
56
  # TODO save user data in the next version
57
 
58
+ current_prompt = prompt_text.strip()
59
+ print("current_prompt: ", current_prompt)
60
+
61
  # check if prompt number is set
62
  if prompt_number == None:
63
  prompt_number = 1
64
+ prompt_index = prompt_number - 1
65
+ print("prompt_number: ", prompt_number)
66
+
67
+ print("promptset: ", promptset)
68
+ if prompt_number == len(promptset):
69
+ next_prompt = "All prompts recorded. Thank you! You can close the app now:)"
70
+ else:
71
+ next_prompt = promptset[prompt_number]
72
+
73
+ print("next_prompt: ", next_prompt)
74
 
75
+ # remove leading and trailing spaces
76
+ next_prompt =next_prompt.strip()
77
+
78
+ # increment prompt number
79
+ prompt_number = prompt_number + 1
80
+
81
  speaker_metadata={}
82
  speaker_metadata['name'] = spk_name if spk_name != None else 'unknown'
83
  speaker_metadata['gender'] = spk_gender if spk_gender != None else 'unknown'
 
87
  speaker_metadata['nativity'] = spk_nativity if spk_nativity != None else 'unknown'
88
 
89
  # TODO get ISO-693-1 codes
90
+
91
 
92
  SAVE_ROOT_DIR = os.path.join(LOCAL_DIR, project_name, today_ymd, spk_name)
93
 
 
116
  'audio_file': audio_fn,
117
  'language_code':language_code,
118
  'prompt_number':prompt_number,
119
+ 'prompt':current_prompt,
120
  'name': speaker_metadata['name'],
121
  'age': speaker_metadata['age'],
122
  'gender': speaker_metadata['gender'],
 
150
 
151
  output = print(f"Recording {audio_fn} and meta file {meta_fn} successfully saved to repo!")
152
 
153
+ prompts_left_info = prompts_left_info - 1
 
154
 
155
  # check if this is the last prompt
156
+
 
 
 
 
 
 
 
157
 
158
+ return [next_prompt, prompt_number, None, prompts_left_info]
159
 
160
 
161
  def whisper_model_change(radio_whisper_model):