Upload 2 files

app.py

@@ -3,6 +3,8 @@ import gradio as gr
 import pandas as pd
 import numpy as np
 import re
+import os
+import uuid
 from io import BytesIO
 from typing import List, Dict, Tuple, Optional
 try:
@@ -22,7 +24,7 @@ DESCRIPTION = """
    - หรือกรอก **หมายเลขคอลัมน์** ตามรายการ Available columns (เลขเริ่ม 1)
 5) Clean → เหลือเฉพาะ NAME, ID, และคอลัมน์วอร์ดที่เลือก (ค่าจัดอันดับถูกแปลงเป็นตัวเลข)
 6) Assign → สุ่มตามลำดับอันดับ โดยเคารพ capacity
-   - **จะตรวจว่าจำนวนนักศึกษา <= ผลรวม capacity** (ขาดได้ แต่ห้ามเกิน)
+   - **จะตรวจว่าจำนวนนักศึกษา <= ผลรวม capacity** (ขาดได้แต่ห้ามเกิน)
 """
 
 WARD_CHOICES = [
@@ -41,8 +43,8 @@ AUTO_MAP = {
     "NAME": ["ชื่อ-สกุล", "ชื่อ - สกุล", "fullname", "full name", "name", "student name"],
     "ID": ["รหัสนักศึกษา", "รหัส", "student id", "id", "studentid"],
     "Medical": ["อายุรศาสตร์", "medical"],
-    "Medical_1": ["อายุรศาสตร์_1", "medical_1", "med_1"],
-    "Medical_2": ["อายุรศาสตร์_2", "medical_2", "med_2"],
+    "Medical_1": ["อายุรศาสตร์_1", "medical_1", "med_1","med1"],
+    "Medical_2": ["อายุรศาสตร์_2", "medical_2", "med_2", "med2"],
     "Surgical": ["ศัลยศาสตร์", "surgical", "surgery"],
     "Pediatric": ["เด็ก", "pediatric", "pediatrics"],
     "Community": ["ชุมชน", "community"],
@@ -181,6 +183,7 @@ def build_cleaned_from_indices(df: pd.DataFrame,
 
 def random_assign(cleaned: pd.DataFrame,
                   capacities: Dict[str, int]) -> Tuple[pd.DataFrame, pd.DataFrame, Dict[str, int]]:
+    """Assign by rank rounds; tie-break with numpy's global RNG (np.random.choice)."""
     wards = [w for w in cleaned.columns if w not in ("NAME", "ID")]
     cap = {w: int(capacities.get(w, 0)) for w in wards}
 
@@ -218,6 +221,11 @@ def random_assign(cleaned: pd.DataFrame,
     not_assigned = result[result["AssignedWard"].isna()].copy()
     return result.fillna(""), not_assigned.fillna(""), cap
 
+# ===== Helpers for temp file paths =====
+def _tmp(name: str) -> str:
+    os.makedirs("/tmp", exist_ok=True)
+    return f"/tmp/{uuid.uuid4().hex}-{name}"
+
 # ===== Gradio callbacks =====
 
 def update_capacity_table(selected_wards: List[str]) -> pd.DataFrame:
@@ -230,6 +238,7 @@ def update_capacity_table(selected_wards: List[str]) -> pd.DataFrame:
 def on_upload(file, selected_wards):
     df, msg = read_table(file)
     if df is None:
+        # return flat outputs for all mapping fields
         return gr.update(value=msg, visible=True), "", None, None, None, None, None, None, None, None, None, None
     # Show available columns
     avail = available_columns_text(df)
@@ -305,14 +314,15 @@ def on_clean(file, selected_wards, capacity_df, name_num, id_num,
     except Exception as e:
         return gr.update(value=f"❌ เกิดข้อผิดพลาด: {e}", visible=True), None, None, None
 
-    buf = BytesIO()
-    cleaned.to_csv(buf, index=False, encoding="utf-8-sig")
-    buf.seek(0)
+    # Write to a unique temp file path
+    cleaned_path = _tmp("cleaned.csv")
+    cleaned.to_csv(cleaned_path, index=False, encoding="utf-8-sig")
+
     info = "✓ Cleaning สำเร็จ"
-    return gr.update(value=info, visible=True), cleaned.head(30), ("cleaned.csv", buf), len(cleaned)
+    return gr.update(value=info, visible=True), cleaned.head(30), cleaned_path, len(cleaned)
 
 def on_assign(file, selected_wards, capacity_df, name_num, id_num,
-              med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num, seed):
+              med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num):
     # Clean first to get the cleaned df and student count
     status, cleaned_preview, cleaned_file, n_students = on_clean(file, selected_wards, capacity_df, name_num, id_num,
                                                                  med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num)
@@ -351,15 +361,18 @@ def on_assign(file, selected_wards, capacity_df, name_num, id_num,
         msg = f"❌ จำนวนผู้สมัคร {n_students} คน มากกว่า capacity รวม {total_capacity} ที่กำหนด (ขาดได้แต่ห้ามเกิน)"
         return gr.update(value=msg, visible=True), None, None, None, None
 
-    assigned, not_assigned, leftover = random_assign(cleaned, cap_map, seed=int(seed) if str(seed).strip().isdigit() else None)
+    # Assign without seed; use np.random.choice
+    assigned, not_assigned, leftover = random_assign(cleaned, cap_map)
+
+    # Write files to unique temp paths
+    assigned_path = _tmp("assigned.csv")
+    not_assigned_path = _tmp("not_assigned.csv")
+    assigned.to_csv(assigned_path, index=False, encoding="utf-8-sig")
+    not_assigned.to_csv(not_assigned_path, index=False, encoding="utf-8-sig")
 
-    out_all = BytesIO()
-    assigned.to_csv(out_all, index=False, encoding="utf-8-sig"); out_all.seek(0)
-    out_un = BytesIO()
-    not_assigned.to_csv(out_un, index=False, encoding="utf-8-sig"); out_un.seek(0)
     leftover_text = "ความจุคงเหลือ:\n" + "\n".join([f"- {k}: {v}" for k, v in leftover.items()])
 
-    return status, assigned.head(30), ("assigned.csv", out_all), ("not_assigned.csv", out_un), leftover_text
+    return status, assigned.head(30), assigned_path, not_assigned_path, leftover_text
 
 with gr.Blocks(title=APP_TITLE) as demo:
     gr.Markdown(f"# {APP_TITLE}")
@@ -407,16 +420,12 @@ with gr.Blocks(title=APP_TITLE) as demo:
             psy_num = gr.Number(label="หมายเลขคอลัมน์ Psychiatric", precision=0)
             obs_num = gr.Number(label="หมายเลขคอลัมน์ Obstetrics", precision=0)
 
-        auto_btn.click(
-        fn=on_upload,
-        inputs=[file, selected_wards],
-        outputs=[status, available, name_num, id_num,
-                 med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num]
-    )
+        auto_btn.click(fn=on_upload, inputs=[file, selected_wards],
+                       outputs=[status, available, name_num, id_num, 
+                                med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num])
 
     with gr.Row():
         clean_btn = gr.Button("Clean data (ดูพรีวิว)", variant="primary")
-        seed = gr.Textbox(label="Random seed (เว้นว่างเพื่อสุ่มใหม่)", value="")
 
     preview = gr.Dataframe(label="พรีวิวข้อมูลที่ผ่านการ clean (หัว 30 แถว)", visible=True)
     cleaned_file = gr.File(label="ดาวน์โหลดไฟล์ cleaned.csv")
@@ -437,7 +446,7 @@ with gr.Blocks(title=APP_TITLE) as demo:
     assign_btn.click(
         fn=on_assign,
         inputs=[file, selected_wards, capacity_df, name_num, id_num,
-                med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num, seed],
+                med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num],
         outputs=[status, assigned_preview, assigned_file, not_assigned_file, leftover_text]
     )