embed_output_deviation_occurrenceファイルも消去し、utilへ移動。

main.py

@@ -1,8 +1,6 @@
 import streamlit as st
 
 from src.embed_output_deviation import main as embed_output_deviation
-from src.embed_output_deviation_occurrence import \
-    main as embed_output_deviation_occurrence
 from src.forms import (change_request_form, deviation_occurrence_report_form,
                        deviation_report_form)
 
@@ -19,6 +17,6 @@ match selected_page:
     case "変更申請書":
         pages["変更申請書"]()
     case "逸脱発生報告書":
-        pages["逸脱発生報告書"](embed_output_deviation_occurrence)
+        pages["逸脱発生報告書"]()
     case "逸脱報告書":
         pages["逸脱報告書"](embed_output_deviation)

src/embed_output_deviation_occurrence.py

@@ -1,76 +0,0 @@
-import json
-
-from docx import Document
-
-
-def replace_text_in_paragraphs(paragraphs, replacements):
-    """
-    パラグラフ内のテキストを置き換える
-    """
-    for paragraph in paragraphs:
-        for key, value in replacements.items():
-            if key in paragraph.text:
-                paragraph.text = paragraph.text.replace(key, value)
-
-
-def replace_text_in_tables(tables, replacements):
-    """
-    テーブル内のテキストを置き換える
-    """
-    for table in tables:
-        for row in table.rows:
-            for cell in row.cells:
-                replace_text_in_paragraphs(cell.paragraphs, replacements)
-
-
-def replace_text_in_docx(template_path, replacements):
-    """
-    ドキュメント内の指定されたテキストを置き換える
-    """
-    doc = Document(template_path)
-    replace_text_in_paragraphs(doc.paragraphs, replacements)
-    replace_text_in_tables(doc.tables, replacements)
-    return doc
-
-
-def main():
-    template_path = "data/template/template_deviation_occurrence.docx"
-
-    with open("data/deviation_occurrence_report.json", "r") as file:
-        data = json.load(file)
-
-    if data["添付資料"] == "なし":
-        yes = "□"
-        no = "☑"
-        attached_file = ""
-    else:
-        yes = "☑"
-        no = "□"
-        attached_file = data["添付資料"]
-
-    replacements = {
-        "[reporter_name]": data["報告者"],
-        "[report_date]": data["報告日"],
-        "[product_name]": data["品名"],
-        "[lot_number]": data["ロットNo."],
-        "[occurrence_datetime]": data["発生日時"],
-        "[occurrence_place]": data["発生場所"],
-        "[discoverer_name]": data["発見者"],
-        "[worker_name]": data["作業者"],
-        "[deviation_discovery]": data["逸脱内容・発見の経緯"],
-        "[first_aid_reason]": data["応急処置・処置の理由"],
-        "[impact_on_quality]": data["品質への影響の調査状況"],
-        "[yes]": yes,
-        "[no]": no,
-        "[attached_file]": attached_file,
-        "[supplementary_information]": data["備考"],
-    }
-
-    doc = replace_text_in_docx(template_path, replacements)
-    output_path = "data/output_deviation_occurrence.docx"
-    doc.save(output_path)
-    print(f"Document saved to {output_path}")
-
-
-if __name__ == "__main__":
-    main()

src/forms.py

@@ -14,7 +14,7 @@ from src.prompts import (deviation_occurrence_system_template_review,
                          deviation_systemprompt_writing_instructions,
                          deviation_systemprompt_output_format_instructions)
 from src.questions import get_questions
-from src.utils import get_embedding, load_env_vars, make_change_application_output
+from src.utils import get_embedding, load_env_vars, output_change_application, output_deviation_occurrence_report
 
 # 変更タイプとサブタイプの定義
 CHANGE_TYPES = [
@@ -318,7 +318,7 @@ def change_request_form():
                 "備考": supplementary_information,
             }
 
-            make_change_application_output(contents)
+            output_change_application(contents)
 
             st.session_state["document_generated"] = True
 
@@ -400,7 +400,7 @@ def change_request_form():
             st.markdown(f"**レビュー結果** : {review}")
 
 
-def deviation_occurrence_report_form(embed_output_deviation_occurrence):
+def deviation_occurrence_report_form():
     st.title("逸脱発生報告書 文書生成")
 
     load_env_vars()
@@ -505,7 +505,7 @@ def deviation_occurrence_report_form(embed_output_deviation_occurrence):
             )
             submitted = st.form_submit_button("送信")
 
-        if submitted:
+        if submitted or st.session_state["document_generated"]:
             for i in range(q_num - 3):
                 if nos[i + 2]:
                     input_values[i + 3] = q_not[i + 3]
@@ -545,7 +545,7 @@ def deviation_occurrence_report_form(embed_output_deviation_occurrence):
                 occurrence_date, occurrence_time
             ).strftime("%Y年%m月%d日%H時%M分")
 
