Update app.py

app.py

@@ -5,7 +5,7 @@ import google.generativeai as genai
 import os
 import re
 from typing import Dict, Any, Union, List
-
+from your_fastapi_module import gradio_interface  # your predict function
 from fastapi.middleware.cors import CORSMiddleware
 import gradio as gr
 
@@ -595,78 +595,31 @@ make it detailed
 
         raise HTTPException(status_code=500, detail=f"Prediction error: {str(e)}")
 
-# ---------------- Gradio Function ----------------
-def gradio_interface(age, gender, height, weight,
-                     urea, creatinine, uric_acid, calcium, phosphorus, sodium, potassium, chloride,
-                     amylase, lipase, bicarbonate, egfr, serum_osmolality, ionized_calcium,
-                     wbc, hemoglobin, mcv, rdw, lymphocytes,
-                     fasting_blood_sugar, hb1ac, insulin, c_peptide, homa_ir,
-                     total_cholesterol, ldl, hdl, cholesterol_hdl_ratio, triglycerides,
-                     apo_a1, apo_b, apo_ratio,
-                     albumin, total_protein, alt, ast, alp, ggt, ld, globulin, albumin_globulin_ratio,
-                     magnesium, total_bilirubin, direct_bilirubin, indirect_bilirubin, ammonia,
-                     hs_crp, ck, ck_mb, homocysteine, zinc, copper, selenium,
-                     iron, tibc, transferrin,
-                     vitamin_d, vitamin_b12,
-                     total_testosterone, free_testosterone, estrogen, progesterone, dhea_s, shbg,
-                     lh, fsh, tsh, free_t3, free_t4, total_t3, total_t4, reverse_t3, tpo_ab, tg_ab,
-                     cortisol, acth, igf1, leptin, adiponectin,
-                     ca125, ca15_3, ca19_9, psa, cea, calcitonin, afp,
-                     tnf, ana, ige, igg, anti_ccp, dsdna, ssa_ssb, rnp, sm_antibodies, anca, anti_ena,
-                     il6, allergy_panel):
-    
-    req = BiomarkerRequest(
-        age=int(age), gender=gender, height=height, weight=weight,
-        urea=urea, creatinine=creatinine, uric_acid=uric_acid, calcium=calcium, phosphorus=phosphorus,
-        sodium=sodium, potassium=potassium, chloride=chloride, amylase=amylase, lipase=lipase,
-        bicarbonate=bicarbonate, egfr=egfr, serum_osmolality=serum_osmolality, ionized_calcium=ionized_calcium,
-        wbc=wbc, hemoglobin=hemoglobin, mcv=mcv, rdw=rdw, lymphocytes=lymphocytes,
-        fasting_blood_sugar=fasting_blood_sugar, hb1ac=hb1ac, insulin=insulin, c_peptide=c_peptide, homa_ir=homa_ir,
-        total_cholesterol=total_cholesterol, ldl=ldl, hdl=hdl, cholesterol_hdl_ratio=cholesterol_hdl_ratio,
-        triglycerides=triglycerides, apo_a1=apo_a1, apo_b=apo_b, apo_ratio=apo_ratio,
-        albumin=albumin, total_protein=total_protein, alt=alt, ast=ast, alp=alp, ggt=ggt, ld=ld,
-        globulin=globulin, albumin_globulin_ratio=albumin_globulin_ratio,
-        magnesium=magnesium, total_bilirubin=total_bilirubin, direct_bilirubin=direct_bilirubin,
-        indirect_bilirubin=indirect_bilirubin, ammonia=ammonia, hs_crp=hs_crp,
-        ck=ck, ck_mb=ck_mb, homocysteine=homocysteine, zinc=zinc, copper=copper, selenium=selenium,
-        iron=iron, tibc=tibc, transferrin=transferrin,
-        vitamin_d=vitamin_d, vitamin_b12=vitamin_b12,
-        total_testosterone=total_testosterone, free_testosterone=free_testosterone,
-        estrogen=estrogen, progesterone=progesterone, dhea_s=dhea_s, shbg=shbg,
-        lh=lh, fsh=fsh, tsh=tsh, free_t3=free_t3, free_t4=free_t4,
-        total_t3=total_t3, total_t4=total_t4, reverse_t3=reverse_t3,
-        tpo_ab=tpo_ab, tg_ab=tg_ab,
-        cortisol=cortisol, acth=acth, igf1=igf1, leptin=leptin, adiponectin=adiponectin,
-        ca125=ca125, ca15_3=ca15_3, ca19_9=ca19_9, psa=psa, cea=cea, calcitonin=calcitonin, afp=afp,
-        tnf=tnf, ana=ana, ige=ige, igg=igg, anti_ccp=anti_ccp, dsdna=dsdna,
-        ssa_ssb=ssa_ssb, rnp=rnp, sm_antibodies=sm_antibodies, anca=anca, anti_ena=anti_ena,
-        il6=il6, allergy_panel=allergy_panel
-    )
-    return generate_report(req)
-
-
-# ---------------- Gradio UI (Vertical Layout) ----------------
+
+
 with gr.Blocks(theme="soft", title="LLM Biomarker Analyzer") as iface:
     gr.Markdown("# 🧬 LLM Biomarker Analyzer")
     gr.Markdown("Enter your full biomarker and demographic data below to generate a **Gemini-powered comprehensive medical insight report**:")
 
     with gr.Column():
