Merge pull request #6 from EQUES-Inc/feature/history

main.py

@@ -1,18 +1,24 @@
 import streamlit as st
 
+from src.entity.document import DocumentNames
 from src.forms.deviation_investigation_report import deviation_investigation_report_form
-from src.forms.deviation_notification_report import deviation_notification_report_form
-
-pages = {
-    "逸脱連絡書": deviation_notification_report_form,
-    "逸脱調査報告書": deviation_investigation_report_form,
-}
+from src.forms.deviation_notification_report import (
+    deviation_notification_report_form,
+    deviation_notification_report_history_file_path,
+)
+from src.forms.history_common import display_download_history
 
 selected_page = st.sidebar.selectbox(
-    "作成する文書を選択してください。", list(pages.keys())
+    "作成する文書を選択してください。", [name.value for name in DocumentNames]
 )
+
 match selected_page:
-    case "逸脱連絡書":
-        pages["逸脱連絡書"]()
-    case "逸脱調査報告書":
-        pages["逸脱調査報告書"]()
+    case DocumentNames.DEVIATION_NOTIFICATION_REPORT.value:
+        deviation_notification_report_form()
+    case DocumentNames.DEVIATION_INVESTIGATION_REPORT.value:
+        deviation_investigation_report_form()
+    case DocumentNames.DEVIATION_NOTIFICATION_REPORT_HISTORY.value:
+        display_download_history(
+            DocumentNames.DEVIATION_NOTIFICATION_REPORT.value,
+            deviation_notification_report_history_file_path,
+        )

src/aws/s3.py

@@ -10,9 +10,10 @@ from src.utils import setup_logger
 logger = setup_logger(__name__)
 
 trial_bucket_name = "pharma-doc-trials"