-            json_data = {
+            contents = {
                 "報告者": reporter_name,
                 "報告日": report_date,
                 "品名": product_name,
@@ -568,11 +568,7 @@ def deviation_occurrence_report_form(embed_output_deviation_occurrence):
                 "ユーザープロンプト": user_prompt,
             }
 
-            filename = "data/deviation_occurrence_report.json"
-            with open(filename, "w") as file:
-                json.dump(json_data, file, ensure_ascii=False, indent=4)
-
-            embed_output_deviation_occurrence()
+            output_deviation_occurrence_report(contents)
             st.session_state["document_generated"] = True
 
     if st.session_state["document_generated"]:
@@ -586,31 +582,29 @@ def deviation_occurrence_report_form(embed_output_deviation_occurrence):
                 mime="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
             )
 
-        with open("data/deviation_occurrence_report.json", "r") as file:
-            json_data = json.load(file)
-        st.markdown(f'**報告者** : {json_data["報告者"]}')
-        st.markdown(f'**報告日** : {json_data["報告日"]}')
-        st.markdown(f'**品名** : {json_data["品名"]}')
-        st.markdown(f'**ロットNo.** : {json_data["ロットNo."]}')
-        st.markdown(f'**発生日時** : {json_data["発生日時"]}')
-        st.markdown(f'**発生場所** : {json_data["発生場所"]}')
-        st.markdown(f'**発見者** : {json_data["発見者"]}')
-        st.markdown(f'**作業者** : {json_data["作業者"]}')
+        st.markdown(f'**報告者** : {contents["報告者"]}')
+        st.markdown(f'**報告日** : {contents["報告日"]}')
+        st.markdown(f'**品名** : {contents["品名"]}')
+        st.markdown(f'**ロットNo.** : {contents["ロットNo."]}')
+        st.markdown(f'**発生日時** : {contents["発生日時"]}')
+        st.markdown(f'**発生場所** : {contents["発生場所"]}')
+        st.markdown(f'**発見者** : {contents["発見者"]}')
+        st.markdown(f'**作業者** : {contents["作業者"]}')
         st.markdown(
-            f'**逸脱内容・発見の経緯** : {json_data["逸脱内容・発見の経緯"]}'
+            f'**逸脱内容・発見の経緯** : {contents["逸脱内容・発見の経緯"]}'
         )
         st.markdown(
-            f'**応急処置・処置の理由** : {json_data["応急処置・処置の理由"]}'
+            f'**応急処置・処置の理由** : {contents["応急処置・処置の理由"]}'
         )
         st.markdown(
-            f'**品質への影響の調査状況** : {json_data["品質への影響の調査状況"]}'
+            f'**品質への影響の調査状況** : {contents["品質への影響の調査状況"]}'
         )
-        st.markdown(f'**添付資料** : {json_data["添付資料"]}')
-        st.markdown(f'**備考** : {json_data["備考"]}')
+        st.markdown(f'**添付資料** : {contents["添付資料"]}')
+        st.markdown(f'**備考** : {contents["備考"]}')
 
         deviation_occurrence_user_template_review = f"""
         ## 今回の「逸脱内容・発見の経緯」:
-            {json_data["逸脱内容・発見の経緯"]}
+            {contents["逸脱内容・発見の経緯"]}
 
         返答:
         """

src/utils.py

@@ -13,7 +13,7 @@ def get_embedding(text, model="text-embedding-3-large", client=None):
     )
 
 
-def make_change_application_output(contents: dict):
+def output_change_application(contents: dict):
     change_application_form_template_path = "data/template/template.docx"
 
     replacements = {
@@ -36,6 +36,43 @@ def make_change_application_output(contents: dict):
     print(f"Document saved to {change_application_form_path}")
 
 
+def output_deviation_occurrence_report(contents: dict):
+    template_path = "data/template/template_deviation_occurrence.docx"
+
+    if contents["添付資料"] == "なし":
+        yes = "□"
+        no = "☑"
+        attached_file = ""
+    else:
+        yes = "☑"
+        no = "□"
+        attached_file = contents["添付資料"]
+
+    replacements = {
+        "[reporter_name]": contents["報告者"],
+        "[report_date]": contents["報告日"],
+        "[product_name]": contents["品名"],
+        "[lot_number]": contents["ロットNo."],
+        "[occurrence_datetime]": contents["発生日時"],
+        "[occurrence_place]": contents["発生場所"],
+        "[discoverer_name]": contents["発見者"],
+        "[worker_name]": contents["作業者"],
+        "[deviation_discovery]": contents["逸脱内容・発見の経緯"],
+        "[first_aid_reason]": contents["応急処置・処置の理由"],
+        "[impact_on_quality]": contents["品質への影響の調査状況"],
+        "[yes]": yes,
+        "[no]": no,
+        "[attached_file]": attached_file,
+        "[supplementary_information]": contents["備考"],
+    }
+
+    doc = replace_text_in_docx(template_path, replacements)
+    output_path = "data/output_deviation_occurrence.docx"
+    doc.save(output_path)
+    # TODO: loggerを使う
+    print(f"Document saved to {output_path}")
+
+
 def replace_text_in_docx(template_path, replacements):
     """
     ドキュメント内の指定されたテキストを置き換える