Update app.py

app.py

@@ -17,37 +17,31 @@ from pipelines.scoring import compute_quality_score
 from pipelines.storage import persist_to_hf
 from pipelines.utils import detect_filetype, load_doc_text
 
-# ❶ app.py の該当箇所を以下に置き換え
-
-# ...（importsはそのまま）
-
 APP_TITLE = "候補者インテーク & レジュメ標準化（OpenAI版）"
 
-def process_resumes(filepaths, candidate_id: str, additional_notes: str = ""):
-    import os, json, hashlib, gradio as gr
-    if not filepaths:
+
+def process_resumes(files, candidate_id: str, additional_notes: str = ""):
+    if not files:
         raise gr.Error("少なくとも1ファイルをアップロードしてください。")
 
     partial_records = []
     raw_texts = []
 
-    for path in filepaths:
-        filename = os.path.basename(path)
-        with open(path, "rb") as f:
-            raw_bytes = f.read()
+    for f in files:
+        raw_bytes = f.read()
+        filetype = detect_filetype(f.name, raw_bytes)
 
-        filetype = detect_filetype(filename, raw_bytes)
-
-        # 1) テキスト抽出
+        # 1) テキスト抽出：画像/PDFはOpenAI Vision OCR、docx/txtは生文面＋OpenAI整形
         if filetype in {"pdf", "image"}:
-            text = extract_text_with_openai(raw_bytes, filename=filename, filetype=filetype)
+            text = extract_text_with_openai(raw_bytes, filename=f.name, filetype=filetype)
         else:
             base_text = load_doc_text(filetype, raw_bytes)
-            text = extract_text_with_openai(base_text.encode("utf-8"), filename=filename, filetype="txt")
+            # 生テキストをOpenAIへ渡し、整形本文を返す
+            text = extract_text_with_openai(base_text.encode("utf-8"), filename=f.name, filetype="txt")
 
-        raw_texts.append({"filename": filename, "text": text})
+        raw_texts.append({"filename": f.name, "text": text})
 
-        # 2) 構造化 → 3) 正規化
+        # 2) OpenAIでセクション構造化 → ルールベース正規化
         structured = structure_with_openai(text)
         normalized = normalize_resume({
             "work_experience": structured.get("work_experience_raw", ""),
@@ -56,16 +50,16 @@ def process_resumes(filepaths, candidate_id: str, additional_notes: str = ""):
             "skills": ", ".join(structured.get("skills_list", [])),
         })
         partial_records.append({
-            "source": filename,
+            "source": f.name,
             "text": text,
             "structured": structured,
             "normalized": normalized,
         })
 
-    # 4) 統合
+    # 3) 統合（複数ファイル→1候補者）
     merged = merge_normalized_records([r["normalized"] for r in partial_records])
 
-    # 5) スキル抽出
+    # 4) スキル抽出
     merged_text = "\n\n".join([r["text"] for r in partial_records])
     skills = extract_skills(merged_text, {
         "work_experience": merged.get("raw_sections", {}).get("work_experience", ""),
@@ -74,20 +68,20 @@ def process_resumes(filepaths, candidate_id: str, additional_notes: str = ""):
         "skills": ", ".join(merged.get("skills", [])),
     })
 
-    # 6) 匿名化
+    # 5) 匿名化
     anonymized_text, anon_map = anonymize_text(merged_text)
     anon_pdf_bytes = render_anonymized_pdf(anonymized_text)
 
-    # 7) 品質スコア
+    # 6) 品質スコア
     score = compute_quality_score(merged_text, merged)
 
-    # 8) 要約
+    # 7) 要約（300/100/1文）
     summaries = summarize_with_openai(merged_text)
 
-    # 9) 構造化出力（UIバグ回避のため **すべて文字列** で返す）
+    # 8) 構造化出力（UIバグ回避のため **すべて文字列** で返す）
     result_json = {
         "candidate_id": candidate_id or hashlib.sha256(merged_text.encode("utf-8")).hexdigest()[:16],
-        "files": [os.path.basename(p) for p in filepaths],
+        "files": [f.name for f in files],
         "merged": merged,
         "skills": skills,
         "quality_score": score,
@@ -96,7 +90,7 @@ def process_resumes(filepaths, candidate_id: str, additional_notes: str = ""):
         "notes": additional_notes,
     }
 
-    # 10) HF Datasets 保存
+    # 9) HF Datasets 保存
     dataset_repo = os.environ.get("DATASET_REPO")
     commit_info = None
     if dataset_repo:
@@ -113,12 +107,12 @@ def process_resumes(filepaths, candidate_id: str, additional_notes: str = ""):
     anon_pdf = (result_json["candidate_id"] + ".anon.pdf", anon_pdf_bytes)
 
     return (
-        json.dumps(result_json, ensure_ascii=False, indent=2),  # out_json -> Code(str)
-        json.dumps(skills, ensure_ascii=False, indent=2),       # out_skills -> Code(str)
-        json.dumps(score, ensure_ascii=False, indent=2),        # out_score -> Code(str)
-        summaries["300chars"],
-        summaries["100chars"],
-        summaries["onesent"],
+        json.dumps(result_json, ensure_ascii=False, indent=2),      # JSON全体
+        json.dumps(skills, ensure_ascii=False, indent=2),           # ★ skillsは文字列で返す
+        json.dumps(score, ensure_ascii=False, indent=2),            # スコアも文字列
+        summaries.get("300chars", ""),
+        summaries.get("100chars", ""),
+        summaries.get("onesent", ""),
         anon_pdf,
         json.dumps(commit_info or {"status": "skipped (DATASET_REPO not set)"}, ensure_ascii=False, indent=2),
     )
@@ -132,7 +126,7 @@ with gr.Blocks(title=APP_TITLE) as demo:
             label="レジュメ類 (PDF/画像/Word/テキスト) 複数可",
             file_count="multiple",
             file_types=[".pdf", ".png", ".jpg", ".jpeg", ".tiff", ".bmp", ".docx", ".txt"],
-            type="filepath",  # ← ここが重要：'file' は非対応・例外の元
+            type="file"   # fileオブジェクトを受ける（process_resumesの実装に合致）
         )
         candidate_id = gr.Textbox(label="候補者ID（任意。未入力なら自動生成）")
     notes = gr.Textbox(label="補足メモ（任意）", lines=3)
@@ -143,7 +137,7 @@ with gr.Blocks(title=APP_TITLE) as demo:
         out_json = gr.Code(label="統合出力 (JSON文字列)")
 
     with gr.Tab("抽出スキル"):
-        out_skills = gr.Code(label="スキル一覧 (JSON文字列)")  # ← gr.JSON を **使わない**
+        out_skills = gr.Code(label="スキル一覧 (JSON文字列)")  # ★ gr.JSON を使わない
 
     with gr.Tab("品質スコア"):
         out_score = gr.Code(label="品質評価 (JSON文字列)")
@@ -165,7 +159,6 @@ with gr.Blocks(title=APP_TITLE) as demo:
         outputs=[out_json, out_skills, out_score, out_sum_300, out_sum_100, out_sum_1, out_pdf, out_commit],
     )
 
+
 if __name__ == "__main__":
-    # ローカル（gradio.live）想定なら share=True が安全
-    # Spaces 内では demo.launch() のままでもOK
-    demo.launch(share=True, server_name="0.0.0.0")
+    demo.launch()