From c62e41fc06765da008faaeceee33fff319eac78e Mon Sep 17 00:00:00 2001 From: Ajiemar Santiago Date: Wed, 22 Jun 2016 13:42:46 -0500 Subject: [PATCH 1/3] commented out GetWorkspaces in Conversation --- Scripts/Services/Conversation/Conversation.cs | 19 +++++++++++-------- Scripts/Services/Conversation/DataModels.cs | 1 + 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Scripts/Services/Conversation/Conversation.cs b/Scripts/Services/Conversation/Conversation.cs index 84b0a2e51..f378d0936 100644 --- a/Scripts/Services/Conversation/Conversation.cs +++ b/Scripts/Services/Conversation/Conversation.cs @@ -57,7 +57,7 @@ public class Conversation : IWatsonService private const string SERVICE_ID = "ConversationV1"; private static fsSerializer sm_Serializer = new fsSerializer(); #endregion - + /* #region Workspaces /// /// Gets the available workspaces for the Conversation service @@ -113,8 +113,9 @@ private void OnGetWorkspacesResp(RESTConnector.Request req, RESTConnector.Respon ((GetWorkspacesReq)req).Callback(resp.Success ? workspaces : null); } #endregion - + */ #region Message + private const string SERVICE_MESSAGE = "/v1/workspaces"; /// /// Message the specified workspaceId, input and callback. /// @@ -130,7 +131,7 @@ public bool Message(string workspaceId, string input, OnMessage callback) if(callback == null) throw new ArgumentNullException("callback"); - RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, "/v2/rest/workspaces"); + RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, SERVICE_MESSAGE); if(connector == null) return false; @@ -140,6 +141,7 @@ public bool Message(string workspaceId, string input, OnMessage callback) MessageReq req = new MessageReq(); req.Callback = callback; req.Headers["Content-Type"] = "application/json"; + req.Parameters["version"] = DataModels.CONVERSATION_VERSION; req.Function = "/" + workspaceId + "/message"; req.Send = Encoding.UTF8.GetBytes(reqString); req.OnResponse = MessageResp; @@ -227,18 +229,19 @@ public CheckServiceStatus(Conversation service, ServiceStatus callback) if (!string.IsNullOrEmpty(customServiceID)) { - if (!m_Service.Message(customServiceID, "Hello", OnMessage)) + if (!m_Service.Message(customServiceID, "Ping", OnMessage)) OnFailure("Failed to invoke Converse()."); else m_ConversationCount += 1; } else { - if (!m_Service.GetWorkspaces(OnGetWorkspaces)) - OnFailure("Failed to invoke GetDialogs()."); +// if (!m_Service.GetWorkspaces(OnGetWorkspaces)) +// OnFailure("Failed to invoke GetDialogs()."); + OnFailure("Please define a workspace variable in config.json (" + SERVICE_ID + "_ID)"); } } - + /* private void OnGetWorkspaces(DataModels.Workspaces workspaces) { if (m_Callback != null) @@ -254,7 +257,7 @@ private void OnGetWorkspaces(DataModels.Workspaces workspaces) else OnFailure("GetMessages() failed."); } - + */ private void OnMessage(DataModels.MessageResponse resp) { if (m_ConversationCount > 0) diff --git a/Scripts/Services/Conversation/DataModels.cs b/Scripts/Services/Conversation/DataModels.cs index a79944a1d..124b358fc 100644 --- a/Scripts/Services/Conversation/DataModels.cs +++ b/Scripts/Services/Conversation/DataModels.cs @@ -19,6 +19,7 @@ namespace IBM.Watson.DeveloperCloud.Services.Conversation.v1 { public class DataModels { + public const string CONVERSATION_VERSION = "2016-05-19"; #region Workspaces /// /// Workspaces. From a9c3e57c5ae6bfc5ad00895d7dc0302a91efc791 Mon Sep 17 00:00:00 2001 From: Ajiemar Santiago Date: Wed, 22 Jun 2016 13:58:44 -0500 Subject: [PATCH 2/3] Fixes #88 fixes #87 revisions to Conversation service status, update credentials and endpoints for conversation and toneanalyzer --- .../Scripts/ExampleConversation.cs | 18 +++++--- .../ServiceExamples/ServiceExamples.unity | 41 ++++++++++++++++++- Scripts/Services/Conversation/Conversation.cs | 1 + 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/Examples/ServiceExamples/Scripts/ExampleConversation.cs b/Examples/ServiceExamples/Scripts/ExampleConversation.cs index 0093655bc..9c40ee2c1 100644 --- a/Examples/ServiceExamples/Scripts/ExampleConversation.cs +++ b/Examples/ServiceExamples/Scripts/ExampleConversation.cs @@ -22,7 +22,7 @@ public class ExampleConversation : MonoBehaviour { private Conversation m_Conversation = new Conversation(); - private string m_WorkspaceID = "car_demo_1"; + private string m_WorkspaceID = "25dfa8a0-0263-471b-8980-317e68c30488"; private string m_Input = "Can you unlock the door?"; void Start () { @@ -32,9 +32,17 @@ void Start () { void OnMessage (DataModels.MessageResponse resp) { - foreach(DataModels.MessageIntent mi in resp.intents) - Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence); - - Debug.Log("response: " + resp.output.text); + if(resp != null) + { + foreach(DataModels.MessageIntent mi in resp.intents) + Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence); + + if(resp.output != null && !string.IsNullOrEmpty(resp.output.text)) + Debug.Log("response: " + resp.output.text); + } + else + { + Debug.Log("Failed to invoke Message();"); + } } } diff --git a/Examples/ServiceExamples/ServiceExamples.unity b/Examples/ServiceExamples/ServiceExamples.unity index 769ae2f86..9f6a70ec0 100644 --- a/Examples/ServiceExamples/ServiceExamples.unity +++ b/Examples/ServiceExamples/ServiceExamples.unity @@ -249,6 +249,45 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 +--- !u!1 &748186939 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 748186941} + - 114: {fileID: 748186940} + m_Layer: 0 + m_Name: ExampleAlchemyLanguage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &748186940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 748186939} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d5294a7b05214c5690d02420b87a821, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &748186941 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 748186939} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 299.5, y: 291.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 --- !u!1 &859102722 GameObject: m_ObjectHideFlags: 0 @@ -538,7 +577,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2004886372 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Scripts/Services/Conversation/Conversation.cs b/Scripts/Services/Conversation/Conversation.cs index f378d0936..4e2cca936 100644 --- a/Scripts/Services/Conversation/Conversation.cs +++ b/Scripts/Services/Conversation/Conversation.cs @@ -141,6 +141,7 @@ public bool Message(string workspaceId, string input, OnMessage callback) MessageReq req = new MessageReq(); req.Callback = callback; req.Headers["Content-Type"] = "application/json"; + req.Headers["Accept"] = "application/json"; req.Parameters["version"] = DataModels.CONVERSATION_VERSION; req.Function = "/" + workspaceId + "/message"; req.Send = Encoding.UTF8.GetBytes(reqString); From d0f011440a7d94389d19b256bf40db7969882f97 Mon Sep 17 00:00:00 2001 From: Ajiemar Santiago Date: Wed, 22 Jun 2016 14:01:11 -0500 Subject: [PATCH 3/3] encrypt credentials --- Config.json.enc | Bin 3120 -> 3248 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Config.json.enc b/Config.json.enc index 880bbb6cfa26cfb360907f96223df93d341cbfcb..104d85fe612531fc50adc879776277082a32d586 100644 GIT binary patch literal 3248 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 K0enF-%9}pjX(faJ