校正ボタン

app.py

@@ -59,5 +59,5 @@ async def unify_chat_completions(request: Request, body: dict = Body(...)):
                     raise HTTPException(status_code=response.status_code, detail=response.text)
                 async for chunk in response.aiter_bytes():
                     yield chunk
+    return StreamingResponse(stream_response(), media_type="text/event-stream")
 
-    return StreamingResponse(stream_response(), media_type="text/event-stream")

gemini.js

@@ -2,6 +2,55 @@ let lastSaveTimestamp = 0;
 let controller;
 let lastTokenUpdateTimestamp = 0;
 let summeries = {};
+let lastIndexUpdateTimestamp = 0;
+
+function replaceProofRead(textarea, proofReadText) {
+    let novelContent1TextLines   = document.getElementById("novelContent1").value.split("\n");
+    let proofReadTextLines = proofReadText.split("\n");
+    let textareaTextLines = textarea.value.split("\n");
+    let start = novelContent1TextLines.indexOf(textareaTextLines[0]);
+    let end = novelContent1TextLines.indexOf(textareaTextLines[textareaTextLines.length - 1]);
+    console.log(start, end);
+    // novelContent1TextLinesから該当部分を削除し、proofReadTextLinesを挿入
+    novelContent1TextLines.splice(start, end - start + 1, ...proofReadTextLines);
+    
+    // 更新された内容をnovelContent1に反映
+    document.getElementById("novelContent1").value = novelContent1TextLines.join("\n");
+    
+    // textareaの内容も更新
+    textarea.value = proofReadTextLines.join("\n");
+    
+    console.log("校正が完了しました。");
+}
+
+
+async function proofRead(textarea) {
+    let content = textarea.value;
+    const ENDPOINT = `https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro-002:generateContent?key=${document.getElementById('geminiApiKey').value}`;
+    let prompt = `以下の文章を校正してください。文法がおかしい、誤字脱字、冗長な表現などを校正するのみに留め、内容は一切変更しないでください。\n\n${content}`;
+    const payload = {
+        method: 'POST',
+        headers: {},
+        body: JSON.stringify({
+            contents: [{ parts: [{ text: prompt }] }],
+        })
+    };
+    let proofReadText;
+    const response = await fetch(ENDPOINT, payload);
+    try{
+        const data = await response.json();
+        proofReadText = data.candidates[0].content.parts[0].text;
+    } catch (error) {
+        console.error('校正エラー:', error);
+        return '';
+    }
+    if (proofReadText) {
+        return replaceProofRead(textarea, proofReadText);
+    } else {
+        return '';
+    }
+}
+
 
 function formatText() {
     const textOrg = document.getElementById('novelContent1').value;
@@ -104,7 +153,7 @@ function saveToJson() {
 function loadFromJson() {
     const fileInput = document.createElement('input');
     fileInput.type = 'file';
-    fileInput.accept = '.json';
+    fileInput.accept = '.json,.txt';
     fileInput.style.display = 'none';
     document.body.appendChild(fileInput);
     fileInput.addEventListener('change', function (event) {
@@ -112,26 +161,32 @@ function loadFromJson() {
         if (file) {
             const reader = new FileReader();
             reader.onload = function (e) {
-                try {
-                    const jsonData = JSON.parse(e.target.result);
-                    if (jsonData.novelContent1) {
-                        document.getElementById('novelContent1').value = jsonData.novelContent1;
-                    }
-                    if (jsonData.novelContent2) {
-                        document.getElementById('novelContent2').value = jsonData.novelContent2;
-                    }
-                    if (jsonData.generatePrompt) {
-                        document.getElementById('generatePrompt').value = jsonData.generatePrompt;
-                    }
-                    if (jsonData.nextPrompt) {
-                        document.getElementById('nextPrompt').value = jsonData.nextPrompt;
-                    }
-                    if (jsonData.savedTitle) {
-                        document.getElementById('savedTitle').value = jsonData.savedTitle;
+                if (file.name.endsWith('.txt')) {
+                    document.getElementById('novelContent1').value = e.target.result;
+                    alert('テキストファイルを正常に読み込みました');
+                } else {
+                    try {
+                        const jsonData = JSON.parse(e.target.result);
+                        if (jsonData.novelContent1) {
+                            document.getElementById('novelContent1').value = jsonData.novelContent1;
+                        }
+                        if (jsonData.novelContent2) {
+                            document.getElementById('novelContent2').value = jsonData.novelContent2;
+                        }
+                        if (jsonData.generatePrompt) {
+                            document.getElementById('generatePrompt').value = jsonData.generatePrompt;
+                        }
+                        if (jsonData.nextPrompt) {
+                            document.getElementById('nextPrompt').value = jsonData.nextPrompt;
+                        }
+                        if (jsonData.savedTitle) {
+                            document.getElementById('savedTitle').value = jsonData.savedTitle;
+                        }
+                        generateIndexMenu(true);
+                        alert('JSONファイルを正常に読み込みました');
+                    } catch (error) {
+                        alert('無効なJSONファイルです。');
                     }
-                    alert('JSONファイルを正常読み込みました');
-                } catch (error) {
-                    alert('無効なJSONファイルです。');
                 }
             };
             reader.readAsText(file);
@@ -490,8 +545,8 @@ function createOpenAIPayload() {
         method: 'POST',
         headers: JSON.parse(document.getElementById('openaiHeaders').value),
         body: JSON.stringify(jsonBody),
-        mode: 'cors',  // CORSモードを追加
-        credentials: 'same-origin'  // 必要に応じて認証情報を含める
+        mode: 'cors',
+        credentials: 'same-origin'
     };
 }
 
@@ -500,16 +555,11 @@ function fetchOpenAIStream(ENDPOINT, payload) {
     updateRequestButtonState('generating');
     controller = new AbortController();
     const signal = controller.signal;
-
-    fetch(ENDPOINT, {
-        ...payload,
-        signal,
-        mode: 'cors',  // CORSモードを追加
-        credentials: 'same-origin'  // 必要に応じて認証情報を含める
-    })
+    payload.signal = signal;
+    fetch(ENDPOINT, payload)
         .then(response => {
             if (!response.ok) {
-                throw new Error('ネットワークの応答が正常ではありません');
+                throw new Error('ネットワークの応答が常ではありません');
             }
             const reader = response.body.getReader();
             const decoder = new TextDecoder();
@@ -578,11 +628,9 @@ async function fetchOpenAINonStream(ENDPOINT, payload) {
     const novelContent2 = document.getElementById('novelContent2');
     updateRequestButtonState('generating');
     try {
-        const response = await fetch(ENDPOINT, {
-            ...payload,
-            mode: 'cors',
-            credentials: 'same-origin'
-        });
+        const signal = controller.signal;
+        payload.signal = signal;
+        const response = await fetch(ENDPOINT, payload);
         const data = await response.json();
         if (data && data.choices && data.choices[0].message && data.choices[0].message.content) {
             novelContent2.value += data.choices[0].message.content;
@@ -604,15 +652,20 @@ async function tokenCount() {
         "contents": JSON.parse(payload.body).contents
     };
     payload.body = JSON.stringify(payload.body);
-    const ENDPOINT = `https://generativelanguage.googleapis.com/v1beta/${selectedEndpoint}:countTokens?key=` + document.getElementById('geminiApiKey').value;
-    try {
-        const response = await fetch(ENDPOINT, payload);
-        const data = await response.json();
-        return data.totalTokens;
-    } catch (error) {
-        console.error('エラー:', error);
-        return null;
+    if (selectedEndpoint.startsWith('models/gemini')) {
+        const ENDPOINT = `https://generativelanguage.googleapis.com/v1beta/${selectedEndpoint}:countTokens?key=` + document.getElementById('geminiApiKey').value;
+        try {
+            const response = await fetch(ENDPOINT, payload);
+            const data = await response.json();
+            return data.totalTokens;
+        } catch (error) {
+            console.error('エラー:', error);
+            return null;
+        }
+    } else {
+        return -1;
     }
+
 }
 
 async function createDraft() {
@@ -626,6 +679,7 @@ async function createDraft() {
 
 
 async function Request() {
+    generateIndexMenu(true);
     let selectedEndpoint = document.getElementById('endpointSelect').value;
     const requestButton = document.getElementById('requestButton');
     requestButton.disabled = true;
@@ -705,7 +759,6 @@ async function Request() {
     }
 
     let stream = document.getElementById('streamToggle').checked;
-
     if (stream) {
         if (selectedEndpoint.startsWith('models/gemini')) {
             ENDPOINT = ENDPOINT.replace(':generateContent', ':streamGenerateContent') + '&alt=sse';
@@ -815,7 +868,7 @@ function moveToInput() {
     if (content1Lines[content1Lines.length - 1] === content2Lines[0]) {
         content2Lines.shift();
     } else {
-        // 部分的な重複を検出して削除
+        // 分的な重複を検出して削除
         const lastLine = content1Lines[content1Lines.length - 1];
         const firstLine = content2Lines[0];
         const overlapIndex = firstLine.indexOf(lastLine);
@@ -870,7 +923,14 @@ async function updateTokenCount(force = false) {
     lastTokenUpdateTimestamp = currentTime;
 }
 
-function generateIndexMenu() {
+function generateIndexMenu(force = false) {
+    const currentTime = Date.now();
+    if (currentTime - lastIndexUpdateTimestamp < 60000 && !force) {
+        console.debug('目次更新をスキップします');
+        return;
+    }
+    console.debug('目次更新を実行します');
+
     const content = document.getElementById('novelContent1').value;
     const tokens = marked.lexer(content);
     const indexOffcanvasBody = document.querySelector('#indexOffcanvas .offcanvas-body');
@@ -940,8 +1000,8 @@ function generateIndexMenu() {
         indexOffcanvasBody.textContent = '目次がありません';
     }
 
-    updateAllAccordionHeaderCounts();
-    updateTokenCount(false);
+    updateTokenCount(force);
+    lastIndexUpdateTimestamp = currentTime;
 }
 
 function toggleSubMenu(li) {
@@ -954,27 +1014,27 @@ function toggleSubMenu(li) {
 
 function addTextarea(ul, content) {
     const li = document.createElement('li');
-    
+
     // テキストエリアの作成
     const textarea = document.createElement('textarea');
     textarea.readOnly = true;
     textarea.className = 'form-control mt-2 full-text';
     textarea.value = content;
     textarea.rows = 3;
-    
+
     // 要約用のテキストエリアの作成
     const summaryInput = document.createElement('textarea');
     summaryInput.className = 'form-control mt-2 summery-text';
     summaryInput.placeholder = '要約';
     summaryInput.rows = 3;
-    if(summeries[content]) {
+    if (summeries[content]) {
         summaryInput.value = summeries[content];
     }
-    
+
     // ボタン用のコンテナ作成
     const buttonContainer = document.createElement('div');
     buttonContainer.className = 'mt-2';
-    
+
     // 要約取得ボタンの作成
     const summaryButton = document.createElement('button');
     summaryButton.textContent = '要約を取得';
@@ -992,7 +1052,7 @@ function addTextarea(ul, content) {
             summaryButton.disabled = false;
         }
     };
-    
+
     // 要約削除ボタンの作成
     const deleteSummaryButton = document.createElement('button');
     deleteSummaryButton.textContent = '要約を削除';
@@ -1002,11 +1062,28 @@ function addTextarea(ul, content) {
         delete summeries[content];
         updateTokenCount(true);
     };
-    
+
+    // 校正ボタンの作成
+    const proofReadButton = document.createElement('button');
+    proofReadButton.textContent = '校正';
+    proofReadButton.className = 'btn btn-secondary me-2';
+    proofReadButton.onclick = async () => {
+        proofReadButton.innerHTML = '<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> 校正中...';
+        proofReadButton.disabled = true;
+        try {
+            await proofRead(textarea);
+        } finally {
+            proofReadButton.innerHTML = '校正';
+            proofReadButton.disabled = false;
+        }
+    };
+    const hr = document.createElement('hr');
+
     // ボタンをコンテナに追加
     buttonContainer.appendChild(summaryButton);
     buttonContainer.appendChild(deleteSummaryButton);
-    
+    buttonContainer.appendChild(hr);
+    buttonContainer.appendChild(proofReadButton);
     // 要素の追加
     li.appendChild(textarea);
     li.appendChild(summaryInput);
@@ -1015,43 +1092,53 @@ function addTextarea(ul, content) {
 }
 
 function scrollToHeading(headingText) {
-    const content = document.getElementById('novelContent1');
-    const lines = content.value.split('\n');
-    let position = 0;
-
-    for (let i = 0; i < lines.length; i++) {
-        if (lines[i].trim().startsWith('#') && lines[i].includes(headingText)) {
-            // アコーディオンを開く
-            openAccordionContainingPosition(position);
-
-            content.focus();
-            content.setSelectionRange(position, position);
-            content.scrollTop = content.scrollHeight * (position / content.value.length);
-            break;
-        }
-        position += lines[i].length + 1; // +1 for newline character
-    }
-
-    // Offcanvasを閉じる
-    const indexOffcanvas = bootstrap.Offcanvas.getInstance(document.getElementById('indexOffcanvas'));
-}
-
-function openAccordionContainingPosition(position) {
-    const content = document.getElementById('novelContent1');
-    const accordionItems = document.querySelectorAll('#mainAccordion .accordion-item');
-    let currentPosition = 0;
-
-    for (let i = 0; i < accordionItems.length; i++) {
-        const textArea = accordionItems[i].querySelector('textarea');
-        if (textArea && textArea.id === 'novelContent1') {
-            if (position >= currentPosition && position < currentPosition + textArea.value.length) {
-                // このアコーディオンアイテムに目的の位置が含まれている
-                const collapseElement = accordionItems[i].querySelector('.accordion-collapse');
-                const bsCollapse = new bootstrap.Collapse(collapseElement, { toggle: false });
-                bsCollapse.show();
-                break;
-            }
-            currentPosition += textArea.value.length;
+    const content1 = document.getElementById('novelContent1');
+    const content1Collapse = document.getElementById('content1Collapse');
+    const accordion = new bootstrap.Collapse(content1Collapse, { toggle: false });
+
+    // テキストエリアの内容を行ごとに分割
+    const lines = content1.value.split('\n');
+
+    // 見出しテキストを含む行のインデックスを探す
+    const headingIndex = lines.findIndex(line => line.includes(headingText));
+
+    if (headingIndex !== -1) {
+        // 一時的な要素を作成してテキストエリアの内容をコピー
+        const tempDiv = document.createElement('div');
+        tempDiv.style.cssText = `
+            position: absolute;
+            top: -9999px;
+            left: -9999px;
+            width: ${content1.clientWidth}px;
+            font-size: ${window.getComputedStyle(content1).fontSize};
+            font-family: ${window.getComputedStyle(content1).fontFamily};
+            line-height: ${window.getComputedStyle(content1).lineHeight};
+            white-space: pre-wrap;
+            word-wrap: break-word;
+            visibility: hidden;
+        `;
+        document.body.appendChild(tempDiv);
+
+        // 見出しまでの内容を一時的な要素に挿入
+        tempDiv.textContent = lines.slice(0, headingIndex).join('\n');
+
+        // 見出しまでの高さを計算
+        const scrollPosition = tempDiv.clientHeight;
+
+        // 一時的な要素を削除
+        document.body.removeChild(tempDiv);
+
+        // アコーディオンが既に開かれているかチェック
+        if (content1Collapse.classList.contains('show')) {
+            // 既に開かれている場合は直接スクロール
+            content1.scrollTop = scrollPosition;
+        } else {
+            // 閉じている場合はアコーディオンを開いてからスクロール
+            accordion.show();
+            content1Collapse.addEventListener('shown.bs.collapse', function onShown() {
+                content1.scrollTop = scrollPosition;
+                content1Collapse.removeEventListener('shown.bs.collapse', onShown);
+            }, { once: true });
         }
     }
 }
@@ -1083,7 +1170,8 @@ document.addEventListener('DOMContentLoaded', function () {
     ['novelContent1', 'novelContent2', 'generatePrompt', 'nextPrompt', 'savedTitle'].forEach(id => {
         document.getElementById(id).addEventListener('input', () => {
             saveToUserStorage(false);
-            generateIndexMenu();
+            generateIndexMenu(false);
+            updateAllAccordionHeaderCounts();
         });
     });
 
@@ -1091,14 +1179,12 @@ document.addEventListener('DOMContentLoaded', function () {
     ['memo', 'geminiApiKey', 'endpointSelect', 'openaiEndpoint', 'openaiHeaders', 'openaiJsonBody', 'characterCount', 'encodeLength'].forEach(id => {
         document.getElementById(id).addEventListener('input', () => {
             saveToUserStorage(true);
-            generateIndexMenu();
         });
     });
 
     ['partialEncodeToggle', 'streamToggle'].forEach(id => {
         document.getElementById(id).addEventListener('change', () => {
             saveToUserStorage(true);
-            generateIndexMenu();
         });
     });
 
@@ -1120,8 +1206,8 @@ document.addEventListener('DOMContentLoaded', function () {
     // 60秒ごとに自動保存実行
     setInterval(() => {
         saveToUserStorage();
-        generateIndexMenu();
-        updateTokenCount(true); // 強制的に更新
+        generateIndexMenu(true);
+        updateAllAccordionHeaderCounts();
     }, 60000);
 
     // 基本設定のアコーディオンを開く
@@ -1139,7 +1225,6 @@ document.addEventListener('DOMContentLoaded', function () {
 
     // 初期表示時にも実行
     updateNavbarBrand();
-    generateIndexMenu();
+    generateIndexMenu(true);
     updateAllAccordionHeaderCounts();
-    updateTokenCount(true); // 強制的に更新
 });