Update app.py

app.py

@@ -5,21 +5,23 @@ import os
 import re
 import base64
 
-# 1️⃣ 저장소 및 환경 설정
+# 1️⃣ 저장소 설정
 UPLOAD_DIR = "uploaded_dbs"
 if not os.path.exists(UPLOAD_DIR):
     os.makedirs(UPLOAD_DIR)
 
 db_registry = []
 
-# BLOB(이미지) 데이터를 HTML 태그로 변환
+# --------------------------
+# 유틸 함수 (그대로 유지)
+# --------------------------
 def blob_to_base64_html(blob_data):
     if blob_data is None or pd.isna(blob_data):
         return ""
     try:
         if isinstance(blob_data, (bytes, bytearray)):
             encoded_string = base64.b64encode(blob_data).decode('utf-8')
-            return f'<img src="data:image/png;base64,{encoded_string}" width="200" height="auto" />'
+            return f'<img src="data:image/png;base64,{encoded_string}" width="200" />'
         return str(blob_data)
     except:
         return str(blob_data)
@@ -32,8 +34,8 @@ def natural_sort_key(s):
 def refresh_registry_data():
     global db_registry
     db_registry = []
-    if not os.path.exists(UPLOAD_DIR): return []
     db_files = [f for f in os.listdir(UPLOAD_DIR) if f.endswith(".db")]
+
     for filename in db_files:
         name_only = filename.replace(".db", "")
         parts = name_only.split("_")
@@ -43,149 +45,128 @@ def refresh_registry_data():
                 "standard": parts[0],
                 "version": parts[1]
             })
+
     return sorted(list(set([db["standard"] for db in db_registry])))
 
-# 2️⃣ UI 업데이트 함수
+# --------------------------
+# 드롭다운 업데이트
+# --------------------------
 def on_load():
     standards = refresh_registry_data()
-    return gr.Dropdown(choices=standards, value=None)
+    return gr.Dropdown(choices=standards)
 
 def update_version_dd(standard):
-    if not standard: return gr.Dropdown(choices=[], value=None)
-    versions = sorted(list(set([db["version"] for db in db_registry if db["standard"] == standard])))
-    return gr.Dropdown(choices=versions, value=None)
+    if not standard:
+        return gr.Dropdown(choices=[])
+    versions = sorted(list(set([
+        db["version"] for db in db_registry if db["standard"] == standard
+    ])))
+    return gr.Dropdown(choices=versions)
 
 def update_category_dd(standard, version):
-    if not standard or not version: return gr.Dropdown(choices=[], value=None)
+    if not standard or not version:
+        return gr.Dropdown(choices=[])
+
     choices = ["ALL"]
+
     try:
         target_db = next(db for db in db_registry if db["standard"] == standard and db["version"] == version)
         conn = sqlite3.connect(target_db["path"])
-        all_tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
-        
+
+        tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
         main_t = f"{standard}_{version}"
-        if main_t not in all_tables:
-            candidates = [t for t in all_tables if standard.lower() in t.lower() and version.lower() in t.lower()]
-            main_t = candidates[0] if candidates else all_tables[0]
-        
+
+        if main_t not in tables:
+            main_t = tables[0]
+
         cols_info = pd.read_sql(f"PRAGMA table_info([{main_t}])", conn)
-        orig_cols = cols_info['name'].tolist()
-        lower_cols = [c.strip().lower() for c in orig_cols]
-        
-        # 💡 장(chapter) + 카테고리(category) 결합 로직
+        cols = cols_info['name'].tolist()
+        lower_cols = [c.lower() for c in cols]
+
         if 'chapter' in lower_cols and 'category' in lower_cols:
-            real_ch = orig_cols[lower_cols.index('chapter')]
-            real_cat = orig_cols[lower_cols.index('category')]
-            
-            # DISTINCT로 중복 제거된 장.카테고리 쌍을 가져옴
-            df_cat = pd.read_sql(f"SELECT DISTINCT [{real_ch}], [{real_cat}] FROM [{main_t}]", conn)
-            
-            cats = []
-            for _, row in df_cat.iterrows():
-                ch = str(row[real_ch]).strip() if row[real_ch] is not None else ""
-                ca = str(row[real_cat]).strip() if row[real_cat] is not None else ""
-                if ch:
-                    # '1.Scope' 형식으로 생성
-                    cats.append(f"{ch}.{ca}" if ca else ch)
-            
-            cats.sort(key=natural_sort_key)
-            choices.extend(cats)
-        
-        # 부속 테이블 추가
-        prefix = f"{standard}_{version}_"
-        for t in all_tables:
-            if t != main_t:
-                choices.append(t.replace(prefix, ""))
-            
+            ch = cols[lower_cols.index('chapter')]
+            ca = cols[lower_cols.index('category')]
+
+            df = pd.read_sql(f"SELECT DISTINCT [{ch}], [{ca}] FROM [{main_t}]", conn)
+
+            for _, row in df.iterrows():
+                c = str(row[ch])
+                cat = str(row[ca])
+                choices.append(f"{c}.{cat}")
+
         conn.close()
     except:
         pass
-    return gr.Dropdown(choices=choices, value=None)
 
-# 3️��� 데이터 조회 로직 (DB 순서 유지)
+    return gr.Dropdown(choices=choices)
+
+# --------------------------
+# 데이터 조회
+# --------------------------
 def display_data(standard, version, selection):
