deploy at 2024-08-25 07:13:18.754224

main.py

@@ -314,9 +314,9 @@ def spinner_div(hidden: bool = False):
 
 
 @app.route("/")
-def get(sess):
+def get(request: Request):
     # Can not get auth directly, as it is skipped in beforeware
-    auth = sess.get("auth", False)
+    auth = request.session.get("auth", False)
     queries = [
         "Breast Cancer Cells Feed on Cholesterol",
         "Treating Asthma With Plants vs. Pills",
@@ -422,8 +422,8 @@ class Login:
 
 
 @app.get("/login")
-def get_login_form(sess, error: bool = False):
-    auth = sess.get("auth", False)
+def get_login_form(request: Request, error: bool = False):
+    auth = request.session.get("auth", False)
     frm = Form(
         Input(id="name", placeholder="Name"),
         Input(id="pwd", type="password", placeholder="Password"),
@@ -444,30 +444,22 @@ def get_login_form(sess, error: bool = False):
 
 
 @app.post("/login")
-async def login(request):
+async def login(request: Request):
     form = await request.form()
     username = form.get("name")
     password = form.get("pwd")
     
     if username == ADMIN_NAME and compare_digest(ADMIN_PWD.encode("utf-8"), password.encode("utf-8")):
         request.session["auth"] = True
-        #
         response = RedirectResponse("/admin", status_code=303)
-        response.set_cookie(
-            key="session",
-            value=request.session,
-            httponly=True,
-            secure=True,
-            samesite="Lax"
-        )
         return response
     
     return RedirectResponse("/login?error=True", status_code=303)
 
 
 @app.route("/logout")
-async def logout(request):
-    request.session.pop("auth", None)
+async def logout(request: Request):
+    request.session.clear()
     return RedirectResponse("/")
 
 
@@ -487,25 +479,25 @@ def replace_hi_with_strong(text):
     return elements
 
 
-def log_query_to_db(query, ranking, sess):
+def log_query_to_db(query, ranking, request):
     queries.insert(
         Query(query=query, ranking=ranking, sess_id=sesskey, timestamp=int(time.time()))
     )
-    if 'user_id' not in sess:
-        sess['user_id'] = str(uuid.uuid4())
+    if 'user_id' not in request.session:
+        request.session['user_id'] = str(uuid.uuid4())
     
-    if 'queries' not in sess:
-        sess['queries'] = []
+    if 'queries' not in request.session:
+        request.session['queries'] = []
     
     query_data = {
         'query': query,
         'ranking': ranking,
         'timestamp': int(time.time())
     }
-    sess['queries'].append(query_data)
+    request.session['queries'].append(query_data)
     
     # Limit the number of queries stored in the session to prevent it from growing too large
-    sess['queries'] = sess['queries'][-100:]  # Keep only the last 100 queries
+    request.session['queries'] = request.session['queries'][-100:]  # Keep only the last 100 queries
 
     return query_data
 
@@ -595,10 +587,10 @@ def get_yql(ranking: RankProfile, userquery: str) -> T[str, dict]:
 
 
 @app.get("/search")
-async def search(userquery: str, ranking: str, sess):
-    print(sess)
+async def search(request: Request, userquery: str, ranking: str):
+    print(request.session)
     quoted = quote(userquery) + "&ranking=" + ranking
-    log_query_to_db(userquery, ranking, sess)
+    log_query_to_db(userquery, ranking, request)
     yql, body = get_yql(ranking, userquery)
     async with vespa_app.asyncio() as session:
         resp = await session.query(
@@ -638,7 +630,7 @@ async def search(userquery: str, ranking: str, sess):
 
 
 @app.get("/download_csv")
-def download_csv(auth):
+def download_csv(request: Request):
     queries_dict = list(db.query("SELECT * FROM queries"))
     queries = [Query(**query) for query in queries_dict]
 
@@ -666,10 +658,8 @@ def download_csv(auth):
 
 
 @app.route("/admin")
-async def admin(request):
-    sess = request.cookies.get("session")
-    if not sess.get("auth", False):
-        print(sess)
+async def admin(request: Request):
+    if not request.session.get("auth", False):
         return RedirectResponse("/login", status_code=303)
     
     page = int(request.query_params.get("page", 1))