marking
/
Learn.VideoAnalysis
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:5a6dc4961508c5cdfc844d62b3ed73b1fba94a22
Branches Tags
marking:master
marking:new-UI
marking:旧AI切片
..
compare: marking:1cb53fe405cda895b3eedb801e8d32ed1c5e25aa
Branches Tags
marking:new-UI
marking:旧AI切片
marking:master

No commits in common. "5a6dc4961508c5cdfc844d62b3ed73b1fba94a22" and "1cb53fe405cda895b3eedb801e8d32ed1c5e25aa" have entirely different histories.
5a6dc49615 ... 1cb53fe405

6 changed files with 85 additions and 87 deletions
Show Stats Expand all files Collapse all files

26
VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
View File

@ -39,7 +39,7 @@ namespace Learn.VideoAnalysis.Components.Pages
bool tableLoading = false; bool tableLoading = false;
private VideoTaskDto selectData; private VideoTaskDto selectData;
private bool rowRestartLoading = false; private bool rowRestartLoading = false;
private VideoTaskDto reStartTask; private VideoTaskDto reStartTask ;
static TextValue[] SelectDataSource = static TextValue[] SelectDataSource =
Enum.GetValues(typeof(RedisChannelEnum)) Enum.GetValues(typeof(RedisChannelEnum))
@ -47,7 +47,7 @@ namespace Learn.VideoAnalysis.Components.Pages
.Select(s => new TextValue(s.ToString(), (int)s)) .Select(s => new TextValue(s.ToString(), (int)s))
.ToArray(); .ToArray();
int selectEnum = 1; int selectEnum = 1;
int selectDefaultValue = 1; int selectDefaultValue =1;
/// <summary> /// <summary>
/// 点击重试 /// 点击重试
@ -63,17 +63,17 @@ namespace Learn.VideoAnalysis.Components.Pages
} }
void PreviewTask(VideoTaskDto task) void PreviewTask(VideoTaskDto task)
{ {
NavigationManager.NavigateTo("/VideoTaskShow/" + task.Id); NavigationManager.NavigateTo("/VideoTaskShow/"+task.Id);
} }
/// <summary> /// <summary>
/// 重试 /// 重试
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
async Task ReStart() async void ReStart()
{ {
await redisManager.ClearTaskError(reStartTask.Id); await redisManager.ClearTaskError(reStartTask.Id);
await Task.Run(async () => _=Task.Run(() =>
await redisManager.InsertChannel((RedisChannelEnum)selectEnum, reStartTask.Id) redisManager.InsertChannel((RedisChannelEnum)selectEnum, reStartTask.Id)
); );
modalShow = false; modalShow = false;
} }
@ -111,7 +111,7 @@ namespace Learn.VideoAnalysis.Components.Pages
.Where(where) .Where(where)
.Select<VideoTaskDto>() .Select<VideoTaskDto>()
.OrderByDescending(s => s.Id) .OrderByDescending(s => s.Id)
.ToPageListAsync(query.PageIndex, query.PageSize, _total); .ToPageListAsync(query.PageIndex , query.PageSize, _total);
tableLoading = false; tableLoading = false;
StateHasChanged(); StateHasChanged();
@ -130,18 +130,18 @@ namespace Learn.VideoAnalysis.Components.Pages
var data = redisManager.Redis.HMGet<string>(RedisExpandKey.Task(item.Id), var data = redisManager.Redis.HMGet<string>(RedisExpandKey.Task(item.Id),
"Progress", "LastEnum", "StartTime", "ErrorMessage"); "Progress", "LastEnum", "StartTime", "ErrorMessage");
item.Progress = data[0]; item.Progress = data[0];
item.LastEnum = data[1] == null ? default : data[1].ToEnum<RedisChannelEnum>() ?? default; item.LastEnum = data[1] == null ?default:data[1].ToEnum<RedisChannelEnum>() ?? default;
item.StartTimeDic = data[2] == null ? null : System.Text.Json.JsonSerializer.Deserialize<Dictionary<RedisChannelEnum, DateTime>>(data[2]) ?? null; item.StartTimeDic = data[2]==null?null: System.Text.Json.JsonSerializer.Deserialize<Dictionary<RedisChannelEnum, DateTime>>(data[2]) ?? null;
item.ErrorMessage = data[3]; item.ErrorMessage = data[3];
rowRestartLoading = false; rowRestartLoading = false;
var statusStr = "wait"; var statusStr = "wait";
var dic = rowData.Data.StartTimeDic; var dic = rowData.Data.StartTimeDic;
if (dic is null) if (dic is null)
statusStr = "wait"; statusStr= "wait";
else if (!string.IsNullOrEmpty(rowData.Data.ErrorMessage)) else if (!string.IsNullOrEmpty(rowData.Data.ErrorMessage))
statusStr = "error"; statusStr= "error";
else if (dic.ContainsKey(RedisChannelEnum.结束任务)) else if (dic.ContainsKey(RedisChannelEnum.结束任务))
statusStr = "finish"; statusStr= "finish";
item.TaskStatus = statusStr; item.TaskStatus = statusStr;
StateHasChanged(); StateHasChanged();
} }
@ -158,7 +158,7 @@ namespace Learn.VideoAnalysis.Components.Pages
} }
private void OnExpand(RowData<VideoTaskDto> rowData) private void OnExpand(RowData<VideoTaskDto> rowData)
{ {
if (rowData.Expanded) if(rowData.Expanded)
RowRload(rowData); RowRload(rowData);
} }
/// <summary> /// <summary>

