Update app.py

app.py

@@ -82,22 +82,22 @@ def update_base_category_dropdown(standard, version):
         conn = sqlite3.connect(db_path)
         tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
         
+        # [패치] 시스템/설정 테이블 완벽 제외
+        valid_tables = [t for t in tables if t.lower() not in ['mapping_registry', 'mapping_table', 'table_config', 'sqlite_sequence']]
+        
         main_table = f"{standard}_{version}"
-        # [복원] 메인 테이블 이름 안전장치
-        if main_table not in tables:
-            main_table = tables[0] if tables else None
+        if main_table not in valid_tables:
+            main_table = valid_tables[0] if valid_tables else None
 
-        # 1. 부속 테이블(TableA 등) 리스트 가져오기
         pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
-        for t in tables:
-            if t == main_table or t.lower() in ['mapping_registry', 'mapping_table', 'table_config']: continue
+        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)
 
-        # 2. 본문 조항 리스트(1. Scope 등) 가져오기
         if main_table:
             cols = pd.read_sql(f"PRAGMA table_info([{main_table}])", conn)['name'].tolist()
             lower_cols = [c.lower() for c in cols]
@@ -109,7 +109,6 @@ def update_base_category_dropdown(standard, version):
                 for _, row in df.iterrows():
                     ch = str(row[ch_col]).strip()
                     ca = str(row[ca_col]).strip()
-                    # [복원] None, nan 값 필터링
                     if ch and ca and ch.lower() not in ['none', 'nan'] and ca.lower() not in ['none', 'nan']:
                         choices.append(f"{ch}.{ca}")
         conn.close()
@@ -120,13 +119,11 @@ 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=[], value=None, interactive=False)
 
     try:
         conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
