deploy at 2024-08-24 17:48:27.223448

main copy.py

@@ -45,6 +45,7 @@ from fasthtml.pico import Search, Grid, Fieldset, Label
 from starlette.middleware import Middleware
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware.sessions import SessionMiddleware
+from starlette.middleware.cors import CORSMiddleware
 from vespa.application import Vespa
 import json
 import os
@@ -178,18 +179,14 @@ class DebugSessionMiddleware(SessionMiddleware):
         await super().__call__(scope, receive, send)
         print(f"DebugSessionMiddleware: After processing - Scope: {scope}")
 
-from starlette.middleware.cors import CORSMiddleware
-
 middlewares = [
     Middleware(
         SessionMiddleware,
         secret_key=get_key(fname=sess_key_path),
         max_age=3600,
-        #same_site='lax',
     ),
-    Middleware(CORSMiddleware, allow_origins=['*']),
     Middleware(XFrameOptionsMiddleware),
-    Middleware(SessionLoggingMiddleware),
+    #Middleware(SessionLoggingMiddleware),
     #Middleware(DebugSessionMiddleware, secret_key=get_key(fname=sess_key_path)),
 ]
 bware = Beforeware(

main.py

@@ -45,7 +45,6 @@ from fasthtml.pico import Search, Grid, Fieldset, Label
 from starlette.middleware import Middleware
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware.sessions import SessionMiddleware
-from starlette.middleware.cors import CORSMiddleware
 from vespa.application import Vespa
 import json
 import os
@@ -58,7 +57,6 @@ import tempfile
 from enum import Enum
 from typing import Tuple as T
 from urllib.parse import quote
-import uuid
 
 DEV_MODE = False
 
@@ -166,18 +164,6 @@ 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(
@@ -186,8 +172,6 @@ middlewares = [
         max_age=3600,
     ),
     Middleware(XFrameOptionsMiddleware),
-    #Middleware(SessionLoggingMiddleware),
-    #Middleware(DebugSessionMiddleware, secret_key=get_key(fname=sess_key_path)),
 ]
 bware = Beforeware(
     user_auth_before,
@@ -311,6 +295,7 @@ 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",
     ]
@@ -439,10 +424,9 @@ 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)
-    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
+    sess["auth"] = True
+    print(f"Sess after login: {sess}")
+    return RedirectResponse("/admin", status_code=303)
 
 
 @app.get("/logout")
@@ -468,26 +452,9 @@ def replace_hi_with_strong(text):
 
 
 def log_query_to_db(query, ranking, sess):
-    queries.insert(
+    return 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):
@@ -577,7 +544,12 @@ 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:
@@ -834,13 +806,12 @@ 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={last_query}",
+                hx_get=f"/search?userquery={sess['queries'][-1]}",
                 hx_target="#results",
                 style="margin: 10px;",
             ),