Update app.py

app.py

@@ -312,3 +312,82 @@ def reload_data():
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Reload failed: {e}")
     return {"status": "reloaded"}
+
+
+
+# ----------------------------------------------------
+# ENDPOINT 7 — TREN IPS PER ANGKATAN / SEMESTER
+# ----------------------------------------------------
+@app.get("/tren_ips")
+def tren_ips(reload: bool = False):
+    if reload:
+        load_data_cached.cache_clear()
+
+    try:
+        df = load_data_cached()
+    except Exception as e:
+        raise HTTPException(500, str(e))
+
+    final = get_final_records(df)
+    final["total_bobot"] = final["sks"] * final["nilai_numerik"]
+
+    # hitung IPS per (angkatan, semester)
+    grouped = final.groupby(["Tahun angkatan", "id_smt"]).agg(
+        total_bobot=("total_bobot", "sum"),
+        total_sks=("sks", "sum")
+    ).reset_index()
+
+    grouped["ips"] = grouped.apply(
+        lambda r: (r["total_bobot"] / r["total_sks"]) if r["total_sks"] > 0 else 0.0,
+        axis=1
+    )
+
+    result = {}
+    for angkatan, d in grouped.groupby("Tahun angkatan"):
+        d_sorted = d.sort_values("id_smt")
+        result[str(angkatan)] = d_sorted["ips"].round(3).tolist()
+
+    return result
+
+
+# ----------------------------------------------------
+# ENDPOINT 8 — DISTRIBUSI POPULASI PER ANGKATAN
+# ----------------------------------------------------
+@app.get("/distribusi_populasi")
+def distribusi_populasi(reload: bool = False, min_sks: int = 110):
+    if reload:
+        load_data_cached.cache_clear()
+
+    try:
+        df = load_data_cached()
+    except Exception as e:
+        raise HTTPException(500, str(e))
+
+    final = get_final_records(df)
+
+    # total mahasiswa per angkatan
+    total_mhs = df.groupby("Tahun angkatan")["kode_mhs"].nunique()
+
+    # eligible per angkatan
+    sks_per_mhs = final.groupby("kode_mhs")["sks"].sum()
+    eligible = sks_per_mhs[sks_per_mhs > min_sks]
+
+    angkatan_map = df.set_index("kode_mhs")["Tahun angkatan"].to_dict()
+
+    eligible_count = {}
+    for mhs in eligible.index:
+        ang = angkatan_map.get(mhs)
+        if ang is not None:
+            eligible_count.setdefault(ang, 0)
+            eligible_count[ang] += 1
+
+    # bentuk response
+    final_result = {}
+    for angkatan in sorted(total_mhs.index):
+        final_result[str(angkatan)] = {
+            "total": int(total_mhs[angkatan]),
+            "eligible": int(eligible_count.get(angkatan, 0))
+        }
+
+    return final_result
+