merge fixTranscription

app.py

@@ -13,13 +13,13 @@ transcripter = TranscriptionMaker()
 app = Flask(__name__)
 
 users = []
-segments_dir = ""
 transcription_text=""
 harassment_keywords = [
         "バカ", "馬鹿", "アホ", "死ね", "クソ", "うざい",
         "きもい", "キモい", "ブス", "デブ", "ハゲ",
         "セクハラ", "パワハラ", "モラハラ"
     ]
+total_audio = ""
 
 # トップページ（テンプレート: index.html）
 @app.route('/')
@@ -32,7 +32,6 @@ def index():
 def feedback():
     return render_template('feedback.html')
 
-
 # 会話詳細画面（テンプレート: talkDetail.html）
 @app.route('/talk_detail', methods=['GET', 'POST'])
 def talk_detail():
@@ -53,12 +52,15 @@ def confirm():
 def reset_html():
     return render_template('reset.html')
 
-#メンバー削除
+#メンバー削除&累積音声削除
 @app.route('/reset_member', methods=['GET', 'POST'])
 def reset_member():
     global users  # ←これを追加！
     #data = request.get_json()
     #name = data['name']  # 名前を取得
+    global total_audio
+    print(total_audio)
+    process.delete_files_in_directory(total_audio)
     base_audio_dir = "/tmp/data/base_audio"
     for name in users:
         file_path = os.path.join(base_audio_dir, f"{name}.wav")
@@ -76,10 +78,11 @@ def reset_member():
 # 書き起こし作成エンドポイント
 @app.route('/transcription',methods =['GET','POST'])
 def transcription():
-    global segments_dir
     global transcription_text
+    global total_audio
+    print(total_audio)
     try:
-        transcription_text = transcripter.create_transcription(segments_dir)
+        transcription_text = transcripter.create_transcription(total_audio)
         print(transcription_text)
         with open(transcription_text,'r',encoding='utf-8') as file:
             file_content = file.read()
@@ -123,7 +126,7 @@ def analyze():
 # 音声アップロード＆解析エンドポイント
 @app.route('/upload_audio', methods=['POST'])
 def upload_audio():
-    global segments_dir
+    global total_audio
     try:
         data = request.get_json()
         # name か users のいずれかが必須。どちらも無い場合はエラー
@@ -153,23 +156,27 @@ def upload_audio():
         if len(users) > 1:
             print("複数人の場合の処理")
             matched_times, segments_dir = process.process_multi_audio(reference_paths, audio_path, threshold=0.05)
+            total_audio = transcripter.merge_segments(segments_dir)
             # 各メンバーのrateを計算
             total_time = sum(matched_times)
             rates = [(time / total_time) * 100 if total_time > 0 else 0 for time in matched_times]
             return jsonify({"rates": rates}), 200
         else:
             matched_time, unmatched_time, segments_dir = process.process_audio(reference_paths[0], audio_path, threshold=0.05)
+            total_audio = transcripter.merge_segments(segments_dir)
             total_time = matched_time + unmatched_time
             rate = (matched_time / total_time) * 100 if total_time > 0 else 0
             return jsonify({"rate": rate}), 200
     except Exception as e:
         print("Error in /upload_audio:", str(e))
         return jsonify({"error": "サーバーエラー", "details": str(e)}), 500
+    
 @app.route('/reset', methods=['GET'])
 def reset():
     global users
     users=[]
     return 200
+
 @app.route('/upload_base_audio', methods=['POST'])
 def upload_base_audio():
     global users#グローバル変数を編集できるようにする

process.py

@@ -58,15 +58,7 @@ class AudioProcessor():
         embedding2 = self.inference(path2)
         return float(self.cosine_similarity(embedding1.data.flatten(), embedding2.data.flatten()))
     
