deploy at 2024-08-25 16:00:42.797545

main.py

@@ -64,7 +64,7 @@ from urllib.parse import quote
 import uuid
 import secrets
 
-DEV_MODE = True
+DEV_MODE = False
 
 if DEV_MODE:
     print("Running in DEV_MODE - Hot reload enabled")
@@ -121,7 +121,7 @@ login_redir = RedirectResponse("/login", status_code=303)
 
 
 def user_auth_before(req, sess):
-    auth = req.scope["auth"] = sess.get("auth", False)
+    sess.setdefault('auth', False)
 
 
 spinner_css = Style("""
@@ -308,9 +308,8 @@ def spinner_div(hidden: bool = False):
 
 
 @app.route("/")
-def get(request: Request):
-    # Can not get auth directly, as it is skipped in beforeware
-    auth = request.session.get("auth", False)
+def get(sess):
+    auth = sess.get('auth', False)
     queries = [
         "Breast Cancer Cells Feed on Cholesterol",
         "Treating Asthma With Plants vs. Pills",
@@ -416,8 +415,8 @@ class Login:
 
 
 @app.get("/login")
-def get_login_form(request: Request, error: bool = False):
-    auth = request.session.get("auth", False)
+def get_login_form(sess, error: bool = False):
+    auth = sess.get('auth', False)
     frm = Form(
         Input(id="name", placeholder="Name"),
         Input(id="pwd", type="password", placeholder="Password"),
@@ -438,21 +437,21 @@ def get_login_form(request: Request, error: bool = False):
 
 
 @app.post("/login")
-async def login(request: Request):
+async def login(sess, 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
+        sess['auth'] = True
         return RedirectResponse("/admin", status_code=303)
     
     return RedirectResponse("/login?error=True", status_code=303)
 
 
 @app.route("/logout")
-async def logout(request: Request):
-    request.session.clear()
+async def logout(sess):
+    sess.clear()
     return RedirectResponse("/")
 
 
@@ -472,25 +471,24 @@ def replace_hi_with_strong(text):
     return elements
 
 
-def log_query_to_db(query, ranking, request):
+def log_query_to_db(query, ranking, sess):
     queries.insert(
         Query(query=query, ranking=ranking, sess_id=sesskey, timestamp=int(time.time()))
     )
-    if 'user_id' not in request.session:
-        request.session['user_id'] = str(uuid.uuid4())
+    if 'user_id' not in sess:
+        sess['user_id'] = str(uuid.uuid4())
     
-    if 'queries' not in request.session:
-        request.session['queries'] = []
+    sess.setdefault('queries', [])
     
     query_data = {
         'query': query,
         'ranking': ranking,
         'timestamp': int(time.time())
     }
-    request.session['queries'].append(query_data)
+    sess['queries'].append(query_data)
     
     # Limit the number of queries stored in the session to prevent it from growing too large
-    request.session['queries'] = request.session['queries'][-100:]  # Keep only the last 100 queries
+    sess['queries'] = sess['queries'][-100:]  # Keep only the last 100 queries
 
     return query_data
 
@@ -580,10 +578,10 @@ def get_yql(ranking: RankProfile, userquery: str) -> T[str, dict]:
 
 
 @app.get("/search")
-async def search(request: Request, userquery: str, ranking: str):
-    print(request.session)
+async def search(sess, userquery: str, ranking: str):
+    print(sess)
     quoted = quote(userquery) + "&ranking=" + ranking
-    log_query_to_db(userquery, ranking, request)
+    log_query_to_db(userquery, ranking, sess)
     yql, body = get_yql(ranking, userquery)
     async with vespa_app.asyncio() as session:
         resp = await session.query(
@@ -651,8 +649,8 @@ def download_csv(request: Request):
 
 
 @app.route("/admin")
-async def admin(request: Request):
-    auth = request.session.get("auth", False)
+async def admin(sess):
+    auth = sess.get('auth', False)
     if not auth:
         print(f"Not authenticated: {auth}")
         return RedirectResponse("/login", status_code=303)