-        # Registry에 등록된 쌍방향(Base<->Comp) 매핑 Standard만 추출
         query = """
         SELECT DISTINCT Comp_std FROM Mapping_registry WHERE Base_std=? AND Base_ver=?
         UNION
@@ -136,14 +133,11 @@ def update_comp_standard_dropdown(base_std, base_ver):
         conn.close()
 
         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.update(choices=[], value=None, interactive=False)
 
 def update_comp_version_dropdown(base_std, base_ver, comp_std):
-    """선택된 비교 Standard에 대해, 매핑이 허용된 버전만 반환"""
     if not all([base_std, base_ver, comp_std]):
         return gr.update(choices=[], value=None, interactive=False)
 
@@ -166,12 +160,11 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
     if not all([base_std, base_ver, base_cat, comp_std, comp_ver]):
         return gr.update(choices=[], value=None, interactive=False)
 
-    # 기준 법규의 타입 판별
-    base_type = "Main" if base_cat == "ALL" or (base_cat and base_cat[0].isdigit() and "." in base_cat) else base_cat
+    # [패치] 국문 조항("제1장.총칙") 등도 완벽히 Main으로 판별
+    base_type = "Main" if not base_cat or base_cat == "ALL" or "." in base_cat else base_cat
 
     try:
         conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
-        # Registry에서 허용된 Comp_Type 조회
         query = "SELECT DISTINCT Comp_Type FROM Mapping_registry WHERE Base_std=? AND Base_ver=? AND Base_Type=? AND Comp_std=? AND Comp_ver=?"
         df = pd.read_sql(query, conn, params=[base_std, base_ver, base_type, comp_std, comp_ver])
         conn.close()
@@ -181,8 +174,6 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
             return gr.update(choices=[], value=None)
 
         final_choices = []
-        
-        # [핵심 수정] Comp_Type이 'Main'인 경우, 실제 DB를 열어서 ALL과 세부 조항을 가져옴!
         if "Main" in allowed_types:
             final_choices.append("ALL")
             comp_db_path = os.path.join(UPLOAD_DIR, f"{comp_std}_{comp_ver}.db")
@@ -190,10 +181,11 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
             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_tables:
-                    c_main_table = c_tables[0] if c_tables else None
+                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()
@@ -210,10 +202,8 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
                                 final_choices.append(f"{ch}.{ca}")
                 c_conn.close()
         
-        # Main이 아닌 다른 타입(TableA 등)은 그대로 목록에 추가
         for t in allowed_types:
-            if t != "Main":
-                final_choices.append(t)
+            if t != "Main": final_choices.append(t)
 
         return gr.update(choices=final_choices, value=final_choices[0] if final_choices else None, interactive=True)
         
@@ -293,14 +283,18 @@ def fetch_database_records(standard, version, selection, table_type):
         anchor_cols_config = [x.strip() for x in anchor_col_config.split(',')]
 
         tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
+        
+        # [패치] SQLite 시스템 테이블 무시 로직 적용
+        valid_tables = [t for t in tables if t.lower() not in ['mapping_registry', 'mapping_table', 'table_config', 'sqlite_sequence']]
+        
         main_table = f"{standard}_{version}"
-        if main_table not in tables:
-            main_table = tables[0]
+        if main_table not in valid_tables:
+            main_table = valid_tables[0] if valid_tables else None
 
         target_table = None
         pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
 
-        for t in tables:
+        for t in valid_tables:
             if t == selection or pattern.sub("", t).strip(" _") == selection:
                 target_table = t
                 break
@@ -308,6 +302,9 @@ def fetch_database_records(standard, version, selection, table_type):
         if target_table and target_table != main_table:
             df = pd.read_sql(f"SELECT * FROM [{target_table}]", conn)
         else:
+            if not main_table:
+                return pd.DataFrame({"Error": ["데이터베이스 내에서 메인 테이블을 찾을 수 없습니다."]}), []
+                
             cursor = conn.cursor()
             cursor.execute(f"PRAGMA table_info([{main_table}])")
             cols = [c[1] for c in cursor.fetchall()]
@@ -361,20 +358,18 @@ def fetch_database_records(standard, version, selection, table_type):
 
 def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, comp_cat):
     try:
-        # [핵심 수정] 왼쪽(Base)과 오른쪽(Comp)의 타입을 각각 독립적으로 판단
+        # [패치] 국문 조항 식별 강화
         def get_type_by_cat(cat):
-            if not cat: return "Main"
-            is_main = cat == "ALL" or (cat[0].isdigit() and "." in cat)
-            return "Main" if is_main else cat
+            if not cat or cat == "ALL": return "Main"
+            if "." in cat: return "Main"
+            return cat
 
         type_b = get_type_by_cat(base_cat)
         type_c = get_type_by_cat(comp_cat)
         
-        # 각각의 기준 열(Anchor) 정보를 가져옴
         anchor_col_b, _ = get_table_config(type_b)
         anchor_col_c, _ = get_table_config(type_c)
 
-        # 시각적 중복 제거 (폭포수 방식)
         def apply_visual_merge(df, cols):
             if not df.empty and len(cols) > 1:
                 is_dup = pd.Series([True] * len(df), index=df.index)
@@ -386,7 +381,6 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                         df.loc[is_dup, col] = "&nbsp;"
             return df
 
-        # Code/Description 결합 로직
         def combine_code_desc(df):
             cols = list(df.columns)
             new_cols = []
@@ -418,7 +412,7 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             df = combine_code_desc(df)
             return apply_visual_merge(df, df.columns)
 
-        # 2. 비교 조회 (서로 다른 타입 지원)
+        # 2. 비교 조회 
         if all([base_std, base_ver, base_cat, comp_std, comp_ver, comp_cat]):
             df_base, real_anchors_b = fetch_database_records(base_std, base_ver, base_cat, type_b)
             df_comp, real_anchors_c = fetch_database_records(comp_std, comp_ver, comp_cat, type_c)
@@ -426,11 +420,17 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             if "Error" in df_base.columns: return df_base
             if "Error" in df_comp.columns: return df_comp
 
-            # 각자의 앵커 리스트를 사용하여 merge_key 생성
+            # [패치] Anchor 결측 시 UI 친화적 에러 메시지 복원
+            for ra in real_anchors_b:
+                if ra not in df_base.columns: 
+                    return pd.DataFrame({"Error": [f"기준 열(Anchor) '{ra}'이(가) 기준 데이터에 존재하지 않습니다. Table_Config를 확인하세요."]})
+            for ra in real_anchors_c:
+                if ra not in df_comp.columns: 
+                    return pd.DataFrame({"Error": [f"비교 열(Anchor) '{ra}'이(가) 비교 데이터에 존재하지 않습니다. Table_Config를 확인하세요."]})
+
             df_base['merge_key'] = df_base[real_anchors_b].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).str.replace(" ", "")
             df_comp['merge_key'] = df_comp[real_anchors_c].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).str.replace(" ", "")
 
-            # 매핑 브릿지 로드
             conn_map = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
             q = "SELECT Base_section, Comp_section FROM Mapping_table WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=?"
             df_fw = pd.read_sql(q, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
@@ -448,12 +448,10 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             else:
                 df_mapping = pd.DataFrame(columns=['Base_section', 'Comp_section'])
 
-            # 암시적 매핑 (키가 완전히 똑같은 경우)
             implicit = pd.DataFrame({'Base_section': list(set(df_base['merge_key']) & set(df_comp['merge_key'])), 
                                      'Comp_section': list(set(df_base['merge_key']) & set(df_comp['merge_key']))})
             bridge = pd.concat([df_mapping, implicit], ignore_index=True).drop_duplicates()
 
-            # 컬럼명 정리 및 병합
             rename_b = {c: f"{c}_{base_ver}" for c in df_base.columns if c != 'merge_key'}
             df_base = df_base.rename(columns=rename_b)
             rename_c = {c: f"{c}_{comp_ver}" for c in df_comp.columns if c != 'merge_key'}
@@ -462,13 +460,17 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             df_base['base_idx'], df_comp['comp_idx'] = range(len(df_base)), range(len(df_comp))
             merged = pd.merge(bridge, df_base, left_on='Base_section', right_on='merge_key', how='outer')
             merged = pd.merge(merged, df_comp, left_on='Comp_section', right_on='merge_key', how='outer')
+            
+            merged['base_idx'] = merged['base_idx'].fillna(float('inf'))
+            merged['comp_idx'] = merged['comp_idx'].fillna(float('inf'))
             merged = merged.sort_values(['base_idx', 'comp_idx'])
 
-            # 결과 행 조립 및 Diff
             result_rows = []
             for _, row in merged.iterrows():
                 row_dict = {}
-                has_b, has_c = not pd.isna(row.get('base_idx')), not pd.isna(row.get('comp_idx'))
+                has_b = not pd.isna(row.get('base_idx')) and row.get('base_idx') != float('inf')
+                has_c = not pd.isna(row.get('comp_idx')) and row.get('comp_idx') != float('inf')
+                
                 for c in rename_b.values(): row_dict[c] = str(row[c]) if has_b and not pd.isna(row[c]) else ""
                 for c in rename_c.values(): row_dict[c] = str(row[c]) if has_c and not pd.isna(row[c]) else ""
                 
@@ -481,16 +483,24 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                 result_rows.append(row_dict)
 
             final_df = combine_code_desc(pd.DataFrame(result_rows))
-            return apply_visual_merge(final_df, final_df.columns)
+            
+            b_cols_final = [c for c in final_df.columns if c.endswith(f"_{base_ver}")]
+            c_cols_final = [c for c in final_df.columns if c.endswith(f"_{comp_ver}")]
+
+            final_df = apply_visual_merge(final_df, b_cols_final)
+            final_df = apply_visual_merge(final_df, c_cols_final)
+
+            return final_df
 
         return pd.DataFrame({"Info": ["조건을 선택하세요."]})
     except Exception as e:
+        import traceback
         traceback.print_exc()
-        return pd.DataFrame({"Error": [str(e)]})
+        return pd.DataFrame({"Error": [f"시스템 오류 발생: {str(e)}"]})
 
 
 # ==========================================
-# 4. UI Layout & Event Binding (화면 구성 및 이벤트 연결)
+# 4. UI Layout & Event Binding
 # ==========================================
 with gr.Blocks() as demo:
     gr.Markdown("# 📜 Regulation Viewer")
@@ -505,7 +515,6 @@ with gr.Blocks() as demo:
     
         with gr.Accordion("🔄 비교 법규", open=False):
             with gr.Column():
-                # 초기에는 선택지를 비워둠 (기준 법규 선택 전까지 ��저히 통제)
                 comp_standard = gr.Dropdown(label="Standard", choices=[])
                 comp_version = gr.Dropdown(label="Version", choices=[])
                 comp_category = gr.Dropdown(label="Category", choices=[])
@@ -514,93 +523,35 @@ with gr.Blocks() as demo:
     search_btn = gr.Button("🔍 조회", variant="primary")
     output_df = gr.Dataframe(wrap=True, interactive=False, datatype="html", max_height=800)
 
-
     # --------------------------------------------------------
-    # 🔗 이벤트 바인딩 (데이터 흐름도)
+    # 🔗 이벤트 바인딩
     # --------------------------------------------------------
-
-    # [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]
-    )
+    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])
 
-    # --------------------------------------------------------
-    # [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]
-    )
+    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])
 
-    # --------------------------------------------------------
-    # [3] 최종 카테고리 통제 (Registry 필터링)
-    # --------------------------------------------------------
-    # ⑤ 기준 Category가 바뀌거나, 비교 Version이 바뀌면 -> 허용된 '비교 Category' 목록 갱신
     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]
-    )
+    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(
         fn=execute_unified_search,
         inputs=[base_standard, base_version, base_category, comp_standard, comp_version, comp_category],
         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]
-    )
+    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])
 
 
 # ==========================================
 # 5. Application Styling (CSS)
 # ==========================================
 css = """