8
VideoAnalysisCore/AICore/GPT/DeepSeek/DeepSeek_GPT.cs
View File

@ -554,6 +554,12 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
await videoKonwPointDB.InsertRangeAsync(insertData); await videoKonwPointDB.InsertRangeAsync(insertData);
break; break;
} }
else
{
Console.WriteLine(DateTime.Now + $"=>{task} 得分过低/分段长度不匹配 得分{checkRes?.Score} ");
Console.WriteLine(checkRes.Evaluation);
Console.WriteLine();
}
if (questionRes.Any(s => s.KeepTime < 30)) if (questionRes.Any(s => s.KeepTime < 30))
{ {
Console.WriteLine(DateTime.Now + "=>视频分段过短!! 重新进行AI分析"); Console.WriteLine(DateTime.Now + "=>视频分段过短!! 重新进行AI分析");
@ -612,7 +618,7 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
{ {
var taskId = long.Parse(task); var taskId = long.Parse(task);
var taskInfo = await videoTaskDB.CopyNew().AsQueryable() var taskInfo = await videoTaskDB.AsQueryable()
.Where(s => s.Id == taskId) .Where(s => s.Id == taskId)
.FirstAsync(); .FirstAsync();
if (taskInfo.VideoType != null&& taskInfo.VideoType!=AttachmentsInfoType.无) if (taskInfo.VideoType != null&& taskInfo.VideoType!=AttachmentsInfoType.无)

3
VideoAnalysisCore/Common/Expand/SqlSugarExpand.cs
View File

@ -76,8 +76,7 @@ namespace VideoAnalysisCore.Common.Expand
if (ex.Parametres == null) return; if (ex.Parametres == null) return;
//var originColor = Console.ForegroundColor; //var originColor = Console.ForegroundColor;
//Console.ForegroundColor = ConsoleColor.DarkRed; //Console.ForegroundColor = ConsoleColor.DarkRed;
Console.WriteLine($"【{DateTime.Now}——错误SQL - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n" Console.WriteLine($"【{DateTime.Now}——错误SQL - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n" + UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
+ UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\r\n");
Console.WriteLine(); Console.WriteLine();
//Console.ForegroundColor = originColor; //Console.ForegroundColor = originColor;
}; };

57
VideoAnalysisCore/Common/RedisExpand.cs
View File

@ -113,40 +113,41 @@ namespace VideoAnalysisCore.Common
public void Init() public void Init()
{ {
var SubscribeList = RedisManager.SubscribeList; var SubscribeList = RedisManager.SubscribeList;
SubscribeList.Add(RedisChannelEnum.下载文件, async (task) => SubscribeList.Add(RedisChannelEnum.下载文件, (task) =>
{ {
using var scope = AppCommon.Services?.CreateScope(); using var scope = AppCommon.Services?.CreateScope();
if (scope is null || scope.ServiceProvider.GetService<DownloadFile>() is null) if (scope is null || scope.ServiceProvider.GetService<DownloadFile>() is null)
throw new Exception("DownloadFile 未注入"); throw new Exception("DownloadFile 未注入");
else else
await scope.ServiceProvider.GetService<DownloadFile>()?.RunTask(task) ; return scope.ServiceProvider.GetService<DownloadFile>()?.RunTask(task) ?? Task.CompletedTask;
}); });
SubscribeList.Add(RedisChannelEnum.分离音频, FFMPGE.RunAsync); SubscribeList.Add(RedisChannelEnum.分离音频, FFMPGE.RunAsync);
SubscribeList.Add(RedisChannelEnum.解析字幕, senseVoice.RunTask); SubscribeList.Add(RedisChannelEnum.解析字幕, senseVoice.RunTask);
//SubscribeList.Add(RedisChannelEnum.解析说话人,Speaker.Run); //SubscribeList.Add(RedisChannelEnum.解析说话人,Speaker.Run);
SubscribeList.Add(RedisChannelEnum.AI课程类型, async (task) => SubscribeList.Add(RedisChannelEnum.AI课程类型,
(task) =>
{ {
using var scope = AppCommon.Services?.CreateScope(); using var scope = AppCommon.Services?.CreateScope();
if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null) if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
throw new Exception("IBserGPT 未注入"); throw new Exception("IBserGPT 未注入");
else else
await scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoType(task); return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoType(task) ?? Task.CompletedTask;
}); });
SubscribeList.Add(RedisChannelEnum.AI模型分析, async (task) => SubscribeList.Add(RedisChannelEnum.AI模型分析, (task) =>
{ {
using var scope = AppCommon.Services?.CreateScope(); using var scope = AppCommon.Services?.CreateScope();
if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null) if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
throw new Exception("IBserGPT 未注入"); throw new Exception("IBserGPT 未注入");
else else
await scope.ServiceProvider?.GetService<IBserGPT>()?.GetKnow(task); return scope.ServiceProvider.GetService<IBserGPT>()?.GetKnow(task) ?? Task.CompletedTask;
}); });
SubscribeList.Add(RedisChannelEnum.AI分析试题, async (task) => SubscribeList.Add(RedisChannelEnum.AI分析试题, (task) =>
{ {
using var scope = AppCommon.Services?.CreateScope(); using var scope = AppCommon.Services?.CreateScope();
if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null) if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
throw new Exception("IBserGPT 未注入"); throw new Exception("IBserGPT 未注入");
else else
await scope.ServiceProvider?.GetService<IBserGPT>()?.GetVideoQuestion(task); return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoQuestion(task) ?? Task.CompletedTask;
}); });
SubscribeList.Add(RedisChannelEnum.结束任务, redisManager.TaskEnd); SubscribeList.Add(RedisChannelEnum.结束任务, redisManager.TaskEnd);
@ -158,7 +159,7 @@ namespace VideoAnalysisCore.Common
public class RedisManager public class RedisManager
{ {
public static bool StopTask { get; set; } = false; public static bool StopTask { get; set; } = false;
public static Dictionary<RedisChannelEnum, Func<string, Task>> SubscribeList = new Dictionary<RedisChannelEnum, Func<string, Task>>(); public static Dictionary<RedisChannelEnum, Func<string,Task>> SubscribeList = new Dictionary<RedisChannelEnum, Func<string, Task>>();
/// <summary> /// <summary>
/// 队列池 /// 队列池
/// </summary> /// </summary>
@ -177,7 +178,7 @@ namespace VideoAnalysisCore.Common
/// 缓存GPT任务缓存 /// 缓存GPT任务缓存
/// </summary> /// </summary>
/// <param name="taskId"></param> /// <param name="taskId"></param>
public void SetTaskGPTCached(object taskId, string time, object? data) public void SetTaskGPTCached(object taskId,string time, object? data)
{ {
Redis.Set(RedisExpandKey.TaskGPT(taskId) + ":" + time, data, 3600 * 24); Redis.Set(RedisExpandKey.TaskGPT(taskId) + ":" + time, data, 3600 * 24);
} }
@ -263,7 +264,7 @@ namespace VideoAnalysisCore.Common
//if (gptRes is null) //if (gptRes is null)
// throw new Exception("未能读取到GPT处理结果"); // throw new Exception("未能读取到GPT处理结果");
//删除任务执行状态 //删除任务执行状态
await Redis.LRemAsync(RedisExpandKey.IDTask, 1, task); await Redis.LRemAsync(RedisExpandKey.IDTask,1,task);
var taskData = await videoTaskDB var taskData = await videoTaskDB
.GetFirstAsync(s => s.Id == tId); .GetFirstAsync(s => s.Id == tId);
if (taskData.Captions == "[]") if (taskData.Captions == "[]")
@ -274,7 +275,7 @@ namespace VideoAnalysisCore.Common
//未使用结果暂时屏蔽 //未使用结果暂时屏蔽
//taskData.ChatAnalysis = JsonSerializer.Serialize(gptRes); //taskData.ChatAnalysis = JsonSerializer.Serialize(gptRes);
taskData.ChatAnalysisScore = 0; taskData.ChatAnalysisScore =0;
taskData.ErrorMessage = string.Empty; taskData.ErrorMessage = string.Empty;
taskData.LastEnum = RedisChannelEnum.结束任务; taskData.LastEnum = RedisChannelEnum.结束任务;
taskData.EndTime = DateTime.Now; taskData.EndTime = DateTime.Now;
@ -290,15 +291,7 @@ namespace VideoAnalysisCore.Common
it.LastEnum, it.LastEnum,
it.EndTime it.EndTime
}).ExecuteCommandAsync(); }).ExecuteCommandAsync();
try
{
ExpandFunction.DeleteTaskFile(tId);
}
catch (Exception)
{
throw;
}
//NewTask(); //NewTask();
} }
@ -308,13 +301,14 @@ namespace VideoAnalysisCore.Common
public async void InitChannel() public async void InitChannel()
{ {
if (Redis is null) throw new Exception("redis未初始化"); if (Redis is null) throw new Exception("redis未初始化");
//处理之前程序结束前未能执行完的情况 //处理之前程序结束前未能执行完的情况
var oldTaskCount = Redis.LLen(RedisExpandKey.IDTask); var oldTaskCount = Redis.LLen(RedisExpandKey.IDTask);
if (oldTaskCount > 0) if (oldTaskCount > 0)
{ {
var oldTaskArr = Redis.LRange(RedisExpandKey.IDTask, 0, oldTaskCount); var oldTaskArr = Redis.LRange(RedisExpandKey.IDTask, 0, oldTaskCount);
//不自动清理未完成任务 等待执行完毕/失败后自动清理 Redis.LTrim(RedisExpandKey.IDTask, 1, 0);//删除 redis 列表
//Redis.LTrim(RedisExpandKey.IDTask, 1, 0);//删除 redis 列表
foreach (var oldTask in oldTaskArr) foreach (var oldTask in oldTaskArr)
{ {
_ = Task.Run(async () => _ = Task.Run(async () =>
@ -384,7 +378,7 @@ namespace VideoAnalysisCore.Common
Console.WriteLine($"{DateTime.Now} =>服务端不接收任务"); Console.WriteLine($"{DateTime.Now} =>服务端不接收任务");
return; return;
} }
Task.Run(() => Task.Run(async () =>
{ {
lock (Redis) lock (Redis)
{ {
@ -402,6 +396,7 @@ namespace VideoAnalysisCore.Common
} }
}); });
} }
/// <summary> /// <summary>
@ -433,7 +428,7 @@ namespace VideoAnalysisCore.Common
/// </summary> /// </summary>
/// <param name="taskID"></param> /// <param name="taskID"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> ClearTaskError(long taskID) => await SetTaskError(taskID, string.Empty); public async Task<bool> ClearTaskError(long taskID) =>await SetTaskError(taskID, string.Empty);
/// <summary> /// <summary>
/// 修改任务的错误信息 /// 修改任务的错误信息
/// </summary> /// </summary>
@ -442,9 +437,8 @@ namespace VideoAnalysisCore.Common
/// <returns></returns> /// <returns></returns>
public async Task<bool> SetTaskError(long taskID, string? error) public async Task<bool> SetTaskError(long taskID, string? error)
{ {
var vDB = AppCommon.Services.GetService<Repository<VideoTask>>();
Redis.HMSet(RedisExpandKey.Task(taskID), "ErrorMessage", error); Redis.HMSet(RedisExpandKey.Task(taskID), "ErrorMessage", error);
return await vDB.CopyNew().AsUpdateable() return await videoTaskDB.AsUpdateable()
.SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值 .SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值
.Where(it => it.Id == taskID) .Where(it => it.Id == taskID)
.ExecuteCommandAsync() == 1; .ExecuteCommandAsync() == 1;
@ -470,11 +464,14 @@ namespace VideoAnalysisCore.Common
{ {
Redis.HMSet(RedisExpandKey.Task(taskId), "LastEnum", key); Redis.HMSet(RedisExpandKey.Task(taskId), "LastEnum", key);
Redis.HMSet(RedisExpandKey.Task(taskId), "Progress", 0); Redis.HMSet(RedisExpandKey.Task(taskId), "Progress", 0);
var vDB = AppCommon.Services.GetService<Repository<VideoTask>>(); lock (Redis)
await vDB.CopyNew().AsUpdateable() {
videoTaskDB.AsUpdateable()
.SetColumns(it => it.LastEnum == key) .SetColumns(it => it.LastEnum == key)
.Where(it => it.Id == tID) .Where(it => it.Id == tID)
.ExecuteCommandAsync(); .ExecuteCommand();
}
await action(taskId); await action(taskId);
return; return;
} }
@ -486,7 +483,7 @@ namespace VideoAnalysisCore.Common
Console.WriteLine("=============================================="); Console.WriteLine("==============================================");
Thread.Sleep(1000); Thread.Sleep(1000);
Console.WriteLine(DateTime.Now.ToString("HH:mm:ss") + "-> 稍后后重试." + key + " " + taskId); Console.WriteLine(DateTime.Now.ToString("HH:mm:ss") + "-> 稍后后重试." + key + " " + taskId);
if (i + 1 == tryCount) if (i+1== tryCount)
throw; throw;
} }
} }

10
VideoAnalysisCore/Common/Repository.cs
View File

@ -13,7 +13,7 @@ namespace VideoAnalysisCore.Common
{ {
public class Repository<T> : SimpleClient<T> where T : class, new() public class Repository<T> : SimpleClient<T> where T : class, new()
{ {
readonly Dictionary<Type, object?> CID = new Dictionary<Type, object?>(); readonly Dictionary<Type, object?> CID= new Dictionary<Type, object?>();
public Repository() public Repository()
{ {
SwitchConnection(); SwitchConnection();
@ -23,12 +23,11 @@ namespace VideoAnalysisCore.Common
var t = typeof(T); var t = typeof(T);
if (CID.ContainsKey(t)) if (CID.ContainsKey(t))
{ {
base.Context = CID[t] != null base.Context = CID[t]!=null
? DbScoped.Sugar.GetConnectionScope(CID[t]) ? DbScoped.Sugar.GetConnectionScope(CID[t])
: DbScoped.Sugar; : DbScoped.Sugar;
return;
} }
else
{
var c = t.GetCustomAttribute<TenantAttribute>(); var c = t.GetCustomAttribute<TenantAttribute>();
if (!CID.ContainsKey(t)) if (!CID.ContainsKey(t))
CID.Add(t, c?.configId); CID.Add(t, c?.configId);
@ -36,8 +35,5 @@ namespace VideoAnalysisCore.Common
? DbScoped.Sugar.GetConnectionScope(c.configId) ? DbScoped.Sugar.GetConnectionScope(c.configId)
: DbScoped.Sugar; : DbScoped.Sugar;
} }
//这个变量也要保证是线程安全的，尽量CopyNew在方法中使用
base.Context = base.Context.CopyNew();
}
} }
} }

2
VideoAnalysisCore/VideoAnalysisCore.csproj
View File

@ -74,7 +74,7 @@
<PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.32" /> <PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.32" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
<PackageReference Include="SqlSugar.IOC" Version="2.0.0" /> <PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.205" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
<PackageReference Include="UserCenter.Model" Version="1.3.5" /> <PackageReference Include="UserCenter.Model" Version="1.3.5" />
<PackageReference Include="Whisper.net" Version="1.5.0" /> <PackageReference Include="Whisper.net" Version="1.5.0" />
<PackageReference Include="Whisper.net.Runtime" Version="1.5.0" /> <PackageReference Include="Whisper.net.Runtime" Version="1.5.0" />