xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/abp' into abp

Browse Source
This commit is contained in:
橙子
2025-03-23 17:16:37 +08:00
parent 21ff599a4e 224c2b96e4
commit b830317608
13 changed files with 91 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Yi.Abp.Net8/framework/Yi.Framework.Core/Options/SemanticKernelOptions.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Yi.Framework.Core.Options;
public class SemanticKernelOptions
{
public List<string> ModelIds { get; set; }
public string Endpoint { get; set; }
public string ApiKey { get; set; }
}

1
Yi.Abp.Net8/module/ai-stock/Yi.Framework.Stock.Application/Services/StockMarketService.cs
View File

@@ -96,6 +96,7 @@ namespace Yi.Framework.Stock.Application.Services
.WhereIF(input.StartTime.HasValue, p => p.RecordTime >= input.StartTime.Value)
.WhereIF(input.EndTime.HasValue, p => p.RecordTime <= input.EndTime.Value)
.WhereIF(input.PeriodType.HasValue, p => p.PeriodType == input.PeriodType.Value)
.Where(x=>x.RecordTime<=DateTime.Now)
.OrderByIF(!string.IsNullOrEmpty(input.Sorting),input.Sorting)
.OrderByIF(string.IsNullOrEmpty(input.Sorting),p=>p.RecordTime);

2
Yi.Abp.Net8/module/ai-stock/Yi.Framework.Stock.Domain/Managers/SemanticKernel/SemanticKernelOptions.cs
View File

@@ -2,7 +2,7 @@ namespace Yi.Framework.Stock.Domain.Managers.SemanticKernel
{
public class SemanticKernelOptions
{
public string ModelId { get; set; }
public List<string> ModelIds { get; set; }
public string Endpoint { get; set; }
public string ApiKey { get; set; }
}

1
Yi.Abp.Net8/module/ai-stock/Yi.Framework.Stock.Domain/Managers/StockMarketManager.cs
View File

@@ -211,6 +211,7 @@ namespace Yi.Framework.Stock.Domain.Managers
// 获取最新的价格记录
var latestPriceRecord = await _stockPriceRecordRepository._DbQueryable
.Where(p => p.StockId == stockId)
.Where(x=>x.RecordTime<=DateTime.Now)
.OrderByDescending(p => p.RecordTime)
.FirstAsync();

3
Yi.Abp.Net8/module/ai-stock/Yi.Framework.Stock.Domain/YiFrameworkStockDomainModule.cs
View File

@@ -32,9 +32,10 @@ namespace Yi.Framework.Stock.Domain
#pragma warning disable SKEXP0010
// 从配置中获取值
var options = semanticKernelSection.Get<SemanticKernelOptions>();
//股市优先使用第一个ai模型
services.AddKernel()
.AddOpenAIChatCompletion(
modelId: options.ModelId,
modelId: options.ModelIds.FirstOrDefault(),
endpoint: new Uri(options.Endpoint),
apiKey: options.ApiKey);
#pragma warning restore SKEXP0010

90
Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Managers/AiManager.cs
View File

@@ -1,6 +1,9 @@
using System.Collections.Generic;
using System.Net;
using Microsoft.Extensions.Options;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.ChatCompletion;
using Microsoft.SemanticKernel.Connectors.OpenAI;
// using OpenAI;
// using OpenAI.Managers;
// using OpenAI.ObjectModels;
@@ -14,61 +17,46 @@ namespace Yi.Framework.ChatHub.Domain.Managers
{
public class AiManager : ISingletonDependency
{
public AiManager(IOptions<AiOptions> options)
private readonly Kernel _kernel;
public AiManager(Kernel kernel)
{
// this.OpenAIService = new OpenAIService(new OpenAiOptions()
// {
// ApiKey = options.Value.ApiKey,
// BaseDomain = options.Value.BaseDomain
// });
_kernel = kernel;
}
// private OpenAIService OpenAIService { get; }
public async IAsyncEnumerable<string> ChatAsStreamAsync(string model, List<AiChatContextDto> aiChatContextDtos)
public async IAsyncEnumerable<string?> ChatAsStreamAsync(string model, List<AiChatContextDto> aiChatContextDtos)
{
throw new NotImplementedException("准备sk重构");
yield break;
// if (aiChatContextDtos.Count == 0)
// {
// yield return null;
// }
//
// List<ChatMessage> messages = aiChatContextDtos.Select(x =>
// {
// if (x.AnswererType == AnswererTypeEnum.Ai)
// {
// return ChatMessage.FromSystem(x.Message);
// }
// else
// {
// return ChatMessage.FromUser(x.Message);
// }
// }).ToList();
// var completionResult = OpenAIService.ChatCompletion.CreateCompletionAsStream(new ChatCompletionCreateRequest
// {
// Messages = messages,
// Model =model
// });
//
// HttpStatusCode? error = null;
// await foreach (var result in completionResult)
// {
// if (result.Successful)
// {
// yield return result.Choices.FirstOrDefault()?.Message.Content ?? null;
// }
// else
// {
// error = result.HttpStatusCode;
// break;
// }
//
// }
// if (error == HttpStatusCode.PaymentRequired)
// {
// yield return "余额不足,请联系站长充值";
//
// }
if (aiChatContextDtos.Count == 0)
{
yield return null;
}
var openSettings = new OpenAIPromptExecutionSettings()
{
MaxTokens =1000
};
var chatCompletionService = this._kernel.GetRequiredService<IChatCompletionService>(model);
var history =new ChatHistory();
foreach (var aiChatContextDto in aiChatContextDtos)
{
if (aiChatContextDto.AnswererType==AnswererTypeEnum.Ai)
{
history.AddSystemMessage(aiChatContextDto.Message);
}
else if(aiChatContextDto.AnswererType==AnswererTypeEnum.User)
{
history.AddUserMessage(aiChatContextDto.Message);
}
}
var results = chatCompletionService.GetStreamingChatMessageContentsAsync(
chatHistory: history,
executionSettings: openSettings,
kernel: _kernel);
await foreach (var result in results)
{
yield return result.Content;
}
}
}
}

2
Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Yi.Framework.ChatHub.Domain.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="$(AbpVersion)" />
<PackageReference Include="Microsoft.SemanticKernel" Version="1.40.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
<ProjectReference Include="..\..\..\framework\Yi.Framework.Caching.FreeRedis\Yi.Framework.Caching.FreeRedis.csproj" />

28
Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/YiFrameworkChatHubDomainModule.cs
View File

@@ -1,6 +1,10 @@
using Volo.Abp.Domain;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.SemanticKernel;
using Volo.Abp.Domain;
using Yi.Framework.Caching.FreeRedis;
using Yi.Framework.ChatHub.Domain.Shared;
using Yi.Framework.Core.Options;
namespace Yi.Framework.ChatHub.Domain
@@ -13,9 +17,27 @@ namespace Yi.Framework.ChatHub.Domain
)]
public class YiFrameworkChatHubDomainModule : AbpModule
{
public override async Task OnPostApplicationInitializationAsync(ApplicationInitializationContext context)
public override void ConfigureServices(ServiceConfigurationContext context)
{
var configuration = context.Services.GetConfiguration();
var services = context.Services;
// 配置绑定
var semanticKernelSection = configuration.GetSection("SemanticKernel");
services.Configure<SemanticKernelOptions>(configuration.GetSection("SemanticKernel"));
#pragma warning disable SKEXP0010
// 从配置中获取值
var options = semanticKernelSection.Get<SemanticKernelOptions>();
foreach (var optionsModelId in options.ModelIds)
{
services.AddKernel()
.AddOpenAIChatCompletion(
serviceId: optionsModelId,
modelId: optionsModelId,
endpoint: new Uri(options.Endpoint),
apiKey: options.ApiKey);
}
#pragma warning restore SKEXP0010
}
}
}

