sql db, filter logs

app.py

@@ -2,17 +2,15 @@ import os
 import json
 import random
 import string
-from datetime import datetime
-from typing import List, Dict
-
-import requests
-from fastapi import FastAPI, HTTPException
+import sqlite3
+from datetime import datetime, timezone
+from fastapi import Query
+from typing import List, Dict, Any
+from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
 from pydantic import BaseModel
-import plotly.graph_objs as go
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
-
 from huggingface_hub import AsyncInferenceClient
 
 app = FastAPI()
@@ -30,9 +28,9 @@ models = [
     "mistralai/Mistral-7B-Instruct-v0.3",
     "mistralai/Mixtral-8x7B-Instruct-v0.1",
 ]
-LOG_FILE = "/data/api_logs.json"
-
 
+LOG_FILE = "/data/api_logs.json"
+DB_FILE = "/data/api_logs.db"
 client = AsyncInferenceClient(token=os.environ["HF_INFERENCE_API_TOKEN"])
 
 # Ensure log file exists
@@ -40,44 +38,84 @@ if not os.path.exists(LOG_FILE):
     with open(LOG_FILE, "w") as f:
         json.dump([], f)
 
+# Initialize SQLite database
+def init_db():
+    conn = sqlite3.connect(DB_FILE)
+    cursor = conn.cursor()
+    cursor.execute('''
+    CREATE TABLE IF NOT EXISTS api_logs (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        model TEXT,
+        success BOOLEAN,
+        timestamp TEXT,
+        failure_message TEXT,
+        response_data TEXT
+    )
+    ''')
+    conn.commit()
+    conn.close()
+
+init_db()
+
 class LogEntry(BaseModel):
     model: str
     success: bool
     timestamp: str
     failure_message: str
-
-
+    response_data: Dict[str, Any] = None
 
 def random_string(length=10):
     characters = string.ascii_letters + string.digits
     return ''.join(random.choice(characters) for _ in range(length))
 
+def log_to_sqlite(entry: LogEntry):
+    conn = sqlite3.connect(DB_FILE)
+    cursor = conn.cursor()
+    cursor.execute('''
+    INSERT INTO api_logs (model, success, timestamp, failure_message, response_data)
+    VALUES (?, ?, ?, ?, ?)
+    ''', (
+        entry.model,
+        entry.success,
+        entry.timestamp,
+        entry.failure_message,
+        json.dumps(entry.response_data) if entry.response_data else None
+    ))
+    conn.commit()
+    conn.close()
+
 async def check_apis():
     results = []
     for model in models:
         try:
             response = await client.chat_completion(
-            	messages=[{"role": "user", "content": f"{random_string()}\nWhat is the capital of France?"}],
-            	max_tokens=10,
+                messages=[{"role": "user", "content": f"{random_string()}\nWhat is the capital of France?"}],
+                max_tokens=10,
             )
             success = True
+            response_data = response
             e = 'success'
         except Exception as e:
             print(e)
             success = False
-        
-        results.append(LogEntry(
+            response_data = None
+
+        log_entry = LogEntry(
             model=model,
             success=success,
-            timestamp=datetime.now().isoformat(),
-            failure_message=str(e)
-        ))
-    
+            timestamp=datetime.now(timezone.utc).isoformat(),
+            failure_message=str(e) if not success else "",
+            response_data=dict(response_data)
+        )
+        results.append(log_entry)
+        log_to_sqlite(log_entry)
+
     with open(LOG_FILE, "r+") as f:
         logs = json.load(f)
         logs.extend([result.dict() for result in results])
         f.seek(0)
-        json.dump(logs, f)
+        f.truncate()
+        json.dump(logs, f, indent=2)
 
 @app.on_event("startup")
 async def start_scheduler():
@@ -85,32 +123,82 @@ async def start_scheduler():
     scheduler.add_job(check_apis, 'interval', minutes=10)
     scheduler.start()
 
+@app.get("/api/models")
+async def get_models():
+    return models
+
 @app.get("/")
 async def index():
     return FileResponse("static/index.html")
 
 @app.get("/api/logs", response_model=List[LogEntry])
