From d3cf043e0925a8909d448fa1d84f5ee0d3b65387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Wed, 27 Nov 2024 10:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20gpt=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E6=97=B6=E9=97=B420=E5=88=86=E9=92=9F=20=E4=BC=98=E5=8C=96=20v?=
 =?UTF-8?q?ad=20=E5=AE=9E=E6=97=B6new?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Pages/VideoTaskPage.razor         |  6 ++++--
 .../Components/Pages/VideoTaskPage.razor.cs      | 16 +++++++++-------
 .../AICore/ChatGPT/KIMI/KIMI_GPT.cs              |  5 ++++-
 .../AICore/ChatGPT/KIMI/MoonshotClient.cs        |  1 +
 .../AICore/SherpaOnnx/SenseVoice.cs              |  9 +++++----
 VideoAnalysisCore/Common/AppCommon.cs            | 11 +++++++++--
 VideoAnalysisCore/Common/RedisExpand.cs          |  2 +-
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/VideoAnalysis/Components/Pages/VideoTaskPage.razor b/VideoAnalysis/Components/Pages/VideoTaskPage.razor
index eb213f0..c1c7380 100644
--- a/VideoAnalysis/Components/Pages/VideoTaskPage.razor
+++ b/VideoAnalysis/Components/Pages/VideoTaskPage.razor
@@ -8,7 +8,9 @@
 @using VideoAnalysisCore.Model.Dto
 @using VideoAnalysisCore.Enum
 
-<Table @ref="_table" Loading="tableLoading" TItem="VideoTaskDto" ScrollY="600px" PageSize="10" Total="_total" DataSource="_dataSource" @bind-SelectedRows="_selectedRows" OnChange="OnChange"
+<Table @ref="_table" Loading="tableLoading" TItem="VideoTaskDto" ScrollY="600px" PageSize="10" Total="_total" DataSource="_dataSource"
+       OnRowClick="(r)=>r.Expanded = !r.Expanded"
+    @bind-SelectedRows="_selectedRows" OnChange="OnChange"
        OnExpand="OnExpand">
     <TitleTemplate>
         <Flex Justify="end" Gap="10">
@@ -36,7 +38,7 @@
             <DescriptionsItem Title="操作" Span="2">
                 <Button Type="@ButtonType.Primary"
                         Loading="rowRestartLoading"
-                        OnClick="()=>RowRestart(rowData)">
+                        OnClick="()=>RowRload(rowData)">
                     刷新数据
                 </Button>
                 <Button Type="@ButtonType.Primary" Danger @onclick="() => ReStartClick(rowData.Data)">
diff --git a/VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs b/VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
index ab23777..550f57b 100644
--- a/VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
+++ b/VideoAnalysis/Components/Pages/VideoTaskPage.razor.cs
@@ -36,7 +36,8 @@ namespace Learn.VideoAnalysis.Components.Pages
         private bool rowRestartLoading = false;
         private VideoTaskDto reStartTask ;
 
-        TextValue[] SelectDataSource = Enum.GetValues(typeof(RedisChannelEnum))
+        static TextValue[] SelectDataSource =
+            Enum.GetValues(typeof(RedisChannelEnum))
             .Cast<RedisChannelEnum>()
            .Select(s => new TextValue(s.ToString(), (int)s))
            .ToArray();
@@ -106,7 +107,11 @@ namespace Learn.VideoAnalysis.Components.Pages
             StateHasChanged();
 
         }
-        public void RowRestart(RowData<VideoTaskDto> rowData)
+        /// <summary>
+        /// 刷新数据
+        /// </summary>
+        /// <param name="rowData"></param>
+        public void RowRload(RowData<VideoTaskDto> rowData)
         {
             rowRestartLoading = true;
             var item = rowData.Data;
@@ -145,14 +150,11 @@ namespace Learn.VideoAnalysis.Components.Pages
         }
         private int RowSTIndex(RowData<VideoTaskDto> rowData)
         {
-            var dic = rowData.Data.StartTimeDic;
-            if (dic is null)
-                return 0;
-            return (int)dic.LastOrDefault().Key;
+            return (int)rowData.Data.LastEnum;
         }
         private void OnExpand(RowData<VideoTaskDto> rowData)
         {
-            RowRestart(rowData);
+            RowRload(rowData);
         }
         /// <summary>
         /// 在渲染页面之后
diff --git a/VideoAnalysisCore/AICore/ChatGPT/KIMI/KIMI_GPT.cs b/VideoAnalysisCore/AICore/ChatGPT/KIMI/KIMI_GPT.cs
index c6ea880..fd718f0 100644
--- a/VideoAnalysisCore/AICore/ChatGPT/KIMI/KIMI_GPT.cs
+++ b/VideoAnalysisCore/AICore/ChatGPT/KIMI/KIMI_GPT.cs
@@ -157,12 +157,15 @@ namespace VideoAnalysisCore.AICore.ChatGPT.KIMI
                 {
                     if (item is null)
                         continue;
+                    var r = item.Content.ToEnum<TimeBaseTypeEnum>();
+                    if (r is null)
+                        continue;
                     var arr = gptRes.TimeBase?
                         .Where(s => s.Start >= item.Start && s.End <= item.End);
                     if (arr is null)
                         continue;
                     foreach (var s in arr)
-                        s.TimeBaseType = item.Content.ToEnum<TimeBaseTypeEnum>();
+                        s.TimeBaseType = r;
                 }
             var totalTokens = chatResp?.usage.total_tokens ?? 0;
             if (totalTokens > 1)
