optimize sql driver

src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs

@@ -43,4 +43,6 @@ public class PageActionArgs
     /// Wait time in seconds after page is opened
     /// </summary>
     public int WaitTime { get; set; }
+
+    public bool ReadInnerHTMLAsBody { get; set; } = false;
 }

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -27,6 +27,7 @@ public interface IBotSharpRepository
     User? GetUserByAffiliateId(string affiliateId) => throw new NotImplementedException();
     User? GetUserByUserName(string userName) => throw new NotImplementedException();
     void CreateUser(User user) => throw new NotImplementedException();
+    void UpdateExistUser(string userId, User user) => throw new NotImplementedException();
     void UpdateUserVerified(string userId) => throw new NotImplementedException();
     void UpdateUserVerificationCode(string userId, string verficationCode) => throw new NotImplementedException();
     void UpdateUserPassword(string userId, string password) => throw new NotImplementedException();

src/Infrastructure/BotSharp.Abstraction/Translation/Models/TranslationRequestModel.cs

@@ -1,9 +1,19 @@
-using BotSharp.Abstraction.Infrastructures.Enums;
-
 namespace BotSharp.OpenAPI.ViewModels.Translations;
 
 public class TranslationRequestModel
 {
     public string Text { get; set; } = null!;
     public string ToLang { get; set; } = LanguageType.CHINESE;
 }
+
+public class TranslationScriptTimestamp
+{
+    public string Text {  set; get; } = null!;
+    public string Timestamp { get; set; } = null!;
+}
+
+public class TranslationLongTextRequestModel
+{
+    public TranslationScriptTimestamp[] Texts { get; set; } = null!;
+    public string ToLang { get; set; } = LanguageType.CHINESE;
+}

src/Infrastructure/BotSharp.Abstraction/Users/Enums/UserRole.cs

@@ -33,4 +33,6 @@ public class UserRole
     /// AI Assistant
     /// </summary>
     public const string Assistant = "assistant";
+
+    public const string Root = "root";
 }

src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs

@@ -13,7 +13,8 @@ public interface IUserService
     Task<User> GetMyProfile();
     Task<bool> VerifyUserNameExisting(string userName);
     Task<bool> VerifyEmailExisting(string email);
-    Task<bool> SendVerificationCodeResetPassword(User user);
+    Task<bool> SendVerificationCodeResetPasswordNoLogin(User user);
+    Task<bool> SendVerificationCodeResetPasswordLogin();
     Task<bool> ResetUserPassword(User user);
     Task<bool> ModifyUserEmail(string email);
     Task<bool> ModifyUserPhone(string phone);

src/Infrastructure/BotSharp.Core/Translation/TranslationService.cs

