Update app.py

app.py

@@ -34,9 +34,32 @@ try:
 except ImportError:
     import pytz # Fallback if zoneinfo is missing
 
+# --- COMPREHENSIVE LOGGING ---
+LOG_FILE = "logs.txt"
+
+def write_log(action_type, details):
+    """Appends a timestamped log entry to logs.txt"""
+    try:
+        try:
+            tz = ZoneInfo("Africa/Nairobi")
+        except:
+            import pytz
+            tz = pytz.timezone("Africa/Nairobi")
+            
+        timestamp = datetime.now(tz).strftime('%Y-%m-%d %H:%M:%S')
+        log_entry = f"[{timestamp}] [{action_type}] {details}\n"
+        
+        with open(LOG_FILE, "a", encoding="utf-8") as f:
+            f.write(log_entry)
+            
+        print(log_entry.strip()) # Also print to console for debugging
+    except Exception as e:
+        print(f"Logging failed: {e}")
+
 # --- CACHING HELPERS ---
 DRAFT_FILE = "user_drafts.json"
 
+
 def load_drafts():
     if os.path.exists(DRAFT_FILE):
         try:
@@ -70,6 +93,7 @@ def update_cache_row(user, session_id, dom_a, pol_a, dom_b, pol_b, tar_col, ctx_
     drafts[user]["rows"][cache_key][b_text] = {
         "rel": rel, "inter": inter, "just": just, "session_id": session_id
     }
+    write_log("CACHE_UPDATE", f"User {user} auto-saved draft for row index {idx}.")
     
     with open(DRAFT_FILE, 'w') as f:
         json.dump(drafts, f)
@@ -775,26 +799,41 @@ with gr.Blocks(theme=gr.themes.Soft(), css=custom_css) as demo:
     
     # ADD link_val and follow_val to inputs
     def authenticate(email, link_val, follow_val):
+        email = email.strip().lower()
+        
+        # 1. Validate Email Format
+        email_pattern = r"^[^@\s]+@[^@\s]+\.[^@\s]+$"
+        if not re.match(email_pattern, email):
+            write_log("LOGIN_FAILED", f"Invalid email format attempted: '{email}'")
+            return (gr.update(value=f"<font color='red'>Please enter a valid email address.</font>"), 
+                    gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), 
+                    None, None,
+                    gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), link_val, follow_val)
+                    
         user_tag, msg = get_or_create_user(email)
         
         if not user_tag:
+            write_log("LOGIN_FAILED", f"System error creating user for '{email}'")
             return (gr.update(value=f"<font color='red'>{msg}</font>"), 
-                    gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), # Added sector_box visibility
+                    gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), 
                     None, None,
                     gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), link_val, follow_val)
             
+        write_log("LOGIN_SUCCESS", f"User {user_tag} ({email}) logged in. Consents - Link: {link_val}, Follow: {follow_val}")
         hf_df = load_hf_dataset()
         drafts = load_drafts()
         user_data = drafts.get(user_tag, {})
         ws = user_data.get("workspace", {})
         
+        # 2. Check for pending session and redirect straight to workspace
         if ws.get("pol_a") and ws.get("pol_b"):
-            msg += f" Restored your previous session workspace."
+            write_log("SESSION_RESTORED", f"User {user_tag} skipped sectors and restored previous session {ws.get('session_id')}.")
+            msg += f" Restored your pending session. Click 'Fetch Data' to resume your draft."
             return (
                 gr.update(value=f"{msg} Loaded {len(hf_df)} annotations."), 
-                gr.update(visible=False), # login_box
-                gr.update(visible=False), # sector_box (SKIP)
-                gr.update(visible=True),  # app_box
+                gr.update(visible=False), # Hide login_box
+                gr.update(visible=False), # Hide sector_box (Bypass directly to app)
+                gr.update(visible=True),  # Show app_box
                 user_tag, 
                 hf_df,
                 gr.update(value=ws["dom_a"]),
@@ -807,11 +846,12 @@ with gr.Blocks(theme=gr.themes.Soft(), css=custom_css) as demo:
                 follow_val   
             )
         else:
+            write_log("NEW_SESSION", f"User {user_tag} starting fresh. Routing to Sector Selection.")
             return (
                 gr.update(value=f"{msg} Loaded {len(hf_df)} annotations."), 
-                gr.update(visible=False), # login_box
-                gr.update(visible=True),  # sector_box (SHOW)
-                gr.update(visible=False), # app_box (HIDE)
+                gr.update(visible=False), # Hide login_box
+                gr.update(visible=True),  # Show sector_box
+                gr.update(visible=False), # Hide app_box
                 user_tag, 
                 hf_df,
                 gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(),
@@ -838,6 +878,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css=custom_css) as demo:
         default_domain = allowed_list[0] if allowed_list else None
         available_policies = get_policy_list(default_domain) if default_domain else []
         
+        write_log("SECTOR_SELECTED", f"Mapped sectors {selected_sectors} to domains {allowed_list}")
         return (
             gr.update(visible=False), # Hide sector box
             gr.update(visible=True),  # Show main app
@@ -1064,6 +1105,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css=custom_css) as demo:
         
         status_msg = t_text(f"Data loaded. {total_missing_pairs} unannotated pairs remain across {len(target_a_list)} Target A groups.", lang)
         
+        write_log("WORKSPACE_LOADED", f"User {user_tag} fetched {pol_a} vs {pol_b}.")
         return [
             target_a_list, pending_tasks, 0, 
             ctx_a_chunk_eng, ctx_b_chunk_eng, b_eng_list, 
@@ -1151,6 +1193,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css=custom_css) as demo:
                 hf_df.to_csv(csv_buffer, index=False)
                 csv_bytes = csv_buffer.getvalue().encode('utf-8')
                 
+                write_log("DATA_SAVED", f"User {user_tag} successfully saved {len(new_rows)} completed rows to Hugging Face.")
                 api = HfApi()
                 api.upload_file(
                     path_or_fileobj=io.BytesIO(csv_bytes), path_in_repo=HF_CSV_FILE,
@@ -1176,6 +1219,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css=custom_css) as demo:
         return gr.update(value=log_msg), idx + 1, hf_df
 
     def skip_action(idx, lang):
+        write_log("TARGET_SKIPPED", f"User skipped group {idx + 1}")
         return gr.update(value=t_text(f"Skipped group {idx + 1}.", lang)), idx + 1
 
     # --- TRIGGER FIRST PASS ---