Use FileNameStar instead of replacing symbols. (Azure#50391)

Author: nick863

sdk/ai/Azure.AI.Agents.Persistent/CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed uploading files with non ASCII symbols in names.
 
 ### Other Changes
 

sdk/ai/Azure.AI.Agents.Persistent/src/Custom/PersistentAgentsFiles.cs

@@ -60,7 +60,6 @@ public virtual async Task<Response<PersistentAgentFileInfo>> UploadFileAsync(Str
             Argument.AssertNotNull(data, nameof(data));
             Argument.AssertNotNullOrEmpty(filename, nameof(filename));
 
-            filename = ReplaceNonAscii(filename);
             UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
             using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
@@ -79,25 +78,13 @@ public virtual Response<PersistentAgentFileInfo> UploadFile(Stream data, Persist
             Argument.AssertNotNull(data, nameof(data));
             Argument.AssertNotNullOrEmpty(filename, nameof(filename));
 
-            filename = ReplaceNonAscii(filename);
             UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
             using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
             Response response = UploadFile(content, content.ContentType, context);
             return Response.FromValue(PersistentAgentFileInfo.FromResponse(response), response);
         }
 
-        /// <summary>
-        /// Remove non ASCII symbols from the file name.
-        /// Temporary workaround of an issue when the file contains non ASCII characters.
-        /// </summary>
-        /// <param name="filename">The file name.</param>
-        /// <returns>The file name with all non ASCII letters replaced.</returns>
-        private static string ReplaceNonAscii(string filename)
-        {
-            return Regex.Replace(filename, @"[^\u0000-\u007F]", "~");
-        }
-
         /// <summary> Uploads a file for use by other operations. </summary>
         /// <param name="body"> Multipart body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>

sdk/ai/Azure.AI.Agents.Persistent/src/Custom/UploadFileRequest.Serialization.cs

@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using System.Net.Http;
+using System.Net.Http.Headers;
 using Azure.Core;
 
 namespace Azure.AI.Agents.Persistent;
@@ -19,7 +21,18 @@ internal partial class UploadFileRequest : IUtf8JsonSerializable
     internal virtual MultipartFormDataRequestContent ToMultipartRequestContent()
     {
         MultipartFormDataRequestContent content = new();
-        content.Add(Data, "file", Filename);
+        ContentDispositionHeaderValue header = new("form-data") { Name = "file"};
+        var _dataStream = new StreamContent(Data);
+        if (System.Linq.Enumerable.Any(Filename, c => c > 127))
+        {
+            header.FileNameStar = Filename;
+        }
+        else
+        {
+            header.FileName = Filename;
+        }
+        _dataStream.Headers.ContentDisposition = header;
+        (content.HttpContent as System.Net.Http.MultipartFormDataContent).Add(_dataStream, "file");
         content.Add(Purpose.ToString(), "purpose");
         return content;
     }