echogarden 3.0.2 → 3.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/dist/api/Synthesis.js +2 -2
  2. package/dist/api/Synthesis.js.map +1 -1
  3. package/dist/nlp/EspeakPhonemizer.js +1 -1
  4. package/dist/nlp/EspeakPhonemizer.js.map +1 -1
  5. package/dist/nlp/Segmentation.d.ts +5 -2
  6. package/dist/nlp/Segmentation.d.ts.map +1 -1
  7. package/dist/nlp/Segmentation.js +13 -6
  8. package/dist/nlp/Segmentation.js.map +1 -1
  9. package/dist/recognition/WhisperSTT.d.ts +1 -0
  10. package/dist/recognition/WhisperSTT.d.ts.map +1 -1
  11. package/dist/recognition/WhisperSTT.js +35 -9
  12. package/dist/recognition/WhisperSTT.js.map +1 -1
  13. package/dist/subtitles/Subtitles.js +3 -3
  14. package/dist/subtitles/Subtitles.js.map +1 -1
  15. package/dist/synthesis/EspeakTTS.d.ts.map +1 -1
  16. package/dist/synthesis/EspeakTTS.js +10 -6
  17. package/dist/synthesis/EspeakTTS.js.map +1 -1
  18. package/dist/utilities/Timeline.js +2 -2
  19. package/dist/utilities/Timeline.js.map +1 -1
  20. package/package.json +1 -1
  21. package/src/api/Synthesis.ts +2 -2
  22. package/src/nlp/EspeakPhonemizer.ts +1 -1
  23. package/src/nlp/Segmentation.ts +15 -6
  24. package/src/recognition/WhisperSTT.ts +59 -39
  25. package/src/subtitles/Subtitles.ts +3 -3
  26. package/src/synthesis/EspeakTTS.ts +9 -6
  27. package/src/utilities/Timeline.ts +2 -2
package/dist/synthesis/EspeakTTS.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EspeakTTS.js","sourceRoot":"","sources":["../../src/synthesis/EspeakTTS.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EspeakTTS.js","sourceRoot":"","sources":["../../src/synthesis/EspeakTTS.ts"],"names":[],"mappings":"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"}
package/dist/utilities/Timeline.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { addMissingPunctuationWordsToWordSequence, segmentWordSequence, WordSequence } from '@echogarden/text-segmentation';
2
- import { applyWhitespaceProcessing, isWord, isWordOrSymbolWord } from '../nlp/Segmentation.js';
2
+ import { applyWhitespaceProcessing, isWord, isWordOrEmojiOrSymbolWord } from '../nlp/Segmentation.js';
3
3
  import { deepClone } from './ObjectUtilities.js';
4
4
  import { getUTF32Chars } from './StringUtilities.js';
5
5
  import { roundToDigits } from './Utilities.js';
