feat(ai): Optimize the configuration of AI tools

aspnet-core/modules/ai/LINGYUN.Abp.AI.Tools/LINGYUN/Abp/AI/Tools/AbpAIToolsModule.cs

@@ -35,12 +35,8 @@ public class AbpAIToolsModule : AbpModule
         {
             options.ChatClientBuildActions.Add(async (workspace, sp, builder) =>
             {
-                IList<AITool>? workspaceAITools = default!;
+                var workspaceAIToolFinder = sp.GetRequiredService<IWorkspaceAIToolFinder>();
-                var workspaceAIToolFinder = sp.GetService<IWorkspaceAIToolFinder>();
+                var workspaceAITools = await workspaceAIToolFinder.GetToolsAsync(workspace);
-                if (workspaceAIToolFinder != null && workspaceAIToolFinder.IsAIToolEnabled())
-                {
-                    workspaceAITools = await workspaceAIToolFinder.GetToolsAsync(workspace);
-                }
 
                 return builder
                     .ConfigureOptions(config =>

aspnet-core/modules/ai/LINGYUN.Abp.AI.Tools/LINGYUN/Abp/AI/Tools/IWorkspaceAIToolFinder.cs

@@ -1,14 +1,9 @@
 using LINGYUN.Abp.AI.Workspaces;
 using Microsoft.Extensions.AI;
-using System;
 using System.Threading.Tasks;
 
 namespace LINGYUN.Abp.AI.Tools;
 public interface IWorkspaceAIToolFinder
 {
-    IDisposable DisableAITool();
-
     Task<AITool[]?> GetToolsAsync(WorkspaceDefinition workspace);
-
-    bool IsAIToolEnabled();
 }

aspnet-core/modules/ai/LINGYUN.Abp.AI.Tools/LINGYUN/Abp/AI/Tools/WorkspaceAIToolFinder.cs

@@ -1,34 +1,22 @@
 using LINGYUN.Abp.AI.Workspaces;
 using Microsoft.Extensions.AI;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Threading;
 
 namespace LINGYUN.Abp.AI.Tools;
 public class WorkspaceAIToolFinder : IWorkspaceAIToolFinder, ITransientDependency
 {
-    private const string AIToolDisabledScopeKey = "Abp.AI.Tools.DisabledAITool";
-
     private readonly IAIToolFactory _aiToolFactory;
     private readonly IAIToolDefinitionManager _aiToolDefinitionManager;
-    private readonly IAmbientScopeProvider<AIToolDisabledState> _aiToolDisabledState;
 
     public WorkspaceAIToolFinder(
         IAIToolFactory aiToolFactory, 
-        IAIToolDefinitionManager aiToolDefinitionManager,
+        IAIToolDefinitionManager aiToolDefinitionManager)
-        IAmbientScopeProvider<AIToolDisabledState> aiToolDisabledState)
     {
         _aiToolFactory = aiToolFactory;
         _aiToolDefinitionManager = aiToolDefinitionManager;
-        _aiToolDisabledState = aiToolDisabledState;
-    }
-
-    public virtual IDisposable DisableAITool()
-    {
-        return _aiToolDisabledState.BeginScope(AIToolDisabledScopeKey, new AIToolDisabledState(true));
     }
 
     public async virtual Task<AITool[]?> GetToolsAsync(WorkspaceDefinition workspace)
@@ -61,10 +49,4 @@ public class WorkspaceAIToolFinder : IWorkspaceAIToolFinder, ITransientDependenc
 
         return useAITools.ToArray();
     }
-
-    public virtual bool IsAIToolEnabled()
-    {
-        var state = _aiToolDisabledState.GetValue(AIToolDisabledScopeKey);
-        return state == null || !state.IsDisabled;
-    }
 }

aspnet-core/modules/ai/LINGYUN.Abp.AIManagement.Domain/LINGYUN/Abp/AIManagement/Chats/ConversationChangeNameHandler.cs

@@ -1,5 +1,4 @@
 using LINGYUN.Abp.AI;
-using LINGYUN.Abp.AI.Tools;
 using LINGYUN.Abp.AIManagement.Localization;
 using LINGYUN.Abp.AIManagement.Tokens;
 using Microsoft.Extensions.AI;
@@ -26,7 +25,6 @@ public class ConversationChangeNameHandler :
     private readonly IGuidGenerator _guidGenerator;
     private readonly IAbpDistributedLock _distributedLock;
     private readonly IChatClientFactory _chatClientFactory;
-    private readonly IWorkspaceAIToolFinder _workspaceAIToolFinder;
     private readonly IStringLocalizer<AIManagementResource> _stringLocalizer;
     private readonly ITokenUsageRecordRepository _tokenUsageRecordRepository;
     private readonly IConversationRecordRepository _conversationRecordRepository;
@@ -37,7 +35,6 @@ public class ConversationChangeNameHandler :
         IGuidGenerator guidGenerator,
         IAbpDistributedLock distributedLock,
         IChatClientFactory chatClientFactory,
-        IWorkspaceAIToolFinder workspaceAIToolFinder,
         IStringLocalizer<AIManagementResource> stringLocalizer,
         ITokenUsageRecordRepository tokenUsageRecordRepository, 
         IConversationRecordRepository conversationRecordRepository, 
@@ -47,7 +44,6 @@ public class ConversationChangeNameHandler :
         _guidGenerator = guidGenerator;
         _distributedLock = distributedLock;
         _chatClientFactory = chatClientFactory;
-        _workspaceAIToolFinder = workspaceAIToolFinder;
         _stringLocalizer = stringLocalizer;
         _tokenUsageRecordRepository = tokenUsageRecordRepository;
         _conversationRecordRepository = conversationRecordRepository;
@@ -101,40 +97,44 @@ public class ConversationChangeNameHandler :
             var chatClient = await _chatClientFactory.CreateAsync(chatMessage.Workspace);
             var instructions = _stringLocalizer["DesignConversationNamePrompt", ConversationRecordConsts.MaxNameLength].Value;
 
-            // 禁用AI工具
+            var aiAgent = chatClient
-            using (_workspaceAIToolFinder.DisableAITool())
+                .AsBuilder()
-            {
+                .ConfigureOptions(options =>
-                var aiAgent = chatClient
+                {
-                    .CreateAIAgent(
+                    // 禁用工具
-                        instructions: instructions,
+                    options.Tools = [];
-                        services: _serviceProvider);
+                })
-
+                .BuildAIAgent(
-                var agentRunRes = await aiAgent.RunAsync([
+                    instructions: instructions,
-                    new ChatMessage(ChatRole.System, instructions),
+                    services: _serviceProvider);
-                    new ChatMessage(ChatRole.User, chatMessage.Content)]);
+
-
+            var agentRunRes = await aiAgent.RunAsync([
-                conversation.SetName(
+                new ChatMessage(ChatRole.System, instructions),
-                    agentRunRes.Text.Length > ConversationRecordConsts.MaxNameLength
+                new ChatMessage(ChatRole.User, chatMessage.Content)]);
+
+            conversation.SetName(
+                agentRunRes.Text.Length > ConversationRecordConsts.MaxNameLength
+                ? chatMessage.Content.Length > ConversationRecordConsts.MaxNameLength
                     ? chatMessage.Content[..ConversationRecordConsts.MaxNameLength]
-                    : agentRunRes.Text);
+                    : chatMessage.Content
+                : agentRunRes.Text);
 
-                await _conversationRecordRepository.UpdateAsync(conversation);
+            await _conversationRecordRepository.UpdateAsync(conversation);
 
-                if (agentRunRes.Usage != null)
+            if (agentRunRes.Usage != null)
-                {
+            {
-                    var tokenUsageRecord = new TokenUsageRecord(
+                var tokenUsageRecord = new TokenUsageRecord(
-                        _guidGenerator.Create(),
+                    _guidGenerator.Create(),
-                        chatMessage.Id,
+                    chatMessage.Id,
-                        conversation.Id,
+                    conversation.Id,
-                        agentRunRes.Usage.InputTokenCount,
+                    agentRunRes.Usage.InputTokenCount,
-                        agentRunRes.Usage.OutputTokenCount,
+                    agentRunRes.Usage.OutputTokenCount,
-                        agentRunRes.Usage.TotalTokenCount,
+                    agentRunRes.Usage.TotalTokenCount,
-                        agentRunRes.Usage.CachedInputTokenCount,
+                    agentRunRes.Usage.CachedInputTokenCount,
-                        agentRunRes.Usage.ReasoningTokenCount,
+                    agentRunRes.Usage.ReasoningTokenCount,
-                        chatMessage.TenantId);
+                    chatMessage.TenantId);
-
+
-                    await _tokenUsageRecordRepository.InsertAsync(tokenUsageRecord);
+                await _tokenUsageRecordRepository.InsertAsync(tokenUsageRecord);
-                }
             }
         }
     }