Merge branch 'develop' into localization/traditional-chinese

Author: JC-Chung

TRANSLATION.md

@@ -0,0 +1,48 @@
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace SourceGit.AI
+{
+    public class ExtraHeadersPolicy : PipelinePolicy
+    {
+        public ExtraHeadersPolicy(string headers)
+        {
+            _headers = headers;
+        }
+
+        public override void Process(PipelineMessage message, IReadOnlyList<PipelinePolicy> pipeline, int currentIndex)
+        {
+            Apply(message);
+            ProcessNext(message, pipeline, currentIndex);
+        }
+
+        public override async ValueTask ProcessAsync(PipelineMessage message, IReadOnlyList<PipelinePolicy> pipeline, int currentIndex)
+        {
+            Apply(message);
+            await ProcessNextAsync(message, pipeline, currentIndex);
+        }
+
+        private void Apply(PipelineMessage message)
+        {
+            var lines = _headers.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var line in lines)
+            {
+                var idx = line.IndexOf(':');
+                if (idx < 0)
+                    continue;
+
+                var key = line.Substring(0, idx).Trim();
+                var value = line.Substring(idx + 1).Trim();
+                if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value))
+                    continue;
+
+                message.Request.Headers.Add(key, value);
+            }
+        }
+
+        private readonly string _headers;
+    }
+}

src/AI/ExtraHeadersPolicy.cs

@@ -1,7 +1,9 @@
 using System;
 using System.ClientModel;
+using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+
 using Azure.AI.OpenAI;
 using CommunityToolkit.Mvvm.ComponentModel;
 using OpenAI;
@@ -66,6 +68,12 @@ public string AdditionalPrompt
             set;
         } = string.Empty;
 
+        public string ExtraHeaders
+        {
+            get;
+            set;
+        } = string.Empty;
+
         public void FetchAvailableModels()
         {
             if (!_autoFetchAvailableModels)
@@ -92,9 +100,21 @@ public ChatClient GetChatClient()
         private OpenAIClient GetOpenAIClient()
         {
             var credential = new ApiKeyCredential(ReadApiKeyFromEnv ? Environment.GetEnvironmentVariable(ApiKey) : ApiKey);
-            return Server.Contains("openai.azure.com/", StringComparison.Ordinal)
-                ? new AzureOpenAIClient(new Uri(Server), credential)
-                : new OpenAIClient(credential, new() { Endpoint = new Uri(Server) });
+
+            if (Server.Contains("openai.azure.com/", StringComparison.Ordinal))
+            {
+                if (string.IsNullOrEmpty(ExtraHeaders))
+                    return new AzureOpenAIClient(new Uri(Server), credential);
+
+                var azureOptions = new AzureOpenAIClientOptions();
+                azureOptions.AddPolicy(new ExtraHeadersPolicy(ExtraHeaders), PipelinePosition.PerCall);
+                return new AzureOpenAIClient(new Uri(Server), credential, azureOptions);
+            }
+
+            var options = new OpenAIClientOptions() { Endpoint = new Uri(Server) };
+            if (!string.IsNullOrEmpty(ExtraHeaders))
+                options.AddPolicy(new ExtraHeadersPolicy(ExtraHeaders), PipelinePosition.PerCall);
+            return new OpenAIClient(credential, options);
         }
 
         private string _name = string.Empty;

src/AI/Service.cs

@@ -37,7 +37,7 @@ public Blame(string repo, string file, string revision, bool ignoreWhitespace)
                 ParseLine(line);
 
                 if (_result.IsBinary)
-                    break;
+                    return _result;
             }
 
             if (_needUnifyCommitSHA)
@@ -49,6 +49,9 @@ public Blame(string repo, string file, string revision, bool ignoreWhitespace)
                 }
             }
 
+            if (_content.Length > 0)
+                _content.Length--; // Remove the last newline character
+
             _result.Content = _content.ToString();
             return _result;
         }
@@ -66,9 +69,8 @@ private void ParseLine(string line)
             if (!match.Success)
                 return;
 
-            if (_content.Length > 0)
-                _content.Append('\n');
-            _content.Append(match.Groups[5].Value);
+            // Force using `\n` as line-ending
+            _content.Append(match.Groups[5].Value).Append('\n');
 
             var commit = match.Groups[1].Value;
             var file = match.Groups[2].Value.Trim();

src/Commands/Blame.cs

@@ -28,12 +28,12 @@ public QuerySubmoduleRevision(string repo, string revision)
 
             var rs = await ReadToEndAsync().ConfigureAwait(false);
             if (!rs.IsSuccess || string.IsNullOrEmpty(rs.StdOut))
-                return null;
+                return new Models.RevisionSubmodule(_revision);
 
             var commit = new Models.Commit();
             var lines = rs.StdOut.Split('\0');
             if (lines.Length < 9)
-                return null;
+                return new Models.RevisionSubmodule(_revision);
 
             commit.SHA = lines[0];
             if (!string.IsNullOrEmpty(lines[1]))
@@ -46,19 +46,14 @@ public QuerySubmoduleRevision(string repo, string revision)
             commit.CommitterTime = ulong.Parse(lines[6]);
             commit.Subject = lines[7];
 
-            var message = new Models.CommitFullMessage() { Message = lines[8].TrimEnd() };
+            var message = lines[8].TrimEnd();
             var uncommittedChangesCount = 0;
             if (_hasUncommittedChange)
                 uncommittedChangesCount = await new CountLocalChanges(WorkingDirectory, true)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 
-            return new Models.RevisionSubmodule()
-            {
-                Commit = commit,
-                FullMessage = message,
-                UncommittedChanges = uncommittedChangesCount
-            };
+            return new Models.RevisionSubmodule(commit, message, uncommittedChangesCount);
         }
 
         private bool _hasUncommittedChange = false;

src/Commands/QuerySubmoduleRevision.cs

@@ -25,5 +25,8 @@ public static class IntConverters
 
         public static readonly FuncValueConverter<int, string> ToBadgeWithLimit =
             new(v => v > 999 ? "999+" : v.ToString());
+
+        public static readonly FuncValueConverter<int, bool> IsMaxCountOfStatistics =
+            new(v => v >= 200000);
     }
 }

src/Converters/IntConverters.cs

@@ -51,5 +51,18 @@ public class RevisionSubmodule
         public Commit Commit { get; set; } = null;
         public CommitFullMessage FullMessage { get; set; } = null;
         public int UncommittedChanges { get; set; } = 0;
+
+        public RevisionSubmodule(string hash)
+        {
+            Commit = new Commit() { SHA = hash };
+            FullMessage = new CommitFullMessage() { Message = string.Empty };
+        }
+
+        public RevisionSubmodule(Commit commit, string message, int uncommittedChanges)
+        {
+            Commit = commit;
+            FullMessage = new CommitFullMessage() { Message = message };
+            UncommittedChanges = uncommittedChanges;
+        }
     }
 }