Skip to content

Commit e872786

Browse files
mediumTajmediumTaj
authored
Merge pull request #484 from watson-developer-cloud/rc-2.12.0
Watson Unity SDK v2.12.0
2 parents f343af9 + dd9d898 commit e872786

File tree

198 files changed

+9076
-2537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+9076
-2537
lines changed

‎Docs/UnitySDK.shfbproj

-8
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,14 @@
7272
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Utilities" isDocumented="True">Various utility classes.</NamespaceSummaryItem>
7373
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Widgets" isDocumented="True">Widget classes.</NamespaceSummaryItem>
7474
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services" isDocumented="True">Watson service classes.</NamespaceSummaryItem>
75-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1" isDocumented="True">Alchemy API version 1 service abstraction.</NamespaceSummaryItem>
7675
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.Conversation.v1" isDocumented="True">Conversation version 1 service abstraction.</NamespaceSummaryItem>
77-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.ConversationExperimental.v1" isDocumented="True">Experimental Conversation service abstraction.</NamespaceSummaryItem>
78-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.DeepQA.v1" isDocumented="True">Deep QA version 1 service abstraction.</NamespaceSummaryItem>
7976
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.Dialog.v1" isDocumented="True">Dialog version 1 service abstraction.</NamespaceSummaryItem>
80-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.DocumentConversion.v1" isDocumented="True">Document Conversiont version 1 service abstraction.</NamespaceSummaryItem>
81-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.LanguageTranslator.v1" isDocumented="True">Language Translator version 1 service abstraction.</NamespaceSummaryItem>
8277
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.NaturalLanguageClassifier.v1" isDocumented="True">Natural Language Classifier version 1 service abstraction.</NamespaceSummaryItem>
8378
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.PersonalityInsights.v2" isDocumented="True">Personality Insightst version 2 service abstraction.</NamespaceSummaryItem>
84-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.RetrieveAndRank.v1" isDocumented="True">Retrieve and Rankt version 1 service abstraction.</NamespaceSummaryItem>
8579
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.SpeechToText.v1" isDocumented="True">Speech to Text version 1 service abstraction.</NamespaceSummaryItem>
8680
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.TextToSpeech.v1" isDocumented="True">Text to Speech version 1 service abstraction.</NamespaceSummaryItem>
8781
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.ToneAnalyzer.v3" isDocumented="True">Tone Analyzer version 3 service abstraction.</NamespaceSummaryItem>
88-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.TradeoffAnalytics.v1" isDocumented="True">Tradeoff Analytics version 1 service abstraction.</NamespaceSummaryItem>
8982
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.VisualRecognition.v3" isDocumented="True">Visual Recognitionr version 3 service abstraction.</NamespaceSummaryItem>
90-
<NamespaceSummaryItem name="IBM.Watson.DeveloperCloud.Services.LanguageTranslation.v1" isDocumented="True">Language Translation version 1 service abstraction.</NamespaceSummaryItem>
9183
</NamespaceSummaries>
9284
<ApiFilter>
9385
<Filter entryType="Namespace" fullName="" isExposed="False" />

‎Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "IBM Watson SDK for Unity"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.11.0
41+
PROJECT_NUMBER = 2.12.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎Examples/ServiceExamples/ExampleStreaming.unity

+4-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.496413, b: 0.5748175, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -145,7 +145,8 @@ MonoBehaviour:
145145
_username:
146146
_password:
147147
_iamApikey:
148-
_iamUrl:
148+
_iamTokenUrl: https://iam.bluemix.net/identity/token
149+
_recognizeModel:
149150
--- !u!4 &249853926
150151
Transform:
151152
m_ObjectHideFlags: 0
@@ -506,7 +507,7 @@ MonoBehaviour:
506507
_username:
507508
_password:
508509
_iamApikey:
509-
_iamUrl:
510+
_iamTokenUrl: https://iam.bluemix.net/identity/token
510511
_recognizeModel:
511512
--- !u!4 &1646685151
512513
Transform:

‎Examples/ServiceExamples/Scripts/ExampleAssistantV1.cs

