Update app.py

app.py

@@ -20,19 +20,19 @@ except Exception as e:
     model_load_error = traceback.format_exc()
     print("⚠️ Model load error:\n", model_load_error)
 
-# ---- Improved parsing ----
+# ---- Parsing ----
 def parse_input_for_fields(text):
     text = text.lower()
     extracted = {}
 
-    def grab(patterns, key):
+    def grab(patterns, key, cast_float=True):
         if key in extracted:
             return
         for pat in patterns:
             m = re.search(pat, text)
             if m:
                 try:
-                    extracted[key] = float(m.group(1))
+                    extracted[key] = float(m.group(1)) if cast_float else m.group(1)
                 except:
                     extracted[key] = m.group(1)
                 return
@@ -50,7 +50,7 @@ def parse_input_for_fields(text):
     # Expenses
     grab([r"(?:expense|bill|spend).{0,15}\$?(\d{3,6})"], "monthly_expenses")
 
-    # Entertainment (expanded)
+    # Entertainment
     grab([
         r"(?:entertainment|fun|leisure).{0,15}\$?(\d{2,5})",
         r"spend.{0,10}\$?(\d{2,5}).{0,10}(?:entertainment|fun|leisure)"
@@ -68,8 +68,11 @@ def parse_input_for_fields(text):
     # Sales skills
     grab([r"(?:sales|selling).{0,15}(\d{1,2})"], "sales_skills_1_5")
 
-    # Dependents
-    grab([r"(?:dependents?|kids|children).{0,15}(\d{1,2})"], "dependence_1_5")
+    # Dependents → support "no kids"/"none"
+    if any(phrase in text for phrase in ["no kids", "none", "0 dependents"]):
+        extracted["dependence_1_5"] = 0
+    else:
+        grab([r"(?:dependents?|kids|children).{0,15}(\d{1,2})"], "dependence_1_5")
 
     return extracted
 
@@ -110,30 +113,54 @@ def chatbot(user_input, history):
     try:
         collected = conversation_state["collected"]
 
-        # Parse any new info
+        # Parse free-text
         new_data = parse_input_for_fields(user_input)
         for k, v in new_data.items():
             if k not in collected:
                 collected[k] = v
 
-        # Missing fields?
+        # Check missing
         missing = [f for f in REQUIRED_FIELDS if f not in collected]
         if missing:
             field_map = {
-                "age": "your age",
-                "monthly_income": "your monthly income ($)",
+                "age": "your age (just the number)",
+                "monthly_income": "your monthly income ($, just numbers)",
                 "monthly_expenses": "your monthly expenses ($)",
                 "entertainment_spending": "your monthly entertainment spending ($)",
                 "savings_amount": "your savings ($)",
                 "assets": "your assets/net worth ($)",
                 "risk_tolerance_1_10": "your risk tolerance (1–10)",
                 "sales_skills_1_5": "your sales skills (1–5)",
-                "dependence_1_5": "how many dependents you support"
+                "dependence_1_5": "how many dependents you support (number or 'none')"
             }
             next_field = missing[0]
+
+            # If user typed only a number in response
+            if re.fullmatch(r"\d+", user_input.strip()):
+                collected[next_field] = float(user_input.strip())
+                missing = [f for f in REQUIRED_FIELDS if f not in collected]
+                if not missing:
+                    # All done
+                    df = pd.DataFrame([collected])
+                    label = None
+                    try:
+                        if model:
+                            raw_pred = model.predict(df)
+                            label = raw_pred[0] if hasattr(raw_pred, "__len__") else raw_pred
+                    except Exception:
+                        label = None
+
+                    score = compute_readiness(collected)
+                    conversation_state["collected"] = {}
+
+                    response = f"📊 Your entrepreneurial readiness score is **{score:.1f}/100**."
+                    if label:
+                        response += f" The model also classified you as: **{label}**."
+                    return response
+
             return f"Hmm... I think I need a bit more info. Could you tell me {field_map[next_field]}?"
 
-        # All fields collected
+        # All info collected
         df = pd.DataFrame([collected])
         label = None
         try:
@@ -161,7 +188,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="purple", secondary_hue="purple"
         """
         <h1 style='text-align:center; color:#D8B4FE;'>💬 Entrepreneurial Readiness Chatbot</h1>
         <p style='text-align:center; color:#E9D5FF; font-size:16px;'>
-        Hello! I'm an <b>entrepreneurial readiness chatbot</b>.<br>
+        👋 Hello! I'm an <b>entrepreneurial readiness chatbot</b>.<br>
         Tell me a little about yourself (e.g., age, income, expenses, savings, etc.)<br>
         and I'll give you a readiness score between 0 and 100!
         </p>
@@ -187,4 +214,3 @@ if model_load_error:
     print("=== MODEL LOAD ERROR ===\n", model_load_error)
 
 demo.launch()
-