Update app.py

app.py

@@ -61,6 +61,7 @@ def fetch_available_standards():
 # ==========================================
 # 2. UI Component Handlers
 # ==========================================
+
 def load_initial_standards():
     return gr.Dropdown(choices=fetch_available_standards())
 
@@ -70,13 +71,17 @@ def update_version_dropdown(standard):
     versions = sorted(set(d["version"] for d in db_registry if d["standard"] == standard))
     return gr.Dropdown(choices=versions)
 
+# ⬇️ [수정] Version이 선택되면 Category와 함께 Status 값도 같이 리턴합니다.
 def update_base_category_dropdown(standard, version):
     if not standard or not version:
-        return gr.update(choices=[], value=None, interactive=False)
+        return gr.update(choices=[], value=None, interactive=False), gr.update(value="")
 
     choices = ["ALL"]
+    status_value = "" # Status 기본값
+    
     db_path = os.path.join(UPLOAD_DIR, f"{standard}_{version}.db")
-    if not os.path.exists(db_path): return gr.update(choices=choices)
+    if not os.path.exists(db_path): 
+        return gr.update(choices=choices), gr.update(value="")
 
     try:
         conn = sqlite3.connect(db_path)
@@ -88,16 +93,17 @@ def update_base_category_dropdown(standard, version):
         if main_table not in valid_tables:
             main_table = valid_tables[0] if valid_tables else None
 
-        pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
-        for t in valid_tables:
-            if t == main_table: continue
-            short_name = pattern.sub("", t).strip(" _")
-            if short_name and short_name not in choices:
-                choices.append(short_name)
-            elif t not in choices:
-                choices.append(t)
-
         if main_table:
+            # 💡 [핵심 추가] DB에서 Status 값을 읽어옵니다.
+            try:
+                cols_check = pd.read_sql(f"PRAGMA table_info([{main_table}])", conn)['name'].tolist()
+                if "Status" in cols_check or "status" in cols_check:
+                    status_df = pd.read_sql(f"SELECT Status FROM [{main_table}] WHERE Status IS NOT NULL AND Status != '' LIMIT 1", conn)
+                    if not status_df.empty:
+                        status_value = str(status_df.iloc[0]['Status'])
+            except Exception:
+                pass
+
             cols = pd.read_sql(f"PRAGMA table_info([{main_table}])", conn)['name'].tolist()
             lower_cols = [c.lower() for c in cols]
             if 'chapter' in lower_cols and 'category' in lower_cols:
@@ -110,12 +116,22 @@ def update_base_category_dropdown(standard, version):
                     ca = str(row[ca_col]).strip()
                     if ch and ca and ch.lower() not in ['none', 'nan'] and ca.lower() not in ['none', 'nan']:
                         choices.append(f"{ch}.{ca}")
+
+        pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
+        for t in valid_tables:
+            if t == main_table: continue
+            short_name = pattern.sub("", t).strip(" _")
+            if short_name and short_name not in choices:
+                choices.append(short_name)
+            elif t not in choices:
+                choices.append(t)
+
         conn.close()
     except Exception: 
         import traceback
         traceback.print_exc()
         
-    return gr.update(choices=choices, value=None, interactive=True)
+    return gr.update(choices=choices, value=None, interactive=True), gr.update(value=status_value)
 
 def update_comp_standard_dropdown(base_std, base_ver):
     if not base_std or not base_ver:
@@ -147,13 +163,35 @@ def update_comp_version_dropdown(base_std, base_ver, comp_std):
     except Exception:
         return gr.update(choices=[], value=None, interactive=False)
 
+# ⬇️ [수정] 비교 법규에서도 Category 갱신 시 Status를 읽어옵니다.
 def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_ver):
     if not all([base_std, base_ver, base_cat, comp_std, comp_ver]):
-        return gr.update(choices=[], value=None, interactive=False)
+        return gr.update(choices=[], value=None, interactive=False), gr.update(value="")
 
     base_type = "Main" if not base_cat or base_cat == "ALL" or "." in base_cat else base_cat
