fix local image gpt-image-1 issue

Author: sdcb

src/BE/Chats.BE.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>d4aa34e2-6c5f-41b9-b61b-c1a48b1d1b44</UserSecretsId>
-    <Version>1.5.3</Version>
+    <Version>1.5.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BE/Controllers/Chats/Chats/ChatController.cs

@@ -349,8 +349,9 @@ private static async Task<MessageLiteDto[]> FillContents(LinkedList<MessageLiteD
         Dictionary<long, MessageContent[]> contents = await db.MessageContents
             .Where(x => messageIds.Contains(x.MessageId))
             .Include(x => x.MessageContentBlob)
-            .Include(x => x.MessageContentFile).ThenInclude(x => x!.File).ThenInclude(x => x.FileService)
-            .Include(x => x.MessageContentFile).ThenInclude(x => x!.File).ThenInclude(x => x.FileImageInfo)
+            .Include(x => x.MessageContentFile).ThenInclude(x => x!.File.FileService)
+            .Include(x => x.MessageContentFile).ThenInclude(x => x!.File.FileImageInfo)
+            .Include(x => x.MessageContentFile).ThenInclude(x => x!.File.FileContentType)
             .Include(x => x.MessageContentText)
             .GroupBy(x => x.MessageId)
             .ToDictionaryAsync(k => k.Key, v => v.ToArray(), cancellationToken);

src/BE/Services/FileServices/DBFileDef.cs

@@ -4,13 +4,15 @@ public record DBFileDef(byte[] Bytes, string ContentType, string? SuggestedFileN
 {
     public string FileName => SuggestedFileName ?? MakeFileNameByContentType(ContentType);
 
-    protected static string MakeFileNameByContentType(string contentType)
+    internal static string MakeFileNameByContentType(string contentType)
     {
         return contentType switch
         {
             "image/jpeg" => "image.jpg",
             "image/png" => "image.png",
             "image/gif" => "image.gif",
+            "image/webp" => "image.webp",
+            "image/svg+xml" => "image.svg",
             _ => "image"
         };
     }

src/BE/Services/Models/ChatServices/OpenAI/Special/ImageGenerationChatService.cs

@@ -7,6 +7,7 @@
 using Chats.BE.DB.Enums;
 using System.Text.Json.Nodes;
 using System.ClientModel.Primitives;
+using Chats.BE.Services.FileServices;
 
 namespace Chats.BE.Services.Models.ChatServices.OpenAI.Special;
 
@@ -70,24 +71,33 @@ public override async Task<ChatSegment> Chat(IReadOnlyList<ChatMessage> messages
             //        EndUserId = options.EndUserId,
             //    }, cancellationToken);
             MultiPartFormDataBinaryContent form = new();
-            (Uri url, HttpResponseMessage resp)[] downloadedImages = await Task.WhenAll(images.GroupBy(x => x.ImageUri).Select(async image =>
+            Dictionary<Uri, HttpResponseMessage> downloadedFiles = (await Task.WhenAll(images
+                .Where(x => x.ImageUri != null)
+                .GroupBy(x => x.ImageUri).Select(async image =>
             {
                 HttpResponseMessage resp = await http.GetAsync(image.Key, cancellationToken);
                 return (url: image.Key, resp);
-            }));
-            Dictionary<Uri, HttpResponseMessage> files = downloadedImages.ToDictionary(k => k.url, v => v.resp);
+            })))
+            .ToDictionary(k => k.url, v => v.resp);
 
             foreach (ChatMessageContentPart image in images)
             {
-                HttpResponseMessage file = files[image.ImageUri];
-                string fileName = Path.GetFileName(image.ImageUri.LocalPath);
-                if (fileName.Contains("mask.png"))
+                if (image.ImageUri != null)
                 {
-                    form.Add(await file.Content.ReadAsStreamAsync(cancellationToken), "mask", fileName, file.Content.Headers.ContentType?.ToString());
+                    HttpResponseMessage file = downloadedFiles[image.ImageUri];
+                    string fileName = Path.GetFileName(image.ImageUri.LocalPath);
+                    if (fileName.Contains("mask.png"))
+                    {
+                        form.Add(await file.Content.ReadAsStreamAsync(cancellationToken), "mask", fileName, file.Content.Headers.ContentType?.ToString());
+                    }
+                    else
+                    {
+                        form.Add(await file.Content.ReadAsStreamAsync(cancellationToken), "image[]", fileName, file.Content.Headers.ContentType?.ToString());
+                    }
                 }
                 else
                 {
-                    form.Add(await file.Content.ReadAsStreamAsync(cancellationToken), "image[]", fileName, file.Content.Headers.ContentType?.ToString());
+                    form.Add(image.ImageBytes, "image[]", image.Filename ?? DBFileDef.MakeFileNameByContentType(image.ImageBytesMediaType), image.ImageBytesMediaType);
                 }
             }
             form.Add(prompt, "prompt");