From 78ee057a99e8fb3c6ef9c0520a6bbd8c0f651cec Mon Sep 17 00:00:00 2001
From: shixian.shi <shixian.shi@alibaba-inc.com>
Date: 星期二, 06 二月 2024 17:38:58 +0800
Subject: [PATCH] update for funasr-app and bug fix

---
 funasr/auto/auto_model.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index 3829bca..8e00703 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -385,11 +385,11 @@
                 result["text"] = punc_res[0]["text"]
                 
             # speaker embedding cluster after resorted
-            if self.spk_model is not None:
+            if self.spk_model is not None and kwargs.get('return_spk_res', True):
                 all_segments = sorted(all_segments, key=lambda x: x[0])
                 spk_embedding = result['spk_embedding']
-                labels = self.cb_model(spk_embedding.cpu(), oracle_num=kwargs['preset_spk_num'])
-                del result['spk_embedding']
+                labels = self.cb_model(spk_embedding.cpu(), oracle_num=kwargs.get('preset_spk_num', None))
+                # del result['spk_embedding']
                 sv_output = postprocess(all_segments, None, labels, spk_embedding.cpu())
                 if self.spk_mode == 'vad_segment':  # recover sentence_list
                     sentence_list = []
@@ -409,6 +409,7 @@
                                                         result['timestamp'], \
                                                         result['raw_text'])
                 result['sentence_info'] = sentence_list
+            del result['spk_embedding']
                     
             result["key"] = key
             results_ret_list.append(result)

--
Gitblit v1.9.1