-        with gr.Row():
+
+        with gr.Accordion("👤 Demographics", open=True):
             age = gr.Number(label="Age (years)", value=52)
             gender = gr.Radio(["male", "female"], label="Gender", value="female")
-        with gr.Row():
             height = gr.Number(label="Height (cm)", value=165)
             weight = gr.Number(label="Weight (kg)", value=70)
 
-        gr.Markdown("### 🩸 Basic Chemistry & Kidney Function")
-        with gr.Row():
+        with gr.Accordion("🩸 Basic Chemistry & Kidney Function", open=False):
             urea = gr.Number(label="Urea (mg/dL)", value=30)
             creatinine = gr.Number(label="Creatinine (mg/dL)", value=1.0)
             uric_acid = gr.Number(label="Uric Acid (mg/dL)", value=5.0)
             egfr = gr.Number(label="eGFR (mL/min)", value=100)
+            amylase = gr.Number(label="Amylase (U/L)", value=70)
+            lipase = gr.Number(label="Lipase (U/L)", value=50)
+            bicarbonate = gr.Number(label="Bicarbonate (mmol/L)", value=24)
+            serum_osmolality = gr.Number(label="Serum Osmolality (mOsm/kg)", value=290)
 
-        gr.Markdown("### ⚡ Electrolytes & Minerals")
-        with gr.Row():
+        with gr.Accordion("⚡ Electrolytes & Minerals", open=False):
             sodium = gr.Number(label="Sodium (mEq/L)", value=140)
             potassium = gr.Number(label="Potassium (mEq/L)", value=4.2)
             chloride = gr.Number(label="Chloride (mEq/L)", value=102)
@@ -675,89 +628,131 @@ with gr.Blocks(theme="soft", title="LLM Biomarker Analyzer") as iface:
             magnesium = gr.Number(label="Magnesium (mg/dL)", value=2.0)
             ionized_calcium = gr.Number(label="Ionized Calcium (mmol/L)", value=1.25)
 
-        gr.Markdown("### 🥼 Liver & Proteins")
-        with gr.Row():
+        with gr.Accordion("🥼 Liver & Proteins", open=False):
             albumin = gr.Number(label="Albumin (g/dL)", value=4.2)
             total_protein = gr.Number(label="Total Protein (g/dL)", value=7.0)
             globulin = gr.Number(label="Globulin (g/dL)", value=3.0)
             albumin_globulin_ratio = gr.Number(label="A/G Ratio", value=1.4)
