Merge branch 'microsoft:main' into gauravkeshre/doc/adding_howto_link_model_embedding_deployment

Author: gauravkeshre

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Application/Application.cs

@@ -684,7 +684,7 @@ public Application<TState> OnMessageFetchTask(MessageFetchTaskHandler<TState> ha
                 }
 
 
-                Activity activity = ActivityUtilities.CreateInvokeResponseActivity(response);
+                Activity activity = ActivityUtilities.CreateInvokeResponseActivity(result);
                 await turnContext.SendActivityAsync(activity, cancellationToken);
             };
             AddRoute(routeSelector, routeHandler, isInvokeRoute: true);

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Application/StreamingChannelData.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.Teams.AI.Application
@@ -37,15 +38,49 @@ public class StreamingChannelData
 
         /// <summary>
         /// Sets the Feedback Loop in Teams that allows a user to
-        /// give thumbs up or down to a response.
+        /// give thumbs up or down to a response. Should not be set if setting feedbackLoopType.
         /// </summary>
         [JsonProperty(PropertyName = "feedbackLoopEnabled")]
         public bool? feedbackLoopEnabled { get; set; }
 
         /// <summary>
-        /// Represents the type of feedback loop. Set to "default" by default. It can be set to one of "default" or "custom".
+        /// Represents the type of feedback loop. It can be set to one of "default" or "custom".
         /// </summary>
-        [JsonProperty(PropertyName = "feedbackLoopType")]
+        [JsonConverter(typeof(FeedbackLoopTypeConverter))]
+        [JsonProperty(PropertyName = "feedbackLoop")]
         public string? feedbackLoopType { get; set; }
+
+        /// <summary>
+        /// Converts feedbackLoopType string to/from the type property of a feedbackLoop object expected within a channelData JSON object.
+        /// </summary>
+        private class FeedbackLoopTypeConverter : JsonConverter<string?>
+        {
+            public override void WriteJson(JsonWriter writer, string? value, JsonSerializer serializer)
+            {
+                if (value is not null)
+                {
+                    JObject obj = new JObject { { "type", value } };
+                    obj.WriteTo(writer);
+                }
+                else
+                {
+                    writer.WriteNull(); // Ensure null values are handled properly  
+                }
+            }
+
+            public override string? ReadJson(JsonReader reader, Type objectType, string? existingValue, bool hasExistingValue, JsonSerializer serializer)
+            {
+                if (reader.TokenType == JsonToken.Null)
+                    return null;
+
+                JObject obj = JObject.Load(reader);
+                JToken? token = obj?["type"];
+                return token?.ToString();
+            }
+        }
     }
 }
+
+
+
+