-/* ----------------------------------------------------
-   [1] 기본 설정 (7열 이상 다중 열 기준)
-   - 열이 많을 경우 100%를 넘어서 자연스럽게 스크롤되도록 설정
----------------------------------------------------- */
 table { 
     table-layout: auto !important; 
     width: max-content !important; 
@@ -608,13 +559,9 @@ table {
 }
 
 th, td {
-    min-width: 150px; /* 열이 많아도 글자가 깨지지 않게 최소 너비 방어 */
+    min-width: 150px; 
 }
 
-/* ----------------------------------------------------
-   [2] 2, 4, 5, 6열 조건부 설정 (지정하신 비율 완벽 복구)
-   - 해당 열 개수일 때만 고정 레이아웃(fixed) 적용
----------------------------------------------------- */
 table:has(th:nth-last-child(2):first-child),
 table:has(th:nth-last-child(4):first-child),
 table:has(th:nth-last-child(5):first-child),
@@ -623,24 +570,20 @@ table:has(th:nth-last-child(6):first-child) {
     width: 100% !important;
 }
 
-/* 2컬럼 */
 table th:nth-last-child(2):first-child, table td:nth-last-child(2):first-child { width: 15% !important; min-width: 0 !important; } 
 table th:nth-last-child(1), table td:nth-last-child(1) { width: 85% !important; min-width: 0 !important; }
 
-/* 4컬럼 */
 table th:nth-child(1):nth-last-child(4), table td:nth-child(1):nth-last-child(4) { width: 10% !important; min-width: 0 !important; } 
 table th:nth-child(2):nth-last-child(3), table td:nth-child(2):nth-last-child(3) { width: 40% !important; min-width: 0 !important; } 
 table th:nth-child(3):nth-last-child(2), table td:nth-child(3):nth-last-child(2) { width: 10% !important; min-width: 0 !important; } 
 table th:nth-child(4):nth-last-child(1), table td:nth-child(4):nth-last-child(1) { width: 40% !important; min-width: 0 !important; }
 
-/* 5컬럼 */
 table th:nth-child(1):nth-last-child(5), table td:nth-child(1):nth-last-child(5) { width: 15% !important; min-width: 0 !important; } 
 table th:nth-child(2):nth-last-child(4), table td:nth-child(2):nth-last-child(4) { width: 10% !important; min-width: 0 !important; } 
 table th:nth-child(3):nth-last-child(3), table td:nth-child(3):nth-last-child(3) { width: 30% !important; min-width: 0 !important; } 
 table th:nth-child(4):nth-last-child(2), table td:nth-child(4):nth-last-child(2) { width: 10% !important; min-width: 0 !important; } 
 table th:nth-child(5):nth-last-child(1), table td:nth-child(5):nth-last-child(1) { width: 35% !important; min-width: 0 !important; }
 
-/* 6컬럼 */
 table th:nth-child(1):nth-last-child(6), table td:nth-child(1):nth-last-child(6) { width: 8% !important; min-width: 0 !important; } 
 table th:nth-child(2):nth-last-child(5), table td:nth-child(2):nth-last-child(5) { width: 15% !important; min-width: 0 !important; } 
 table th:nth-child(3):nth-last-child(4), table td:nth-child(3):nth-last-child(4) { width: 27% !important; min-width: 0 !important; } 
@@ -648,9 +591,6 @@ table th:nth-child(4):nth-last-child(3), table td:nth-child(4):nth-last-child(3)
 table th:nth-child(5):nth-last-child(2), table td:nth-child(5):nth-last-child(2) { width: 15% !important; min-width: 0 !important; } 
 table th:nth-child(6):nth-last-child(1), table td:nth-child(6):nth-last-child(1) { width: 27% !important; min-width: 0 !important; }
 
-/* ----------------------------------------------------
-   [3] 데이터프레임 및 헤더 기본 스크롤/텍스트 설정
----------------------------------------------------- */
 thead th { 
     font-size: 18px !important;
     position: sticky;
@@ -661,7 +601,7 @@ thead th {
 .dataframe { 
     max-height: none !important; 
     overflow-y: visible !important; 
-    overflow-x: auto !important; /* 좌우 스크롤바 허용 */
+    overflow-x: auto !important; 
     display: block;
 } 
 .dataframe > div { 
@@ -671,7 +611,7 @@ thead th {
 td { 
     font-size: 18px !important;
     white-space: pre-wrap !important;
-    word-break: keep-all !important; /* 알파벳이 하나씩 찢어지는 현상 방지 */
+    word-break: keep-all !important; 
     line-height: 1.6; 
     padding: 10px; 
     vertical-align: top !important;