Update app.py

app.py

@@ -120,53 +120,45 @@ def update_base_category_dropdown(standard, version):
     return gr.update(choices=choices, value=None, interactive=True)
 
 def update_comp_standard_dropdown(base_std, base_ver):
+    """기준 법규 선택 시, 매핑이 허용된 상대 Standard만 반환"""
     if not base_std or not base_ver:
-        return gr.Dropdown(choices=[], interactive=False)
+        return gr.Dropdown(choices=[], value=None, interactive=False)
 
     try:
         conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
+        # Registry에 등록된 쌍방향(Base<->Comp) 매핑 Standard만 추출
         query = """
-        SELECT DISTINCT Comp_std AS mapped_std FROM Mapping_registry WHERE Base_std=? AND Base_ver=?
+        SELECT DISTINCT Comp_std FROM Mapping_registry WHERE Base_std=? AND Base_ver=?
         UNION
-        SELECT DISTINCT Base_std AS mapped_std FROM Mapping_registry WHERE Comp_std=? AND Comp_ver=?
+        SELECT DISTINCT Base_std FROM Mapping_registry WHERE Comp_std=? AND Comp_ver=?
         """
         df = pd.read_sql(query, conn, params=[base_std, base_ver, base_std, base_ver])
         conn.close()
 
-        if df.empty:
-            return gr.Dropdown(choices=[], interactive=False)
-
-        return gr.Dropdown(choices=sorted(df['mapped_std'].dropna().unique().tolist()), interactive=True)
+        mapped_stds = sorted(df['Comp_std'].dropna().unique().tolist()) if not df.empty else []
+        
+        # 매핑된 것이 없으면 선택 불가 상태로 반환
+        return gr.update(choices=mapped_stds, value=None, interactive=bool(mapped_stds))
     except Exception:
-        return gr.Dropdown(choices=[], interactive=False)
+        return gr.update(choices=[], value=None, interactive=False)
 
 def update_comp_version_dropdown(base_std, base_ver, comp_std):
-    if not comp_std:
+    """선택된 비교 Standard에 대해, 매핑이 허용된 버전만 반환"""
+    if not all([base_std, base_ver, comp_std]):
         return gr.update(choices=[], value=None, interactive=False)
 
     try:
         conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
         query = """
-        SELECT DISTINCT Comp_ver AS mapped_ver FROM Mapping_registry WHERE Base_std=? AND Base_ver=? AND Comp_std=?
+        SELECT DISTINCT Comp_ver FROM Mapping_registry WHERE Base_std=? AND Base_ver=? AND Comp_std=?
         UNION
-        SELECT DISTINCT Base_ver AS mapped_ver FROM Mapping_registry WHERE Comp_std=? AND Comp_ver=? AND Base_std=?
+        SELECT DISTINCT Base_ver FROM Mapping_registry WHERE Comp_std=? AND Comp_ver=? AND Base_std=?
         """
         df = pd.read_sql(query, conn, params=[base_std, base_ver, comp_std, base_std, base_ver, comp_std])
         conn.close()
 
-        choices = sorted(df['mapped_ver'].dropna().unique().tolist())
-        
-        if not choices:
-            for f in os.listdir(UPLOAD_DIR):
-                if f.startswith(comp_std + "_") and f.endswith(".db"):
-                    ver = f.replace(comp_std + "_", "").replace(".db", "")
-                    choices.append(ver)
-            choices = sorted(list(set(choices)))
-
-        if not choices:
-            return gr.update(choices=[], value=None, interactive=False)
-
-        return gr.update(choices=choices, value=None, interactive=True)
+        mapped_vers = sorted(df['Comp_ver'].dropna().unique().tolist()) if not df.empty else []
+        return gr.update(choices=mapped_vers, value=None, interactive=bool(mapped_vers))
     except Exception:
         return gr.update(choices=[], value=None, interactive=False)
 
@@ -498,7 +490,7 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
 
 
 # ==========================================
-# 4. UI Layout & Event Binding
+# 4. UI Layout & Event Binding (화면 구성 및 이벤트 연결)
 # ==========================================
 with gr.Blocks() as demo:
     gr.Markdown("# 📜 Regulation Viewer")
@@ -513,44 +505,92 @@ with gr.Blocks() as demo:
     
         with gr.Accordion("🔄 비교 법규", open=False):
             with gr.Column():
