Upload app.py

app.py

@@ -4,14 +4,11 @@ from pydub import AudioSegment  # 変換用にpydubをインポート
 import os
 import shutil
 from process import AudioProcessor
-from transcription import TranscriptionMaker
 
 process=AudioProcessor()
-transcription = TranscriptionMaker()
 app = Flask(__name__)
 
 users = []
-segments_dir = ""
 
 # トップページ（テンプレート: index.html）
 @app.route('/')
@@ -24,6 +21,7 @@ def index():
 def feedback():
     return render_template('feedback.html')
 
+
 # 会話詳細画面（テンプレート: talkDetail.html）
 @app.route('/talk_detail', methods=['GET', 'POST'])
 def talk_detail():
@@ -38,17 +36,11 @@ def userregister():
 def confirm():
     return jsonify({'members': users}), 200
 
-# 書き起こし作成エンドポイント
-@app.route('/transcription',methods =['GET','POST'])
-def transcription():
-    global segments_dir
-    text = transcription.create_transcription(segments_dir)
-    return jsonify({'transcription': text}),200
+
 
 # 音声アップロード＆解析エンドポイント
 @app.route('/upload_audio', methods=['POST'])
 def upload_audio():
-    global segments_dir
     try:
         data = request.get_json()
         # name か users のいずれかが必須。どちらも無い場合はエラー
@@ -58,8 +50,6 @@ def upload_audio():
         # Base64デコードして音声バイナリを取得
         audio_binary = base64.b64decode(data['audio_data'])
         
-        
-       
         upload_name = 'tmp'
         audio_dir = "/tmp/data"
         os.makedirs(audio_dir, exist_ok=True)
@@ -79,13 +69,16 @@ def upload_audio():
         # 複数人の場合は参照パスのリストを、1人の場合は単一のパスを渡す
         if len(users) > 1:
             print("複数人の場合の処理")
-            matched_time, unmatched_time,segments_dir = process.process_multi_audio(reference_paths, audio_path, threshold=0.05)
+            matched_times = process.process_multi_audio(reference_paths, audio_path, threshold=0.05)
+            # 各メンバーの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_time = matched_time + unmatched_time
-        rate = (matched_time / total_time) * 100 if total_time > 0 else 0
-        return jsonify({"rate": rate}), 200
+            matched_time, unmatched_time = process.process_audio(reference_paths[0], audio_path, threshold=0.05)
+            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