@@ -51,7 +51,7 @@ export async function wordTimelineToSegmentSentenceTimeline(wordTimelineWithOffs
51
51
  for (const wordEntry of wordTimelineWithOffsets) {
52
52
  const wordStartOffset = wordEntry.startOffsetUtf16;
53
53
  const wordEndOffset = wordEntry.endOffsetUtf16;
54
- const isPunctuation = !isWordOrSymbolWord(wordEntry.text);
54
+ const isPunctuation = !isWordOrEmojiOrSymbolWord(wordEntry.text);
55
55
  wordSequence.addWord(wordEntry.text, wordStartOffset, isPunctuation);
56
56
  }
57
57
  const { wordSequenceWithPunctuation, originalWordsReverseMapping } = addMissingPunctuationWordsToWordSequence(wordSequence, transcript);
package/dist/utilities/Timeline.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Timeline.js","sourceRoot":"","sources":["../../src/utilities/Timeline.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Timeline.js","sourceRoot":"","sources":["../../src/utilities/Timeline.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "echogarden",
3
- "version": "3.0.2",
3
+ "version": "3.0.4",
4
4
  "description": "An easy-to-use speech toolset. Includes tools for synthesis, recognition, alignment, speech translation, language detection, source separation and more.",
5
5
  "author": "Rotem Dan",
6
6
  "license": "MIT AND GPL-3.0",
package/src/api/Synthesis.ts CHANGED
@@ -10,7 +10,7 @@ import { clip, sha256AsHex, stringifyAndFormatJson, yieldToEventLoop, runOperati
10
10
  import { RawAudio, concatAudioSegments, downmixToMono, encodeRawAudioToWave, getSamplePeakDecibels, getEmptyRawAudio, getRawAudioDuration, trimAudioEnd, trimAudioStart, attenuateIfClippingInPlace, normalizeAudioLevelInPlace } from '../audio/AudioUtilities.js'
11
11
  import { Logger } from '../utilities/Logger.js'
12
12
 
13
- import { isWordOrSymbolWord, parseText, splitToParagraphs } from '../nlp/Segmentation.js'
13
+ import { isWordOrEmojiOrSymbolWord, parseText, splitToParagraphs } from '../nlp/Segmentation.js'
14
14
  import { type RubberbandOptions } from '../dsp/Rubberband.js'
15
15
  import { loadLexiconsForLanguage } from '../nlp/Lexicon.js'
16
16
 
@@ -1165,7 +1165,7 @@ async function synthesizeSegment(text: string, options: SynthesisOptions, callba
1165
1165
  }
1166
1166
 
1167
1167
  if (timeline) {
1168
- timeline = timeline.filter(entry => isWordOrSymbolWord(entry.text))
1168
+ timeline = timeline.filter(entry => isWordOrEmojiOrSymbolWord(entry.text))
1169
1169
  }
1170
1170
 
1171
1171
  logger.end()
package/src/nlp/EspeakPhonemizer.ts CHANGED
@@ -63,7 +63,7 @@ export async function phonemizeText(text: string, voice: string, substitutionMap
63
63
 
64
64
  for (const sentence of segmentedText) {
65
65
  for (const phrase of sentence.phrases) {
66
- const words = phrase.words.filter(wordObject => Segmentation.isWordOrSymbolWord(wordObject.text))
66
+ const words = phrase.words.filter(wordObject => Segmentation.isWordOrEmojiOrSymbolWord(wordObject.text))
67
67
  const preparedPhraseText = words.map(word => word.text.replace(/\./g, ' ')).join(' ')
68
68
 
69
69
  preparedPhrases.push(preparedPhraseText)
package/src/nlp/Segmentation.ts CHANGED
@@ -14,16 +14,21 @@ export const wordCharacterRegExp = /[\p{Letter}\p{Number}]/u
14
14
  // See: https://mathiasbynens.be/notes/es-unicode-property-escapes
15
15
  export const emojiSequenceRegExp = /\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F/u
16
16
 
17
- export const punctuationRegExp = /[\p{Punctuation}]/u
17
+ export const includesPunctuationRegExp = /[\p{Punctuation}]/u
18
+ export const isAllPunctuationRegExp = /^[\p{Punctuation}]+$/u
18
19
 
19
20
  export const phraseSeparators = [',', '、', '，', '،', ';', '；', ':', '：', '—']
20
- export const symbolWords = ['$', '€', '¢', '£', '¥', '©', '®', '™', '%', '&', '#', '~', '@', '+', '±', '÷', '/', '\\', '^', '*', '×', '=', '≈', '¼', '½', '¾']
21
+ export const symbolWords = ['$', '€', '¢', '£', '¥', '©', '®', '™', '%', '&', '#', '~', '@', '+', '±', '÷', '/', '\\', '^', '*', '×', '=', '≈', '¼', '½', '¾', '→', '≤', '≥']
21
22
 
22
23
  ///////////////////////////////////////////////////////////////////////////////////////////////
23
24
  // Predicates
24
25
  ///////////////////////////////////////////////////////////////////////////////////////////////
25
- export function isWordOrSymbolWord(str: string) {
26
- return isWord(str) || includesEmoji(str) || symbolWords.includes(str)
26
+ export function isWordOrEmojiOrSymbolWord(str: string) {
27
+ return isWordOrEmoji(str) || symbolWords.includes(str)
28
+ }
29
+
30
+ export function isWordOrEmoji(str: string) {
31
+ return isWord(str) || includesEmoji(str)
27
32
  }
28
33
 
29
34
  export function isSymbolWord(str: string) {
@@ -35,7 +40,11 @@ export function isWord(str: string) {
35
40
  }
36
41
 
37
42
  export function includesPunctuation(str: string) {
38
- return punctuationRegExp.test(str?.trim())
43
+ return includesPunctuationRegExp.test(str?.trim())
44
+ }
45
+
46
+ export function isAllPunctuation(str: string) {
47
+ return isAllPunctuationRegExp.test(str?.trim())
39
48
  }
40
49
 
41
50
  export function includesEmoji(str: string) {
@@ -104,7 +113,7 @@ export async function splitToWords(text: string, langCode: string): Promise<Text
104
113
  for (const wordText of wordArray) {
105
114
  const startOffset = offset
106
115
  const endOffset = startOffset + wordText.length
107
- const isPunctuation = !isWordOrSymbolWord(wordText)
116
+ const isPunctuation = !isWordOrEmojiOrSymbolWord(wordText)
108
117
 
109
118
  wordSequence.addWord(wordText, startOffset, isPunctuation)
110
119
 
package/src/recognition/WhisperSTT.ts CHANGED
@@ -79,16 +79,20 @@ export async function recognize(
79
79
  libPath,
80
80
  seed)
81
81
 
82
- const result = await whisper.recognize(
83
- sourceRawAudio,
84
- task,
85
- sourceLanguage,
86
- options,
87
- undefined,
88
- callbacks,
89
- )
82
+ try {
83
+ const result = await whisper.recognize(
84
+ sourceRawAudio,
85
+ task,
86
+ sourceLanguage,
87
+ options,
88
+ undefined,
89
+ callbacks,
90
+ )
90
91
 
91
- return result
92
+ return result
93
+ } finally {
94
+ whisper.release()
95
+ }
92
96
  }
93
97
 
94
98
  export async function align(
@@ -122,17 +126,19 @@ export async function align(
122
126
  modelPath,
123
127
  libPath,
124
128
  )
125
-
126
- const timeline = await whisper.align(
127
- sourceRawAudio,
128
- transcript,
129
- sourceLanguage,
130
- 'transcribe',
131
- options,
132
- callbacks,
133
- )
134
-
135
- return timeline
129
+ try {
130
+ const timeline = await whisper.align(
131
+ sourceRawAudio,
132
+ transcript,
133
+ sourceLanguage,
134
+ 'transcribe',
135
+ options,
136
+ callbacks,
137
+ )
138
+ return timeline
139
+ } finally {
140
+ whisper.release()
141
+ }
136
142
  }
137
143
 
138
144
  export async function alignEnglishTranslation(
@@ -171,16 +177,19 @@ export async function alignEnglishTranslation(
171
177
  libPath
172
178
  )
173
179
 
174
- const timeline = await whisper.align(
175
- sourceRawAudio,
176
- translatedTranscript,
177
- sourceLanguage,
178
- 'translate',
179
- options,
180
- callbacks,
181
- )
182
-
183
- return timeline
180
+ try {
181
+ const timeline = await whisper.align(
182
+ sourceRawAudio,
183
+ translatedTranscript,
184
+ sourceLanguage,
185
+ 'translate',
186
+ options,
187
+ callbacks,
188
+ )
189
+ return timeline
190
+ } finally {
191
+ whisper.release()
192
+ }
184
193
  }
185
194
 
186
195
  export async function detectLanguage(
@@ -217,17 +226,21 @@ export async function detectLanguage(
217
226
  return partResults
218
227
  }
219
228
 
220
- const results = await detectSpeechLanguageByParts(
221
- sourceRawAudio,
222
- detectLanguageForPart,
223
- undefined,
224
- undefined,
225
- callbacks,
226
- )
229
+ try {
230
+ const results = await detectSpeechLanguageByParts(
231
+ sourceRawAudio,
232
+ detectLanguageForPart,
233
+ undefined,
234
+ undefined,
235
+ callbacks,
236
+ )
227
237
 
228
- results.sort((entry1, entry2) => entry2.probability - entry1.probability)
238
+ results.sort((entry1, entry2) => entry2.probability - entry1.probability)
229
239
 
230
- return results
240
+ return results
241
+ } finally {
242
+ whisper.release()
243
+ }
231
244
  }
232
245
 
233
246
  export class Whisper {
@@ -1770,6 +1783,13 @@ export class Whisper {
1770
1783
 
1771
1784
  return tokensData
1772
1785
  }
1786
+
1787
+ release() {
1788
+ if (this.context) {
1789
+ this.context.release()
1790
+ this.context = undefined
1791
+ }
1792
+ }
1773
1793
  }
1774
1794
 
1775
1795
  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
package/src/subtitles/Subtitles.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { htmlToText } from 'html-to-text'
2
2
 
3
3
  import { secondsToHMS, secondsToMS } from '../utilities/Utilities.js'
4
- import { isWordOrSymbolWord } from '../nlp/Segmentation.js'
4
+ import { isWordOrEmojiOrSymbolWord } from '../nlp/Segmentation.js'
5
5
  import { charactersToWriteAhead } from '../audio/AudioPlayer.js'
6
6
  import { Timeline, TimelineEntry } from '../utilities/Timeline.js'
7
7
  import { readFileAsUtf8 } from '../utilities/FileSystem.js'
@@ -155,7 +155,7 @@ function getCuesFromTimeline_IsolateSegmentSentence(timeline: Timeline, config:
155
155
 
156
156
  // If the given timeline is a word timeline, wrap it with a segment and call again
157
157
  if (timeline[0].type === 'word') {
158
- const wordTimeline = timeline.filter(entry => isWordOrSymbolWord(entry.text))
158
+ const wordTimeline = timeline.filter(entry => isWordOrEmojiOrSymbolWord(entry.text))
159
159
 
160
160
  const text = wordTimeline.map(entry => entry.text).join(' ')
161
161
 
@@ -206,7 +206,7 @@ function getCuesFromTimeline_IsolateSegmentSentence(timeline: Timeline, config:
206
206
  continue
207
207
  }
208
208
 
209
- const wordTimeline = entry.timeline!.filter(entry => isWordOrSymbolWord(entry.text))
209
+ const wordTimeline = entry.timeline!.filter(entry => isWordOrEmojiOrSymbolWord(entry.text))
210
210
 
211
211
  // First, add word start and end offsets for all word entries
212
212
  let lastWordEndOffset = 0
package/src/synthesis/EspeakTTS.ts CHANGED
@@ -4,7 +4,7 @@ import { Logger } from '../utilities/Logger.js'
4
4
  import { RawAudio, getEmptyRawAudio } from '../audio/AudioUtilities.js'
5
5
  import { getNormalizedFragmentsForSpeech, simplifyPunctuationCharacters } from '../nlp/TextNormalizer.js'
6
6
  import { ipaPhoneToKirshenbaum } from '../nlp/PhoneConversion.js'
7
- import { includesPunctuation, splitToWords, wordCharacterRegExp } from '../nlp/Segmentation.js'
7
+ import { isAllPunctuation, isWord, isWordOrEmoji, splitToWords, wordCharacterRegExp } from '../nlp/Segmentation.js'
8
8
  import { Lexicon, tryGetFirstLexiconSubstitution } from '../nlp/Lexicon.js'
9
9
  import { phonemizeSentence } from '../nlp/EspeakPhonemizer.js'
10
10
  import { Timeline, TimelineEntry } from '../utilities/Timeline.js'
@@ -49,10 +49,10 @@ export async function preprocessAndSynthesize(text: string, language: string, es
49
49
 
50
50
  let words = (await splitToWords(text, language)).wordArray
51
51
 
52
- // Merge repeating non-words to a single word to work around eSpeak bug
53
52
  {
54
53
  const mergedWords: string[] = []
55
54
 
55
+ // Merge repeating non-words to a single word to work around eSpeak bugs
56
56
  for (let i = 0; i < words.length; i++) {
57
57
  const currentWord = words[i]
58
58
  const previousWord = words[i - 1]
@@ -61,7 +61,7 @@ export async function preprocessAndSynthesize(text: string, language: string, es
61
61
  i > 0 &&
62
62
  currentWord === previousWord &&
63
63
  !['[', ']'].includes(currentWord) && // Work around eSpeak-NG marker bug with repeating squared brackets
64
- !wordCharacterRegExp.test(currentWord)) {
64
+ !isWordOrEmoji(currentWord)) {
65
65
 
66
66
  mergedWords[mergedWords.length - 1] += currentWord
67
67
  } else {
@@ -69,12 +69,15 @@ export async function preprocessAndSynthesize(text: string, language: string, es
69
69
  }
70
70
  }
71
71
 
72
+ // Collapse or convert some types of non-words
72
73
  for (let i = 0; i < mergedWords.length; i++) {
73
74
  const mergedWord = mergedWords[i]
74
75
 
75
- // Replace vertical bar only words with empty words
76
- if (/^[\|│]+$/.test(mergedWord)) {
77
- mergedWords[i] = ' '.repeat(mergedWord.length)
76
+ // Convert isolated groups of vertical bars and em dashes to a comma
77
+ if (/^[\|│—─–]+$/.test(mergedWord)) {
78
+ mergedWords[i] = ','
79
+ } else if (isAllPunctuation(mergedWord)) { // Collapse repeated punctuation
80
+ mergedWords[i] = mergedWord[0]
78
81
  }
79
82
  }
80
83
 
package/src/utilities/Timeline.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { addMissingPunctuationWordsToWordSequence, segmentWordSequence, WordSequence } from '@echogarden/text-segmentation'
2
2
  import { ParagraphBreakType, WhitespaceProcessing } from '../api/Common.js'
3
- import { applyWhitespaceProcessing, isWord, isWordOrSymbolWord, splitToParagraphs } from '../nlp/Segmentation.js'
3
+ import { applyWhitespaceProcessing, isWord, isWordOrEmojiOrSymbolWord, splitToParagraphs } from '../nlp/Segmentation.js'
4
4
  import { deepClone } from './ObjectUtilities.js'
5
5
  import { getUTF32Chars } from './StringUtilities.js'
6
6
  import { roundToDigits } from './Utilities.js'
@@ -70,7 +70,7 @@ export async function wordTimelineToSegmentSentenceTimeline(wordTimelineWithOffs
70
70
  const wordStartOffset = wordEntry.startOffsetUtf16!
71
71
  const wordEndOffset = wordEntry.endOffsetUtf16!
72
72
 
73
- const isPunctuation = !isWordOrSymbolWord(wordEntry.text)
73
+ const isPunctuation = !isWordOrEmojiOrSymbolWord(wordEntry.text)
74
74
 
75
75
  wordSequence.addWord(wordEntry.text, wordStartOffset, isPunctuation)
76
76
  }