Fix bug on frontend and backend

app.py

@@ -5,7 +5,7 @@ from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
 import traceback
 from pydantic import BaseModel, Field
-from typing import List, Dict, Tuple
+from typing import List, Dict, Tuple, Optional
 import os
 from langchain_community.vectorstores import FAISS
 from langchain_community.embeddings import FakeEmbeddings
@@ -13,9 +13,16 @@ from langchain_community.vectorstores.utils import DistanceStrategy
 from together import Together
 import numpy as np
 from collections import defaultdict
+from fastapi import FastAPI, HTTPException
+from fastapi.responses import FileResponse
+from fastapi.middleware.cors import CORSMiddleware
+from dotenv import load_dotenv
+from fastapi.staticfiles import StaticFiles
 
 app = FastAPI(title="Knowledge Graph API")
 
+app.mount("/static", StaticFiles(directory="static"), name="static")
+
 # Enable CORS for frontend access
 app.add_middleware(
     CORSMiddleware,
@@ -116,7 +123,7 @@ def get_news_db():
 def get_definitions_db():
     conn = None
     try:
-        conn = safe_connect(DATABASE_CONFIG["definitions_db"])
+        conn = sqlite3.connect(DATABASE_CONFIG["definitions_db"])
         yield conn
     finally:
         if conn:
@@ -132,6 +139,7 @@ def retrieve_triplets(query: str) -> Tuple[List[Tuple[str, str, str]], List[Tupl
         - List of triplets: [(head, relation, tail), ...]
         - List of relations with definitions: [(relation, definition), ...]
     """
+    load_dotenv() 
     API_KEY = os.environ.get("TOGETHER_API_KEY")
     client = Together(api_key = API_KEY)
     
@@ -200,6 +208,7 @@ def retrieve_news(query: str) -> Dict[str, str]:
         - Related content
         - Links of the related content
     """
+    load_dotenv() 
     API_KEY = os.environ.get("TOGETHER_API_KEY")
     client = Together(api_key = API_KEY)
     
@@ -263,7 +272,8 @@ def extract_information_from_triplets(query: str,
     list of relations and their definition: {relations}
     extracted information:
     '''
-
+    
+    load_dotenv() 
     API_KEY = os.environ.get("TOGETHER_API_KEY")
     client = Together(api_key = API_KEY)
 
@@ -286,15 +296,15 @@ def extract_information_from_triplets(query: str,
     
     return response.choices[0].message.content
 
-def extract_information_from_news(query: str,
-                                  news_list: Dict[str, str]) -> Tuple[str, List[str]]:
-   """   
+def extract_information_from_news(query: str, news_list: Dict[str, str]) -> Tuple[str, List[str]]:
+    """   
     Args:
         news_list: List from retrieve_news
         
     Returns:
         Extracted information string
     """
+    
     system_prompt = f'''Given a list of some information related to the query, extract all important information from the list to answer query question.
     Every item in the list represent one information, if the information is ambiguous (e.g. contains unknown pronoun to which it refers), do not use that information to answer the query.
     You don't have to use all the information, only use the information that has clarity and a good basis, but try to use as many information as possible.
@@ -309,6 +319,10 @@ def extract_information_from_news(query: str,
     output:
     '''
 
+    load_dotenv() 
+    API_KEY = os.environ.get("TOGETHER_API_KEY")
+    client = Together(api_key = API_KEY)
+
     response = client.chat.completions.create(
        model="meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
        response_format={
@@ -343,7 +357,6 @@ def extract_information(query:str, triplet_info: str, news_info: str, language:s
     Returns:
         str: Final answer for the user
     """
-    client = Together(api_key = API_KEY)
     system_prompt = f'''Given information from two sources, combine the information and make a comprehensive and informative paragraph that answer the query.
     Make sure the output paragraph includes all crucial information and given in detail.
     If there is no related or useful information can be extracted from the triplets to answer the query question, inform "No related information found."
@@ -358,6 +371,10 @@ def extract_information(query:str, triplet_info: str, news_info: str, language:s
     extracted information:
     '''
 
+    load_dotenv() 
+    API_KEY = os.environ.get("TOGETHER_API_KEY")
+    client = Together(api_key = API_KEY)
+
     response = client.chat.completions.create(
        model="meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
        response_format={
@@ -413,6 +430,9 @@ def query_language(query):
     query: {query}
     output:
     '''
+    
+    load_dotenv() 
+    API_KEY = os.environ.get("TOGETHER_API_KEY")
     client = Together(api_key = API_KEY)
     
     response = client.chat.completions.create(
@@ -439,6 +459,18 @@ def query_language(query):
 
 #API ENDPOINTS
 
+@app.get("/", response_class=FileResponse)
+def serve_index():
+    return FileResponse("index.html")
+
+@app.get("/explorepage.html", response_class=FileResponse)
+def serve_explore_page():
+    return FileResponse("explorepage.html")
+
+@app.get("/search.html", response_class=FileResponse)
+def serve_search_page():
+    return FileResponse("search.html")
+
 @app.post("/api/query", response_model=QueryResponse)
 def process_query(request: QueryRequest):
     """Process user query and return comprehensive response"""
@@ -517,9 +549,7 @@ def process_query(request: QueryRequest):
 
 @app.get("/api/graph", response_model=GraphData)
 def get_graph_data(
-    search: Optional[str] = None,
-    triplets_db: sqlite3.Connection = Depends(get_triplets_connection),
-    definitions_db: sqlite3.Connection = Depends(get_definitions_connection)
+    search: Optional[str] = None
 ):
     """Get complete graph data with nodes and edges."""
     
@@ -541,8 +571,9 @@ def get_graph_data(
         base_query += " LIMIT 1000"
         
         # Get triplets
-        cursor = triplets_db.execute(base_query, params)
-        triplets = cursor.fetchall()
+        with get_triplets_db() as conn:
+            cursor = conn.execute(base_query, params)
+            triplets = cursor.fetchall()
 
         with get_definitions_db() as conn:
             # Get definitions
@@ -590,7 +621,7 @@ if __name__ == "__main__":
     print(f"Definitions DB: {DATABASE_CONFIG['definitions_db']}")
     
     import uvicorn
-    port = int(os.environ.get("PORT", 7860))
-    uvicorn.run(app, host="0.0.0.0", port=port)
+    port = int(os.environ.get("PORT", 8000))
+    uvicorn.run(app, host="localhost", port=port)
 
     

explorepage.html

@@ -412,7 +412,7 @@
         <div class="main-content">
             <!-- Home Button in Top-Right -->
             <button class="main-home-btn" id="mainHomeBtn">
-                <img src="Home.png" alt="Home" style="width: 20px; height: 20px;">
+                <img src="/static/Home.png" alt="Home" style="width: 20px; height: 20px;">
             </button>
             <div id="loading" class="loading">
                 <div class="loading-spinner"></div>
@@ -426,7 +426,7 @@
 
     <script>
         // Configuration
-        const API_BASE = '/api';
+        const API_BASE = 'http://localhost:8000/api';
         
         // Global variables
         let graphData = { nodes: [], edges: [] };
@@ -468,7 +468,7 @@
 
         function goHome() {
             // Navigate back to main page
-            window.location.href = 'index.html'; // Adjust path as needed
+            window.location.href = 'http://localhost:8000/'; // Adjust path as needed
         }
 
         function setupVisualizationSVG() {

search.html

@@ -425,7 +425,7 @@
         <!-- Header with Search -->
         <div class="header">
             <button class="home-btn" id="homeBtn" title="Go to Home">
-                <img src="Home.png" alt="Home" style="width: 20px; height: 20px;">
+                <img src="/static/Home.png" alt="Home" style="width: 20px; height: 20px;">
             </button>
             <div class="search-container">
                 <input 
@@ -484,7 +484,7 @@
 
     <script>
         // Configuration
-        const API_BASE = '/api';
+        const API_BASE = 'http://localhost:8000/api';
         
         // Global variables
         let currentQuery = '';
@@ -530,7 +530,7 @@
         }
 
         function goHome() {
-            window.location.href = 'index.html';
+            window.location.href = 'http://localhost:8000/';
         }
 
         function setupMiniGraph() {