Update app.py

app.py

@@ -1,50 +1,12 @@
 import streamlit as st
 import json
 
-# --- Constants for searching ---
-COMMON_NAME_KEYS = ["user", "username", "name", "fullName", "firstName", "lastName"]
+COMMON_NAME_KEYS = ["user", "username", "name", "fullName", "firstName", "lastName", "customer"]
 LOGIN_KEYS = ["lastLogin", "login", "loggedIn", "lastLoggedIn", "last_login", "last_logged_in"]
 
-# --- Session state setup ---
-if "json_data" not in st.session_state:
-    st.session_state.json_data = {}
-if "messages" not in st.session_state:
-    st.session_state.messages = []
-if "temp_input" not in st.session_state:
-    st.session_state.temp_input = ""
-if "files_loaded" not in st.session_state:
-    st.session_state.files_loaded = False
-
-st.set_page_config(page_title="Instant JSON Q&A", layout="wide")
-st.title("Instant JSON-Backed AI Q&A (No More Clarifying Loops)")
-
-# --- Upload area ---
-st.sidebar.header("Upload Multiple JSON Files")
-uploaded_files = st.sidebar.file_uploader(
-    "Choose one or more JSON files", type="json", accept_multiple_files=True
-)
-
-if uploaded_files and not st.session_state.files_loaded:
-    st.session_state.json_data.clear()
-    for f in uploaded_files:
-        try:
-            content = json.load(f)
-            st.session_state.json_data[f.name] = content
-            st.sidebar.success(f"Loaded: {f.name}")
-        except Exception as e:
-            st.sidebar.error(f"Error reading {f.name}: {e}")
-    st.session_state.messages = []
-    st.session_state.files_loaded = True
-elif not uploaded_files:
-    st.session_state.json_data.clear()
-    st.session_state.files_loaded = False
-
-# --- Robust normalization function for matching ---
 def normalize(s):
-    # Lowercase, remove underscores/dashes, strip, collapse double spaces
     return str(s).lower().replace("_", " ").replace("-", " ").replace(".", " ").strip()
 
-# --- Recursive user search with robust matching ---
 def recursive_find_user(target_name):
     matches = []
     norm_target = normalize(target_name)
@@ -52,7 +14,8 @@ def recursive_find_user(target_name):
         def _search(obj, path):
             if isinstance(obj, dict):
                 for k, v in obj.items():
-                    if k in COMMON_NAME_KEYS and norm_target in normalize(v):
+                    # Direct match for string value
+                    if k in COMMON_NAME_KEYS and isinstance(v, str) and norm_target in normalize(v):
                         login_info = {}
                         for lk in LOGIN_KEYS:
                             if lk in obj:
@@ -64,6 +27,21 @@ def recursive_find_user(target_name):
                             "file": file_name,
                             "login_info": login_info
                         })
+                    # Nested dict, e.g., user: { username: ... }
+                    if k in COMMON_NAME_KEYS and isinstance(v, dict):
+                        for nk, nv in v.items():
+                            if nk in COMMON_NAME_KEYS and norm_target in normalize(nv):
+                                login_info = {}
+                                for lk in LOGIN_KEYS:
+                                    if lk in obj:
+                                        login_info[lk] = obj[lk]
+                                matches.append({
+                                    "match_path": path + [k, nk],
+                                    "matched_name": nv,
+                                    "record": obj,
+                                    "file": file_name,
+                                    "login_info": login_info
+                                })
                     _search(v, path + [k])
             elif isinstance(obj, list):
                 for idx, item in enumerate(obj):
@@ -71,7 +49,6 @@ def recursive_find_user(target_name):
         _search(data, [])
     return matches
 
-# --- Show all user keys/values (for debug) ---
 def show_all_users():
     found = []
     for file_name, data in st.session_state.json_data.items():
@@ -79,7 +56,12 @@ def show_all_users():
             if isinstance(obj, dict):
                 for k, v in obj.items():
                     if k in COMMON_NAME_KEYS:
-                        found.append(f"{file_name} | {'.'.join(path + [k])} = {v}")
+                        if isinstance(v, str):
+                            found.append(f"{file_name} | {'.'.join(path + [k])} = {v}")
+                        elif isinstance(v, dict):
+                            for nk, nv in v.items():
+                                if nk in COMMON_NAME_KEYS:
+                                    found.append(f"{file_name} | {'.'.join(path + [k, nk])} = {nv}")
                     recursive(v, path + [k])
             elif isinstance(obj, list):
                 for idx, item in enumerate(obj):
@@ -87,10 +69,8 @@ def show_all_users():
         recursive(data, [])
     return found
 
-# --- Main Q&A logic ---
 import re
 def handle_user_query(query):
-    # Try to extract a likely user name from the query
     patterns = [
         r"(?:last\s*login.*?for|when\s+did)\s+([a-zA-Z0-9 _\-\.]+)",
         r"when\s+was\s+([a-zA-Z0-9 _\-\.]+)\s+last\s+(?:login|logged\s*in)",
@@ -104,7 +84,6 @@ def handle_user_query(query):
             found_name = m.group(1).strip()
             break
     if not found_name:
-        # Fallback: look for first capitalized word or phrase
         m = re.search(r"([A-Z][a-z]+(?: [A-Z][a-z]+)*)", query)
         if m:
             found_name = m.group(1).strip()
@@ -122,7 +101,37 @@ def handle_user_query(query):
     else:
         return "Sorry, I can only answer direct user info queries (e.g., 'When did Bob the Builder last login?')."
 
-# --- Chat UI ---
+# --- Streamlit UI ---
+if "json_data" not in st.session_state:
+    st.session_state.json_data = {}
+if "messages" not in st.session_state:
+    st.session_state.messages = []
+if "temp_input" not in st.session_state:
+    st.session_state.temp_input = ""
+if "files_loaded" not in st.session_state:
+    st.session_state.files_loaded = False
+
+st.set_page_config(page_title="Instant JSON Q&A", layout="wide")
+st.title("Instant JSON-Backed AI Q&A (Now Handles Nested Users!)")
+
+uploaded_files = st.sidebar.file_uploader(
+    "Choose one or more JSON files", type="json", accept_multiple_files=True
+)
+if uploaded_files and not st.session_state.files_loaded:
+    st.session_state.json_data.clear()
+    for f in uploaded_files:
+        try:
+            content = json.load(f)
+            st.session_state.json_data[f.name] = content
+            st.sidebar.success(f"Loaded: {f.name}")
+        except Exception as e:
+            st.sidebar.error(f"Error reading {f.name}: {e}")
+    st.session_state.messages = []
+    st.session_state.files_loaded = True
+elif not uploaded_files:
+    st.session_state.json_data.clear()
+    st.session_state.files_loaded = False
+
 st.markdown("### Ask about any user directly (e.g. 'When did Bob the Builder last login?')")
 for msg in st.session_state.messages:
     if msg["role"] == "user":