Add .net 7.0 as supported framework

MarcoABCardoso · MarcoABCardoso · commit 1770cec08a05 · 2024-03-01T11:24:58.000-03:00
diff --git a/gen-ai/Assistants/bot-in-a-box/src/AssistantBot.csproj b/gen-ai/Assistants/bot-in-a-box/src/AssistantBot.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <UserSecretsId>73c2a03b-aae7-4833-b3a8-c01744ad2b7e</UserSecretsId>
   </PropertyGroup>
diff --git a/gen-ai/Assistants/bot-in-a-box/src/Bots/AssistantBot.cs b/gen-ai/Assistants/bot-in-a-box/src/Bots/AssistantBot.cs
@@ -18,6 +18,7 @@
 using HtmlAgilityPack;
 using Services;
 using Models;
+using System.IO;
 
 
 namespace Microsoft.BotBuilderSamples
@@ -77,13 +78,23 @@ public override async Task<List<string>> ProcessMessage(ConversationData convers
                 // await turnContext.SendActivityAsync($"Thread found: {conversationData.ThreadId}");
             }
 
+            // Process any attachments
+
+            if (!turnContext.Activity.Attachments.IsNullOrEmpty())
+                foreach (Bot.Schema.Attachment attachment in turnContext.Activity.Attachments)
+                    await IngestAttachment(conversationData, turnContext, attachment);
+
+            if (turnContext.Activity.Text.IsNullOrEmpty())
+                return new List<string>() {"1"};
+
+            // Process keywords
             if (turnContext.Activity.Text.ToLower() == "clear")
             {
                 var thread = await _aoaiClient.DeleteThread(conversationData.ThreadId);
                 conversationData.ThreadId = null;
                 conversationData.History.Clear();
                 conversationData.Attachments.Clear();
-                return new List<string> { $"Thread {thread.Id} deleted." };
+                return new List<string>() { $"Thread {thread.Id} deleted." };
             }
 
             // Add user message to thread
@@ -113,7 +124,8 @@ public override async Task<List<string>> ProcessMessage(ConversationData convers
                 System.Threading.Thread.Sleep(10000);
                 run = await _aoaiClient.GetThreadRun(conversationData.ThreadId, run.Id);
             }
-            if (run.Status == "failed") {
+            if (run.Status == "failed")
+            {
                 await turnContext.SendActivityAsync("Something went wrong when running the assistant.");
             }
 
@@ -134,7 +146,7 @@ public override async Task<List<string>> ProcessMessage(ConversationData convers
                     if (messages[i].Content[j].Type == "image_file")
                     {
                         responses.Add($"Image (ID: {messages[i].Content[j].ImageFile.FileId})");
-                        List<object> images = [new { type = "Image", url = $"{_appUrl}/openai/files/{messages[i].Content[j].ImageFile.FileId}/content" }];
+                        List<object> images = new() { new { type = "Image", url = $"{_appUrl}/openai/files/{messages[i].Content[j].ImageFile.FileId}/content" } };
                         object adaptiveCardJson = new
                         {
                             type = "AdaptiveCard",
@@ -153,5 +165,22 @@ public override async Task<List<string>> ProcessMessage(ConversationData convers
             }
             return responses;
         }
+
+
+        private async Task IngestAttachment(ConversationData conversationData, ITurnContext<IMessageActivity> turnContext, Bot.Schema.Attachment attachment)
+        {
+            Uri fileUri = new Uri(attachment.ContentUrl);
+            var httpClient = new HttpClient();
+            var stream = await httpClient.GetStreamAsync(fileUri);
+            var file = await _aoaiClient.UploadFile(stream, attachment.Name);
+            await _aoaiClient.SendMessage(conversationData.ThreadId, new MessageInput()
+            {
+                Role = "user",
+                Content = "(File uploaded)",
+                FileIds = new List<string>() {file.Id}
+            });
+            stream.Dispose();
+            await turnContext.SendActivityAsync($"File {attachment.Name} uploaded successfully!");
+        }
     }
 }
diff --git a/gen-ai/Assistants/bot-in-a-box/src/Models/AOAIModels.cs b/gen-ai/Assistants/bot-in-a-box/src/Models/AOAIModels.cs
@@ -29,6 +29,9 @@ public class MessageInput
 
         [JsonPropertyName("content")]
         public string Content { get; set; } = null;
+
+        [JsonPropertyName("file_ids")]
+        public List<string> FileIds { get; set; } = new();
     }
         public class MessageContentText {
         [JsonPropertyName("value")]
@@ -44,6 +47,12 @@ public class MessageContent {
         public ImageFile ImageFile { get; set; }
     }
 
+    public class File {
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
+    }
+
+
     public class ImageFile {
         [JsonPropertyName("file_id")]
         public string FileId { get; set; }
@@ -55,7 +64,10 @@ public class Message
         public string Role { get; set; }
 
         [JsonPropertyName("content")]
-        public List<MessageContent> Content { get; set; }
+        public List<MessageContent> Content { get; set; } = null;
+
+        [JsonPropertyName("file_ids")]
+        public List<string> FileIds { get; set; }
     }
 
     public class ThreadRunInput
diff --git a/gen-ai/Assistants/bot-in-a-box/src/Services/AOAIClient.cs b/gen-ai/Assistants/bot-in-a-box/src/Services/AOAIClient.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.Azure.Cosmos.Core;
 using Models;
 
 namespace Services
@@ -57,13 +59,24 @@ public async Task<List<Message>> ListThreadMessages(string threadId)
             var result = await JsonRequest<AOAIResponse<Message>>($"/threads/{threadId}/messages", HttpMethod.Get);
             return result.Data;
         }
