Skip to content

Commit 9b6cca2

Browse files
committed
Merge branch '162-add-global-transaction-id' of github.com:watson-developer-cloud/dotnet-standard-sdk into 162-add-global-transaction-id
2 parents 3011ee3 + 527957f commit 9b6cca2

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Ensure you have the following prerequisites:
2727
You can get the latest SDK packages through NuGet. Installation instructions can be found in the ReadMe of each package.
2828

2929
* [Assistant V1](/src/IBM.WatsonDeveloperCloud.Assistant.v1)
30-
* [Assistant V2](/src/IBM.WatsonDeveloperCloud.Assistant.v2)
30+
* [Assistant V2](/src/IBM.WatsonDeveloperCloud.Assistant.v2) (private beta)
3131
* [Conversation](/src/IBM.WatsonDeveloperCloud.Conversation.v1) (deprecated - Use Assistant V1 or Assistant V2)
3232
* [Discovery](/src/IBM.WatsonDeveloperCloud.Discovery.v1)
3333
* [Language Translator V2](/src/IBM.WatsonDeveloperCloud.LanguageTranslator.v2) (deprecated - Use LanguageTranslator V3)

src/IBM.WatsonDeveloperCloud.Assistant.v2/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
### Assistant
44

5+
**Watson Assistant v2 API is released in beta. For details, see the ["Introducing Watson Assistant"](https://www.ibm.com/blogs/watson/2018/03/the-future-of-watson-conversation-watson-assistant/) blog post.**
6+
57
The IBM Watson™ [Assistant][assistant] service combines machine learning, natural language understanding, and integrated dialog tools to create conversation flows between your apps and your users.
68

79
### Installation

src/IBM.WatsonDeveloperCloud.TextToSpeech.v1/TextToSpeechService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public Voices ListVoices(Dictionary<string, object> customData = null)
199199
/// that owns the custom model. Omit the parameter to use the specified voice with no customization.
200200
/// (optional)</param>
201201
/// <param name="customData">Custom data object to pass data including custom request headers.</param>
202-
/// <returns><see cref="System.IO.FileStream" />System.IO.FileStream</returns>
202+
/// <returns><see cref="System.IO.MemoryStream" />System.IO.MemoryStream</returns>
203203
public System.IO.MemoryStream Synthesize(Text text, string accept = null, string voice = null, string customizationId = null, Dictionary<string, object> customData = null)
204204
{
205205
if (text == null)

src/IBM.WatsonDeveloperCloud/Http/Request.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ public IRequest WithBodyContent(HttpContent body)
8181

8282
public IRequest WithHeader(string key, string value)
8383
{
84+
if (key == "Accept" && value.StartsWith("audio/", StringComparison.OrdinalIgnoreCase))
85+
{
86+
this.Message.Headers.Accept.Clear();
87+
}
8488
this.Message.Headers.TryAddWithoutValidation(key, value);
8589
return this;
8690
}

0 commit comments

Comments
 (0)