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

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

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

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

@ -554,6 +554,12 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
await videoKonwPointDB.InsertRangeAsync(insertData);
break;
}
else
{
Console.WriteLine(DateTime.Now + $"=>{task} 得分过低/分段长度不匹配 得分{checkRes?.Score} ");
Console.WriteLine(checkRes.Evaluation);
Console.WriteLine();
}
if (questionRes.Any(s => s.KeepTime < 30))
{
Console.WriteLine(DateTime.Now + "=>视频分段过短!! 重新进行AI分析");
@ -612,7 +618,7 @@ namespace VideoAnalysisCore.AICore.GPT.DeepSeek
{
var taskId = long.Parse(task);
var taskInfo = await videoTaskDB.CopyNew().AsQueryable()
var taskInfo = await videoTaskDB.AsQueryable()
.Where(s => s.Id == taskId)
.FirstAsync();
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;
//var originColor = Console.ForegroundColor;
//Console.ForegroundColor = ConsoleColor.DarkRed;
Console.WriteLine($"【{DateTime.Now}——错误SQL - [{config.ConfigId}]】\r\n"+ ex.Message + "\r\n"
+ UtilMethods.GetSqlString(config.DbType, ex.Sql, (SugarParameter[])ex.Parametres) + "\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");
Console.WriteLine();
//Console.ForegroundColor = originColor;
};

95
VideoAnalysisCore/Common/RedisExpand.cs
View File

@ -113,40 +113,41 @@ namespace VideoAnalysisCore.Common
public void Init()
{
var SubscribeList = RedisManager.SubscribeList;
SubscribeList.Add(RedisChannelEnum.下载文件, async (task) =>
SubscribeList.Add(RedisChannelEnum.下载文件, (task) =>
{
using var scope = AppCommon.Services?.CreateScope();
if (scope is null || scope.ServiceProvider.GetService<DownloadFile>() is null)
throw new Exception("DownloadFile 未注入");
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.解析字幕, senseVoice.RunTask);
//SubscribeList.Add(RedisChannelEnum.解析说话人,Speaker.Run);
SubscribeList.Add(RedisChannelEnum.AI课程类型, async (task) =>
SubscribeList.Add(RedisChannelEnum.AI课程类型,
(task) =>
{
using var scope = AppCommon.Services?.CreateScope();
if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
throw new Exception("IBserGPT 未注入");
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();
if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
throw new Exception("IBserGPT 未注入");
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();
if (scope is null || scope.ServiceProvider.GetService<IBserGPT>() is null)
throw new Exception("IBserGPT 未注入");
else
await scope.ServiceProvider?.GetService<IBserGPT>()?.GetVideoQuestion(task);
return scope.ServiceProvider.GetService<IBserGPT>()?.GetVideoQuestion(task) ?? Task.CompletedTask;
});
SubscribeList.Add(RedisChannelEnum.结束任务, redisManager.TaskEnd);
@ -155,10 +156,10 @@ namespace VideoAnalysisCore.Common
/// <summary>
/// redis拓展
/// </summary>
public class RedisManager
public class RedisManager
{
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>
@ -177,7 +178,7 @@ namespace VideoAnalysisCore.Common
/// 缓存GPT任务缓存
/// </summary>
/// <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);
}
@ -185,7 +186,7 @@ namespace VideoAnalysisCore.Common
/// 加入到消费队列
/// </summary>
/// <param name="taskIds"></param>
public void JoinQueue(params long[] taskIds)
public void JoinQueue(params long[] taskIds)
{ //事务
if (taskIds is null || taskIds.Length == 0)
return;
@ -200,7 +201,7 @@ namespace VideoAnalysisCore.Common
/// 获取任务进度
/// </summary>
/// <param name="taskId"></param>
public float GetTaskProgress(object taskId)
public float GetTaskProgress(object taskId)
{
return Redis.HMGet<float>(RedisExpandKey.Task(taskId), "Progress")[0];
}
@ -209,7 +210,7 @@ namespace VideoAnalysisCore.Common
/// </summary>
/// <param name="p">进度百分比</param>
/// <param name="taskId"></param>
public void SetTaskProgress(object taskId, object p)
public void SetTaskProgress(object taskId, object p)
{
Redis.HMSet(RedisExpandKey.Task(taskId), "Progress", p.ToString());
@ -219,7 +220,7 @@ namespace VideoAnalysisCore.Common
/// </summary>
/// <param name="enum">枚举</param>
/// <param name="taskId">任务id</param>
public async Task InsertChannel(RedisChannelEnum @enum, object taskId)
public async Task InsertChannel(RedisChannelEnum @enum, object taskId)
{
if (taskId is null) throw new Exception("taskId为空");
if (Redis is null) throw new Exception("redis未初始化");
@ -241,8 +242,8 @@ namespace VideoAnalysisCore.Common
Redis.HMSet(RedisExpandKey.Task(taskId), "StartTime", startTime);
await TouchChannel(@enum, tId, SubscribeList[@enum]);
//await SubscribeList[@enum](tId);
await TouchChannel(@enum, tId, SubscribeList[@enum]);
//await SubscribeList[@enum](tId);
var e = @enum.NextEnum();
if (e is null)
break;
@ -255,7 +256,7 @@ namespace VideoAnalysisCore.Common
}
}
public async Task TaskEnd(string task)
public async Task TaskEnd(string task)
{
var tId = long.Parse(task);
//var gptRes = (await Redis
@ -263,7 +264,7 @@ namespace VideoAnalysisCore.Common
//if (gptRes is null)
// throw new Exception("未能读取到GPT处理结果");
//删除任务执行状态
await Redis.LRemAsync(RedisExpandKey.IDTask, 1, task);
await Redis.LRemAsync(RedisExpandKey.IDTask,1,task);
var taskData = await videoTaskDB
.GetFirstAsync(s => s.Id == tId);
if (taskData.Captions == "[]")
@ -274,7 +275,7 @@ namespace VideoAnalysisCore.Common
//未使用结果暂时屏蔽
//taskData.ChatAnalysis = JsonSerializer.Serialize(gptRes);
taskData.ChatAnalysisScore = 0;
taskData.ChatAnalysisScore =0;
taskData.ErrorMessage = string.Empty;
taskData.LastEnum = RedisChannelEnum.结束任务;
taskData.EndTime = DateTime.Now;
@ -290,31 +291,24 @@ namespace VideoAnalysisCore.Common
it.LastEnum,
it.EndTime
}).ExecuteCommandAsync();
try
{
ExpandFunction.DeleteTaskFile(tId);
}
catch (Exception)
{
throw;
}
//NewTask();
//NewTask();
}
/// <summary>
/// 初始化 队列 任务
/// </summary>
public async void InitChannel()
public async void InitChannel()
{
if (Redis is null) throw new Exception("redis未初始化");
//处理之前程序结束前未能执行完的情况
var oldTaskCount = Redis.LLen(RedisExpandKey.IDTask);
if (oldTaskCount > 0)
{
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)
{
_ = Task.Run(async () =>
@ -336,7 +330,7 @@ namespace VideoAnalysisCore.Common
/// <summary>
/// 停止接收新任务
/// </summary>
public void StopTaskAsync()
public void StopTaskAsync()
{
StopTask = true;
try
@ -354,7 +348,7 @@ namespace VideoAnalysisCore.Common
/// <summary>
/// 开始接收新任务
/// </summary>
public void RestartTask()
public void RestartTask()
{
StopTask = false;
NewTask();
@ -363,7 +357,7 @@ namespace VideoAnalysisCore.Common
/// 重新执行新任务
/// </summary>
/// <returns></returns>
public void NewTask()
public void NewTask()
{
// 取消 消费机的任务订阅
if (StopTask)
@ -377,14 +371,14 @@ namespace VideoAnalysisCore.Common
/// <summary>
/// 重新接收新任务
/// </summary>
public void ReceivingTaskAsync()
public void ReceivingTaskAsync()
{
if (AppCommon.Config.TaskSetting.IS_Server)
{
Console.WriteLine($"{DateTime.Now} =>服务端不接收任务");
return;
}
Task.Run(() =>
Task.Run(async () =>
{
lock (Redis)
{
@ -402,6 +396,7 @@ namespace VideoAnalysisCore.Common
}
});
}
/// <summary>
@ -410,7 +405,7 @@ namespace VideoAnalysisCore.Common
/// <param name="taskID"></param>
/// <param name="ex"></param>
/// <returns></returns>
public async Task<bool> SetTaskErrorMessage(long taskID, Exception? ex)
public async Task<bool> SetTaskErrorMessage(long taskID, Exception? ex)
{
var error = string.Empty;
if (ex != null)
@ -433,18 +428,17 @@ namespace VideoAnalysisCore.Common
/// </summary>
/// <param name="taskID"></param>
/// <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>
/// <param name="taskID"></param>
/// <param name="error"></param>
/// <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);
return await vDB.CopyNew().AsUpdateable()
return await videoTaskDB.AsUpdateable()
.SetColumns(it => it.ErrorMessage == error)//SetColumns是可以叠加的 写2个就2个字段赋值
.Where(it => it.Id == taskID)
.ExecuteCommandAsync() == 1;
@ -456,7 +450,7 @@ namespace VideoAnalysisCore.Common
/// <param name="key"></param>
/// <param name="taskId"></param>
/// <param name="action"></param>
public async Task TouchChannel(RedisChannelEnum key, string taskId, Func<string, Task> action = null)
public async Task TouchChannel(RedisChannelEnum key, string taskId, Func<string, Task> action = null)
{
if (taskId is null) return;
var tID = long.Parse(taskId);
@ -470,11 +464,14 @@ namespace VideoAnalysisCore.Common
{
Redis.HMSet(RedisExpandKey.Task(taskId), "LastEnum", key);
Redis.HMSet(RedisExpandKey.Task(taskId), "Progress", 0);
var vDB = AppCommon.Services.GetService<Repository<VideoTask>>();
await vDB.CopyNew().AsUpdateable()
.SetColumns(it => it.LastEnum == key)
.Where(it => it.Id == tID)
.ExecuteCommandAsync();
lock (Redis)
{
videoTaskDB.AsUpdateable()
.SetColumns(it => it.LastEnum == key)
.Where(it => it.Id == tID)
.ExecuteCommand();
}
await action(taskId);
return;
}
@ -486,7 +483,7 @@ namespace VideoAnalysisCore.Common
Console.WriteLine("==============================================");
Thread.Sleep(1000);
Console.WriteLine(DateTime.Now.ToString("HH:mm:ss") + "-> 稍后后重试." + key + " " + taskId);
if (i + 1 == tryCount)
if (i+1== tryCount)
throw;
}
}

22
VideoAnalysisCore/Common/Repository.cs
View File

@ -13,7 +13,7 @@ namespace VideoAnalysisCore.Common
{
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()
{
SwitchConnection();
@ -23,21 +23,17 @@ namespace VideoAnalysisCore.Common
var t = typeof(T);
if (CID.ContainsKey(t))
{
base.Context = CID[t] != null
base.Context = CID[t]!=null
? DbScoped.Sugar.GetConnectionScope(CID[t])
: DbScoped.Sugar;
return;
}
else
{
var c = t.GetCustomAttribute<TenantAttribute>();
if (!CID.ContainsKey(t))
CID.Add(t, c?.configId);
base.Context = c != null
? DbScoped.Sugar.GetConnectionScope(c.configId)
: DbScoped.Sugar;
}
//这个变量也要保证是线程安全的，尽量CopyNew在方法中使用
base.Context = base.Context.CopyNew();
var c = t.GetCustomAttribute<TenantAttribute>();
if (!CID.ContainsKey(t))
CID.Add(t, c?.configId);
base.Context = c != null
? DbScoped.Sugar.GetConnectionScope(c.configId)
: DbScoped.Sugar;
}
}
}

2
VideoAnalysisCore/VideoAnalysisCore.csproj
View File

@ -74,7 +74,7 @@
<PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.32" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
<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="Whisper.net" Version="1.5.0" />
<PackageReference Include="Whisper.net.Runtime" Version="1.5.0" />