-        with gr.Row():
             alt = gr.Number(label="ALT (U/L)", value=25)
             ast = gr.Number(label="AST (U/L)", value=24)
             alp = gr.Number(label="ALP (U/L)", value=120)
             ggt = gr.Number(label="GGT (U/L)", value=20)
             ld = gr.Number(label="LD (U/L)", value=180)
+            total_bilirubin = gr.Number(label="Total Bilirubin (mg/dL)", value=1.0)
+            direct_bilirubin = gr.Number(label="Direct Bilirubin (mg/dL)", value=0.3)
+            indirect_bilirubin = gr.Number(label="Indirect Bilirubin (mg/dL)", value=0.7)
+            ammonia = gr.Number(label="Ammonia (µmol/L)", value=35)
 
-        gr.Markdown("### 🩺 Hematology")
-        with gr.Row():
+        with gr.Accordion("🩺 Hematology", open=False):
             wbc = gr.Number(label="WBC (×10³/μL)", value=6.0)
             hemoglobin = gr.Number(label="Hemoglobin (g/dL)", value=14.0)
             mcv = gr.Number(label="MCV (fL)", value=90)
             rdw = gr.Number(label="RDW (%)", value=13.5)
             lymphocytes = gr.Number(label="Lymphocytes (%)", value=30)
 
-        gr.Markdown("### 🍬 Diabetes & Insulin Resistance")
-        with gr.Row():
+        with gr.Accordion("🍬 Diabetes & Insulin Resistance", open=False):
             fasting_blood_sugar = gr.Number(label="Fasting Blood Sugar (mg/dL)", value=85)
             hb1ac = gr.Number(label="HbA1c (%)", value=5.4)
             insulin = gr.Number(label="Insulin (μU/mL)", value=10)
             c_peptide = gr.Number(label="C-Peptide (ng/mL)", value=1.2)
             homa_ir = gr.Number(label="HOMA-IR", value=1.2)
 
-        gr.Markdown("### ❤️ Lipids")
-        with gr.Row():
+        with gr.Accordion("❤️ Lipids", open=False):
             total_cholesterol = gr.Number(label="Total Cholesterol (mg/dL)", value=180)
             ldl = gr.Number(label="LDL (mg/dL)", value=90)
             hdl = gr.Number(label="HDL (mg/dL)", value=50)
             triglycerides = gr.Number(label="Triglycerides (mg/dL)", value=120)
             cholesterol_hdl_ratio = gr.Number(label="Chol/HDL Ratio", value=3.0)
+            apo_a1 = gr.Number(label="Apo A1 (mg/dL)", value=140)
+            apo_b = gr.Number(label="Apo B (mg/dL)", value=90)
+            apo_ratio = gr.Number(label="Apo A1/B Ratio", value=1.55)
 
-        gr.Markdown("### 🔥 Inflammation & Others")
-        with gr.Row():
+        with gr.Accordion("🔥 Inflammation & Others", open=False):
             hs_crp = gr.Number(label="hs-CRP (mg/L)", value=1.0)
             homocysteine = gr.Number(label="Homocysteine (μmol/L)", value=10)
-            ferritin = gr.Number(label="Ferritin (ng/mL)", value=100)  # assuming you might add this later
-
-        gr.Markdown("### 🌡️ Hormones & Vitamins")
-        with gr.Row():
+            ferritin = gr.Number(label="Ferritin (ng/mL)", value=100)
+            ck = gr.Number(label="CK (U/L)", value=150)
+            ck_mb = gr.Number(label="CK-MB (ng/mL)", value=5)
+            zinc = gr.Number(label="Zinc (µg/dL)", value=90)
+            copper = gr.Number(label="Copper (µg/dL)", value=110)
+            selenium = gr.Number(label="Selenium (µg/L)", value=120)
+            iron = gr.Number(label="Iron (µg/dL)", value=80)
+            tibc = gr.Number(label="TIBC (µg/dL)", value=300)
+            transferrin = gr.Number(label="Transferrin (mg/dL)", value=250)
+            allergy_panel = gr.Number(label="Allergy Panel Score", value=0)
+
+        with gr.Accordion("🌡️ Hormones & Vitamins", open=False):
             tsh = gr.Number(label="TSH (μIU/mL)", value=2.0)