-                comp_standard = gr.Dropdown(label="Standard")
-                comp_version = gr.Dropdown(label="Version")
-                comp_category = gr.Dropdown(label="Category")
+                # 초기에는 선택지를 비워둠 (기준 법규 선택 전까지 철저히 통제)
+                comp_standard = gr.Dropdown(label="Standard", choices=[])
+                comp_version = gr.Dropdown(label="Version", choices=[])
+                comp_category = gr.Dropdown(label="Category", choices=[])
                 comp_reset_btn = gr.Button("↺ 초기화")
 
     search_btn = gr.Button("🔍 조회", variant="primary")
     output_df = gr.Dataframe(wrap=True, interactive=False, datatype="html", max_height=800)
 
-    # 초기 로드
-    demo.load(load_initial_standards, None, base_standard)
 
-    # [수정된 바인딩 로직]
-    # 1. 기준 버전이 선택되면 -> 기준 카테고리를 '전체'에서 가져옴
-    base_standard.change(update_version_dropdown, base_standard, base_version)
-    base_version.change(update_base_category_dropdown, [base_standard, base_version], base_category)
-    
-    # 2. 기준 버전이 선택되면 비교 가능한 '상대 법규' 목록 업데이트
-    base_version.change(update_comp_standard_dropdown, [base_standard, base_version], comp_standard)
-    
-    # 3. 비교 법규의 버전이 선택되면 -> '비교 버전' 목록 업데이트
-    comp_standard.change(update_comp_version_dropdown, [base_standard, base_version, comp_standard], comp_version)
+    # --------------------------------------------------------
+    # 🔗 이벤트 바인딩 (데이터 흐름도)
+    # --------------------------------------------------------
+
+    # [0] 앱 초기 로드
+    demo.load(fn=load_initial_standards, inputs=None, outputs=base_standard)
+
+    # --------------------------------------------------------
+    # [1] 기준 법규 흐름 (Base Flow)
+    # --------------------------------------------------------
+    # ① 기준 Standard 선택 -> 기준 Version 목록 갱신
+    base_standard.change(
+        fn=update_version_dropdown, 
+        inputs=[base_standard], 
+        outputs=[base_version]
+    )
+    # ② 기준 Version 선택 -> 기준 Category 목록 갱신 (DB 전체 목록)
+    base_version.change(
+        fn=update_base_category_dropdown, 
+        inputs=[base_standard, base_version], 
+        outputs=[base_category]
+    )
+
+    # --------------------------------------------------------
+    # [2] 비교 법규 통제 흐름 (Base -> Comp Flow)
+    # --------------------------------------------------------
+    # ③ 기준 Version이 결정되면 -> 허용된 '비교 Standard' 목록 갱신
+    base_version.change(
+        fn=update_comp_standard_dropdown, 
+        inputs=[base_standard, base_version], 
+        outputs=[comp_standard]
+    )
+    # ④ 비교 Standard 선택 -> 허용된 '비교 Version' 목록 갱신
+    comp_standard.change(
+        fn=update_comp_version_dropdown, 
+        inputs=[base_standard, base_version, comp_standard], 
+        outputs=[comp_version]
+    )
 
-    # 4. [통제 로직 적용] 기준 카테고리나 비교 버전이 바뀌면 -> 비교 카테고리를 'Mapping_registry' 기준으로 필터링
+    # --------------------------------------------------------
+    # [3] 최종 카테고리 통제 (Registry 필터링)
+    # --------------------------------------------------------
+    # ⑤ 기준 Category가 바뀌거나, 비교 Version이 바뀌면 -> 허용된 '비교 Category' 목록 갱신
     comp_change_triggers = [base_standard, base_version, base_category, comp_standard, comp_version]
     
-    base_category.change(update_comp_category_dropdown, comp_change_triggers, comp_category)
-    comp_version.change(update_comp_category_dropdown, comp_change_triggers, comp_category)
+    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]
+    )
 
-    # 조회 버튼
+    # --------------------------------------------------------
+    # [4] 버튼 동작 (Action)
+    # --------------------------------------------------------
     search_btn.click(
-        execute_unified_search,
+        fn=execute_unified_search,
         inputs=[base_standard, base_version, base_category, comp_standard, comp_version, comp_category],
-        outputs=output_df
+        outputs=[output_df]
     )
 
-    # 초기화 버튼들
-    base_reset_btn.click(reset_base_selections, None, [base_standard, base_version, base_category])
-    comp_reset_btn.click(reset_comp_selections, None, [comp_standard, comp_version, comp_category])
+    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]
+    )
 
 
 # ==========================================