+16-33
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,10 @@ public class ExampleAssistantV1 : MonoBehaviour
3737
[Tooltip("The version date with which you would like to use the service in the form YYYY-MM-DD.")]
3838
[SerializeField]
3939
private string _versionDate;
40-
[Header("CF Authentication")]
41-
[Tooltip("The authentication username.")]
42-
[SerializeField]
43-
private string _username;
44-
[Tooltip("The authentication password.")]
45-
[SerializeField]
46-
private string _password;
4740
[Header("IAM Authentication")]
4841
[Tooltip("The IAM apikey.")]
4942
[SerializeField]
5043
private string _iamApikey;
51-
[Tooltip("The IAM url used to authenticate the apikey (optional). This defaults to \"https://iam.bluemix.net/identity/token\".")]
52-
[SerializeField]
53-
private string _iamUrl;
5444
#endregion
5545

5646
private string _createdWorkspaceId;
@@ -132,32 +122,25 @@ void Start()
132122

133123
private IEnumerator CreateService()
134124
{
135-
// Create credential and instantiate service
136-
Credentials credentials = null;
137-
if (!string.IsNullOrEmpty(_username) && !string.IsNullOrEmpty(_password))
125+
if(string.IsNullOrEmpty(_iamApikey))
138126
{
139-
// Authenticate using username and password
140-
credentials = new Credentials(_username, _password, _serviceUrl);
127+
throw new WatsonException("Plesae provide IAM ApiKey for the service.");
141128
}
142-
else if (!string.IsNullOrEmpty(_iamApikey))
143-
{
144-
// Authenticate using iamApikey
145-
TokenOptions tokenOptions = new TokenOptions()
146-
{
147-
IamApiKey = _iamApikey,
148-
IamUrl = _iamUrl
149-
};
150-
151-
credentials = new Credentials(tokenOptions, _serviceUrl);
152-
153-
// Wait for tokendata
154-
while (!credentials.HasIamTokenData())
155-
yield return null;
156-
}
157-
else
129+
130+
// Create credential and instantiate service
131+
Credentials credentials = null;
132+
133+
// Authenticate using iamApikey
134+
TokenOptions tokenOptions = new TokenOptions()
158135
{
159-
throw new WatsonException("Please provide either username and password or IAM apikey to authenticate the service.");
160-
}
136+
IamApiKey = _iamApikey
137+
};
138+
139+
credentials = new Credentials(tokenOptions, _serviceUrl);
140+
141+
// Wait for tokendata
142+
while (!credentials.HasIamTokenData())
143+
yield return null;
161144

162145
_service = new Assistant(credentials);
163146
_service.VersionDate = _versionDate;

‎Examples/ServiceExamples/Scripts/ExampleAssistantV2.cs

+111-39
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,20 @@ public class ExampleAssistantV2 : MonoBehaviour
3838
[Tooltip("The version date with which you would like to use the service in the form YYYY-MM-DD.")]
3939
[SerializeField]
4040
private string _versionDate;
41-
[Header("CF Authentication")]
42-
[Tooltip("The authentication username.")]
43-
[SerializeField]
44-
private string _username;
45-
[Tooltip("The authentication password.")]
46-
[SerializeField]
47-
private string _password;
4841
[Header("IAM Authentication")]
4942
[Tooltip("The IAM apikey.")]
5043
[SerializeField]
5144
private string _iamApikey;
52-
[Tooltip("The IAM url used to authenticate the apikey (optional). This defaults to \"https://iam.bluemix.net/identity/token\".")]
53-
[SerializeField]
54-
private string _iamUrl;
5545
#endregion
5646

5747
private Assistant _service;
5848

5949
private bool _createSessionTested = false;
60-
private bool _messageTested = false;
50+
private bool _messageTested0 = false;
51+
private bool _messageTested1 = false;
52+
private bool _messageTested2 = false;
53+
private bool _messageTested3 = false;
54+
private bool _messageTested4 = false;
6155
private bool _deleteSessionTested = false;
6256
private string _sessionId;
6357

@@ -69,32 +63,25 @@ private void Start()
6963

