embed_output関数を関数化。

main.py

@@ -1,6 +1,5 @@
 import streamlit as st
 
-from src.embed_output import main as embed_output
 from src.embed_output_deviation import main as embed_output_deviation
 from src.embed_output_deviation_occurrence import \
     main as embed_output_deviation_occurrence
@@ -18,7 +17,7 @@ selected_page = st.sidebar.selectbox(
 )
 match selected_page:
     case "変更申請書":
-        pages["変更申請書"](embed_output)
+        pages["変更申請書"]()
     case "逸脱発生報告書":
         pages["逸脱発生報告書"](embed_output_deviation_occurrence)
     case "逸脱報告書":

src/embed_output.py

@@ -1,62 +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():
-    with open("data/change_request.json", "r") as file:
-        data = json.load(file)
-
-    template_path = "data/template/template.docx"
-
-    replacements = {
-        "[plant]": data["工場"],
-        "[applicant]": data["申請者"],
-        "[apply_date]": data["申請日"],
-        "[subject_to_change]": data["変更対象"],
-        "[scheduled_implementation_date]": data["実施予定時期"],
-        "[details_of_change]": data["変更内容"],
-        "[reason_for_change]": data["変更理由"],
-        "[impact_on_quality]": data["品質への影響"],
-        "[attached_file]": data["添付資料"],
-        "[supplementary_information]": data["備考"],
-    }
-
-    doc = replace_text_in_docx(template_path, replacements)
-    output_path = "data/output.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
+from src.utils import get_embedding, load_env_vars, make_change_application_output
 
 # 変更タイプとサブタイプの定義
 CHANGE_TYPES = [
@@ -137,7 +137,7 @@ SUBTYPES2 = {
 }
 
 
-def change_request_form(embed_output):
+def change_request_form():
     st.title("変更申請書 文書生成")
 
     load_env_vars()
@@ -270,7 +270,7 @@ def change_request_form(embed_output):
             )
             submitted = st.form_submit_button("送信")
 
-        if submitted:
+        if submitted or st.session_state["document_generated"]:
             for k in range(question_num):
                 if nos[k]:
                     input_values[k] = "特になし"
@@ -305,7 +305,7 @@ def change_request_form(embed_output):
             date_obj = datetime.strptime(application_date, "%Y-%m-%d")
             application_date = date_obj.strftime("%Y年%m月%d日")
 
-            json_data = {
+            contents = {
                 "工場": plant_type,
                 "申請者": applicant_name,
                 "申請日": application_date,
@@ -316,14 +316,10 @@ def change_request_form(embed_output):
                 "品質への影響": str(response_data["品質への影響"]),
                 "添付資料": attached_files,
                 "備考": supplementary_information,
-                "ユーザープロンプト": user_prompt,
             }
 
-            filename = "data/change_request.json"
-            with open(filename, "w") as file:
-                json.dump(json_data, file, ensure_ascii=False, indent=4)
+            make_change_application_output(contents)
 
-            embed_output()
             st.session_state["document_generated"] = True
 
     if st.session_state["document_generated"]:
@@ -337,23 +333,20 @@ def change_request_form(embed_output):
                 mime="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
             )
 
-        with open("data/change_request.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'**実施予定時期** : {json_data["実施予定時期"]}')
-        st.markdown(f'**変更内容** : {json_data["変更内容"]}')
-        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'**実施予定時期** : {contents["実施予定時期"]}')
+        st.markdown(f'**変更内容** : {contents["変更内容"]}')
+        st.markdown(f'**変更理由** : {contents["変更理由"]}')
+        st.markdown(f'**品質への影響** : {contents["品質への影響"]}')
+        st.markdown(f'**添付資料** : {contents["添付資料"]}')
+        st.markdown(f'**備考** : {contents["備考"]}')
 
         review_button = st.button("レビューする")
         if review_button:
-            query_content = json_data["変更内容"]
-            query_reason = json_data["変更理由"]
+            query_content = contents["変更内容"]
+            query_reason = contents["変更理由"]
             query_vec = get_embedding(query_content, client=client)
 
             genres = [None] * change_num

src/generate_query_all.py

@@ -5,6 +5,7 @@ from dotenv import load_dotenv
 from openai import OpenAI
 from openpyxl import load_workbook
 
+
 # TODO: 実際には使われていない様子なので、消去して良いか確認する。（堤）
 def make_json(type, subtype, subtype2, items):
     name = f"{type}_{subtype}_{subtype2}"

src/utils.py

@@ -1,3 +1,4 @@
+from docx import Document
 from dotenv import load_dotenv
 
 
@@ -10,3 +11,56 @@ def get_embedding(text, model="text-embedding-3-large", client=None):
     return (
         client.embeddings.create(input=[text], model=model).data[0].embedding
     )
+
+
+def make_change_application_output(contents: dict):
+    change_application_form_template_path = "data/template/template.docx"
+
+    replacements = {
+        "[plant]": contents["工場"],
+        "[applicant]": contents["申請者"],
+        "[apply_date]": contents["申請日"],
+        "[subject_to_change]": contents["変更対象"],
+        "[scheduled_implementation_date]": contents["実施予定時期"],
+        "[details_of_change]": contents["変更内容"],
+        "[reason_for_change]": contents["変更理由"],
+        "[impact_on_quality]": contents["品質への影響"],
+        "[attached_file]": contents["添付資料"],
+        "[supplementary_information]": contents["備考"],
+    }
+
+    doc = replace_text_in_docx(change_application_form_template_path, replacements)
+    change_application_form_path = "data/output.docx"
+    doc.save(change_application_form_path)
+    # TODO: loggerを使う
+    print(f"Document saved to {change_application_form_path}")
+
+
+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 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_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)