12
Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
View File

@@ -103,18 +103,10 @@
//开启定时数据库备份
"EnableDataBaseBackup": false
},
//OpenAi
"AiOptions": {
"ApiKey": "",
"BaseDomain": ""
},
//语义内核
"SemanticKernel": {
"ModelId": "gpt-4o",
"ModelIds": ["gpt-4o"],
"Endpoint": "https://xxx.com/v1",
"ApiKey": "sk-xxxxxx"
}

3
Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/stock/marketPrompt.txt
View File

@@ -22,6 +22,7 @@
- 一天24小时下来整体价格变化的趋势应该比较连贯，可以部分小时的价格大幅度变化
- 变化幅度可以大一些，为了更吸引用户
- 可能下跌，可能上涨
- 最低价值为1，最高价值为100
- 最低价格为5，最高价格为100，如果小于等于5，就固定一直是5，如果大于等于100，要即时的修正扣减
- 可能出现暴跌或者暴涨，一天直接减少或增加百分之50
请确保数据格式正确，以便系统能够自动处理。

7
Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/stock/newsPrompt.txt
View File

@@ -1,6 +1,4 @@
基于以下最近的新闻背景，预测趋势生成一条其他新闻。
{{newsContext}}
生成一条有趣并通俗易懂的新闻
包含以下要素：
1. 新闻标题：吸引人且简短，涉及不同行业
@@ -14,6 +12,5 @@
- 内容应当暗示可能对不同行业公司产生某种影响（积极或消极），不能太过于明显
- 行业焦点可以包括娱乐、科技、金融、医疗、食品等多个领域
- 新闻有很小的概率造假，如果是造假的，新闻来源就得来自小的工作室
- 不要一直重复着一个公司、一个行业的新闻
- 可以加一些很离谱的元素增加新闻的趣味性
- 不要一直重复着一个公司、一个行业、一个事件的新闻
- 只需生成一次即可