7064
private IEnumerator CreateService()
7165
{
72-
// Create credential and instantiate service
73-
Credentials credentials = null;
74-
if (!string.IsNullOrEmpty(_username) && !string.IsNullOrEmpty(_password))
66+
if (string.IsNullOrEmpty(_iamApikey))
7567
{
76-
// Authenticate using username and password
77-
credentials = new Credentials(_username, _password, _serviceUrl);
68+
throw new WatsonException("Plesae provide IAM ApiKey for the service.");
7869
}
79-
else if (!string.IsNullOrEmpty(_iamApikey))
80-
{
81-
// Authenticate using iamApikey
82-
TokenOptions tokenOptions = new TokenOptions()
83-
{
84-
IamApiKey = _iamApikey,
85-
IamUrl = _iamUrl
86-
};
8770

88-
credentials = new Credentials(tokenOptions, _serviceUrl);
71+
// Create credential and instantiate service
72+
Credentials credentials = null;
8973

90-
// Wait for tokendata
91-
while (!credentials.HasIamTokenData())
92-
yield return null;
93-
}
94-
else
74+
// Authenticate using iamApikey
75+
TokenOptions tokenOptions = new TokenOptions()
9576
{
96-
throw new WatsonException("Please provide either username and password or IAM apikey to authenticate the service.");
97-
}
77+
IamApiKey = _iamApikey
78+
};
79+
80+
credentials = new Credentials(tokenOptions, _serviceUrl);
81+
82+
// Wait for tokendata
83+
while (!credentials.HasIamTokenData())
84+
yield return null;
9885

9986
_service = new Assistant(credentials);
10087
_service.VersionDate = _versionDate;
@@ -104,23 +91,83 @@ private IEnumerator CreateService()
10491