-            free_t4 = gr.Number(label="Free T4 (ng/dL)", value=1.2)
             free_t3 = gr.Number(label="Free T3 (pg/mL)", value=3.2)
-            vitamin_d = gr.Number(label="Vitamin D (ng/mL)", value=35)
-            vitamin_b12 = gr.Number(label="Vitamin B12 (pg/mL)", value=500)
-
-        # Add more sections as needed (you can expand this further with Tabs or Accordions for 90+ inputs)
-        # For brevity and usability, consider using gr.Accordion or gr.TabbedInterface in production
+            free_t4 = gr.Number(label="Free T4 (ng/dL)", value=1.2)
+            total_t3 = gr.Number(label="Total T3 (ng/dL)", value=1.3)
+            total_t4 = gr.Number(label="Total T4 (µg/dL)", value=7.8)
+            reverse_t3 = gr.Number(label="Reverse T3 (ng/dL)", value=15)
+            tpo_ab = gr.Number(label="TPO Ab (IU/mL)", value=10)
+            tg_ab = gr.Number(label="TG Ab (IU/mL)", value=12)
+            total_testosterone = gr.Number(label="Total Testosterone (ng/dL)", value=500)
+            free_testosterone = gr.Number(label="Free Testosterone (ng/dL)", value=15)
+            estrogen = gr.Number(label="Estrogen (pg/mL)", value=50)
+            progesterone = gr.Number(label="Progesterone (ng/mL)", value=1.2)
+            dhea_s = gr.Number(label="DHEA-S (µg/dL)", value=200)
+            shbg = gr.Number(label="SHBG (nmol/L)", value=40)
+            lh = gr.Number(label="LH (mIU/mL)", value=5)
+            fsh = gr.Number(label="FSH (mIU/mL)", value=6)
+            cortisol = gr.Number(label="Cortisol (µg/dL)", value=12)
+            acth = gr.Number(label="ACTH (pg/mL)", value=25)
+            igf1 = gr.Number(label="IGF-1 (ng/mL)", value=150)
+            leptin = gr.Number(label="Leptin (ng/mL)", value=10)
+            adiponectin = gr.Number(label="Adiponectin (µg/mL)", value=8)
+
+        with gr.Accordion("🧬 Tumor Markers", open=False):
+            ca125 = gr.Number(label="CA-125 (U/mL)", value=20)
+            ca15_3 = gr.Number(label="CA 15-3 (U/mL)", value=25)
+            ca19_9 = gr.Number(label="CA 19-9 (U/mL)", value=15)
+            psa = gr.Number(label="PSA (ng/mL)", value=2.0)
+            cea = gr.Number(label="CEA (ng/mL)", value=3.0)
+            calcitonin = gr.Number(label="Calcitonin (pg/mL)", value=5)
+            afp = gr.Number(label="AFP (ng/mL)", value=10)
+
+        with gr.Accordion("🧪 Immunology", open=False):
+            tnf = gr.Number(label="TNF-α (pg/mL)", value=10)
+            ana = gr.Number(label="ANA (IU/mL)", value=5)
+            ige = gr.Number(label="IgE (IU/mL)", value=100)
+            igg = gr.Number(label="IgG (IU/mL)", value=1200)
+            anti_ccp = gr.Number(label="Anti-CCP (U/mL)", value=5)
+            dsdna = gr.Number(label="dsDNA (IU/mL)", value=10)
+            ssa_ssb = gr.Number(label="SSA/SSB (U/mL)", value=10)
+            rnp = gr.Number(label="RNP (U/mL)", value=5)
+            sm_antibodies = gr.Number(label="Sm Antibodies (U/mL)", value=5)
+            anca = gr.Number(label="ANCA (U/mL)", value=5)
+            anti_ena = gr.Number(label="Anti-ENA (U/mL)", value=5)
+            il6 = gr.Number(label="IL-6 (pg/mL)", value=5)
 
         submit_btn = gr.Button("🧠 Generate Comprehensive Medical Report", variant="primary", size="lg")
