Update app.py via AI Editor

app.py

@@ -32,14 +32,24 @@ MAX_OUTPUT_TOKENS = 65536
 
 SESSION_STORE = {}
 
-def get_session_id():
-    ctx = dash.callback_context
-    sid = None
-    if hasattr(ctx, "request") and hasattr(ctx.request, "cookies"):
-        cookies = ctx.request.cookies
-        sid = cookies.get('dash_session', None)
-    if not sid:
-        sid = str(uuid.uuid4())
+def get_session_id_from_cookie(cookie_str):
+    # Parse a cookie string like "dash_session=abcd; something=xyz"
+    if not cookie_str:
+        return None
+    for part in cookie_str.split(";"):
+        if part.strip().startswith("dash_session="):
+            return part.strip().split("=")[1]
+    return None
+
+def get_session_id(session_id=None):
+    # Always require session_id as input; never generate unless absent
+    if session_id and session_id in SESSION_STORE:
+        return session_id
+    if session_id:
+        # New session, not yet in store
+        return session_id
+    # Defensive fallback: generate a new session_id (should never hit this)
+    sid = str(uuid.uuid4())
     return sid
 
 def get_session_data(session_id):
@@ -471,6 +481,9 @@ def get_proposals_list(proposaldict):
 
 app.layout = dbc.Container([
     dcc.Store(id='preview-window-state', data='expanded'),
+    dcc.Store(id='session-id-store', storage_type='session'),  # Session ID per browser session
+    html.Div(id='set-session-cookie', style={'display': 'none'}),  # dummy div for JS callback
+    dcc.Location(id='dummy-url', refresh=False),  # For JS init on page load
     dbc.Row([
         dbc.Col([
             dbc.Card([
@@ -568,6 +581,27 @@ app.layout = dbc.Container([
     ], style={'marginTop':'20px'})
 ], fluid=True)
 
+# JS callback: Set session cookie and session-id-store on first page load if not present
+app.clientside_callback(
+    """
+    function(n, dummy_url) {
+      let sid = window.sessionStorage.getItem('dash_session');
+      let store_val = null;
+      if(!sid) {
+        sid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c =>
+          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+        );
+        window.sessionStorage.setItem('dash_session', sid);
+      }
+      document.cookie = "dash_session=" + sid + "; path=/";
+      store_val = sid;
+      return store_val;
+    }
+    """,
+    Output('session-id-store', 'data'),
+    Input('dummy-url', 'pathname')
+)
+
 @app.callback(
     Output('output-preview-container', 'style'),
     [Input('preview-window-state', 'data')]
@@ -616,7 +650,8 @@ def update_preview_window_style(state):
         State('select-proposal-dropdown', 'value'),
         State('chat-input', 'value'),
         Input('cancel-action-btn', 'n_clicks'),
-        State('preview-window-state', 'data')
+        State('preview-window-state', 'data'),
+        State('session-id-store', 'data')
     ],
     prevent_initial_call=True
 )
@@ -624,10 +659,12 @@ def master_callback(
     shred_clicks, proposal_clicks, compliance_clicks, recover_clicks, board_clicks, loe_clicks,
     rfp_content, rfp_filename, doc_delete_clicks, selected_doc,
     proposal_content, proposal_filename, proposal_delete_clicks, selected_proposal,
-    chat_input, cancel_clicks, preview_window_state
+    chat_input, cancel_clicks, preview_window_state,
+    session_id
 ):
-    session_id = get_session_id()
-    sess_data = get_session_data(session_id)
+    # Always get session_id from dcc.Store, never generate
+    sid = get_session_id(session_id)
+    sess_data = get_session_data(sid)
     ctx = callback_context
     triggered_id = ctx.triggered[0]['prop_id'].split('.')[0] if ctx.triggered else None
 
@@ -669,9 +706,9 @@ def master_callback(
             sess_data["uploaded_documents_bytes"][rfp_filename] = decoded
             if fileid:
                 sess_data["uploaded_documents_fileid"][rfp_filename] = fileid
-            logging.info(f"[{session_id}] Document uploaded: {rfp_filename}")
+            logging.info(f"[{sid}] Document uploaded: {rfp_filename}")
         else:
-            logging.error(f"[{session_id}] Failed to decode uploaded document: {rfp_filename}")
+            logging.error(f"[{sid}] Failed to decode uploaded document: {rfp_filename}")
 
     if triggered_id == 'upload-proposal' and proposal_content is not None and proposal_filename:
         content_type, content_string = proposal_content.split(',')
@@ -684,9 +721,9 @@ def master_callback(
             sess_data["proposals"][proposal_filename] = text
             if fileid:
                 sess_data["proposals_fileid"][proposal_filename] = fileid
-            logging.info(f"[{session_id}] Proposal uploaded: {proposal_filename}")
+            logging.info(f"[{sid}] Proposal uploaded: {proposal_filename}")
         else:
-            logging.error(f"[{session_id}] Failed to decode uploaded proposal: {proposal_filename}")
+            logging.error(f"[{sid}] Failed to decode uploaded proposal: {proposal_filename}")
 
     if triggered_id and isinstance(doc_delete_clicks, list):
         for i, n_click in enumerate(doc_delete_clicks):
@@ -699,14 +736,14 @@ def master_callback(
                         try:
                             genai.delete_file(sess_data["uploaded_documents_fileid"][del_filename])
                         except Exception as e:
-                            logging.warning(f"[{session_id}] Failed to delete Gemini file {del_filename}: {e}")
+                            logging.warning(f"[{sid}] Failed to delete Gemini file {del_filename}: {e}")
                         del sess_data["uploaded_documents_fileid"][del_filename]
                     if del_filename in sess_data["uploaded_documents_bytes"]:
                         del sess_data["uploaded_documents_bytes"][del_filename]
-                    logging.info(f"[{session_id}] Document deleted: {del_filename}")
+                    logging.info(f"[{sid}] Document deleted: {del_filename}")
                 if del_filename in sess_data["shredded_documents"]:
                     del sess_data["shredded_documents"][del_filename]
-                    logging.info(f"[{session_id}] Shredded doc deleted: {del_filename}")
+                    logging.info(f"[{sid}] Shredded doc deleted: {del_filename}")
                 if selected_doc == del_filename:
                     selected_doc = None
                 break
@@ -722,9 +759,9 @@ def master_callback(
                         try:
                             genai.delete_file(sess_data["proposals_fileid"][del_filename])
                         except Exception as e:
-                            logging.warning(f"[{session_id}] Failed to delete Gemini proposal file {del_filename}: {e}")
+                            logging.warning(f"[{sid}] Failed to delete Gemini proposal file {del_filename}: {e}")
                         del sess_data["proposals_fileid"][del_filename]
-                    logging.info(f"[{session_id}] Proposal deleted: {del_filename}")
+                    logging.info(f"[{sid}] Proposal deleted: {del_filename}")
                 if selected_proposal == del_filename:
                     selected_proposal = None
                 break