10592
private IEnumerator Examples()
10693
{
107-
Log.Debug("ExampleAssistantV2.Examples()", "Attempting to CreateSession");
94+
Log.Debug("ExampleAssistantV2.RunTest()", "Attempting to CreateSession");
10895
_service.CreateSession(OnCreateSession, OnFail, _assistantId);
10996

11097
while (!_createSessionTested)
11198
{
11299
yield return null;
113100
}
114101

115-
Log.Debug("ExampleAssistantV2.Examples()", "Attempting to Message");
116-
_service.Message(OnMessage, OnFail, _assistantId, _sessionId);
102+
Log.Debug("ExampleAssistantV2.RunTest()", "Attempting to Message");
103+
_service.Message(OnMessage0, OnFail, _assistantId, _sessionId);
104+
105+
while (!_messageTested0)
106+
{
107+
yield return null;
108+
}
109+
110+
Log.Debug("ExampleAssistantV2.RunTest()", "Are you open on Christmas?");
111+
MessageRequest messageRequest1 = new MessageRequest()
112+
{
113+
Input = new MessageInput()
114+
{
115+
Text = "Are you open on Christmas?"
116+
}
117+
};
118+
_service.Message(OnMessage1, OnFail, _assistantId, _sessionId, messageRequest1);
119+
120+
while (!_messageTested1)
121+
{
122+
yield return null;
123+
}
124+
125+
Log.Debug("ExampleAssistantV2.RunTest()", "What are your hours?");
126+
MessageRequest messageRequest2 = new MessageRequest()
127+
{
128+
Input = new MessageInput()
129+
{
130+
Text = "What are your hours?"
131+
}
132+
};
133+
_service.Message(OnMessage2, OnFail, _assistantId, _sessionId, messageRequest2);
134+
135+
while (!_messageTested2)
136+
{
137+
yield return null;
138+
}
139+
140+
Log.Debug("ExampleAssistantV2.RunTest()", "I'd like to make an appointment for 12pm.");
141+
MessageRequest messageRequest3 = new MessageRequest()
142+
{
143+
Input = new MessageInput()
144+
{
145+
Text = "I'd like to make an appointment for 12pm."
146+
}
147+
};
148+
_service.Message(OnMessage3, OnFail, _assistantId, _sessionId, messageRequest3);
117149

118-
while (!_messageTested)
150+
while (!_messageTested3)
119151
{
120152
yield return null;
121153
}
122154

123-
Log.Debug("ExampleAssistantV2.Examples()", "Attempting to DeleteSession");
155+
Log.Debug("ExampleAssistantV2.RunTest()", "On Friday please.");
156+
MessageRequest messageRequest4 = new MessageRequest()
157+
{
158+
Input = new MessageInput()
159+
{
160+
Text = "On Friday please."
161+
}
162+
};
163+
_service.Message(OnMessage4, OnFail, _assistantId, _sessionId, messageRequest4);
164+
165+
while (!_messageTested4)
166+
{
167+
yield return null;
168+
}
169+
170+
Log.Debug("ExampleAssistantV2.RunTest()", "Attempting to delete session");
124171
_service.DeleteSession(OnDeleteSession, OnFail, _assistantId, _sessionId);
125172

126173
while (!_deleteSessionTested)
@@ -137,9 +184,34 @@ private void OnDeleteSession(object response, Dictionary<string, object> customD
137184
_createSessionTested = true;
138185
}
139186

140-
private void OnMessage(MessageResponse response, Dictionary<string, object> customData)
187+
private void OnMessage0(MessageResponse response, Dictionary<string, object> customData)
188+
{
189+
Log.Debug("ExampleAssistantV2.OnMessage0()", "response: {0}", response.Output.Generic[0].Text);
190+
_messageTested0 = true;
191+
}
192+
193+
private void OnMessage1(MessageResponse response, Dictionary<string, object> customData)
194+
{
195+
Log.Debug("ExampleAssistantV2.OnMessage1()", "response: {0}", response.Output.Generic[0].Text);
196+
197+
_messageTested1 = true;
198+
}
199+
200+
private void OnMessage2(MessageResponse response, Dictionary<string, object> customData)
201+
{
202+
Log.Debug("ExampleAssistantV2.OnMessage2()", "response: {0}", response.Output.Generic[0].Text);
203+
_messageTested2 = true;
204+
}
205+
206+
private void OnMessage3(MessageResponse response, Dictionary<string, object> customData)
207+
{
208+
Log.Debug("ExampleAssistantV2.OnMessage3()", "response: {0}", response.Output.Generic[0].Text);
209+
_messageTested3 = true;
210+
}
211+
private void OnMessage4(MessageResponse response, Dictionary<string, object> customData)
141212
{
142-
_messageTested = true;
213+
Log.Debug("ExampleAssistantV2.OnMessage4()", "response: {0}", response.Output.Generic[0].Text);
214+
_messageTested4 = true;
143215
}
144216

145217
private void OnCreateSession(SessionResponse response, Dictionary<string, object> customData)

‎Examples/ServiceExamples/Scripts/ExampleCallback.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using IBM.Watson.DeveloperCloud.Connection;
1919
using IBM.Watson.DeveloperCloud.Logging;
20-
using IBM.Watson.DeveloperCloud.Services.Conversation.v1;
20+
using IBM.Watson.DeveloperCloud.Services.Assistant.v1;
2121
using IBM.Watson.DeveloperCloud.Services.Discovery.v1;
2222
using IBM.Watson.DeveloperCloud.Utilities;
2323
using System.Collections.Generic;
@@ -51,20 +51,21 @@ void Start()
5151

5252
// Create conversation instance
5353
Credentials conversationCredentials = new Credentials(_conversationUsername, _conversationPassword, _conversationUrl);
54-
Conversation conversation = new Conversation(conversationCredentials);
55-
conversation.VersionDate = "2017-05-26";
54+
Assistant assistant = new Assistant(conversationCredentials);
55+
assistant.VersionDate = "2017-05-26";
5656

5757
// Create discovery instance
5858
Credentials discoveryCredentials = new Credentials(_discoveryUsername, _discoveryPassword, _discoveryUrl);
5959
Discovery discovery = new Discovery(discoveryCredentials);
6060
discovery.VersionDate = "2016-12-01";
6161

6262
// Call with generic callbacks
63-
conversation.Message(OnSuccess, OnFail, _workspaceId, "");
63+
64+
assistant.Message(OnSuccess, OnFail, _workspaceId);
6465
discovery.GetEnvironments(OnSuccess, OnFail);
6566

6667
// Call with sepcific callbacks
67-
conversation.Message(OnMessage, OnMessageFail, _workspaceId, "");
68+
assistant.Message(OnMessage, OnMessageFail, _workspaceId);
6869
discovery.GetEnvironments(OnGetEnvironments, OnGetEnvironmentsFail);
6970
}
7071

0 commit comments

Comments
 (0)