-    def generate_random_string(self,length):
-        letters = string.ascii_letters + string.digits
-        return ''.join(random.choice(letters) for i in range(length))
-
-    def generate_filename(self,random_length):
-        random_string = self.generate_random_string(random_length)
-        current_time = datetime.now().strftime("%Y%m%d%H%M%S")
-        filename = f"{current_time}_{random_string}.wav"
-        return filename
+
     
     def process_audio(self, reference_path, input_path, output_folder='/tmp/data/matched_segments', seg_duration=1.0, threshold=0.5):
         # 出力先ディレクトリの中身をクリアする
@@ -182,4 +174,17 @@ class AudioProcessor():
             print(f"File Not Found Error: {e}")
         except Exception as e:
             print(f"Unexpected Error: {e}")
-        return None
+        return None
+
+    def delete_files_in_directory(self,directory_path):
+        try:
+            # ディレクトリ内のすべてのファイルを取得
+            for filename in os.listdir(directory_path):
+                file_path = os.path.join(directory_path, filename)
+                # ファイルのみ削除する
+                if os.path.isfile(file_path):
+                    os.remove(file_path)
+                    print(f"{file_path} を削除しました")
+        except Exception as e:
+            print(f"エラーが発生しました: {e}")
+        

templates/talkDetail.html

@@ -43,17 +43,21 @@
           if (!response.ok) throw new Error("データ取得に失敗しました。");
 
           const data = await response.json();
-          const conversations = data.conversations;
+          const conversations = data.transcription;
 
-          if (!Array.isArray(conversations)) {
+          if (!data || !data.transcription) {
             throw new Error("会話データが見つかりませんでした。");
           }
+          /*
           const formattedText = conversations
 
             .map((conv) => `【${conv.speaker}】 ${conv.text}`)
             .join("\n");
           console.log("フォーマットテキスト:", formattedText);
           transcriptionElement.textContent = formattedText;
+          */
+         transcriptionElement.textContent = conversations;
+         console.log(conversations);
         } catch (error) {
           transcriptionElement.textContent = `エラー: ${error.message}`;
           console.error("データ取得エラー:", error);

transcription.py

@@ -1,6 +1,9 @@
 import os
 from faster_whisper import WhisperModel
 from pydub import AudioSegment
+import string
+import random
+from datetime import datetime
 
 # Matplotlibのキャッシュディレクトリを変更
 os.environ["MPLCONFIGDIR"] = "/tmp/matplotlib"
@@ -18,10 +21,9 @@ class TranscriptionMaker():
 
 
     #音声ファイルのディレクトリを受け取り、書き起こしファイルを作成する
-    def create_transcription(self,segments_directory):
+    def create_transcription(self,audio_directory):
         results = []
-        #細切れ音声をくっつける
-        audio_directory = self.merge_segments(segments_directory)
+
         #ディレクトリ内のファイルを全て取得
         if not os.path.isdir(audio_directory):
             raise ValueError(f"The specified path is not a valid directory: {audio_directory}")
@@ -53,7 +55,7 @@ class TranscriptionMaker():
         return output_file
     
     #ファイル名が連続しているならくっつける
-    def merge_segments(self,segments_dir,output_dir = "/tmp/data/merged_audio"):
+    def merge_segments(self,segments_dir,output_dir = "/tmp/data/merged_segment"):
         if not os.path.exists(output_dir):
             os.makedirs(output_dir, exist_ok=True)
 
@@ -90,7 +92,17 @@ class TranscriptionMaker():
                 segment = AudioSegment.from_file(file_path)
                 combined_audio += segment
             # 出力ファイル名を設定して保存
-            output_file = os.path.join(output_dir, f'merged_{i}.wav')
+            output_file = os.path.join(output_dir, self.generate_filename(3))
             combined_audio.export(output_file, format='wav')
 
-        return output_dir
+        return output_dir
+    
+    def generate_random_string(self,length):
+        letters = string.ascii_letters + string.digits
+        return ''.join(random.choice(letters) for i in range(length))
+
+    def generate_filename(self,random_length):
+        random_string = self.generate_random_string(random_length)
+        current_time = datetime.now().strftime("%Y%m%d%H%M%S")
+        filename = f"{current_time}_{random_string}.wav"
+        return filename