deploy at 2024-08-24 15:22:52.475046

main.py

@@ -171,7 +171,6 @@ middlewares = [
         SessionMiddleware,
         secret_key=get_key(fname=sess_key_path),
         max_age=3600,
-        same_site='lax',  # This allows cookies to be sent in top-level navigations
     ),
     Middleware(XFrameOptionsMiddleware),
 ]
@@ -601,23 +600,16 @@ async def search(userquery: str, ranking: str, sess):
 
 
 @app.get("/download_csv")
-def download_csv(auth, sess):
-    if not auth:
-        return RedirectResponse("/login", status_code=303)
-
-    all_queries = []
-    for user_id, user_sess in app.state.sessions.items():
-        user_queries = user_sess.get('queries', [])
-        for query in user_queries:
-            query['user_id'] = user_id
-        all_queries.extend(user_queries)
+def download_csv(auth):
+    queries_dict = list(db.query("SELECT * FROM queries"))
+    queries = [Query(**query) for query in queries_dict]
 
     # Create CSV in memory
     csv_file = StringIO()
     csv_writer = csv.writer(csv_file)
-    csv_writer.writerow(["Query", "User ID", "Timestamp", "Ranking"])
-    for query in all_queries:
-        csv_writer.writerow([query['query'], query['user_id'], query['timestamp'], query['ranking']])
+    csv_writer.writerow(["Query", "Session ID", "Timestamp"])
+    for query in queries:
+        csv_writer.writerow([query.query, query.sess_id, query.timestamp])
 
     # Move to the beginning of the StringIO object
     csv_file.seek(0)
@@ -636,27 +628,21 @@ def download_csv(auth, sess):
 
 
 @app.get("/admin")
-def get_admin(auth, sess, page: int = 1):
-    if not auth:
-        return RedirectResponse("/login", status_code=303)
-
+def get_admin(auth, page: int = 1):
     limit = 15
     offset = (page - 1) * limit
+    total_queries_result = list(
+        db.query("SELECT COUNT(*) AS count FROM queries ORDER BY timestamp DESC")
+    )
+    total_queries = total_queries_result[0]["count"]
+    queries_dict = list(
+        db.query(f"SELECT * FROM queries LIMIT {limit} OFFSET {offset}")
+    )
+    queries = [Query(**query) for query in queries_dict]
 
-    all_queries = []
-    for user_id, user_sess in app.state.sessions.items():
-        user_queries = user_sess.get('queries', [])
-        for query in user_queries:
-            query['user_id'] = user_id
-        all_queries.extend(user_queries)
-
-    # Sort queries by timestamp in descending order
-    all_queries.sort(key=lambda x: x['timestamp'], reverse=True)
-
-    total_queries = len(all_queries)
-    queries = all_queries[offset:offset+limit]
-
-    total_pages = (total_queries + limit - 1) // limit
+    total_pages = (
+        total_queries + limit - 1
+    ) // limit  # Calculate total number of pages
 
     # Define the range of pages to display
     page_window = 5  # Number of pages to display at once
@@ -736,16 +722,16 @@ def get_admin(auth, sess, page: int = 1):
                 Thead(
                     Tr(
                         Th("Query"),
-                        Th("User ID"),
+                        Th("Session ID"),
                         Th("Datetime"),
                     )
                 ),
                 Tbody(
                     *[
                         Tr(
-                            Td(query['query']),
-                            Td(query['user_id']),
-                            Td(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(query['timestamp']))),
+                            Td(query.query),
+                            Td(query.sess_id),
+                            Td(query.get_datetime()),
                         )
                         for query in queries
                     ],
@@ -830,12 +816,13 @@ def get_document(docid: str, sess):
     resp = vespa_app.get_data(data_id=docid, schema="doc", namespace="tutorial")
     doc = resp.json
     # Link with Back to search results at top of page
+    last_query = sess.get('queries', [{}])[-1].get('query', '')
     return Main(
         Div(
             A(
                 I(cls="fa fa-arrow-left"),
                 "Back to search results",
-                hx_get=f"/search?userquery={sess['queries'][-1]}",
+                hx_get=f"/search?userquery={last_query}",
                 hx_target="#results",
                 style="margin: 10px;",
             ),
@@ -850,17 +837,4 @@ if not DEV_MODE:
         setup_hf_backup(app)
     except Exception as e:
         print(f"Error setting up hf backup: {e}")
-
-# Add this at the end of your file, before serve()
-app.state.sessions = {}
-
-@app.middleware("http")
-async def add_session_to_app_state(request, call_next):
-    response = await call_next(request)
-    if 'session' in request.scope:
-        session = request.scope['session']
-        if 'user_id' in session:
-            app.state.sessions[session['user_id']] = session
-    return response
-
 serve()