Update main.py

coba tanpa coreq

main.py

@@ -1,5 +1,5 @@
 # ======================================================================
-# --- main.py (GABUNGAN DUA API) ---
+# --- main.py---
 # ======================================================================
 
 import os
@@ -15,9 +15,9 @@ from typing import List, Dict, Any
 # 1. Inisialisasi Aplikasi FastAPI
 # ======================================================================
 app = FastAPI(
-    title="API Layanan Akademik Mahasiswa",
-    description="Menggabungkan API Prediksi Risiko Akademik dan Rekomendasi Mata Kuliah.",
-    version="1.1.0"
+    title="GCOMPRO",
+    description="API Prediksi Risiko Akademik dan Rekomendasi Mata Kuliah.",
+    version="1.2.0" # Versi dinaikkan
 )
 
 # ======================================================================
@@ -75,7 +75,6 @@ MODEL_FEATURES = [
 G = nx.DiGraph()
 course_details_map = {}
 prereq_map = {}
-coreq_map = {}
 out_degree_map = {}
 
 # --- Fungsi Pemuatan (dipanggil saat startup) ---
@@ -96,14 +95,16 @@ def load_ml_model():
         print("Model ML berhasil dimuat.")
     except Exception as e:
         print(f"ERROR: Gagal memuat model ML dari {MODEL_PATH}: {e}")
-        # Di produksi, Anda mungkin ingin ini menghentikan server
-        # raise RuntimeError(f"Gagal memuat model dari {MODEL_PATH}: {e}")
 
 def load_graph_data():
     """Memuat dan memproses data graf kurikulum dari JSON"""
-    global G, course_details_map, prereq_map, coreq_map, out_degree_map
+    # Menghapus 'coreq_map' dari global
+    global G, course_details_map, prereq_map, out_degree_map
     JSON_PATH = os.path.join(os.path.dirname(__file__), "OK_matkul_graph.json")
     print(f"Mencoba memuat data graf dari: {JSON_PATH}")
+    
+    prereq_edge_count = 0 # Ditambahkan untuk log yang lebih baik
+    
     try:
         with open(JSON_PATH, "r") as f:
             data = json.load(f)
@@ -114,19 +115,20 @@ def load_graph_data():
 
         for edge in data["edges"]:
             if edge["type"] == "prereq":
+                prereq_edge_count += 1
                 G.add_edge(edge["from"], edge["to"])
                 if edge["to"] not in prereq_map:
                     prereq_map[edge["to"]] = []
                 prereq_map[edge["to"]].append(edge["from"])
-            elif edge["type"] == "coreq":
-                if edge["to"] not in coreq_map:
-                    coreq_map[edge["to"]] = []
-                coreq_map[edge["to"]].append(edge["from"])
+
 
         for node_code in G.nodes():
             out_degree_map[node_code] = G.out_degree(node_code)
         
-        print(f"Data graf berhasil dimuat. Prereqs: {len(prereq_map)}, Coreqs: {len(coreq_map)}")
+        print(f"Data graf berhasil dimuat.")
+        print(f"  - Total Relasi Prasyarat (Edges): {prereq_edge_count}")
+        print(f"  - (Info) MK unik dgn Prasyarat: {len(prereq_map)}")
+        
     except FileNotFoundError:
         print(f"ERROR: {JSON_PATH} tidak ditemukan!")
     except Exception as e:
@@ -143,7 +145,7 @@ def on_startup():
 # ======================================================================
 
 def get_recommendations_logic(current_semester: int, courses_passed_list: List[str]) -> List[Dict[str, Any]]:
-    """Inti dari logika rekomendasi, dengan validasi prereq dan coreq."""
+    """Inti dari logika rekomendasi, HANYA dengan validasi prereq."""
     passed_set = set(courses_passed_list)
     all_courses_set = set(course_details_map.keys())
     not_passed_courses = all_courses_set - passed_set
@@ -165,34 +167,19 @@ def get_recommendations_logic(current_semester: int, courses_passed_list: List[s
             candidate_data["priority_score"] = priority_score
             prereq_valid_candidates.append(candidate_data)
 
-    # Tahap 2: Cek Ko-requisite (Coreq)
-    prereq_valid_codes = {c['code'] for c in prereq_valid_candidates}
-    final_valid_candidates = []
+    # Tahap 2: Cek Ko-requisite (Coreq) GAJADI
     
-    for candidate in prereq_valid_candidates:
-        course_code = candidate['code']
-        coreqs = coreq_map.get(course_code, [])
-        
-        if not coreqs:
-            final_valid_candidates.append(candidate)
-            continue
-
-        is_coreq_met = True
-        for coreq_code in coreqs:
-            if (coreq_code not in passed_set) and (coreq_code not in prereq_valid_codes):
-                is_coreq_met = False
-                break
-        
-        if is_coreq_met:
-            final_valid_candidates.append(candidate)
-
     # Tahap 3: Urutkan berdasarkan prioritas
-    catch_up_courses = [c for c in final_valid_candidates if c["semester_plan"] < current_semester]
-    current_semester_courses = [c for c in final_valid_candidates if c["semester_plan"] == current_semester]
-    future_courses = [c for c in final_valid_candidates if c["semester_plan"] > current_semester]
+    # Menggunakan 'prereq_valid_candidates' sebagai sumber
+    catch_up_courses = [c for c in prereq_valid_candidates if c["semester_plan"] < current_semester]
+    current_semester_courses = [c for c in prereq_valid_candidates if c["semester_plan"] == current_semester]
+    future_courses = [c for c in prereq_valid_candidates if c["semester_plan"] > current_semester]
 
     sorted_catch_up = sorted(catch_up_courses, key=lambda x: (x["semester_plan"], -x["priority_score"]))
+    
     sorted_current = sorted(current_semester_courses, key=lambda x: -x["priority_score"], reverse=False)
+
+    
     sorted_future = sorted(future_courses, key=lambda x: (x["semester_plan"], -x["priority_score"]))
 
     final_ranked_list = sorted_catch_up + sorted_current + sorted_future