Update app.py

app.py

@@ -1,4 +1,3 @@
-# app.py
 import os, base64
 import gradio as gr
 import pandas as pd
@@ -10,7 +9,7 @@ LOGO_PATH = Path("rowsquared-logo-large.png")
 with open(LOGO_PATH, "rb") as f:
     logo_b64 = base64.b64encode(f.read()).decode()
 
-# --- load your ISCO hierarchy and build nested dict (as before) ---
+# --- load your ISCO hierarchy and build nested dict ---
 PROCESSED_DATA_DIR = Path(".")
 df_isco = (
     pd.read_excel(
@@ -25,34 +24,33 @@ for _, r in df_isco.iterrows():
              .setdefault(r.sub_major_label, {})\
              .setdefault(r.minor_label, [])\
              .append(r.unit_label)
-# dedupe & sort units
 for maj in hierarchy:
     for sub in hierarchy[maj]:
         for mn in hierarchy[maj][sub]:
             hierarchy[maj][sub][mn] = sorted(dict.fromkeys(hierarchy[maj][sub][mn]))
 
-def majors():    return sorted(hierarchy.keys())
-def submajors(m):return sorted(hierarchy.get(m,{}).keys())
-def minors(m,s): return sorted(hierarchy.get(m,{}).get(s,{}).keys())
-def units(m,s,n):return hierarchy.get(m,{}).get(s,{}).get(n,[])
+def majors():     return sorted(hierarchy.keys())
+def submajors(m): return sorted(hierarchy.get(m,{}).keys())
+def minors(m,s):  return sorted(hierarchy.get(m,{}).get(s,{}).keys())
+def units(m,s,n): return hierarchy.get(m,{}).get(s,{}).get(n,[])
 
-# --- load your records (same as before) ---
+# --- load your records ---
 records = pd.read_excel(PROCESSED_DATA_DIR/"isco_predictions.xlsx").copy()
 for c in ["major_label","sub_major_label","minor_label","unit_label"]:
-    if c not in records: records[c]=""
-if "annotated" not in records: records["annotated"]=False
+    if c not in records: records[c] = ""
+if "annotated" not in records: records["annotated"] = False
 records.reset_index(drop=True,inplace=True)
 
-# --- clamp + save + load + handlers (copy in your code) ---
+# --- clamp + save + load + handlers ---
 def clamp_path(maj,sub,mn,un):
     maj_c = majors()
-    if maj not in maj_c: maj = maj_c[0] if maj_c else ""
+    maj   = maj if maj in maj_c else (maj_c[0] if maj_c else "")
     sub_c = submajors(maj)
-    if sub not in sub_c: sub = sub_c[0] if sub_c else ""
+    sub   = sub if sub in sub_c else (sub_c[0] if sub_c else "")
     mn_c  = minors(maj,sub)
-    if mn  not in mn_c:  mn  = mn_c[0]  if mn_c  else ""
+    mn    = mn if mn in mn_c else (mn_c[0] if mn_c else "")
     un_c  = units(maj,sub,mn)
-    if un  not in un_c:  un  = un_c[0]  if un_c  else ""
+    un    = un if un in un_c else (un_c[0] if un_c else "")
     return maj,sub,mn,un, maj_c,sub_c,mn_c,un_c
 
 def save_record(i,maj,sub,mn,un):
@@ -64,10 +62,8 @@ def status_text(i):
 
 def load_record(i):
     r = records.loc[i]
-    maj,sub,mn,un,maj_c,sub_c,mn_c,un_c = clamp_path(
-        r.major_label, r.sub_major_label, r.minor_label, r.unit_label
-    )
-    save_record(i, maj,sub,mn,un)
+    maj,sub,mn,un,maj_c,sub_c,mn_c,un_c = clamp_path(r.major_label, r.sub_major_label, r.minor_label, r.unit_label)
+    save_record(i,maj,sub,mn,un)
     md = f"## Occupation: {r.occupation_title_main}\n## Industry: {r.industry_title_main}"
     return (
         md,
@@ -79,15 +75,15 @@ def load_record(i):
     )
 
 def on_major_change(new_maj,i):
-    sub_c = submajors(new_maj);    sub = sub_c[0] if sub_c else ""
-    mn_c  = minors(new_maj,sub);   mn  = mn_c[0]  if mn_c  else ""
+    sub_c = submajors(new_maj); sub = sub_c[0] if sub_c else ""
+    mn_c  = minors(new_maj,sub); mn  = mn_c[0]  if mn_c  else ""
     un_c  = units(new_maj,sub,mn); un  = un_c[0]  if un_c  else ""
     save_record(i,new_maj,sub,mn,un)
     return (
-        gr.update(choices=majors(),value=new_maj),
-        gr.update(choices=sub_c,value=sub),
-        gr.update(choices=mn_c,value=mn),
-        gr.update(choices=un_c,value=un),
+        gr.update(choices=majors(),  value=new_maj),
+        gr.update(choices=sub_c,     value=sub),
+        gr.update(choices=mn_c,      value=mn),
+        gr.update(choices=un_c,      value=un),
         status_text(i),
     )
 
@@ -98,8 +94,8 @@ def on_sub_change(new_sub,i,maj):
     records.loc[i,"annotated"]=True
     return (
         gr.update(choices=submajors(maj),value=new_sub),
-        gr.update(choices=mn_c,value=mn),
-        gr.update(choices=un_c,value=un),
+        gr.update(choices=mn_c,          value=mn),
+        gr.update(choices=un_c,          value=un),
         status_text(i),
     )
 
@@ -109,13 +105,13 @@ def on_minor_change(new_mn,i,maj,sub):
     records.loc[i,"annotated"]=True
     return (
         gr.update(choices=minors(maj,sub),value=new_mn),
-        gr.update(choices=un_c,value=un),
+        gr.update(choices=un_c,           value=un),
         status_text(i),
     )
 
 def on_unit_change(new_un,i,maj,sub,mn):
     un_c=units(maj,sub,mn)
-    if new_un not in un_c: new_un = un_c[0] if un_c else ""
+    new_un = new_un if new_un in un_c else (un_c[0] if un_c else "")
     records.loc[i,"unit_label"]=new_un
     records.loc[i,"annotated"]=True
     return gr.update(choices=un_c,value=new_un), status_text(i)
@@ -123,73 +119,76 @@ def on_unit_change(new_un,i,maj,sub,mn):
 def go_next(i): return (i+1)%len(records)
 def go_prev(i): return (i-1)%len(records)
 
-def save_and_jump(i,dir):
-    # clamp and save first
+def save_and_jump(i,direction):
     r=records.loc[i]
-    maj,sub,mn,un,*_ = clamp_path(r.major_label, r.sub_major_label, r.minor_label, r.unit_label)
+    maj,sub,mn,un,*_ = clamp_path(r.major_label,r.sub_major_label,r.minor_label,r.unit_label)
     save_record(i,maj,sub,mn,un)
-    j = go_next(i) if dir=="next" else go_prev(i)
+    j = go_next(i) if direction=="next" else go_prev(i)
     return (j,)+load_record(j)
 
 def download_csv():
-    path = PROCESSED_DATA_DIR/"annotated_output.csv"
-    records.to_csv(path,index=False)
-    return str(path)
+    out = PROCESSED_DATA_DIR/"annotated_output.csv"
+    records.to_csv(out,index=False)
+    return str(out)
 
-# --- now build the Blocks with a login gate ---
+# --- build with login gate ---
 def build_gradio_app():
     USER = os.getenv("APP_USER","")
     PWD  = os.getenv("APP_PASS","")
 
     with gr.Blocks() as demo:
-        gr.HTML(f"""<style>
-            footer, .share-link, .api-link {{display:none!important}}
-            #logo {{margin-bottom:1em}}
-            #title{{text-align:center;margin-bottom:1em}}
+        gr.HTML("""
+        <style>
+          footer, .share-link, .api-link {display:none!important}
+          #title{text-align:center;margin:0.5em}
         </style>""")
 
-        # login panel
-        with gr.Column(elem_id="login_panel"):
-            gr.HTML(f'<img id="logo" src="data:image/png;base64,{logo_b64}" width="180" '
-                    'style="pointer-events:none;user-select:none;display:block;margin:auto;" />')
-            user_in  = gr.Textbox(label="Username")
-            pass_in  = gr.Textbox(label="Password", type="password")
-            login_btn= gr.Button("🔒 Log in")
-            login_msg= gr.Markdown("", visible=False)
-
-        # main app panel (hidden until auth)
-        with gr.Column(elem_id="app_panel", visible=False):
-            gr.HTML(f'<img id="logo" src="data:image/png;base64,{logo_b64}" width="180" '
-                    'style="pointer-events:none;user-select:none;display:block;margin:auto;" />')
+        # === capture the two panels ===
+        with gr.Column(elem_id="login_panel") as login_panel:
+            gr.HTML(f'<img src="data:image/png;base64,{logo_b64}" width="160" '
+                    'style="pointer-events:none;user-select:none;display:block;margin:auto;"/>')
+            user_in   = gr.Textbox(label="Username")
+            pass_in   = gr.Textbox(label="Password", type="password")
+            login_btn = gr.Button("🔒 Log in")
+            login_msg = gr.Markdown("", visible=False)
+
+        with gr.Column(elem_id="app_panel", visible=False) as app_panel:
+            gr.HTML(f'<img src="data:image/png;base64,{logo_b64}" width="160" '
+                    'style="pointer-events:none;user-select:none;display:block;margin:auto;"/>')
             gr.Markdown("# ISCO Annotation", elem_id="title")
             idx_state = gr.State(0)
             record_md = gr.Markdown()
             status_md = gr.Markdown()
-            with gr.Row():
-                prev_btn = gr.Button("⬅ Previous")
-                next_btn = gr.Button("✅ Next")
-            with gr.Row():
-                major_radio = gr.Radio("Level 1: Major", choices=[], interactive=True)
-                sub_radio   = gr.Radio("Level 2: Sub-major", choices=[], interactive=True)
-                minor_radio = gr.Radio("Level 3: Minor", choices=[], interactive=True)
-                unit_radio  = gr.Radio("Level 4: Unit", choices=[], interactive=True)
+            prev_btn  = gr.Button("⬅ Previous")
+            next_btn  = gr.Button("✅ Next")
+            major_radio = gr.Radio("Level 1 Major",   choices=[], interactive=True)
+            sub_radio   = gr.Radio("Level 2 Sub-major",choices=[], interactive=True)
+            minor_radio = gr.Radio("Level 3 Minor",   choices=[], interactive=True)
+            unit_radio  = gr.Radio("Level 4 Unit",    choices=[], interactive=True)
             download_btn  = gr.Button("📥 Download CSV")
             download_file = gr.File(visible=False)
 
-        # login logic
+        # --- login handler ---
         def check_creds(u,p):
             if u==USER and p==PWD:
-                return gr.update(visible=False), gr.update(visible=True), gr.update(visible=False), ""
+                return (
+                    gr.update(visible=False),  # hide login
+                    gr.update(visible=True),   # show app
+                    gr.update(visible=False),  # hide error
+                    ""                         # clear user_in
+                )
             else:
-                return None, None, gr.update(visible=True,value="❌ Bad credentials"), ""
+                return (None, None,
+                        gr.update(visible=True,value="❌ Bad credentials"),
+                        "")
 
         login_btn.click(
             check_creds,
             inputs=[user_in,pass_in],
-            outputs=[login_panel, app_panel, login_msg, user_in]
+            outputs=[login_panel,app_panel,login_msg,user_in]
         )
 
-        # app logic wiring
+        # --- main app wiring ---
         demo.load(lambda: (0,)+load_record(0),
                   outputs=[idx_state,record_md,status_md,
                            major_radio,sub_radio,minor_radio,unit_radio])
@@ -224,4 +223,6 @@ def build_gradio_app():
 
 if __name__=="__main__":
     demo = build_gradio_app()
-    demo.queue().launch(show_api=False, share=True)
+    demo.queue().launch(show_api=False, share=True,
+                       # require Gradio‐level HTTP auth
+                       auth=(os.getenv("APP_USER",""), os.getenv("APP_PASS","")))