deploy at 2024-08-24 17:59:30.546351

main.py

@@ -58,6 +58,7 @@ import tempfile
 from enum import Enum
 from typing import Tuple as T
 from urllib.parse import quote
+import uuid
 
 DEV_MODE = False
 
@@ -165,24 +166,28 @@ class XFrameOptionsMiddleware(BaseHTTPMiddleware):
         response.headers["X-Frame-Options"] = "ALLOW-FROM https://huggingface.co/"
         return response
 
+class SessionLoggingMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request, call_next):
+        print(f"Before request: Session data: {request.session}")
+        response = await call_next(request)
+        print(f"After request: Session data: {request.session}")
+        return response
+
+class DebugSessionMiddleware(SessionMiddleware):
+    async def __call__(self, scope, receive, send):
+        print(f"DebugSessionMiddleware: Before processing - Scope: {scope}")
+        await super().__call__(scope, receive, send)
+        print(f"DebugSessionMiddleware: After processing - Scope: {scope}")
 
 middlewares = [
     Middleware(
         SessionMiddleware,
         secret_key=get_key(fname=sess_key_path),
         max_age=3600,
-        same_site='None',
-        https_only=True,
-        domain=".hf.space"
     ),
     Middleware(XFrameOptionsMiddleware),
-     Middleware(
-        CORSMiddleware,
-        allow_origins=["*"],  # Allows all origins
-        allow_credentials=True,
-        allow_methods=["*"],  # Allows all methods
-        allow_headers=["*"],  # Allows all headers
-    ),
+    #Middleware(SessionLoggingMiddleware),
+    #Middleware(DebugSessionMiddleware, secret_key=get_key(fname=sess_key_path)),
 ]
 bware = Beforeware(
     user_auth_before,
@@ -306,7 +311,6 @@ def get(sess):
     queries = [
         "Breast Cancer Cells Feed on Cholesterol",
         "Treating Asthma With Plants vs. Pills",
-        "Alkylphenol Endocrine Disruptors",
         "Testing Turmeric on Smokers",
         "The Role of Pesticides in Parkinson's Disease",
     ]
@@ -435,9 +439,10 @@ def post(login: Login, sess):
     if not compare_digest(ADMIN_PWD.encode("utf-8"), login.pwd.encode("utf-8")):
         # Incorrect password - add error message
         return RedirectResponse("/login?error=True", status_code=303)
-    sess["auth"] = True
-    print(f"Sess after login: {sess}")
-    return RedirectResponse("/admin", status_code=303)
+    print(f"Session after setting auth: {sess}")
+    response = RedirectResponse("/admin", status_code=303)
+    print(f"Cookies being set: {response.headers.get('Set-Cookie')}")
+    return response
 
 
 @app.get("/logout")
@@ -463,9 +468,26 @@ def replace_hi_with_strong(text):
 
 
 def log_query_to_db(query, ranking, sess):
-    return queries.insert(
+    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 'queries' not in sess:
+        sess['queries'] = []
+    
+    query_data = {
+        'query': query,
+        'ranking': ranking,
+        'timestamp': int(time.time())
+    }
+    sess['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
+
+    return query_data
 
 
 def parse_results(records):
@@ -555,12 +577,7 @@ def get_yql(ranking: RankProfile, userquery: str) -> T[str, dict]:
 @app.get("/search")
 async def search(userquery: str, ranking: str, sess):
     print(sess)
-    if "queries" not in sess:
-        sess["queries"] = []
     quoted = quote(userquery) + "&ranking=" + ranking
-    sess["queries"].append(quoted)
-    print(f"Searching for: {userquery}")
-    print(f"Ranking: {ranking}")
     log_query_to_db(userquery, ranking, sess)
     yql, body = get_yql(ranking, userquery)
     async with vespa_app.asyncio() as session:
@@ -817,12 +834,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;",
             ),