-base_change_request_history_file_path_in_trial_bucket = (
-    "bankyo/change_request_history.csv"
+base_deviation_notification_report_history_file_path_in_trial_bucket = (
+    "taiyo/deviation_notification_report_history.csv"
 )
+
 csv_extension = ".csv"
 err_msg_file_is_not_csv = "指定したファイルはcsvではありません。"
 

src/entity/document.py

@@ -0,0 +1,7 @@
+from enum import Enum
+
+
+class DocumentNames(Enum):
+    DEVIATION_NOTIFICATION_REPORT = "逸脱連絡書"
+    DEVIATION_INVESTIGATION_REPORT = "逸脱調査報告書"
+    DEVIATION_NOTIFICATION_REPORT_HISTORY = "逸脱連絡履歴"

src/forms/deviation_notification_report.py

@@ -1,11 +1,25 @@
 import json
 import os
 from datetime import date, datetime
+from typing import Any, List
+from zoneinfo import ZoneInfo
 
+import pandas as pd
 import streamlit as st
 from dotenv import load_dotenv
 from openai import OpenAI
 
+from src.aws.s3 import (
+    base_deviation_notification_report_history_file_path_in_trial_bucket,
+)
+from src.aws.s3 import get_client as get_s3_client
+from src.aws.s3 import (
+    get_csv_as_pd_dataframe_from_s3,
+    save_pd_dataframe_as_csv_to_s3,
+    trial_bucket_name,
+)
+from src.entity.document import DocumentNames
+from src.forms.history_common import display_history
 from src.prompts.deviation_notification_report import (
     deviation_notification_system_template_review,
     deviation_notification_systemprompt_output_format_instructions,
@@ -13,6 +27,11 @@ from src.prompts.deviation_notification_report import (
 )
 from src.utils import output_deviation_notification_report, setup_logger
 
+deviation_notification_report_history_file_path = (
+    "data/deviation_notification_report_history.csv"
+)
+
+
 OCCURRENCE_CLASSIFICATIONS = [
     "",
     "工程内外観",
@@ -282,8 +301,8 @@ def deviation_notification_report_form() -> None:
                 "課名": st.session_state["section_name"],
                 "発生場所": st.session_state["occurrence_place"],
                 "発見者": st.session_state["discoverer"],
-                "発生日": formatted_occurrence_date,
                 "発見日": formatted_discovery_date,
+                "発生日": formatted_occurrence_date,
                 "品質保証課への第一報日": formatted_first_report_date,
                 "発生事象の分類": st.session_state["occurrence_classification"],
                 "逸脱概要": str(response_data["逸脱概要"]),
@@ -305,6 +324,35 @@ def deviation_notification_report_form() -> None:
             )
 
             output_deviation_notification_report(st.session_state["contents"])
+
+            save_deviation_notification_report_history(
+                st.session_state["contents"]["件名"],
+                st.session_state["contents"]["管理番号"],
+                st.session_state["contents"]["品名"],
+                st.session_state["contents"]["品目コード"],
+                st.session_state["contents"]["工程名"],
+                st.session_state["contents"]["標準書番号"],
+                st.session_state["contents"]["ロット番号"],
+                st.session_state["contents"]["課名"],
+                st.session_state["contents"]["発生場所"],
+                st.session_state["contents"]["発見者"],
+                st.session_state["contents"]["発見日"],
+                st.session_state["contents"]["発生日"],
+                st.session_state["contents"]["品質保証課への第一報日"],
+                st.session_state["contents"]["発生事象の分類"],
+                st.session_state["contents"]["逸脱概要"],
+                st.session_state["contents"]["応急措置"],
+                st.session_state["contents"]["調査（根本原因・品質影響等）の提案"],
+                st.session_state["contents"]["調査の実施部署"],
+                st.session_state["contents"][
+                    "措置（回復措置・製品等に対する措置）の提案"
+                ],
+                st.session_state["contents"]["措置の実施部署"],
+                st.session_state["contents"]["調査回答期限（30営業日）"],
+                st.session_state["contents"]["添付資料"],
+                answers,
+            )
+
             st.session_state["document_generated"] = True
 
     if st.session_state["document_generated"]:
@@ -321,6 +369,11 @@ def deviation_notification_report_form() -> None:
         for key, value in st.session_state["contents"].items():
             st.markdown(f"**{key}**: {value}")
 
+        display_history(
+            DocumentNames.DEVIATION_NOTIFICATION_REPORT.value,
+            deviation_notification_report_history_file_path,
+        )
+
         deviation_notification_user_template_review = f"""
         ## 今回の「逸脱概要」:
             {st.session_state["contents"]["逸脱概要"]}
@@ -348,3 +401,156 @@ def deviation_notification_report_form() -> None:
 
             logger.info(f"**レビュー結果** : {review}")
             st.markdown(f"**レビュー結果** : {review}")
+
+
+def save_deviation_notification_report_history(
+    subject: str,
+    control_number: str,
+    product_name: str,
+    item_code: str,
+    process_name: str,
+    standard_number: str,
+    lot_number: str,
+    section_name: str,
+    occurrence_place: str,
+    discoverer: str,
+    discovery_date: str,
+    occurrence_date: str,
+    first_report_date: str,
+    occurrence_classification: str,
+    output_deviation_summary: str,
+    output_emergency_measures: str,
+    output_proposed_investigation: str,
+    investigation_department: str,
+    output_proposed_measures: str,
+    measures_department: str,
+    survey_response_deadline: str,
+    attached_files: str,
+    answers: List[str],
+) -> None:
+    s3_client = get_s3_client()
+    try:
+        env = os.environ["ENV"]
+        if env != "production":
+            file_name, file_extension = os.path.splitext(
+                base_deviation_notification_report_history_file_path_in_trial_bucket
+            )
+            deviation_notification_report_history_file_path_in_trial_bucket = (
+                f"{file_name}_{env}{file_extension}"
+            )
+        else:
+            deviation_notification_report_history_file_path_in_trial_bucket = (
+                base_deviation_notification_report_history_file_path_in_trial_bucket
+            )
+        df = get_csv_as_pd_dataframe_from_s3(
+            s3_client,
+            trial_bucket_name,
+            deviation_notification_report_history_file_path_in_trial_bucket,
+        )
+    except s3_client.exceptions.NoSuchKey:
+        df = pd.DataFrame()
+
+    new_row_data = create_new_row_data(
+        subject,
+        control_number,
+        product_name,
+        item_code,
+        process_name,
+        standard_number,
+        lot_number,
+        section_name,
+        occurrence_place,
+        discoverer,
+        discovery_date,
+        occurrence_date,
+        first_report_date,
+        occurrence_classification,
+        output_deviation_summary,
+        output_emergency_measures,
+        output_proposed_investigation,
+        investigation_department,
+        output_proposed_measures,
+        measures_department,
+        survey_response_deadline,
+        attached_files,
+        answers,
+    )
+
+    new_row = pd.DataFrame([new_row_data])
+    df = pd.concat([df, new_row], ignore_index=True)
+
+    # NOTE: トライアル版のため、排他制御は実施しない。バケットはバージョニングする。
+    save_pd_dataframe_as_csv_to_s3(
+        s3_client,
+        df,
+        trial_bucket_name,
+        deviation_notification_report_history_file_path_in_trial_bucket,
+    )
+
+
+def create_new_row_data(
+    subject: str,
+    control_number: str,
+    product_name: str,
+    item_code: str,
+    process_name: str,
+    standard_number: str,
+    lot_number: str,
+    section_name: str,
+    occurrence_place: str,
+    discoverer: str,
+    discovery_date: str,
+    occurrence_date: str,
+    first_report_date: str,
+    occurrence_classification: str,
+    output_deviation_summary: str,
+    output_emergency_measures: str,
+    output_proposed_investigation: str,
+    investigation_department: str,
+    output_proposed_measures: str,
+    measures_department: str,
+    survey_response_deadline: str,
+    attached_files: str,
+    answers: List[str],
+) -> dict[str, Any]:
+    now = datetime.now(ZoneInfo("Asia/Tokyo"))
+    data = {
+        "件名": subject,
+        "作成日時": now,
+        "管理番号": control_number,
+        "品名": product_name,
+        "品目コード": item_code,
+        "工程名": process_name,
+        "標準書番号": standard_number,
+        "ロット番号": lot_number,
+        "課名": section_name,
+        "発生場所": occurrence_place,
+        "発見者": discoverer,
+        "発見日": discovery_date,
+        "発生日": occurrence_date,
+        "品質保証課への第一報日": first_report_date,
+        "発生事象の分類": occurrence_classification,
+        "逸脱概要": output_deviation_summary,
+        "応急処置": output_emergency_measures,
+        "調査（根本原因・品質影響等）の提案": output_proposed_investigation,
+        "調査の実施部署": investigation_department,
+        "措置（回復措置・製品等に対する措置）の提案": output_proposed_measures,
+        "措置の実施部署": measures_department,
+        "調査回答期限（30営業日）": survey_response_deadline,
+        "添付資料": attached_files,
+        "逸脱内容（回答）": answers[0],
+        "発見の経緯（回答）": answers[1],
+        "応急処置とその理由（回答）": answers[2],
+        "当該ロットの品質評価（回答）": answers[3],
+        "安定性モニタリングの対象ロットか（回答）": answers[4],
+        "安定性モニタリングの検体採取表の更新（回答）": answers[5],
+        "在庫ロットの品質評価・状況確認（回答）": answers[6],
+        "メーカーへの調査依頼（回答）": answers[7],
+        "生産スケジュール・受注状況の変更（回答）": answers[8],
+        "出荷日の変更（回答）": answers[9],
+        "製造販売業者への連絡（回答）": answers[10],
+        "他製品・他ラインへの影響（回答）": answers[11],
+        "過去製造ロットの品質の再評価（回答）": answers[12],
+        "その他の調査・措置（回答）": answers[13],
+    }
+    return data

src/forms/history_common.py

@@ -0,0 +1,87 @@
+import os
+
+import streamlit as st
+
+from src.aws.s3 import (
+    base_deviation_notification_report_history_file_path_in_trial_bucket,
+    get_client,
+    get_csv_as_pd_dataframe_from_s3,
+    trial_bucket_name,
+)
+from src.entity.document import DocumentNames
+
+
+def display_history(document_name: str, history_file_path: str) -> None:
+    match document_name:
+        case DocumentNames.DEVIATION_NOTIFICATION_REPORT.value:
+            base_history_file_path_in_trial_bucket = (
+                base_deviation_notification_report_history_file_path_in_trial_bucket
+            )
+
+    s3_client = get_client()
+    env = os.environ["ENV"]
+    if env != "production":
+        file_name, file_extension = os.path.splitext(
+            base_history_file_path_in_trial_bucket
+        )
+        history_file_path_in_trial_bucket = f"{file_name}_{env}{file_extension}"
+    else:
+        history_file_path_in_trial_bucket = base_history_file_path_in_trial_bucket
+    data = get_csv_as_pd_dataframe_from_s3(
+        s3_client,
+        trial_bucket_name,
+        history_file_path_in_trial_bucket,
+    )
+    data.to_csv(history_file_path, index=False)
+    st.write(f"**{document_name}作成履歴**")
+    st.dataframe(data)
+    return
+
+
+def display_download_history(document_name: str, history_file_path: str) -> None:
+    match document_name:
+        case DocumentNames.DEVIATION_NOTIFICATION_REPORT.value:
+            base_history_file_path_in_trial_bucket = (
+                base_deviation_notification_report_history_file_path_in_trial_bucket
+            )
+
+    s3_client = get_client()
+    try:
+        env = os.environ["ENV"]
+        if env != "production":
+            file_name, file_extension = os.path.splitext(
+                base_history_file_path_in_trial_bucket
+            )
+            history_file_path_in_trial_bucket = f"{file_name}_{env}{file_extension}"
+        else:
+            history_file_path_in_trial_bucket = base_history_file_path_in_trial_bucket
+        data = get_csv_as_pd_dataframe_from_s3(
+            s3_client,
+            trial_bucket_name,
+            history_file_path_in_trial_bucket,
+        )
+    except s3_client.exceptions.NoSuchKey:
+        st.write(f"{document_name}作成履歴がありません。")
+        return
+    except Exception:
+        st.error(
+            f"システムの内部エラーにより、{document_name}作成履歴の表示ができません。システム管理者に問い合わせて下さい。"
+        )
+        return
+    data.to_csv(history_file_path, index=False)
+    st.write(f"**{document_name}作成履歴**")
+    st.dataframe(data)
+    file_exists = os.path.isfile(history_file_path)
+    if file_exists:
+        with open(history_file_path, "rb") as file:
+            st.download_button(
+                label="ダウンロード",
+                data=file,
+                file_name="history.csv",
+                mime="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            )
+    else:
+        st.error(
+            f"システムの内部エラーにより、{document_name}作成履歴の表示ができません。システム管理者に問い合わせて下さい。"
+        )
+        return