feat(Assistant V2): Deserializing Dictionaries

Author: mediumTaj

Assistant.meta

@@ -411,6 +411,11 @@ private void OnMessageResponse(RESTConnector.Request req, RESTConnector.Response
             response.Result = new MessageResponse();
             fsData data = null;
             Dictionary<string, object> customData = ((MessageRequestObj)req).CustomData;
+            foreach (KeyValuePair<string, string> kvp in resp.Headers)
+            {
+                response.Headers.Add(kvp.Key, kvp.Value);
+            }
+            response.StatusCode = resp.HttpResponseCode;
 
             try
             {

Assistant/v2.meta

@@ -34,7 +34,7 @@ public class MessageContext
         /// Contains information specific to particular skills within the Assistant.
         /// </summary>
         [fsProperty("skills")]
-        public object Skills { get; set; }
+        public MessageContextSkills Skills { get; set; }
     }
 
 }

Assistant/v2/Assistant.cs

@@ -16,15 +16,61 @@
 */
 
 using FullSerializer;
+using FullSerializer.Internal;
+using System;
+using System.Collections.Generic;
 
 namespace IBM.Watson.Assistant.V2
 {
     /// <summary>
     /// Contains information specific to particular skills within the Assistant.
     /// </summary>
-    [fsObject]
-    public class MessageContextSkills
+    [fsObject(Converter = typeof(MessageContextSkillsConverter))]
+    public class MessageContextSkills : Dictionary<string, object>
     {
     }
 
+    public class MessageContextSkillsConverter : fsConverter
+    {
+        private fsSerializer serializer = new fsSerializer();
+
+        public override bool CanProcess(Type type)
+        {
+            return type == typeof(MessageContextSkills);
+        }
+
+        public override fsResult TryDeserialize(fsData data, ref object instance, Type storageType)
+        {
+            if (data.IsString == false)
+            {
+                return fsResult.Fail("Type converter requires a string");
+            }
+
+            instance = fsTypeCache.GetType(data.AsString);
+            if (instance == null)
+            {
+                return fsResult.Fail("Unable to find type " + data.AsString);
+            }
+            return fsResult.Success;
+        }
+
+        public override object CreateInstance(fsData data, Type storageType)
+        {
+            return new MessageContextSkills();
+        }
+
+        public override fsResult TrySerialize(object instance, out fsData serialized, Type storageType)
+        {
+            MessageContextSkills messageContextSkills = (MessageContextSkills)instance;
+            serialized = null;
+
+            Dictionary<string, fsData> serialization = new Dictionary<string, fsData>();
+            fsData tempData = null;
+
+
+
+            serialized = new fsData(serialization);
+            return fsResult.Success;
+        }
+    }
 }

Assistant/v2/Models/MessageContext.cs

@@ -24,7 +24,7 @@ public class WatsonResponse<T>
         /// <summary>
         /// The status code returned from the server.
         /// </summary>
-        public int StatusCode { get; set; }
+        public long StatusCode { get; set; }
         /// <summary>
         /// Dictionary of headers returned by the request.
         /// </summary>
@@ -33,5 +33,13 @@ public class WatsonResponse<T>
         /// The deserialized result.
         /// </summary>
         public T Result { get; set; }
+
+        public WatsonResponse()
+        {
+            if(Headers == null)
+            {
+                Headers = new Dictionary<string, object>();
+            }
+        }
     }
 }

Assistant/v2/Models/MessageContextSkills.cs

@@ -169,10 +169,10 @@ private IEnumerator Examples()
             Dictionary<string, string> userDefinedDictionary = new Dictionary<string, string>();
             userDefinedDictionary.Add("name", "Watson");
 
-            Dictionary<string, Dictionary<string, string>> skillDictionary = new Dictionary<string, Dictionary<string, string>>();
+            Dictionary<string, object> skillDictionary = new Dictionary<string, object>();
             skillDictionary.Add("user_defined", userDefinedDictionary);
 
-            Dictionary<string, Dictionary<string, Dictionary<string, string>>> skills = new Dictionary<string, Dictionary<string, Dictionary<string, string>>>();
+            MessageContextSkills skills = new MessageContextSkills();
             skills.Add("main skill", skillDictionary);
 
             //SerializableDictionary<string, string> userDefinedDictionary = new SerializableDictionary<string, string>();