+    status_value = ""
 
     try:
+        # Status 읽기
+        comp_db_path = os.path.join(UPLOAD_DIR, f"{comp_std}_{comp_ver}.db")
+        if os.path.exists(comp_db_path):
+            c_conn = sqlite3.connect(comp_db_path)
+            c_tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", c_conn)['name'].tolist()
+            c_valid_tables = [t for t in c_tables if t.lower() not in ['mapping_registry', 'mapping_table', 'table_config', 'sqlite_sequence']]
+            c_main_table = f"{comp_std}_{comp_ver}"
+            if c_main_table not in c_valid_tables:
+                c_main_table = c_valid_tables[0] if c_valid_tables else None
+            
+            if c_main_table:
+                try:
+                    cols_check = pd.read_sql(f"PRAGMA table_info([{c_main_table}])", c_conn)['name'].tolist()
+                    if "Status" in cols_check or "status" in cols_check:
+                        status_df = pd.read_sql(f"SELECT Status FROM [{c_main_table}] WHERE Status IS NOT NULL AND Status != '' LIMIT 1", c_conn)
+                        if not status_df.empty:
+                            status_value = str(status_df.iloc[0]['Status'])
+                except Exception:
+                    pass
+
         conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
         query = """
         SELECT DISTINCT TRIM(Comp_Type) AS Comp_Type 
@@ -169,22 +207,14 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
 
         allowed_types = df['Comp_Type'].dropna().tolist()
         if not allowed_types:
-            return gr.update(choices=[], value=None)
+            return gr.update(choices=[], value=None), gr.update(value=status_value)
 
         final_choices = []
         if "Main" in allowed_types:
             final_choices.append("ALL")
-            comp_db_path = os.path.join(UPLOAD_DIR, f"{comp_std}_{comp_ver}.db")
-            
             if os.path.exists(comp_db_path):
+                # c_conn is already closed above, reopen if needed
                 c_conn = sqlite3.connect(comp_db_path)
-                c_tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", c_conn)['name'].tolist()
-                c_valid_tables = [t for t in c_tables if t.lower() not in ['mapping_registry', 'mapping_table', 'table_config', 'sqlite_sequence']]
-                
-                c_main_table = f"{comp_std}_{comp_ver}"
-                if c_main_table not in c_valid_tables:
-                    c_main_table = c_valid_tables[0] if c_valid_tables else None
-                
                 if c_main_table:
                     cols = pd.read_sql(f"PRAGMA table_info([{c_main_table}])", c_conn)['name'].tolist()
                     lower_cols = [c.lower() for c in cols]
@@ -203,18 +233,20 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
         for t in allowed_types:
             if t != "Main": final_choices.append(t)
 
-        return gr.update(choices=final_choices, value=final_choices[0] if final_choices else None, interactive=True)
+        return gr.update(choices=final_choices, value=final_choices[0] if final_choices else None, interactive=True), gr.update(value=status_value)
         
     except Exception as e:
         import traceback
         traceback.print_exc()
-        return gr.update(choices=[], value=None)
+        return gr.update(choices=[], value=None), gr.update(value="")
 
 def reset_base_selections():
-    return gr.update(value=None), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
+    # Status까지 4개를 리셋
+    return gr.update(value=None), gr.update(choices=[], value=None), gr.update(choices=[], value=None), gr.update(value="")
 
 def reset_comp_selections():
-    return gr.update(value=None), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
+    # Status까지 4개를 리셋
+    return gr.update(value=None), gr.update(choices=[], value=None), gr.update(choices=[], value=None), gr.update(value="")
 
 
 # ==========================================
@@ -536,9 +568,6 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
         return pd.DataFrame({"Error": [f"시스템 오류 발생: {str(e)}"]})
 
 
-# ==========================================
-# 4. UI Layout & Event Binding
-# ==========================================
 with gr.Blocks() as demo:
     gr.Markdown("# 📜 Regulation Viewer")
 
@@ -547,6 +576,8 @@ with gr.Blocks() as demo:
             with gr.Column():
                 base_standard = gr.Dropdown(label="Standard")
                 base_version = gr.Dropdown(label="Version")
+                # ⬇️ [UI 추가] Version과 Category 사이에 Status 칸 추가 (읽기 전용)
+                base_status = gr.Textbox(label="Status", interactive=False, lines=1)
                 
                 with gr.Row(elem_classes="reset-row"):
                     base_category = gr.Dropdown(label="Category", scale=4)
@@ -556,12 +587,13 @@ with gr.Blocks() as demo:
             with gr.Column():
                 comp_standard = gr.Dropdown(label="Standard", choices=[])
                 comp_version = gr.Dropdown(label="Version", choices=[])
+                # ⬇️ [UI 추가] Version과 Category 사이에 Status 칸 추가 (읽기 전용)
+                comp_status = gr.Textbox(label="Status", interactive=False, lines=1)
                 
                 with gr.Row(elem_classes="reset-row"):
                     comp_category = gr.Dropdown(label="Category", choices=[], scale=4)
                     comp_reset_btn = gr.Button("↺ 초기화", scale=1)
 
-    # 누락되었던 조회 버튼과 필터 체크박스 복구
     with gr.Row(elem_id="search_row"):
         search_btn = gr.Button("🔍 조회", variant="primary", scale=10)
         diff_filter_cb = gr.Checkbox(label="💡 변경된 내용만 보기", value=False, elem_id="diff_cb_item", container=False, scale=1)
@@ -570,15 +602,18 @@ with gr.Blocks() as demo:
 
     demo.load(fn=load_initial_standards, inputs=None, outputs=base_standard)
 
+    # ⬇️ [이벤트 수정] Version이 변경될 때 base_status에도 값을 보냅니다.
     base_standard.change(fn=update_version_dropdown, inputs=[base_standard], outputs=[base_version])
-    base_version.change(fn=update_base_category_dropdown, inputs=[base_standard, base_version], outputs=[base_category])
+    base_version.change(fn=update_base_category_dropdown, inputs=[base_standard, base_version], outputs=[base_category, base_status])
 
     base_version.change(fn=update_comp_standard_dropdown, inputs=[base_standard, base_version], outputs=[comp_standard])
     comp_standard.change(fn=update_comp_version_dropdown, inputs=[base_standard, base_version, comp_standard], outputs=[comp_version])
 
     comp_change_triggers = [base_standard, base_version, base_category, comp_standard, comp_version]
-    base_category.change(fn=update_comp_category_dropdown, inputs=comp_change_triggers, outputs=[comp_category])
-    comp_version.change(fn=update_comp_category_dropdown, inputs=comp_change_triggers, outputs=[comp_category])
+    
+    # ⬇️ [이벤트 수정] 비교 법규쪽 갱신 시에도 comp_status에 값을 보냅니다.
+    base_category.change(fn=update_comp_category_dropdown, inputs=comp_change_triggers, outputs=[comp_category, comp_status])
+    comp_version.change(fn=update_comp_category_dropdown, inputs=comp_change_triggers, outputs=[comp_category, comp_status])
 
     search_btn.click(
         fn=execute_unified_search,
@@ -592,8 +627,9 @@ with gr.Blocks() as demo:
         outputs=[output_df]
     )
 
-    base_reset_btn.click(fn=reset_base_selections, inputs=None, outputs=[base_standard, base_version, base_category])
-    comp_reset_btn.click(fn=reset_comp_selections, inputs=None, outputs=[comp_standard, comp_version, comp_category])
+    # ⬇️ [이벤트 수정] 초기화 버튼 누를 때 status도 리셋되도록 4개의 outputs 지정
+    base_reset_btn.click(fn=reset_base_selections, inputs=None, outputs=[base_standard, base_version, base_category, base_status])
+    comp_reset_btn.click(fn=reset_comp_selections, inputs=None, outputs=[comp_standard, comp_version, comp_category, comp_status])
 
 
 # ==========================================