diff --git a/VideoAnalysisCore/AICore/ChatGPT/KIMI/MoonshotClient.cs b/VideoAnalysisCore/AICore/ChatGPT/KIMI/MoonshotClient.cs
index 2bf230d..fc8df02 100644
--- a/VideoAnalysisCore/AICore/ChatGPT/KIMI/MoonshotClient.cs
+++ b/VideoAnalysisCore/AICore/ChatGPT/KIMI/MoonshotClient.cs
@@ -190,6 +190,7 @@ namespace VideoAnalysisCore.AICore.ChatGPT.KIMI
                 try
                 {
                     var client = _httpClientFactory.CreateClient();
+                    client.Timeout = TimeSpan.FromSeconds(60 * 20);//超时时间20分钟
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", ApiKey);
                     var request = ToHttpRequest(path);
                     request.Content = new StringContent(json, Encoding.UTF8, "application/json");
diff --git a/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs b/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
index 658ba69..8f45e85 100644
--- a/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
+++ b/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
@@ -14,7 +14,7 @@ namespace VideoAnalysisCore.AICore.SherpaOnnx
     public  class SenseVoice
     {
         static OfflineRecognizer OR =default!;
-        static VoiceActivityDetector VAD = default!;
+        //static VoiceActivityDetector VAD = default!;
         static VadModelConfig VADModelConfig = default!;
         /// <summary>
         /// 初始化 SenseVoice
@@ -71,8 +71,6 @@ namespace VideoAnalysisCore.AICore.SherpaOnnx
             VADModelConfig = new VadModelConfig();
             VADModelConfig.SileroVad.Model = Path.Combine(AppCommon.AIModelFile, "sherpa-onnx-sense-voice-24-07-17", "silero_vad.onnx");
             VADModelConfig.Debug = 0;
-            //缓冲区大小
-            VAD = new VoiceActivityDetector(VADModelConfig, 60);
         }
 
         /// <summary>
@@ -94,6 +92,9 @@ namespace VideoAnalysisCore.AICore.SherpaOnnx
             int numIter = numSamples / windowSize;
             var totalSecond = numSamples / (float)sampleRate;
             var res = new List<SenseVoiceRes>(500);
+
+            //缓冲区大小
+            var VAD = new VoiceActivityDetector(VADModelConfig, 60);
             //var VAD = new VoiceActivityDetector(VADModelConfig, 60);
             for (int i = 0; i != numIter; ++i)
             {
@@ -173,7 +174,7 @@ namespace VideoAnalysisCore.AICore.SherpaOnnx
             int numIter = numSamples / windowSize;
             var totalSecond = numSamples / (float)sampleRate;
             var res = new List<SenseVoiceRes>(500);
-            //var VAD = new VoiceActivityDetector(VADModelConfig, 60);
+            var VAD = new VoiceActivityDetector(VADModelConfig, 60);
             for (int i = 0; i != numIter; ++i)
             {
                 int start = i * windowSize;
diff --git a/VideoAnalysisCore/Common/AppCommon.cs b/VideoAnalysisCore/Common/AppCommon.cs
index f60d690..aadfb87 100644
--- a/VideoAnalysisCore/Common/AppCommon.cs
+++ b/VideoAnalysisCore/Common/AppCommon.cs
@@ -207,9 +207,16 @@ namespace VideoAnalysisCore.Common
         /// <returns></returns>
         public static T? ToEnum<T>(this object data) where T : struct, System.Enum
         {
-            if (data is null || string.IsNullOrEmpty(data?.ToString()))
+            try
+            {
+                if (data is null || string.IsNullOrEmpty(data?.ToString()))
+                    return null;
+                return System.Enum.Parse<T>(data.ToString());
+            }
+            catch (Exception)
+            {
                 return null;
-            return System.Enum.Parse<T>(data.ToString());
+            }
         }
         /// <summary>
         /// 转化本地缓存目录
diff --git a/VideoAnalysisCore/Common/RedisExpand.cs b/VideoAnalysisCore/Common/RedisExpand.cs
index d25307c..615263a 100644
--- a/VideoAnalysisCore/Common/RedisExpand.cs
+++ b/VideoAnalysisCore/Common/RedisExpand.cs
@@ -94,7 +94,7 @@ namespace VideoAnalysisCore.Common
             Redis.Deserialize = (json, type) => System.Text.Json.JsonSerializer.Deserialize(json, type);
             Task.Run(() =>
             {
-                Task.Delay(1000 * 5);
+                Task.Delay(1000 * 10);
                 InitChannel();
             });
         }