From 937e9ef227b02c46264dfec2148813c77cdfbfa0 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Mon, 15 May 2023 13:33:32 -0700 Subject: [PATCH 01/16] Set config property --- src/cs/CommandSystemServices/SpeechConfigService.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cs/CommandSystemServices/SpeechConfigService.cs b/src/cs/CommandSystemServices/SpeechConfigService.cs index 0248963e..3e530ff5 100644 --- a/src/cs/CommandSystemServices/SpeechConfigService.cs +++ b/src/cs/CommandSystemServices/SpeechConfigService.cs @@ -44,6 +44,9 @@ public SpeechConfig GetSpeechConfig(SpeechConfigKind kind) var language = GetDefaultLanguage(); if (language != null && kind == SpeechConfigKind.SpeechRecognition) config.SpeechRecognitionLanguage = language; + // TODO: This is to investigate TTS issue. Need to confirm this is needed. + config.SetProperty(PropertyId.SpeechServiceConnection_SynthEnableCompressedAudioTransmission, "false"); + return config; } From a490de08c8b5b024f577fccc5e3b753829468c3c Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Mon, 12 Jun 2023 08:31:29 -0700 Subject: [PATCH 02/16] added GM keyword property --- src/cs/CommandSystemServices/SpeechConfigService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cs/CommandSystemServices/SpeechConfigService.cs b/src/cs/CommandSystemServices/SpeechConfigService.cs index 3e530ff5..4c5db1a2 100644 --- a/src/cs/CommandSystemServices/SpeechConfigService.cs +++ b/src/cs/CommandSystemServices/SpeechConfigService.cs @@ -46,6 +46,8 @@ public SpeechConfig GetSpeechConfig(SpeechConfigKind kind) // TODO: This is to investigate TTS issue. Need to confirm this is needed. config.SetProperty(PropertyId.SpeechServiceConnection_SynthEnableCompressedAudioTransmission, "false"); + // TODO: Figure out how to expose this + config.SetServiceProperty("X-FD-Features", "kwsgm,", ServicePropertyChannel.HttpHeader); return config; } From 71763432a378d186c2e6e9b98935595d074135d2 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Thu, 20 Jul 2023 10:54:22 -0700 Subject: [PATCH 03/16] Made maven build a ronen version --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index af7480c3..be451cd4 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -57,7 +57,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.1' + version = '0.0.1-ronen' afterEvaluate { from components.release From bde666f26d6408abce8a273a36b74294992bf20a Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Fri, 25 Aug 2023 11:36:38 -0700 Subject: [PATCH 04/16] bump version --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index d2a3672f..9fdf476e 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -62,7 +62,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.1-ronen' + version = '0.0.2-ronen' afterEvaluate { from components.release From 57a887218397aba4acc0f01dfb4425122514c0ff Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Tue, 29 Aug 2023 13:11:19 -0700 Subject: [PATCH 05/16] disabling minify on the command system aar --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index 9fdf476e..d617a828 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -27,7 +27,7 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'consumer-rules.pro' testCoverageEnabled true } From 3d382fed3296da0d3cf7c10cbe4338c59bd1d088 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Tue, 29 Aug 2023 13:33:22 -0700 Subject: [PATCH 06/16] bumping version for GM --- src/android/CommandSystem/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index d617a828..c3333137 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -10,7 +10,7 @@ apply from: 'copyDependentBinaries.gradle' android { namespace 'com.azure.android.ai.speech.commandsystem' compileSdk 33 - + defaultConfig { minSdk 29 targetSdk 33 @@ -62,7 +62,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.2-ronen' + version = '0.0.3-ronen' afterEvaluate { from components.release From d4b7842287dec2d7fe08ab9352fc7f77154e0e99 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Fri, 27 Oct 2023 13:41:21 -0700 Subject: [PATCH 07/16] updated synthesis config to higher bandwidth --- src/cs/CommandSystemServices/SpeechConfigService.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cs/CommandSystemServices/SpeechConfigService.cs b/src/cs/CommandSystemServices/SpeechConfigService.cs index 4c5db1a2..089cff45 100644 --- a/src/cs/CommandSystemServices/SpeechConfigService.cs +++ b/src/cs/CommandSystemServices/SpeechConfigService.cs @@ -36,6 +36,12 @@ public SpeechConfig GetSpeechConfig(SpeechConfigKind kind) config.SetProperty(PropertyId.Speech_SegmentationSilenceTimeoutMs, GetSegmentationTimeout()); + if (kind == SpeechConfigKind.SpeechSynthesis) + { + config.SetProperty(PropertyId.SpeechServiceConnection_SynthEnableCompressedAudioTransmission, "false"); + config.SetSpeechSynthesisOutputFormat(SpeechSynthesisOutputFormat.Riff48Khz16BitMonoPcm); + } + var endpointId = kind == SpeechConfigKind.SpeechRecognition ? _settings.Get("SPEECH_CUSTOM_RECOGNITION_ENDPOINT_ID", string.Empty) : _settings.Get("SPEECH_CUSTOM_SYNTHESIS_ENDPOINT_ID", string.Empty); From 2dd2f9cf098a3b519e1fb4a12cab7b9a8e9aaf32 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Fri, 27 Oct 2023 14:18:46 -0700 Subject: [PATCH 08/16] dotnet version --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index 5ba3e13d..9418f6d9 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -4,7 +4,7 @@ plugins { id 'maven-publish' } // So far I'm unable to get this to be set dynamically ... -project.ext.GRADLE_DOTNET_VERSION = "7.0.12" +project.ext.GRADLE_DOTNET_VERSION = "7.0.13" apply from: 'copyDependentBinaries.gradle' android { From 0f44e96313e629e2900c69633811534f3ce79f5b Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Fri, 27 Oct 2023 14:26:53 -0700 Subject: [PATCH 09/16] version bump --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index 9418f6d9..925c499b 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -62,7 +62,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.3-ronen' + version = '0.0.4-ronen' afterEvaluate { from components.release From 181535032f77a4c36e7831e11e0bce74834fed7e Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Mon, 6 Nov 2023 07:47:51 -0800 Subject: [PATCH 10/16] bump aar version --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index 925c499b..ef464a1c 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -62,7 +62,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.4-ronen' + version = '0.0.5-ronen' afterEvaluate { from components.release From b4df2adde5648153a0dd25c9fd7001215d18e530 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Thu, 16 Nov 2023 11:04:03 -0800 Subject: [PATCH 11/16] Added a bunch of debug prints to help diagnose timing issue --- .../CommandSystemBuilder.cs | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/cs/CommandSystemBuilder/CommandSystemBuilder.cs b/src/cs/CommandSystemBuilder/CommandSystemBuilder.cs index e31eaaba..34e68569 100644 --- a/src/cs/CommandSystemBuilder/CommandSystemBuilder.cs +++ b/src/cs/CommandSystemBuilder/CommandSystemBuilder.cs @@ -18,24 +18,52 @@ internal CommandSystemBuilder() public ICommandSystem Build() { + MR.DBG_TRACE_INFO("CommandSystemBuilder.Build ... started!"); + MR.DBG_TRACE_INFO("ConfigComponentBuilder.Build ... started!"); var components = ConfigComponentBuilder.Build(_componentBuilders); + MR.DBG_TRACE_INFO("ConfigComponentBuilder.Build ... done!"); + MR.DBG_TRACE_INFO("ConfigComponentBuilder.Configure ... started!"); components.Configure(this); + MR.DBG_TRACE_INFO("ConfigComponentBuilder.Configure ... done!"); + MR.DBG_TRACE_INFO("ConfigLoggingBuilder.Build ... started!"); var logging = ConfigLoggingBuilder.Build(_loggingBuilders); + MR.DBG_TRACE_INFO("ConfigLoggingBuilder.Build ... done!"); + MR.DBG_TRACE_INFO("ConfigSourceBuilder.Build ... started!"); var source = ConfigSourceBuilder.Build(_sourceBuilders); + MR.DBG_TRACE_INFO("ConfigSourceBuilder.Build ... done!"); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... started!"); var secret = ConfigSecretBuilder.Build(_secretBuilders); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... done!"); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... started!"); var resolver = ConfigResolverBuilder.Build(_resolverBuilders); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... done!"); + + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... started!"); var message = ConfigMessageBuilder.Build(_messageBuilders); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... done!"); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... started!"); var ui = ConfigUiBuilder.Build(_uiBuilders); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... done!"); + + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... started!"); var media = ConfigMediaBuilder.Build(_mediaBuilders); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... done!"); + + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... started!"); var speech = ConfigSpeechBuilder.Build(_speechBuilders); + MR.DBG_TRACE_INFO("ConfigSecretBuilder.Build ... done!"); + MR.DBG_TRACE_INFO("ConfigureLogging.Configure ... started!"); _builder.ConfigureLogging(logging => logging.ClearProviders()); + MR.DBG_TRACE_INFO("ConfigureLogging.Configure ... done!"); + MR.DBG_TRACE_INFO("ConfigureServices.Configure ... started!"); _builder.ConfigureServices((context, services) => { + MR.DBG_TRACE_INFO("_builder.ConfigureServices ... started!"); logging.ConfigureServices(context, services); source.ConfigureServices(context, services); @@ -46,24 +74,47 @@ public ICommandSystem Build() ui.ConfigureServices(context, services); media.ConfigureServices(context, services); speech.ConfigureServices(context, services); + MR.DBG_TRACE_INFO("_builder.ConfigureServices ... done!"); }); + MR.DBG_TRACE_INFO("ConfigureServices.Configure ... done!"); + MR.DBG_TRACE_INFO("Building Host ... started!"); var host = _builder.Build(); + MR.DBG_TRACE_INFO("Building Host ... done!"); + MR.DBG_TRACE_INFO("logging.ConfigureServices ... started!"); logging.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("logging.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("source.ConfigureServices ... started!"); source.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("source.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("secret.ConfigureServices ... started!"); secret.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("secret.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("resolver.ConfigureServices ... started!"); resolver.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("resolver.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("message.ConfigureServices ... started!"); message.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("message.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("ui.ConfigureServices ... started!"); ui.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("ui.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("media.ConfigureServices ... started!"); media.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("media.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("speech.ConfigureServices ... started!"); speech.ConfigureServices(host.Services); + MR.DBG_TRACE_INFO("speech.ConfigureServices ... done!"); + MR.DBG_TRACE_INFO("Building CommandSystem ... started!"); var commandSystem = new CommandSystem(host); + MR.DBG_TRACE_INFO("Building CommandSystem ... done!"); components.SetCommandSystem(commandSystem); + MR.DBG_TRACE_INFO("CommandSystemBuilder.Build ... done!"); return commandSystem; } From 9a352d5e38fd8c494d00eba0b925e2568e3ad370 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Thu, 16 Nov 2023 13:03:52 -0800 Subject: [PATCH 12/16] bumped release to tarek --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index ef464a1c..a7166a91 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -62,7 +62,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.5-ronen' + version = '0.0.5-tarek' afterEvaluate { from components.release From 2b6df1eab366cc7f1577513a0e5c6b919f8b8bb4 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Thu, 16 Nov 2023 13:18:03 -0800 Subject: [PATCH 13/16] bumped dotnet --- src/android/CommandSystem/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index a7166a91..4dc1047d 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -4,7 +4,7 @@ plugins { id 'maven-publish' } // So far I'm unable to get this to be set dynamically ... -project.ext.GRADLE_DOTNET_VERSION = "7.0.13" +project.ext.GRADLE_DOTNET_VERSION = "7.0.14" apply from: 'copyDependentBinaries.gradle' android { From 0e97b8df7df40813199ea817fee0c158dd962028 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Tue, 28 Nov 2023 13:01:51 -0800 Subject: [PATCH 14/16] setting mono debug levels --- src/android/CommandSystem/src/main/jni/myjni.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/CommandSystem/src/main/jni/myjni.cpp b/src/android/CommandSystem/src/main/jni/myjni.cpp index e0aa800a..19cdf65d 100644 --- a/src/android/CommandSystem/src/main/jni/myjni.cpp +++ b/src/android/CommandSystem/src/main/jni/myjni.cpp @@ -9,8 +9,8 @@ Java_com_azure_android_ai_speech_commandsystem_CommandSystemBuilderJNI_00024Comp JNIEnv *env, jobject thiz, jstring j_filesDir) { // Mono Debugging settings -// setenv("MONO_LOG_LEVEL", "debug", true); -// setenv("MONO_LOG_MASK", "all", true); + setenv("MONO_LOG_LEVEL", "debug", true); + setenv("MONO_LOG_MASK", "all", true); // Set our singleton bundlePath BundlePath::getInstance()->setPath(env, j_filesDir); From 406bd9da842c126c771ac36d133edb97fce63f2a Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Wed, 29 Nov 2023 07:45:23 -0800 Subject: [PATCH 15/16] removing keys --- .../microsoft/commandsystemsample/MainActivity.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/android/app/src/main/java/com/microsoft/commandsystemsample/MainActivity.kt b/src/android/app/src/main/java/com/microsoft/commandsystemsample/MainActivity.kt index 040d31d5..86049bf8 100644 --- a/src/android/app/src/main/java/com/microsoft/commandsystemsample/MainActivity.kt +++ b/src/android/app/src/main/java/com/microsoft/commandsystemsample/MainActivity.kt @@ -213,22 +213,22 @@ class MainActivity : AppCompatActivity() { } .configureSecrets { secrets: ConfigureSecretBuilder -> secrets - .addSecret("SPEECH_KEY","2b68d45cadbb4f0f8862b963deedfdee") + .addSecret("SPEECH_KEY","YOUR_KEY") .addSecret("SPEECH_REGION","westus") .addSecret("SPEECH_DEFAULT_LANGUAGE","en-us") .addSecret("SPEECH_CUSTOM_RECOGNITION_ENDPOINT_ID","") .addSecret("SPEECH_CUSTOM_SYNTHESIS_ENDPOINT_ID","") - .addSecret("CLU_KEY","e89ceb8761194fc39814f32f353a8a31") + .addSecret("CLU_KEY","YOUR_KEY") .addSecret("CLU_ENDPOINT","https://internal-gm-dev.cognitiveservices.azure.com") .addSecret("CLU_PROJECT_NAME","GM-Orchestrator") .addSecret("CLU_DEPLOYMENT_NAME","2023-02-06") .addSecret("OPEN_AI_DEPLOYMENT","robch-southcentral-oai-txtdav002") .addSecret("OPEN_AI_ENDPOINT","https://robch-openai.openai.azure.com/") - .addSecret("OPEN_AI_KEY","c096b958a6974ec790c9a1444cf1d76f") - .addSecret("TRANSLATOR_KEY","2cf1013f19bd4dea976a4e21420ff92c") + .addSecret("OPEN_AI_KEY","YOUR_KEY") + .addSecret("TRANSLATOR_KEY","YOUR_KEY") .addSecret("TRANSLATOR_ENDPOINT","https://api.cognitive.microsofttranslator.com/") .addSecret("TRANSLATOR_REGION","westus") - .addSecret("VISION_KEY","c34da3df78d942aaa013944992b563b7") + .addSecret("VISION_KEY","YOUR_KEY") .addSecret("VISION_DEFAULT_LANGUAGE","en") .addSecret("VISION_ENDPOINT","https://carbon-vision.cognitiveservices.azure.com") .addSecret("MACARONI_CLIENT_SECRET","something") @@ -236,7 +236,7 @@ class MainActivity : AppCompatActivity() { //.useKeyVault("uri","tenant","client") // .addSecret("SPEECH_KEY") { // Log.i(LOGTAG, "SPEECH_KEY callback called") -// "2b68d45cadbb4f0f8862b963deedfdee" +// "YOUR_KEY" // } } .configureMessage { messages: ConfigureMessageBuilder -> From 11e480ea30c03d2f7af4cdca74e36c05c61f7c32 Mon Sep 17 00:00:00 2001 From: Chris Schraer Date: Wed, 3 Jan 2024 10:13:01 -0800 Subject: [PATCH 16/16] updated version --- src/android/CommandSystem/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/CommandSystem/build.gradle b/src/android/CommandSystem/build.gradle index 55247a47..d12b075e 100644 --- a/src/android/CommandSystem/build.gradle +++ b/src/android/CommandSystem/build.gradle @@ -24,7 +24,7 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'consumer-rules.pro' testCoverageEnabled true } @@ -59,7 +59,7 @@ publishing { release(MavenPublication) { groupId = 'com.azure.android' artifactId = 'azure-ai-speech-commandsystem' - version = '0.0.5-tarek.1' + version = '0.0.6-tarekDebug' afterEvaluate { from components.release