-async def get_logs():
-    with open(LOG_FILE, "r") as f:
-        logs = json.load(f)
-    return logs
+async def get_logs(
+    model: str = Query(None, description="Filter by model name"),
+    start: str = Query(None, description="Start time for filtering (ISO format)"),
+    end: str = Query(None, description="End time for filtering (ISO format)")
+):
+    conn = sqlite3.connect(DB_FILE)
+    cursor = conn.cursor()
+
+    query = "SELECT * FROM api_logs"
+    params = []
+
+    if any([model, start, end]):
+        query += " WHERE"
+
+    if model:
+        query += " AND model = ?"
+        params.append(model)
+
+    if start:
+        query += " AND timestamp >= ?"
+        params.append(start)
+
+    if end:
+        query += " AND timestamp <= ?"
+        params.append(end)
+
+    query += " ORDER BY timestamp DESC LIMIT 100"
+
+    cursor.execute(query, params)
+    logs = cursor.fetchall()
+    conn.close()
+
+    return [LogEntry(
+        model=log[1],
+        success=log[2],
+        timestamp=log[3],
+        failure_message=log[4],
+        response_data=json.loads(log[5]) if log[5] else None
+    ) for log in logs]
+
+@app.get("/api/db-logs")
+async def get_db_logs():
+    conn = sqlite3.connect(DB_FILE)
+    cursor = conn.cursor()
+    cursor.execute("SELECT * FROM api_logs ORDER BY timestamp DESC LIMIT 100")
+    logs = cursor.fetchall()
+    conn.close()
+    return [{"id": log[0], "model": log[1], "success": log[2], "timestamp": log[3], "failure_message": log[4], "response_data": json.loads(log[5]) if log[5] else None} for log in logs]
 
 @app.get("/api/chart-data", response_model=Dict[str, Dict[str, Dict[str, List]]])
 async def get_chart_data():
-    with open(LOG_FILE, "r") as f:
-        logs = json.load(f)
+    conn = sqlite3.connect(DB_FILE)
+    cursor = conn.cursor()
+    cursor.execute("SELECT model, success, timestamp FROM api_logs ORDER BY timestamp")
+    logs = cursor.fetchall()
+    conn.close()
     
     chart_data = {}
     for log in logs:
-        model = log['model']
+        model, success, timestamp = log
         if model not in chart_data:
             chart_data[model] = {
                 'success': {'x': [], 'y': []},
                 'failure': {'x': [], 'y': []}
             }
-        
-        status = 'success' if log['success'] else 'failure'
-        chart_data[model][status]['x'].append(log['timestamp'])
+        status = 'success' if success else 'failure'
+        chart_data[model][status]['x'].append(timestamp)
         chart_data[model][status]['y'].append(1)
     
     return chart_data

static/index.html

@@ -15,6 +15,8 @@
         table { width: 100%; border-collapse: collapse; }
         th, td { border: 1px solid #ddd; padding: 8px; text-align: left; }
         th { background-color: #f2f2f2; }
+        #logFilter { margin-top: 20px; margin-bottom: 20px; }
+        #logFilter input, #logFilter select, #logFilter button { margin-right: 10px; }
     </style>
 </head>
 <body>
@@ -22,16 +24,14 @@
     <div id="charts"></div>
     <div id="logs">
         <h2>Logs</h2>
-        <table id="logTable">
-            <thead>
-                <tr>
-                    <th>Timestamp</th>
-                    <th>Model</th>
-                    <th>Status</th>
-                </tr>
-            </thead>
-            <tbody></tbody>
-        </table>
+        <div id="logFilter">
+            <select id="modelSelect">
+                <option value="">All Models</option>
+            </select>
+            <input type="datetime-local" id="startTime">
+            <input type="datetime-local" id="endTime">
+            <button onclick="filterLogs()">Filter Logs</button>
+        </div>
     </div>
 
     <script>
@@ -66,8 +66,8 @@
             });
         }
 
-        function updateLogs() {
-            $.getJSON('/api/logs', function(data) {
+        function updateLogs(filterModel = '', startTime = '', endTime = '') {
+            $.getJSON('/api/logs', { model: filterModel, start: startTime, end: endTime }, function(data) {
                 let tbody = $('#logTable tbody');
                 tbody.empty();
                 data.forEach(function(log) {
@@ -82,11 +82,28 @@
             });
         }
 
+        function updateModelSelect() {
+            $.getJSON('/api/models', function(models) {
+                let select = $('#modelSelect');
+                models.forEach(function(model) {
+                    $('<option>').val(model).text(model).appendTo(select);
+                });
+            });
+        }
+
+        function filterLogs() {
+            let model = $('#modelSelect').val();
+            let startTime = $('#startTime').val();
+            let endTime = $('#endTime').val();
+            updateLogs(model, startTime, endTime);
+        }
+
         $(document).ready(function() {
             updateCharts();
             updateLogs();
+            updateModelSelect();
             setInterval(updateCharts, 60000);  // Update every minute
-            setInterval(updateLogs, 60000);    // Update every minute
+            setInterval(function() { updateLogs($('#modelSelect').val(), $('#startTime').val(), $('#endTime').val()); }, 60000);
         });
     </script>
 </body>