echogarden 1.1.0 → 1.2.0

package/src/alignment/DTWSequenceAlignmentWindowed.ts

@@ -1,3 +1,5 @@
+import chalk from 'chalk'
+import { Logger } from '../utilities/Logger.js'
 import { logToStderr } from '../utilities/Utilities.js'
 import { AlignmentPath } from './SpeechAlignment.js'
 
@@ -164,7 +166,11 @@ function computeBestPathTransposed(accumulatedCostMatrixTransposed: Float32Array
 		}
 
 		if (upCost == Infinity && leftCost == Infinity && upAndLeftCost == Infinity) {
-			log(`computeBestPath: Unexpected - all cost directions are equal to infinity (${columnIndex}, ${rowIndex}).`)
+			const logger = new Logger()
+
+			logger.setAsActiveLogger()
+			logger.logTitledMessage(`computeBestPath`, `unexpected - all cost directions are equal to infinity (${columnIndex}, ${rowIndex}).`, chalk.yellowBright, 'warning')
+			logger.unsetAsActiveLogger()
 		}
 
 		const smallestCostDirection = argIndexOfMinimumOf3(upCost, leftCost, upAndLeftCost)

package/src/alignment/SpeechAlignment.ts

@@ -63,7 +63,7 @@ export async function alignUsingDtw(
 			const minRecommendedWindowDuration = 0.2 * rawAudioDuration
 
 			if (windowDuration < minRecommendedWindowDuration) {
-				logger.logTitledMessage('Warning', `Maximum DTW window duration is set to ${windowDuration.toFixed(1)}s, which is smaller than 20% of the source audio duration of ${rawAudioDuration.toFixed(1)}s. This may lead to suboptimal results in some cases. Consider increasing window duration if needed.`, chalk.yellowBright)
+				logger.logTitledMessage('Warning', `Maximum DTW window duration is set to ${windowDuration.toFixed(1)}s, which is smaller than 20% of the source audio duration of ${rawAudioDuration.toFixed(1)}s. This may lead to suboptimal results in some cases. Consider increasing window duration if needed.`, chalk.yellowBright, 'warning')
 			}
 		}
 

package/src/api/APIOptions.ts

@@ -1,5 +1,6 @@
 import * as API from './API.js'
 import type { ServerOptions } from '../server/Server.js'
+import { CLIOptions } from '../cli/CLIOptions.js'
 
 export interface APIOptions {
 	VoiceListRequestOptions: API.VoiceListRequestOptions
@@ -14,4 +15,6 @@ export interface APIOptions {
 	DenoisingOptions: API.DenoisingOptions
 	SourceSeparationOptions: API.SourceSeparationOptions
 	ServerOptions: ServerOptions
+	GlobalOptions: API.GlobalOptions
+	CLIOptions: CLIOptions
 }

package/src/api/Alignment.ts

@@ -125,6 +125,8 @@ export async function align(input: AudioSourceParam, transcript: string, options
 
 	switch (options.engine) {
 		case 'dtw': {
+			logger.end()
+
 			const {
 				referenceRawAudio,
 				referenceTimeline
@@ -140,11 +142,11 @@ export async function align(input: AudioSourceParam, transcript: string, options
 		}
 
 		case 'dtw-ra': {
+			logger.end()
+
 			const recognitionOptions: API.RecognitionOptions =
 				extendDeep({ crop: options.crop, language }, options.recognition)
 
-			logger.end()
-
 			// Recognize source audio
 			let { wordTimeline: recognitionTimeline } = await API.recognize(sourceRawAudio, recognitionOptions)
 

package/src/api/GlobalOptions.ts

@@ -1,5 +1,5 @@
 export function getGlobalOption<K extends keyof GlobalOptions>(key: K): GlobalOptions[K] {
-	if (!Object.keys(globalOptions).includes(key)) {
+	if (!listGlobalOptions().includes(key)) {
 		throw new Error(`Unknown global option key '${key}'`)
 	}
 
@@ -7,19 +7,47 @@ export function getGlobalOption<K extends keyof GlobalOptions>(key: K): GlobalOp
 }
 
 export function setGlobalOption<K extends keyof GlobalOptions>(key: K, value: GlobalOptions[K]) {
-	if (!Object.keys(globalOptions).includes(key)) {
+	if (!listGlobalOptions().includes(key)) {
 		throw new Error(`Unknown global option key '${key}'`)
 	}
 
-	globalOptions[key] = value as any
+	globalOptions[key] = value
 }
 
+export function listGlobalOptions() {
+	return Object.keys(globalOptions)
+}
+
+export function logLevelToNumber(logLevel: LogLevel) {
+	return logLevels.indexOf(logLevel)
+}
+
+export function getLogLevel() {
+	return globalOptions.logLevel ?? 'info'
+}
+
+export function logLevelGreaterOrEqualTo(referenceLevel: LogLevel) {
+	return !logLevelSmallerThan(referenceLevel)
+}
+
+export function logLevelSmallerThan(referenceLevel: LogLevel) {
+	return logLevelToNumber(getLogLevel()) < logLevelToNumber(referenceLevel)
+}
+
+const logLevels = ['silent', 'output', 'error', 'warning', 'info', 'trace'] as const
+
+export type LogLevel = typeof logLevels[number]
+
 export interface GlobalOptions {
 	ffmpegPath?: string
 	soxPath?: string
+	packageBaseURL?: string
+	logLevel?: LogLevel
 }
 
-const globalOptions = {
+const globalOptions: GlobalOptions = {
 	ffmpegPath: undefined,
-	soxPath: undefined
+	soxPath: undefined,
+	packageBaseURL: 'https://huggingface.co/echogarden/echogarden-packages/resolve/main/',
+	logLevel: 'info',
 }