-    if not all([standard, version, selection]): return None
-    try:
-        target_db = next(db for db in db_registry if db["standard"] == standard and db["version"] == version)
-        conn = sqlite3.connect(target_db["path"])
-        all_tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
-        
-        main_t = f"{standard}_{version}"
-        if main_t not in all_tables:
-            candidates = [t for t in all_tables if standard.lower() in t.lower() and version.lower() in t.lower()]
-            main_t = candidates[0] if candidates else all_tables[0]
-
-        is_sub_table = False 
-        if selection == "ALL":
-            df = pd.read_sql(f"SELECT * FROM [{main_t}] ORDER BY rowid", conn)
-        elif "." in selection:
-            # '1.Scope'에서 장과 카테고리 분리
-            ch, ca = selection.split('.', 1)
-            cols_info = pd.read_sql(f"PRAGMA table_info([{main_t}])", conn)
-            cols_lower = [c.strip().lower() for c in cols_info['name'].tolist()]
-            real_ch = cols_info['name'].tolist()[cols_lower.index('chapter')]
-            real_cat = cols_info['name'].tolist()[cols_lower.index('category')]
-            
-            df = pd.read_sql(f"SELECT * FROM [{main_t}] WHERE CAST([{real_ch}] AS TEXT)=? AND CAST([{real_cat}] AS TEXT)=? ORDER BY rowid", 
-                             conn, params=[ch, ca])
-        else:
-            is_sub_table = True
-            actual_table = next((t for t in all_tables if selection in t), selection)
-            df = pd.read_sql(f"SELECT * FROM [{actual_table}] ORDER BY rowid", conn)
-        conn.close()
+    if not all([standard, version, selection]):
+        return None
+
+    target_db = next(db for db in db_registry if db["standard"] == standard and db["version"] == version)
+    conn = sqlite3.connect(target_db["path"])
+
+    main_t = f"{standard}_{version}"
+
+    if selection == "ALL":
+        df = pd.read_sql(f"SELECT * FROM [{main_t}]", conn)
+    elif "." in selection:
+        ch, ca = selection.split(".", 1)
+        df = pd.read_sql(f"SELECT * FROM [{main_t}] WHERE chapter=? AND category=?", conn, params=[ch, ca])
+    else:
+        df = pd.read_sql(f"SELECT * FROM [{selection}]", conn)
+
+    conn.close()
 
-        if not df.empty:
-            # 이미지 변환
-            for col in df.columns:
-                df[col] = df[col].apply(blob_to_base64_html)
-
-            # 본문 조회 시 열 필터링 (DB 순서 유지)
-            if not is_sub_table:
-                base_cols = [c for c in ['section', 'description'] if c in df.columns]
-                # 이미지가 포함된 열 자동 추가
-                image_cols = [c for c in df.columns if c not in base_cols and df[c].astype(str).str.contains('<img', na=False).any()]
-                df = df[base_cols + image_cols]
-                
-        return df
-    except Exception as e:
-        return pd.DataFrame({"Error": [f"조회 실패: {str(e)}"]})
-
-# 4️⃣ UI 구성
+    if not df.empty:
+        for col in df.columns:
+            df[col] = df[col].apply(blob_to_base64_html)
+
+        if 'section' in df.columns and 'description' in df.columns:
+            df = df[['section', 'description']]
+
+    return df
+
+# --------------------------
+# 🔥 통합 조회 (핵심)
+# --------------------------
 def unified_search(bs, bv, bc, cs, cv, cc):
 
+    # 기준만
     if bs and bv and bc and not (cs and cv and cc):
         return display_data(bs, bv, bc)
 
+    # 비교
     if bs and bv and bc and cs and cv and cc:
         df_base = display_data(bs, bv, bc)
         df_comp = display_data(cs, cv, cc)
 
-        try:
-            merged = pd.merge(
-                df_base,
-                df_comp,
-                on="section",
-                how="outer",
-                suffixes=("_base", "_comp")
-            )
-            return merged
-        except Exception as e:
-            return pd.DataFrame({"Error": [str(e)]})
+        merged = pd.merge(
+            df_base,
+            df_comp,
+            on="section",
+            how="outer",
+            suffixes=("_base", "_comp")
+        )
+
+        return merged
 
     return pd.DataFrame({"Info": ["선택을 완료하세요"]})
-    
-with gr.Blocks(css="""
-table td {
-    white-space: normal !important;
-    word-break: break-word !important;
-}
-""") as demo: 
+
+# --------------------------
+# UI 구성
+# --------------------------
+with gr.Blocks() as demo:
 
     gr.Markdown("# 📜 Regulation Viewer")
 
     with gr.Row():
 
-        # 👉 왼쪽
+        # 왼쪽
         with gr.Column(scale=1):
 
             with gr.Group():
@@ -200,11 +181,10 @@ table td {
                 comp_version = gr.Dropdown(label="Version")
                 comp_category = gr.Dropdown(label="Category")
 
-        # 👉 ��른쪽
+        # 오른쪽
         with gr.Column(scale=4):
             gr.Markdown("### 📊 내용")
 
-            # ❗ height 제거
             output_df = gr.Dataframe(
                 wrap=True,
                 interactive=False,
@@ -215,7 +195,7 @@ table td {
     with gr.Row():
         search_btn = gr.Button("🔍 조회")
 
-    # 기존 이벤트 그대로
+    # 이벤트 연결
     demo.load(on_load, None, base_standard)
     demo.load(on_load, None, comp_standard)
 
@@ -232,6 +212,17 @@ table td {
         output_df
     )
 
-# ❗ theme는 여기로 이동
+# --------------------------
+# 실행
+# --------------------------
 if __name__ == "__main__":
-    demo.launch(theme=gr.themes.Soft())
+    demo.launch(
+        theme=gr.themes.Soft(),
+        share=True,
+        css="""
+        table td {
+            white-space: normal !important;
+            word-break: break-word !important;
+        }
+        """
+    )