@@ -249,8 +249,17 @@ private void OnMessage3(WatsonResponse<MessageResponse> response, WatsonError er
         }
         private void OnMessage4(WatsonResponse<MessageResponse> response, WatsonError error, System.Collections.Generic.Dictionary<string, object> customData)
         {
-            Log.Debug("ExampleAssistantV2.OnMessage4()", "response: {0}", response.Result.Output.Generic[0].Text);
-            //Log.Debug("ExampleAssistantV2.OnMessage4()", "response: {0}", response.Result.Context.Skills["main skill"]["user_defined"]["name"]);
+            //Log.Debug("ExampleAssistantV2.OnMessage4()", "response: {0}", response.Result.Output.Generic[0].Text);
+
+            object e = response.Result as object;
+            Dictionary<string, object> e2 = e as Dictionary<string, object>;
+            Dictionary<string, object> context = e2["context"] as Dictionary<string, object>;
+            Dictionary<string, object> skills = context["skills"] as Dictionary<string, object>;
+            Dictionary<string, object> main_skill = skills["main skill"] as Dictionary<string, object>;
+            Dictionary<string, object> user_defined = main_skill["user_defined"] as Dictionary<string, object>;
+
+            string name = user_defined["name"] as string;
+            Log.Debug("GenericSerialization", "test: {0}", name);
             _messageTested4 = true;
         }
 

Core/Editor.meta

@@ -50,7 +50,6 @@ LightmapSettings:
     m_BounceScale: 1
     m_IndirectOutputScale: 1
     m_AlbedoBoost: 1
-    m_TemporalCoherenceThreshold: 1
     m_EnvironmentLightingMode: 0
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
@@ -117,7 +116,8 @@ NavMeshSettings:
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
   - component: {fileID: 474543417}
@@ -133,7 +133,8 @@ GameObject:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 474543415}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -161,7 +162,8 @@ Transform:
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
   - component: {fileID: 486024580}
@@ -178,14 +180,16 @@ GameObject:
 AudioListener:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 486024577}
   m_Enabled: 1
 --- !u!20 &486024579
 Camera:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 486024577}
   m_Enabled: 1
   serializedVersion: 2
@@ -194,6 +198,7 @@ Camera:
   m_projectionMatrixMode: 1
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
+  m_GateFitMode: 2
   m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
@@ -225,7 +230,8 @@ Camera:
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 486024577}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
@@ -238,7 +244,8 @@ Transform:
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
   - component: {fileID: 561626363}
@@ -254,7 +261,8 @@ GameObject:
 Light:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 561626361}
   m_Enabled: 1
   serializedVersion: 8
@@ -291,7 +299,8 @@ Light:
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 561626361}
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}

Core/Editor/Help.meta

@@ -0,0 +1,50 @@
+/**
+* Copyright 2019 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using IBM.Watson.Assistant.V2;
+using IBM.Watson.Logging;
+using MiniJSON;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace IBM.Watson.Examples
+{
+    public class GenericSerialization : MonoBehaviour
+    {
+        private string responseJson = "{\"output\":{\"generic\":[{\"response_type\":\"text\",\"text\":\"Let me confirm: You want an appointment for Friday at 12 PM. Is this correct?\"}],\"intents\":[{\"intent\":\"Customer_Care_Appointments\",\"confidence\":0.642203044891357}],\"entities\":[{\"entity\":\"sys-date\",\"location\":[0,9],\"value\":\"2019-01-11\",\"confidence\":1,\"metadata\":{\"calendar_type\":\"GREGORIAN\",\"timezone\":\"GMT\"}},{\"entity\":\"reply\",\"location\":[10,16],\"value\":\"yes\",\"confidence\":1}]},\"context\":{\"global\":{\"system\":{\"turn_count\":5,\"skill_reference_id\":\"dc762f48-e10c-4418-92c1-c7be6feadbc0\"}},\"skills\":{\"main skill\":{\"user_defined\":{\"no_reservation\":true,\"time\":\"12:00:00\",\"name\":\"Watson\",\"date\":\"2019-01-11\"}}}}}";
+
+        void Start()
+        {
+            LogSystem.InstallDefaultReactors();
+
+            Dictionary<string, object> e = Json.Deserialize(responseJson) as Dictionary<string, object>;
+            Dictionary<string, object> context = e["context"] as Dictionary<string, object>;
+            Dictionary<string, object> skills = context["skills"] as Dictionary<string, object>;
+            Dictionary<string, object> main_skill = skills["main skill"] as Dictionary<string, object>;
+            Dictionary<string, object> user_defined = main_skill["user_defined"] as Dictionary<string, object>;
+
+            string name = user_defined["name"] as string;
+            Log.Debug("GenericSerialization", "test: {0}", name);
+        }
+
+        public T GetValueFromGeneric<T>(Dictionary<string, object> obj)
+        {
+            T response = default;
+            return response;
+        }
+    }
+}