Update static/app.js

static/app.js

@@ -7,8 +7,10 @@ async function postJSON(url, body){
     headers: {"Content-Type": "application/json"},
     body: JSON.stringify(body)
   });
-  if(!res.ok){ throw new Error(`${url}: ${res.status} ${await res.text()}`); }
-  return await res.json();
+  // 200以外でも本文を拾って表示したいのでここでは throw しない
+  let data = null;
+  try { data = await res.json(); } catch(_) { data = {ok:false, error:`${res.status} ${res.statusText}`}; }
+  return { status: res.status, data };
 }
 
 document.getElementById("btnIngestEdinet").onclick = async () => {
@@ -16,14 +18,10 @@ document.getElementById("btnIngestEdinet").onclick = async () => {
   const edinetDate = document.getElementById("edinetDate").value.trim();
   const out = document.getElementById("ingestEdinetResult");
   out.textContent = "実行中…";
-  try{
-    const data = await postJSON("/ingest/edinet", {edinet_code: edinetCode, date: edinetDate});
-    out.textContent = `投入チャンク数: ${data.ingested_chunks}`;
-    log(`[EDINET] code=${edinetCode} date=${edinetDate} -> chunks=${data.ingested_chunks}`);
-  }catch(e){
-    out.textContent = "エラー: " + e.message;
-    log("[EDINET][ERR] " + e.message);
-  }
+  const {data} = await postJSON("/ingest/edinet", {edinet_code: edinetCode, date: edinetDate});
+  if(data.ok){ out.textContent = `投入チャンク数: ${data.ingested_chunks}`; }
+  else { out.textContent = "エラー: " + (data.error || "unknown"); }
+  log("[EDINET] " + JSON.stringify(data));
 };
 
 document.getElementById("btnIngestUpload").onclick = async () => {
@@ -35,10 +33,10 @@ document.getElementById("btnIngestUpload").onclick = async () => {
     const fd = new FormData();
     for(const f of files){ fd.append("files", f, f.name); }
     const res = await fetch("/ingest/upload", { method: "POST", body: fd });
-    if(!res.ok){ throw new Error(await res.text()); }
     const data = await res.json();
-    out.textContent = `アップロード保存: ${data.saved?.length || 0}件 / 投入チャンク: ${data.ingested_chunks}`;
-    log(`[UPLOAD] saved=${(data.saved||[]).join(", ")} chunks=${data.ingested_chunks}`);
+    if(data.ok){ out.textContent = `保存:${data.saved?.length||0} / チャンク:${data.ingested_chunks}`; }
+    else { out.textContent = "エラー: " + (data.error || "unknown"); }
+    log("[UPLOAD] " + JSON.stringify(data));
   }catch(e){
     out.textContent = "エラー: " + e.message;
     log("[UPLOAD][ERR] " + e.message);
@@ -49,21 +47,16 @@ document.getElementById("btnGenerate").onclick = async () => {
   const q = document.getElementById("query").value.trim();
   const st = document.getElementById("generateStatus");
   const dl = document.getElementById("downloadLinks");
-  st.textContent = "生成中…（初回はモデルDLで時間がかかる場合があります）";
+  st.textContent = "生成中…（初回はDLで時間がかかる場合があります）";
   dl.innerHTML = "";
-  try{
-    const data = await postJSON("/generate/all", {query: q});
+  const {data} = await postJSON("/generate/all", {query: q});
+  if(data.ok){
     st.textContent = "生成完了";
-    const a1 = document.createElement("a");
-    a1.href = data.pptx; a1.textContent = "PPTXをダウンロード";
-    const a2 = document.createElement("a");
-    a2.href = data.qa_csv; a2.textContent = "Q&A CSVをダウンロード";
-    dl.appendChild(a1);
-    dl.appendChild(document.createTextNode(" / "));
-    dl.appendChild(a2);
-    log(`[GENERATE] ppt=${data.pptx} csv=${data.qa_csv}`);
-  }catch(e){
-    st.textContent = "エラー: " + e.message;
-    log("[GENERATE][ERR] " + e.message);
+    const a1 = document.createElement("a"); a1.href = data.pptx; a1.textContent = "PPTXをダウンロード";
+    const a2 = document.createElement("a"); a2.href = data.qa_csv; a2.textContent = "Q&A CSVをダウンロード";
+    dl.appendChild(a1); dl.appendChild(document.createTextNode(" / ")); dl.appendChild(a2);
+  }else{
+    st.textContent = "エラー: " + (data.error || "unknown");
   }
+  log("[GENERATE] " + JSON.stringify(data));
 };