会話フィードバック
-
-
-
-
-
-
-
-
-
-
- 会話レベル:
- ハラスメントの有無:
- ハラスメントの種類:
- 繰り返しの程度:
- 会話の心地よさ:
-
- 非難またはハラスメントの程度:
-
- 録音した音声を送信する準備ができました。
+ + + + + diff --git a/requirements.txt b/requirements.txt index 37b3286e5b67790ce79d3e3931a53922569b16f9..eea8b236d32deaa9a919bb7dfb0134dba7aa98b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1 @@ -Flask==2.2.5 -Flask-WTF -pyannote.audio==2.1.1 -numpy==1.23.5 -pydub==0.25.1 -matplotlib==3.6.3 -python-dotenv -uwsgi -Flask-SQLAlchemy==3.0.5 -PyMySQL -Flask-Login==0.6.3 -requests==2.32.3 -google-auth==2.38.0 -google-auth-oauthlib==1.2.1 -google-auth-httplib2==0.2.0 -faster-whisper -Flask-Migrate -requests -Flask-CORS +Flask diff --git a/room.js b/room.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/sample.wav b/sample.wav deleted file mode 100644 index 92911c5e03f43a06fab2d7d47fabde2dcf486868..0000000000000000000000000000000000000000 --- a/sample.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f64da9fcf28836e98f50ac7a9ce3c213c186a9d444f295e5bd6a66b5b26d8c5 -size 882044 diff --git a/static/feedback.js b/static/feedback.js deleted file mode 100644 index e8e366a206304260a0278ec24d4e64bd88be4d27..0000000000000000000000000000000000000000 --- a/static/feedback.js +++ /dev/null @@ -1,66 +0,0 @@ -async function getTranscription() { - try { - const response = await fetch("/transcription"); - if (!response.ok) { - throw new Error("HTTP error! status: ${response.status}"); - } - const data = await response.json(); - const results = data.response; - } catch (error) { - console.error("Failed to fetch transcription", error); - } -} - -async function getAnalysis() { - const loader = document.getElementById("loader"); - loader.style.display = "block"; - try { - await getTranscription(); - - const response = await fetch("/analyze"); - if (!response.ok) { - throw new Error(`HTTP error! status: ${response.status}`); - } - - const data = await response.json(); - console.log("分析データ取得:", data); // ←構造確認用 - const results = data.results; - const analysis = results.deepseek_analysis; - - // 変数に格納 - const conversationLevel = analysis.conversationLevel; - const harassmentPresent = analysis.harassmentPresent; - const harassmentType = analysis.harassmentType; - const repetition = analysis.repetition; - const pleasantConversation = analysis.pleasantConversation; - const blameOrHarassment = analysis.blameOrHarassment; - - loader.style.display = "none"; - // DOMに表示 - document.getElementById( - "level" - ).innerText = `会話レベル: ${conversationLevel}`; - document.getElementById( - "Harassment_bool" - ).innerText = `ハラスメントの有無: ${harassmentPresent}`; - document.getElementById( - "Harassment_type" - ).innerText = `ハラスメントの種類: ${harassmentType}`; - document.getElementById( - "Harassment_loop" - ).innerText = `繰り返しの程度: ${repetition}`; - document.getElementById( - "Harassment_comfort" - ).innerText = `会話の心地よさ: ${pleasantConversation}`; - document.getElementById( - "Harassment_volume" - ).innerText = `非難またはハラスメントの程度: ${blameOrHarassment}`; - } catch (error) { - loader.style.display = "none"; - console.error("Failed to fetch analysis data:", error); - } -} - -window.onload = () => { - getAnalysis(); -}; diff --git a/static/loading.css b/static/loading.css deleted file mode 100644 index 7b41799bd554a5edb58618132319551deed3fcd4..0000000000000000000000000000000000000000 --- a/static/loading.css +++ /dev/null @@ -1,56 +0,0 @@ -.loader { - position: absolute; - top: calc(50% - 32px); - left: calc(50% - 32px); - width: 64px; - height: 64px; -} - -.loader div { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - border-radius: 50%; - box-sizing: border-box; - opacity: 0.8; -} - -.one { - border-top: 1px solid #8834e8; - animation: rotate-left 1s linear infinite; -} - -.two { - border-right: 1px solid #a28ecb; - animation: rotate-right 1s linear infinite; -} - -.three { - border-bottom: 1px solid #ffd933; - animation: rotate-right 1s linear infinite; -} - -.four { - border-left: 1px solid #ff7f00; - animation: rotate-right 1s linear infinite; -} - -@keyframes rotate-left { - 0% { - transform: rotate(360deg); - } - 100% { - transform: rotate(0deg); - } -} - -@keyframes rotate-right { - 0% { - transform: rotate(0deg); - } - 100% { - transform: rotate(360deg); - } -} diff --git a/static/loading.js b/static/loading.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/static/main.css b/static/main.css deleted file mode 100644 index ea7842cf1909e1a61d8f7d140b7b90fccab16420..0000000000000000000000000000000000000000 --- a/static/main.css +++ /dev/null @@ -1,40 +0,0 @@ -/* Responsive Design */ -@media (max-width: 640px) { - .w-72 { - width: 95%; - } - .h-72 { - height: 350px; - } - } - /* Main Container */ - body { - background: linear-gradient(135deg, #2c3e50, #1f2937); - display: flex; - align-items: center; - justify-content: center; - min-height: 100vh; - font-family: "Arial", sans-serif; - color: #fff; - } - - /* Main Content Wrapper */ - .main-content { - border: 5px solid rgba(255, 255, 255, 0.2); - padding: 2rem; - border-radius: 1rem; - width: 90%; - max-width: 500px; - background-color: rgba(0, 0, 0, 0.3); - box-shadow: 0 10px 20px rgba(0, 0, 0, 0.4); - text-align: center; - } - - /* Title */ - .main-title { - font-size: 2.5rem; - font-weight: bold; - margin-bottom: 1.5rem; - color: #fff; - text-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); - } diff --git a/static/menu.css b/static/menu.css deleted file mode 100644 index 4d4c824ec410f3a9963223c3e76577a12c0a257b..0000000000000000000000000000000000000000 --- a/static/menu.css +++ /dev/null @@ -1,56 +0,0 @@ -/* Hamburger Menu Styles */ -#menu { - position: absolute; - top: 0; - left: 0; - z-index: 10; - transform: translateX(-100%); - visibility: hidden; - opacity: 0; - background-color: rgb(31, 41, 55); - transition: transform 0.3s ease-in-out, opacity 0.3s ease-in-out; - backdrop-filter: blur(10px); - border-right: 1px solid rgba(255, 255, 255, 0.2); - } - - #menu.open { - transform: translateX(0); - visibility: visible; - opacity: 1; - } - - #menu button { - transition: background-color 0.2s ease; - background-color: rgba(0, 0, 0, 0.1); - margin: 2px; - border-radius: 8px; /* 少し角を丸める */ - display: flex; - align-items: center; - justify-content: flex-start; - gap: 10px; - padding: 0.75rem 1rem; - width: 100%; - text-align: left; - border: none; - color: #fff; - font-size: 1rem; - cursor: pointer; - } - - #menu button:hover { - background-color: rgba(55, 65, 81, 0.7); - } - - /* Hamburger Menu Button */ - #menuButton { - background-color: rgba(255, 255, 255, 0.1); - border: none; - border-radius: 50%; - padding: 0.75rem; /* サイズを少し大きく */ - cursor: pointer; - transition: background-color 0.2s ease; - } - - #menuButton:hover { - background-color: rgba(255, 255, 255, 0.2); - } \ No newline at end of file diff --git a/static/menu.js b/static/menu.js deleted file mode 100644 index 3da358e8a0dbed9e9202eafc32220dbc2ca88b37..0000000000000000000000000000000000000000 --- a/static/menu.js +++ /dev/null @@ -1,53 +0,0 @@ - // Show user registration page - function showUserRegister() { - fetch("/reset"); - window.location.href = "userregister"; - } -// メンバー選択画面表示 - function showUserSelect() { - window.location.href = "/userselect"; - } - // Show recorder page - function showRecorder() { - window.location.href = "index"; - } - - // Show results page - function showResults() { - window.location.href = "feedback"; - } - - // Show talk detail page - function showTalkDetail() { - window.location.href = "talk_detail"; - } - - // Reset action page - function resetAction() { - window.location.href = "reset_html"; - } - - // Toggle hamburger menu visibility - function toggleMenu(event) { - event.stopPropagation(); // Prevents click event from propagating to the document - const menu = document.getElementById("menu"); - menu.classList.toggle("open"); - } - - // Close the menu if clicked outside - function closeMenu(event) { - const menu = document.getElementById("menu"); - if ( - menu.classList.contains("open") && - !menu.contains(event.target) && - !event.target.closest("#menuButton") - ) { - menu.classList.remove("open"); - } - } - - // Add event listener for closing the menu when clicking outside - document.addEventListener("click", closeMenu); - - // Show recorder page 名前に気を付けて！ - document.getElementById("add-btn").addEventListener("click", showRecorder); \ No newline at end of file diff --git a/static/process.js b/static/process.js deleted file mode 100644 index 1254bd55f3ecf43f253c96b135b12115d6a51df6..0000000000000000000000000000000000000000 --- a/static/process.js +++ /dev/null @@ -1,222 +0,0 @@ - - let isRecording = false; - let mediaRecorder; - let audioChunks = []; - let recordingInterval; - let count_voice = 0; - let before_rate = []; - const RECORDING_INTERVAL_MS = 5000; // 5秒 - // メンバーとチャートの初期化 - let members = []; - let voiceData = []; - let baseMemberColors = ["#4caf50", "#007bff", "#ffc107", "#dc3545", "#28a745", "#9c27b0", "#ff9800"]; - // Chart.js の初期化 - const ctx = document.getElementById("speechChart").getContext("2d"); - const speechChart = new Chart(ctx, { - type: "doughnut", - data: { - labels: members, - datasets: [ - { - data: voiceData, - backgroundColor: getMemberColors(members.length), - }, - ], - }, - options: { - responsive: true, - plugins: { - legend: { - display: true, - position: "bottom", - labels: { color: "white" }, - }, - }, - }, - }); - // サーバーからメンバー情報を取得してチャートを更新する関数 - async function updateChartFrom() { - try { - const response = await fetch("/confirm"); - if (!response.ok) { - throw new Error(`HTTP error! status: ${response.status}`); - } - const data = await response.json(); - if (!data || !data.members || !Array.isArray(data.members)) { - console.error("Invalid member data received:", data); - members = ["member1"]; - voiceData = [50, 50]; - updateChart(); - return; - } - members = data.members; - voiceData = []; - for (let i = 0; i < members.length; i++) { - voiceData.push(100 / members.length); - } - updateChart(); - } catch (error) { - console.error("Failed to fetch member data:", error); - members = ["member1"]; - voiceData = [50, 50]; - updateChart(); - } - } - function updateChart() { - // 一人モードの場合は、ユーザーとグレー（無音）の比率をチャートに表示 - if (members.length === 1) { - const userName = members[0]; - speechChart.data.labels = [userName, "無音"]; - speechChart.data.datasets[0].backgroundColor = ["#4caf50", "#757575"]; - } else { - // 複数メンバーの場合は通常通りの処理 - speechChart.data.labels = members; - speechChart.data.datasets[0].backgroundColor = getMemberColors(members.length); - } - speechChart.data.datasets[0].data = voiceData; - speechChart.update(); - } - - // ページ読み込み時にチャート情報を更新 - updateChartFrom(); - // 録音ボタンの録音開始／停止処理 - async function toggleRecording() { - const recordButton = document.getElementById("recordButton"); - if (!isRecording) { - // 録音開始 - isRecording = true; - recordButton.classList.add("recording"); - try { - const stream = await navigator.mediaDevices.getUserMedia({ audio: true }); - mediaRecorder = new MediaRecorder(stream); - audioChunks = []; - mediaRecorder.ondataavailable = (event) => { - if (event.data.size > 0) { - audioChunks.push(event.data); - } - }; - mediaRecorder.onstop = () => { - sendAudioChunks([...audioChunks]); - audioChunks = []; - }; - mediaRecorder.start(); - // 5秒ごとに録音を停止して送信するインターバルを設定 - recordingInterval = setInterval(() => { - if (mediaRecorder && mediaRecorder.state === "recording") { - mediaRecorder.stop(); - mediaRecorder.start(); - } - }, RECORDING_INTERVAL_MS); - } catch (error) { - console.error("マイクへのアクセスに失敗しました:", error); - isRecording = false; - recordButton.classList.remove("recording"); - } - } else { - // 録音停止 - isRecording = false; - recordButton.classList.remove("recording"); - if (mediaRecorder && mediaRecorder.state === "recording") { - mediaRecorder.stop(); - } - clearInterval(recordingInterval); - count_voice = 0; - //before_rate = []; - } - } - function sendAudioChunks(chunks) { - const audioBlob = new Blob(chunks, { type: "audio/wav" }); - const reader = new FileReader(); - reader.onloadend = () => { - const base64String = reader.result.split(",")[1]; - const form = document.getElementById("recordForm"); - const nameInput = form.querySelector('input[name="name"]'); - const name = nameInput ? nameInput.value : "unknown"; - fetch("/upload_audio", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ audio_data: base64String, name: name }), - }) - .then((response) => response.json()) - .then((data) => { - if (data.error) { - alert("エラー: " + data.error); - console.error(data.details); - } else if (data.rate !== undefined) { - updateChartData(data.rate); - } else if (data.rates !== undefined) { - updateChartData(data.rates); - } - }) - .catch((error) => { - console.error("エラー:", error); - }); - }; - reader.readAsDataURL(audioBlob); - } - function getMemberColors(memberCount) { - // 一人モードの場合は特別な処理をしない（updateChartで処理するため） - if (memberCount <= 1) { - return ["#4caf50", "#757575"]; - } else { - let colors = []; - for (let i = 0; i < memberCount; i++) { - colors.push(baseMemberColors[i % baseMemberColors.length]); - } - return colors; - } - } - function updateChartData(newRate) { - // 一人モードの時の処理 - if (members.length === 1) { - if (count_voice === 0) { - speechChart.data.datasets[0].data = [newRate, 100 - newRate]; - before_rate = [newRate]; - } else { - // 一人モードでは、過去のデータと現在のデータを加重平均する - let tmp_rate = (newRate + before_rate[0] * count_voice) / (count_voice + 1); - speechChart.data.datasets[0].data = [tmp_rate, 100 - tmp_rate]; - before_rate = [tmp_rate]; - } - count_voice++; - // 一人モードでは常に緑色とグレーの組み合わせを使用 - speechChart.data.labels = [members[0], "無音"]; - speechChart.data.datasets[0].backgroundColor = ["#4caf50", "#757575"]; - } else { - console.log(before_rate) - // 複数人モードの処理 - if (!Array.isArray(newRate)) { - console.error("newRate is not an array:", newRate); - return; - } - if (newRate.length !== members.length) { - console.error( - "newRate length does not match members length:", - newRate, - members - ); - return; - } - let averagedRates = new Array(newRate.length); - for (let i = 0; i < newRate.length; i++) { - let tmp_rate; - if (count_voice === 0) { - // 初回はそのまま - tmp_rate = newRate[i]; - } else { - // 2回目以降は、過去の平均値と現在の値を加重平均する - tmp_rate = (newRate[i] + before_rate[i] * count_voice) / (count_voice + 1); - } - averagedRates[i] = tmp_rate; - } - // before_rateを更新 - before_rate = averagedRates; - //グラフに反映 - speechChart.data.datasets[0].data = averagedRates; - count_voice++; - speechChart.data.datasets[0].backgroundColor = getMemberColors( - members.length - ); - } - speechChart.update(); - } \ No newline at end of file diff --git a/static/process1.js b/static/process1.js deleted file mode 100644 index 9bce589a125108d6d140487ae8ec1234e734ef3b..0000000000000000000000000000000000000000 --- a/static/process1.js +++ /dev/null @@ -1,294 +0,0 @@ -let allUsers = []; -let selectedUsers = []; -let userToDelete = null; - -// ページ読み込み時にユーザーリストを取得 -document.addEventListener('DOMContentLoaded', fetchUserList); - -// ユーザーリスト取得 - Flask APIの変更に合わせて修正 -function fetchUserList() { - fetch('/list_base_audio') - .then(response => response.json()) - .then(data => { - if (data.status === 'success' && Array.isArray(data.id)) { - // APIの変更: data.fileNames → data.id - allUsers = data.id; - renderUserList(allUsers); - } else { - showError('メンバーリストの取得に失敗しました'); - } - }) - .catch(error => { - console.error('Error fetching user list:', error); - showError('サーバーとの通信中にエラーが発生しました'); - }); -} - -// ユーザーリストの表示 -function renderUserList(users) { - const userListElement = document.getElementById('userList'); - - if (!users || users.length === 0) { - userListElement.innerHTML = ` -登録されているメンバーがいません。
-「新規登録」から音声を登録してください。
-${message}
- -メンバー「${userToDelete}」を削除中...
-メンバーリストを読み込み中...
-