@@ -101,12 +101,12 @@ public async Task<T> Translate<T>(Agent router, string messageId, T data, string
             {
                 var translatedStringList = await InnerTranslate(texts, language, template);
 
-                int retry = 0;
+                /*int retry = 0;
                 while (translatedStringList.Texts.Length != texts.Count && retry < 3)
                 {
                     translatedStringList = await InnerTranslate(texts, language, template);
                     retry++;
-                }
+                }*/
 
                 // Override language if it's Unknown, it's used to output the corresponding language.
                 var states = _services.GetRequiredService<IConversationStateService>();
@@ -119,7 +119,7 @@ public async Task<T> Translate<T>(Agent router, string messageId, T data, string
                 var translatedTexts = translatedStringList.Texts;
                 var memoryInputs = new List<TranslationMemoryInput>();
 
-                for (var i = 0; i < texts.Count; i++)
+                for (var i = 0; i < Math.Min(texts.Count, translatedTexts.Length); i++)
                 {
                     map[outOfMemoryList[i].OriginalText] = translatedTexts[i].Text;
                     memoryInputs.Add(new TranslationMemoryInput
@@ -375,6 +375,8 @@ private async Task<TranslationOutput> InnerTranslate(List<TranslationInput> text
         var render = _services.GetRequiredService<ITemplateRender>();
         var prompt = render.Render(template, translator.TemplateDict);
 
+        _logger.LogInformation($"Translation prompt: {prompt}");
+
         var translationDialogs = new List<RoleDialogModel>
         {
             new RoleDialogModel(AgentRole.User, prompt)
@@ -384,6 +386,8 @@ private async Task<TranslationOutput> InnerTranslate(List<TranslationInput> text
             }
         };
         var response = await _completion.GetChatCompletions(translator, translationDialogs);
+
+        _logger.LogInformation(response.Content);
         return response.Content.JsonContent<TranslationOutput>();
     }
 

src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs

@@ -32,6 +32,7 @@ public UserService(IServiceProvider services,
 
     public async Task<User> CreateUser(User user)
     {
+        string hasRegisterId = null;
         if (string.IsNullOrEmpty(user.UserName))
         {
             // generate unique name
@@ -48,7 +49,7 @@ public async Task<User> CreateUser(User user)
 
         if (record != null)
         {
-            return record;
+            hasRegisterId = record.Id;
         }
 
         if (string.IsNullOrEmpty(user.Id))
@@ -71,7 +72,14 @@ record = user;
             record.Verified = false;
         }
 
-        db.CreateUser(record);
+        if (hasRegisterId == null)
+        {
+            db.CreateUser(record);
+        }
+        else
+        {
+            db.UpdateExistUser(hasRegisterId, record);
+        }
 
         _logger.LogWarning($"Created new user account: {record.Id} {record.UserName}");
         Utilities.ClearCache();
@@ -386,8 +394,9 @@ public async Task<bool> VerifyUserNameExisting(string userName)
         }
 
         var db = _services.GetRequiredService<IBotSharpRepository>();
+
         var user = db.GetUserByUserName(userName);
-        if (user != null)
+        if (user != null && user.Verified)
         {
             return true;
         }
@@ -404,40 +413,64 @@ public async Task<bool> VerifyEmailExisting(string email)
 
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var emailName = db.GetUserByEmail(email);
-        if (emailName != null)
+        if (emailName != null && emailName.Verified)
         {
             return true;
         }
 
         return false;
     }
 
-    public async Task<bool> SendVerificationCodeResetPassword(User user)
+    public async Task<bool> SendVerificationCodeResetPasswordNoLogin(User user)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
 
         User? record = null;
 
-        if (!string.IsNullOrWhiteSpace(_user.Id))
+        if (!string.IsNullOrEmpty(user.Email) && !string.IsNullOrEmpty(user.Phone))
         {
-            record = db.GetUserById(_user.Id);
+            return false;
         }
-        else
+
+        if (!string.IsNullOrEmpty(user.Phone))
         {
-            if (!string.IsNullOrEmpty(user.Email) && !string.IsNullOrEmpty(user.Phone))
-            {
-                return false;
-            }
+            record = db.GetUserByPhone(user.Phone);
+        }
 
-            if (!string.IsNullOrEmpty(user.Email))
-            {
-                record = db.GetUserByEmail(user.Email);
-            }
+        if (!string.IsNullOrEmpty(user.Email))
+        {
+            record = db.GetUserByEmail(user.Email);
+        }
 
-            if (!string.IsNullOrEmpty(user.Phone))
-            {
-                record = db.GetUserByPhone(user.Phone);
-            }
+        if (record == null)
+        {
+            return false;
+        }
+
+        record.VerificationCode = Nanoid.Generate(alphabet: "0123456789", size: 6);
+
+        //update current verification code.
+        db.UpdateUserVerificationCode(record.Id, record.VerificationCode);
+
+        //send code to user Email.
+        var hooks = _services.GetServices<IAuthenticationHook>();
+        foreach (var hook in hooks)
+        {
+            hook.VerificationCodeResetPassword(record);
+        }
+
+        return true;
+    }
+
+    public async Task<bool> SendVerificationCodeResetPasswordLogin()
+    {
+        var db = _services.GetRequiredService<IBotSharpRepository>();
+
+        User? record = null;
+
+        if (!string.IsNullOrWhiteSpace(_user.Id))
+        {
+            record = db.GetUserById(_user.Id);
         }
 
         if (record == null)
@@ -520,6 +553,11 @@ public async Task<bool> ModifyUserPhone(string phone)
             return false;
         }
 
+        if ((record.UserName.Substring(0, 3) == "+86" || record.FirstName.Substring(0, 3) == "+86") && phone.Substring(0, 3) != "+86")
+        {
+            phone = $"+86{phone}";
+        }
+
         db.UpdateUserPhone(record.Id, phone);
         return true;
     }

src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/templates/translation_prompt.liquid

@@ -1,6 +1,19 @@
 {{ text_list }}
 
 =====
+{% if language == "Chinese" %}
+将以上所有句子翻译成中文。
+
+要求：
+* 以 JSON 格式输出翻译后的文本 {"input_lang":"原始文本语言", "output_count": {{ text_list_size }}, "output_lang":"{{ language }}", "texts":[{"id": 1, "text":""},{"id": 2, "text":""}]}。
+* output_count 必须等于输出中texts数组的长度。
+{% else %}
 Translate all the above sentences into {{ language }}.
-Output the translated text in JSON {"input_lang":"original text language", "output_count": {{ text_list_size }}, "output_lang":"{{ language }}", "texts":[{"id": 1, "text":""},{"id": 2, "text":""}]}.
-The "output_count" must equal the length of the "texts" array in the output.
+
+Requirements:
+* Output the translated text in JSON {"input_lang":"original text language", "output_count": {{ text_list_size }}, "output_lang":"{{ language }}", "texts":[{"id": 1, "text":""},{"id": 2, "text":""}]}.
+* The "output_count" must equal the length of the "texts" array in the output.
+{% endif %}
+
+
+

src/Infrastructure/BotSharp.OpenAPI/Controllers/TranslationController.cs

@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.Agents.Models;
+using BotSharp.Abstraction.Options;
 using BotSharp.Abstraction.Translation;
 using BotSharp.OpenAPI.ViewModels.Translations;
 
@@ -9,10 +9,13 @@ namespace BotSharp.OpenAPI.Controllers;
 public class TranslationController : ControllerBase
 {
     private readonly IServiceProvider _services;
+    private readonly JsonSerializerOptions _jsonOptions;
 
-    public TranslationController(IServiceProvider services)
+    public TranslationController(IServiceProvider services,
+        BotSharpOptions options)
     {
         _services = services;
+        _jsonOptions = InitJsonOptions(options);
     }
 
     [HttpPost("/translate")]
@@ -21,10 +24,79 @@ public async Task<TranslationResponseModel> Translate([FromBody] TranslationRequ
         var agentService = _services.GetRequiredService<IAgentService>();
         var agent = await agentService.LoadAgent(BuiltInAgentId.AIAssistant);
         var translator = _services.GetRequiredService<ITranslationService>();
-        var text = await translator.Translate(agent, Guid.NewGuid().ToString(), model.Text, language: model.ToLang);
+        var states = _services.GetRequiredService<IConversationStateService>();
+        states.SetState("max_tokens", "8192");
+        var text = await translator.Translate(agent, Guid.NewGuid().ToString(), model.Text.Split("\r\n"), language: model.ToLang);
         return new TranslationResponseModel
         {
-            Text = text
+            Text = string.Join("\r\n", text)
         };
     }
+
+    [HttpPost("/translate/long-text")]
+    public async Task SendMessageSse([FromBody] TranslationLongTextRequestModel model)
+    {
+        var agentService = _services.GetRequiredService<IAgentService>();
+        var agent = await agentService.LoadAgent(BuiltInAgentId.AIAssistant);
+        var translator = _services.GetRequiredService<ITranslationService>();
+
+        Response.StatusCode = 200;
+        Response.Headers.Append(Microsoft.Net.Http.Headers.HeaderNames.ContentType, "text/event-stream");
+        Response.Headers.Append(Microsoft.Net.Http.Headers.HeaderNames.CacheControl, "no-cache");
+        Response.Headers.Append(Microsoft.Net.Http.Headers.HeaderNames.Connection, "keep-alive");
+
+        foreach (var script in model.Texts)
+        {
+            var translatedText = await translator.Translate(agent, Guid.NewGuid().ToString(), script.Text, language: model.ToLang);
+
+            var json = JsonSerializer.Serialize(new TranslationScriptTimestamp
+            {
+                Text = translatedText,
+                Timestamp = script.Timestamp
+            }, _jsonOptions);
+
+            await OnChunkReceived(Response, json);
+        }
+
+        await OnEventCompleted(Response);
+    }
+
+    private async Task OnChunkReceived(HttpResponse response, string text)
+    {
+        var buffer = Encoding.UTF8.GetBytes($"data:{text}\n");
+        await response.Body.WriteAsync(buffer, 0, buffer.Length);
+        await Task.Delay(10);
+
+        buffer = Encoding.UTF8.GetBytes("\n");
+        await response.Body.WriteAsync(buffer, 0, buffer.Length);
+    }
+
+    private async Task OnEventCompleted(HttpResponse response)
+    {
+        var buffer = Encoding.UTF8.GetBytes("data:[DONE]\n");
+        await response.Body.WriteAsync(buffer, 0, buffer.Length);
+
+        buffer = Encoding.UTF8.GetBytes("\n");
+        await response.Body.WriteAsync(buffer, 0, buffer.Length);
+    }
+
+    private JsonSerializerOptions InitJsonOptions(BotSharpOptions options)
+    {
+        var jsonOption = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            AllowTrailingCommas = true
+        };
+
+        if (options?.JsonSerializerOptions != null)
+        {
+            foreach (var option in options.JsonSerializerOptions.Converters)
+            {
+                jsonOption.Converters.Add(option);
+            }
+        }
+
+        return jsonOption;
+    }
 }

src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs

@@ -108,12 +108,20 @@ public async Task<bool> VerifyEmailExisting([FromQuery] string email)
     {
         return await _userService.VerifyEmailExisting(email);
     }
+
     [AllowAnonymous]
-    [HttpPost("/user/verifycode")]
+    [HttpPost("/user/verifycode-out")]
     public async Task<bool> SendVerificationCodeResetPassword([FromBody] UserCreationModel user)
     {
-        return await _userService.SendVerificationCodeResetPassword(user.ToUser());
+        return await _userService.SendVerificationCodeResetPasswordNoLogin(user.ToUser());
     }
+
+    [HttpPost("/user/verifycode-in")]
+    public async Task<bool> SendVerificationCodeResetPasswordLogined()
+    {
+        return await _userService.SendVerificationCodeResetPasswordLogin();
+    }
+
     [AllowAnonymous]
     [HttpPost("/user/resetpassword")]
     public async Task<bool> ResetUserPassword([FromBody] UserResetPasswordModel user)