Merge branch 'ai-agent-backend' into ai-agent

# Conflicts:
#	Yi.Ai.Vue3/src/pages/console/index.vue
#	Yi.Ai.Vue3/src/routers/modules/staticRouter.ts

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs

@@ -40,35 +40,37 @@ namespace Yi.Framework.AiHub.Application.Services;
 public class AiChatService : ApplicationService
 {
     private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     private readonly AiBlacklistManager _aiBlacklistManager;
     private readonly ILogger<AiChatService> _logger;
     private readonly AiGateWayManager _aiGateWayManager;
+    private readonly ModelManager _modelManager;
     private readonly PremiumPackageManager _premiumPackageManager;
     private readonly ChatManager _chatManager;
     private readonly TokenManager _tokenManager;
     private readonly IAccountService _accountService;
     private readonly ISqlSugarRepository<AgentStoreAggregateRoot> _agentStoreRepository;
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
 
     public AiChatService(IHttpContextAccessor httpContextAccessor,
         AiBlacklistManager aiBlacklistManager,
-        ISqlSugarRepository<AiModelEntity> aiModelRepository,
         ILogger<AiChatService> logger,
         AiGateWayManager aiGateWayManager,
+        ModelManager modelManager,
         PremiumPackageManager premiumPackageManager,
         ChatManager chatManager, TokenManager tokenManager, IAccountService accountService,
-        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository)
+        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository, ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _httpContextAccessor = httpContextAccessor;
         _aiBlacklistManager = aiBlacklistManager;
-        _aiModelRepository = aiModelRepository;
         _logger = logger;
         _aiGateWayManager = aiGateWayManager;
+        _modelManager = modelManager;
         _premiumPackageManager = premiumPackageManager;
         _chatManager = chatManager;
         _tokenManager = tokenManager;
         _accountService = accountService;
         _agentStoreRepository = agentStoreRepository;
+        _aiModelRepository = aiModelRepository;
     }
 
 
@@ -102,7 +104,7 @@ public class AiChatService : ApplicationService
                 ModelName = x.Name,
                 ModelDescribe = x.Description,
                 Remark = x.Description,
-                IsPremiumPackage = PremiumPackageConst.ModeIds.Contains(x.ModelId)
+                IsPremiumPackage = x.IsPremium
             }).ToListAsync();
         return output;
     }
@@ -137,19 +139,24 @@ public class AiChatService : ApplicationService
         }
 
         //如果是尊享包服务，需要校验是是否尊享包足够
-        if (CurrentUser.IsAuthenticated && PremiumPackageConst.ModeIds.Contains(input.Model))
+        if (CurrentUser.IsAuthenticated)
         {
-            // 检查尊享token包用量
-            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
-            if (availableTokens <= 0)
+            var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
+
+            if (isPremium)
             {
-                throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+                // 检查尊享token包用量
+                var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
+                if (availableTokens <= 0)
+                {
+                    throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+                }
             }
         }
 
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, sessionId, null, cancellationToken);
+            CurrentUser.Id, sessionId, null, CancellationToken.None);
     }
 
     /// <summary>
@@ -185,7 +192,7 @@ public class AiChatService : ApplicationService
 
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, null, null, cancellationToken);
+            CurrentUser.Id, null, null, CancellationToken.None);
     }
 
 
@@ -212,7 +219,9 @@ public class AiChatService : ApplicationService
         }
 
         //如果是尊享包服务，需要校验是是否尊享包足够
-        if (PremiumPackageConst.ModeIds.Contains(input.ModelId))
+        var isPremium = await _modelManager.IsPremiumModelAsync(input.ModelId);
+
+        if (isPremium)
         {
             // 检查尊享token包用量
             var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(tokenValidation.UserId);
@@ -230,7 +239,7 @@ public class AiChatService : ApplicationService
             input.ModelId,
             tokenValidation.UserId,
             input.Tools,
-            cancellationToken);
+            CancellationToken.None);
     }
 
     /// <summary>