+        output_md = gr.Markdown(label="AI-Generated Medical Report")
+
+        submit_btn.click(
+            fn=gradio_interface,
+            inputs=[
+                age, gender, height, weight,
+                urea, creatinine, uric_acid, calcium, phosphorus, sodium, potassium, chloride,
+                amylase, lipase, bicarbonate, egfr, serum_osmolality, ionized_calcium,
+                wbc, hemoglobin, mcv, rdw, lymphocytes,
+                fasting_blood_sugar, hb1ac, insulin, c_peptide, homa_ir,
+                total_cholesterol, ldl, hdl, cholesterol_hdl_ratio, triglycerides, apo_a1, apo_b, apo_ratio,
+                albumin, total_protein, alt, ast, alp, ggt, ld, globulin, albumin_globulin_ratio,
+                magnesium, total_bilirubin, direct_bilirubin, indirect_bilirubin, ammonia,
+                hs_crp, ck, ck_mb, homocysteine, zinc, copper, selenium,
+                iron, tibc, transferrin,
+                vitamin_d, vitamin_b12,
+                total_testosterone, free_testosterone, estrogen, progesterone, dhea_s, shbg,
+                lh, fsh, tsh, free_t3, free_t4, total_t3, total_t4, reverse_t3, tpo_ab, tg_ab,
+                cortisol, acth, igf1, leptin, adiponectin,
+                ca125, ca15_3, ca19_9, psa, cea, calcitonin, afp,
+                tnf, ana, ige, igg, anti_ccp, dsdna, ssa_ssb, rnp, sm_antibodies, anca, anti_ena,
+                il6, allergy_panel
+            ],
+            outputs=output_md
+        )
 
-    output_md = gr.Markdown(label="AI-Generated Medical Report")
-
-    submit_btn.click(
-        fn=gradio_interface,
-        inputs=[
-            age, gender, height, weight,
-            urea, creatinine, uric_acid, calcium, phosphorus, sodium, potassium, chloride,
-            amylase, lipase, bicarbonate, egfr, serum_osmolality, ionized_calcium,
-            wbc, hemoglobin, mcv, rdw, lymphocytes,
-            fasting_blood_sugar, hb1ac, insulin, c_peptide, homa_ir,
-            total_cholesterol, ldl, hdl, cholesterol_hdl_ratio, triglycerides,
-            apo_a1, apo_b, apo_ratio,
-            albumin, total_protein, alt, ast, alp, ggt, ld, globulin, albumin_globulin_ratio,
-            magnesium, total_bilirubin, direct_bilirubin, indirect_bilirubin, ammonia,
-            hs_crp, ck, ck_mb, homocysteine, zinc, copper, selenium,
-            iron, tibc, transferrin,
-            vitamin_d, vitamin_b12,
-            total_testosterone, free_testosterone, estrogen, progesterone, dhea_s, shbg,
-            lh, fsh, tsh, free_t3, free_t4, total_t3, total_t4, reverse_t3, tpo_ab, tg_ab,
-            cortisol, acth, igf1, leptin, adiponectin,
-            ca125, ca15_3, ca19_9, psa, cea, calcitonin, afp,
-            tnf, ana, ige, igg, anti_ccp, dsdna, ssa_ssb, rnp, sm_antibodies, anca, anti_ena,
-            il6, allergy_panel
-        ],
-        outputs=output_md
-    )
-
-# ---------------- Launch ----------------
 if __name__ == "__main__":
-    iface.launch(server_name="0.0.0.0", server_port=7860)
+    iface.launch(server_name="0.0.0.0", server_port=7860)