+        public async Task<Models.File> UploadFile(Stream file, string fileName)
+        {
+            MultipartFormDataContent form = new MultipartFormDataContent
+            {
+                { new StringContent("assistants"), "purpose" },
+                { new StreamContent(file), "file", fileName }
+            };
+            var result = await JsonRequest<Models.File>($"/files", HttpMethod.Post, form);
+            return result;
+        }
         public async Task<HttpResponseMessage> GetFile(string fileId)
         {
             var result = await SendRequest($"/files/{fileId}/content", HttpMethod.Get);
             return result;
         }
 
-        private async Task<HttpResponseMessage> SendRequest(string path, HttpMethod method, StringContent body = null) {
+        private async Task<HttpResponseMessage> SendRequest(string path, HttpMethod method, StringContent body = null)
+        {
             var url = "/openai" + path + "?api-version=2024-02-15-preview";
 
             var request = new HttpRequestMessage(method, url)
@@ -76,7 +89,7 @@ private async Task<HttpResponseMessage> SendRequest(string path, HttpMethod meth
             };
             return await _httpClient.SendAsync(request, default);
         }
-        
+
 
         private async Task<T> JsonRequest<T>(string path, HttpMethod method, StringContent body = null)
         {
@@ -89,6 +102,34 @@ private async Task<T> JsonRequest<T>(string path, HttpMethod method, StringConte
             return content;
         }
 
+        private async Task<HttpResponseMessage> SendRequest(string path, HttpMethod method, MultipartFormDataContent body)
+        {
+            var url = "/openai" + path + "?api-version=2024-02-15-preview";
+
+            var request = new HttpRequestMessage(method, url)
+            {
+                Headers =
+                {
+                    { "api-key", _accessKey },
+                },
+                Content = body
+            };
+            return await _httpClient.SendAsync(request, default);
+        }
+
+
+        private async Task<T> JsonRequest<T>(string path, HttpMethod method, MultipartFormDataContent body)
+        {
+            var response = await SendRequest(path, method, body);
+            
+            var responseContent = await response.Content.ReadAsStringAsync();
+            if (!response.IsSuccessStatusCode)
+                throw new Exception(responseContent);
+
+            var content = JsonSerializer.Deserialize<T>(responseContent);
+            return content;
+        }
+
 
     }
 }
diff --git a/gen-ai/Assistants/bot-in-a-box/src/Tools/_Tools.cs b/gen-ai/Assistants/bot-in-a-box/src/Tools/_Tools.cs
@@ -35,7 +35,7 @@ public async Task<ToolOutputData> RunRequestedTools(ThreadRun run)
         {
             var method = typeof(Tools).GetMethod(toolcall.Function.Name);
             var arguments = JsonSerializer.Deserialize<Dictionary<string, object>>(toolcall.Function.Arguments);
-            string output = await (Task<string>)method.Invoke(this, [arguments]);
+            string output = await (Task<string>)method.Invoke(this, new object[]{arguments});
             var toolOutput = new ToolOutput
             {
                 ToolCallId = toolcall.Id,

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public async Task<ToolOutputData> RunRequestedTools(ThreadRun run)`
`35`	`35`	`{`
`36`	`36`	`var method = typeof(Tools).GetMethod(toolcall.Function.Name);`
`37`	`37`	`var arguments = JsonSerializer.Deserialize<Dictionary<string, object>>(toolcall.Function.Arguments);`
`38`		`- string output = await (Task<string>)method.Invoke(this, [arguments]);`
	`38`	`+ string output = await (Task<string>)method.Invoke(this, new object[]{arguments});`
`39`	`39`	`var toolOutput = new ToolOutput`
`40`	`40`	`{`
`41`	`41`	`ToolCallId = toolcall.Id,`