feat(bot): comprehensive natural language command parsing
- Enhanced AI prompts with time/frequency conversion rules and 20+ examples - Added smart medication name resolution and confirmation flows - New medication commands: today, refills, snooze, adherence - New routine commands: create_with_steps, add_steps, steps, schedule - Added active session awareness with shortcuts (done, skip, pause, resume) - Confirmation handling for destructive/create actions - Improved help message with natural language examples
This commit is contained in:
@@ -32,58 +32,59 @@ async def handle_medication(message, session, parsed):
|
||||
times = parsed.get("times", ["08:00"])
|
||||
days_of_week = parsed.get("days_of_week", [])
|
||||
interval_days = parsed.get("interval_days")
|
||||
needs_confirmation = parsed.get("needs_confirmation", False)
|
||||
confirmation_prompt = parsed.get("confirmation_prompt")
|
||||
|
||||
if not name or not dosage:
|
||||
await message.channel.send("Please provide medication name and dosage.")
|
||||
return
|
||||
|
||||
data = {
|
||||
"name": name,
|
||||
"dosage": dosage,
|
||||
"unit": unit,
|
||||
"frequency": frequency,
|
||||
"times": times
|
||||
}
|
||||
|
||||
# Add optional fields if present
|
||||
if days_of_week:
|
||||
data["days_of_week"] = days_of_week
|
||||
if interval_days:
|
||||
data["interval_days"] = interval_days
|
||||
# Handle confirmation
|
||||
if needs_confirmation:
|
||||
# Store pending action in session for confirmation
|
||||
if "pending_confirmations" not in session:
|
||||
session["pending_confirmations"] = {}
|
||||
|
||||
resp, status = api_request("post", "/api/medications", token, data)
|
||||
if status == 201:
|
||||
await message.channel.send(f"Added **{name}** to your medications!")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to add medication')}")
|
||||
confirmation_id = f"med_add_{name}"
|
||||
session["pending_confirmations"][confirmation_id] = {
|
||||
"action": "add",
|
||||
"name": name,
|
||||
"dosage": dosage,
|
||||
"unit": unit,
|
||||
"frequency": frequency,
|
||||
"times": times,
|
||||
"days_of_week": days_of_week,
|
||||
"interval_days": interval_days
|
||||
}
|
||||
|
||||
schedule_desc = _format_schedule(frequency, times, days_of_week, interval_days)
|
||||
await message.channel.send(
|
||||
f"{confirmation_prompt}\n\n"
|
||||
f"**Details:**\n"
|
||||
f"- Name: {name}\n"
|
||||
f"- Dosage: {dosage} {unit}\n"
|
||||
f"- Schedule: {schedule_desc}\n\n"
|
||||
f"Reply **yes** to confirm, or **no** to cancel."
|
||||
)
|
||||
return
|
||||
|
||||
await _add_medication(message, token, name, dosage, unit, frequency, times, days_of_week, interval_days)
|
||||
|
||||
elif action == "take":
|
||||
med_id = parsed.get("medication_id")
|
||||
name = parsed.get("name")
|
||||
|
||||
if not med_id and name:
|
||||
# Look up medication by name
|
||||
resp, status = api_request("get", "/api/medications", token)
|
||||
if status == 200:
|
||||
meds = resp if isinstance(resp, list) else []
|
||||
# Find medication by name (case-insensitive partial match)
|
||||
matching = [m for m in meds if name.lower() in m['name'].lower() or m['name'].lower() in name.lower()]
|
||||
if matching:
|
||||
med_id = matching[0]['id']
|
||||
name = matching[0]['name']
|
||||
else:
|
||||
await message.channel.send(f"I couldn't find a medication called '{name}'. Use 'list' to see your medications.")
|
||||
return
|
||||
else:
|
||||
await message.channel.send("Error looking up medication. Please try again.")
|
||||
return
|
||||
elif not med_id:
|
||||
med_id, name, found = await _find_medication_by_name(message, token, med_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not med_id:
|
||||
await message.channel.send("Which medication did you take?")
|
||||
return
|
||||
|
||||
resp, status = api_request("post", f"/api/medications/{med_id}/take", token, {})
|
||||
if status == 201:
|
||||
await message.channel.send("Logged it! Great job staying on track.")
|
||||
await message.channel.send(f"Logged **{name}**! Great job staying on track.")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to log')}")
|
||||
|
||||
@@ -92,49 +93,225 @@ async def handle_medication(message, session, parsed):
|
||||
name = parsed.get("name")
|
||||
reason = parsed.get("reason", "Skipped by user")
|
||||
|
||||
if not med_id and name:
|
||||
# Look up medication by name
|
||||
resp, status = api_request("get", "/api/medications", token)
|
||||
if status == 200:
|
||||
meds = resp if isinstance(resp, list) else []
|
||||
# Find medication by name (case-insensitive partial match)
|
||||
matching = [m for m in meds if name.lower() in m['name'].lower() or m['name'].lower() in name.lower()]
|
||||
if matching:
|
||||
med_id = matching[0]['id']
|
||||
name = matching[0]['name']
|
||||
else:
|
||||
await message.channel.send(f"I couldn't find a medication called '{name}'. Use 'list' to see your medications.")
|
||||
return
|
||||
else:
|
||||
await message.channel.send("Error looking up medication. Please try again.")
|
||||
return
|
||||
elif not med_id:
|
||||
med_id, name, found = await _find_medication_by_name(message, token, med_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not med_id:
|
||||
await message.channel.send("Which medication are you skipping?")
|
||||
return
|
||||
|
||||
resp, status = api_request("post", f"/api/medications/{med_id}/skip", token, {"reason": reason})
|
||||
if status == 201:
|
||||
await message.channel.send("OK, noted.")
|
||||
await message.channel.send(f"Skipped **{name}**. {reason}")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to log')}")
|
||||
|
||||
elif action == "today":
|
||||
resp, status = api_request("get", "/api/medications/today", token)
|
||||
if status == 200:
|
||||
meds = resp if isinstance(resp, list) else []
|
||||
if not meds:
|
||||
await message.channel.send("No medications scheduled for today!")
|
||||
else:
|
||||
lines = []
|
||||
for item in meds:
|
||||
med = item.get("medication", {})
|
||||
times = item.get("scheduled_times", [])
|
||||
taken = item.get("taken_times", [])
|
||||
skipped = item.get("skipped_times", [])
|
||||
is_prn = item.get("is_prn", False)
|
||||
|
||||
med_name = med.get("name", "Unknown")
|
||||
dosage = f"{med.get('dosage', '')} {med.get('unit', '')}".strip()
|
||||
|
||||
if is_prn:
|
||||
status_icon = "💊"
|
||||
lines.append(f"{status_icon} **{med_name}** {dosage} (as needed)")
|
||||
elif times:
|
||||
for time in times:
|
||||
if time in taken:
|
||||
status_icon = "✅"
|
||||
elif time in skipped:
|
||||
status_icon = "⏭️"
|
||||
else:
|
||||
status_icon = "⏰"
|
||||
lines.append(f"{status_icon} **{med_name}** {dosage} at {time}")
|
||||
else:
|
||||
lines.append(f"💊 **{med_name}** {dosage}")
|
||||
|
||||
await message.channel.send("**Today's Medications:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch today\'s schedule')}")
|
||||
|
||||
elif action == "refills":
|
||||
resp, status = api_request("get", "/api/medications/refills-due", token)
|
||||
if status == 200:
|
||||
meds = resp if isinstance(resp, list) else []
|
||||
if not meds:
|
||||
await message.channel.send("No refills due soon! 🎉")
|
||||
else:
|
||||
lines = []
|
||||
for med in meds:
|
||||
name = med.get("name", "Unknown")
|
||||
qty = med.get("quantity_remaining")
|
||||
refill_date = med.get("refill_date")
|
||||
|
||||
if qty is not None and qty <= 7:
|
||||
lines.append(f"⚠️ **{name}**: Only {qty} remaining")
|
||||
elif refill_date:
|
||||
lines.append(f"📅 **{name}**: Refill due by {refill_date}")
|
||||
|
||||
await message.channel.send("**Refills Due:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch refills')}")
|
||||
|
||||
elif action == "snooze":
|
||||
med_id = parsed.get("medication_id")
|
||||
name = parsed.get("name")
|
||||
minutes = parsed.get("minutes", 15)
|
||||
|
||||
med_id, name, found = await _find_medication_by_name(message, token, med_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not med_id:
|
||||
await message.channel.send("Which medication reminder should I snooze?")
|
||||
return
|
||||
|
||||
resp, status = api_request("post", f"/api/medications/{med_id}/snooze", token, {"minutes": minutes})
|
||||
if status == 200:
|
||||
await message.channel.send(f"⏰ Snoozed **{name}** for {minutes} minutes.")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to snooze')}")
|
||||
|
||||
elif action == "adherence":
|
||||
med_id = parsed.get("medication_id")
|
||||
name = parsed.get("name")
|
||||
|
||||
if name and not med_id:
|
||||
# Look up by name first
|
||||
med_id, name, found = await _find_medication_by_name(message, token, None, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if med_id:
|
||||
resp, status = api_request("get", f"/api/medications/{med_id}/adherence", token)
|
||||
else:
|
||||
resp, status = api_request("get", "/api/medications/adherence", token)
|
||||
|
||||
if status == 200:
|
||||
if isinstance(resp, list):
|
||||
lines = [f"- {m['name']}: {m['adherence_percent']}% adherence" for m in resp]
|
||||
await message.channel.send("**Adherence:**\n" + "\n".join(lines))
|
||||
lines = []
|
||||
for m in resp:
|
||||
adherence = m.get('adherence_percent')
|
||||
if adherence is not None:
|
||||
lines.append(f"- **{m['name']}**: {adherence}% adherence ({m.get('taken', 0)}/{m.get('expected', 0)} doses)")
|
||||
else:
|
||||
lines.append(f"- **{m['name']}**: PRN medication (no adherence tracking)")
|
||||
await message.channel.send("**Adherence Stats:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"**{resp.get('name')}**: {resp.get('adherence_percent')}% adherence")
|
||||
adherence = resp.get('adherence_percent')
|
||||
if adherence is not None:
|
||||
await message.channel.send(
|
||||
f"**{resp.get('name')}**:\n"
|
||||
f"- Adherence: {adherence}%\n"
|
||||
f"- Taken: {resp.get('taken', 0)}/{resp.get('expected', 0)} doses\n"
|
||||
f"- Skipped: {resp.get('skipped', 0)}"
|
||||
)
|
||||
else:
|
||||
await message.channel.send(f"**{resp.get('name')}**: PRN medication (no adherence tracking)")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch adherence')}")
|
||||
|
||||
else:
|
||||
await message.channel.send(f"Unknown action: {action}. Try: list, add, take, skip, or adherence.")
|
||||
await message.channel.send(f"Unknown action: {action}. Try: list, add, take, skip, today, refills, snooze, or adherence.")
|
||||
|
||||
|
||||
async def _add_medication(message, token, name, dosage, unit, frequency, times, days_of_week, interval_days):
|
||||
"""Helper to add a medication."""
|
||||
data = {
|
||||
"name": name,
|
||||
"dosage": dosage,
|
||||
"unit": unit,
|
||||
"frequency": frequency,
|
||||
"times": times
|
||||
}
|
||||
|
||||
# Add optional fields if present
|
||||
if days_of_week:
|
||||
data["days_of_week"] = days_of_week
|
||||
if interval_days:
|
||||
data["interval_days"] = interval_days
|
||||
|
||||
resp, status = api_request("post", "/api/medications", token, data)
|
||||
if status == 201:
|
||||
schedule_desc = _format_schedule(frequency, times, days_of_week, interval_days)
|
||||
await message.channel.send(f"✅ Added **{name}** ({dosage} {unit}) - {schedule_desc}")
|
||||
else:
|
||||
error_msg = resp.get('error', 'Failed to add medication')
|
||||
if "invalid input syntax" in error_msg.lower():
|
||||
await message.channel.send(f"Error: I couldn't understand the schedule format. Try saying it differently, like 'every day at 9am' or 'on Monday and Wednesday at 8pm'.")
|
||||
else:
|
||||
await message.channel.send(f"Error: {error_msg}")
|
||||
|
||||
|
||||
async def _find_medication_by_name(message, token, med_id, name):
|
||||
"""Helper to find medication by name if ID not provided. Returns (med_id, name, found)."""
|
||||
if med_id:
|
||||
return med_id, name, True
|
||||
|
||||
if not name:
|
||||
return None, None, True # Will prompt user later
|
||||
|
||||
# Look up medication by name
|
||||
resp, status = api_request("get", "/api/medications", token)
|
||||
if status != 200:
|
||||
await message.channel.send("Error looking up medication. Please try again.")
|
||||
return None, None, False
|
||||
|
||||
meds = resp if isinstance(resp, list) else []
|
||||
|
||||
# Try exact match first
|
||||
matching = [m for m in meds if m['name'].lower() == name.lower()]
|
||||
|
||||
# Then try partial match
|
||||
if not matching:
|
||||
matching = [m for m in meds if name.lower() in m['name'].lower() or m['name'].lower() in name.lower()]
|
||||
|
||||
if not matching:
|
||||
await message.channel.send(f"❌ I couldn't find a medication called '{name}'.\n\nYour medications:\n" +
|
||||
"\n".join([f"- {m['name']}" for m in meds[:10]]))
|
||||
return None, None, False
|
||||
|
||||
if len(matching) > 1:
|
||||
# Multiple matches - show list
|
||||
lines = [f"{i+1}. {m['name']}" for i, m in enumerate(matching[:5])]
|
||||
await message.channel.send(
|
||||
f"🔍 I found multiple medications matching '{name}':\n" +
|
||||
"\n".join(lines) +
|
||||
"\n\nPlease specify which one (e.g., 'take 1' or say the full name)."
|
||||
)
|
||||
return None, None, False
|
||||
|
||||
return matching[0]['id'], matching[0]['name'], True
|
||||
|
||||
|
||||
def _format_schedule(frequency, times, days_of_week, interval_days):
|
||||
"""Helper to format schedule description."""
|
||||
if frequency == "daily":
|
||||
return f"daily at {', '.join(times)}"
|
||||
elif frequency == "twice_daily":
|
||||
return f"twice daily at {', '.join(times)}"
|
||||
elif frequency == "specific_days":
|
||||
days_str = ', '.join(days_of_week) if days_of_week else 'certain days'
|
||||
return f"on {days_str} at {', '.join(times)}"
|
||||
elif frequency == "every_n_days":
|
||||
return f"every {interval_days} days at {', '.join(times)}"
|
||||
elif frequency == "as_needed":
|
||||
return "as needed"
|
||||
else:
|
||||
return f"{frequency} at {', '.join(times)}"
|
||||
|
||||
|
||||
def api_request(method, endpoint, token, data=None):
|
||||
|
||||
@@ -26,48 +26,183 @@ async def handle_routine(message, session, parsed):
|
||||
elif action == "create":
|
||||
name = parsed.get("name")
|
||||
description = parsed.get("description")
|
||||
needs_confirmation = parsed.get("needs_confirmation", False)
|
||||
confirmation_prompt = parsed.get("confirmation_prompt")
|
||||
|
||||
if not name:
|
||||
await message.channel.send("Please provide a routine name.")
|
||||
return
|
||||
|
||||
data = {"name": name, "description": description or ""}
|
||||
resp, status = api_request("post", "/api/routines", token, data)
|
||||
if status == 201:
|
||||
await message.channel.send(f"Created routine **{name}**!")
|
||||
# Handle confirmation
|
||||
if needs_confirmation:
|
||||
if "pending_confirmations" not in session:
|
||||
session["pending_confirmations"] = {}
|
||||
|
||||
confirmation_id = f"routine_create_{name}"
|
||||
session["pending_confirmations"][confirmation_id] = {
|
||||
"action": "create",
|
||||
"interaction_type": "routine",
|
||||
"name": name,
|
||||
"description": description or ""
|
||||
}
|
||||
|
||||
await message.channel.send(
|
||||
f"{confirmation_prompt}\n\n"
|
||||
f"Reply **yes** to create it, or **no** to cancel."
|
||||
)
|
||||
return
|
||||
|
||||
await _create_routine(message, token, name, description or "")
|
||||
|
||||
elif action == "create_with_steps":
|
||||
name = parsed.get("name")
|
||||
steps = parsed.get("steps", [])
|
||||
description = parsed.get("description", "")
|
||||
needs_confirmation = parsed.get("needs_confirmation", True)
|
||||
confirmation_prompt = parsed.get("confirmation_prompt")
|
||||
|
||||
if not name:
|
||||
await message.channel.send("Please provide a routine name.")
|
||||
return
|
||||
|
||||
if not steps:
|
||||
await message.channel.send("What steps should this routine have?")
|
||||
return
|
||||
|
||||
# Handle confirmation
|
||||
if needs_confirmation:
|
||||
if "pending_confirmations" not in session:
|
||||
session["pending_confirmations"] = {}
|
||||
|
||||
confirmation_id = f"routine_create_{name}"
|
||||
session["pending_confirmations"][confirmation_id] = {
|
||||
"action": "create_with_steps",
|
||||
"interaction_type": "routine",
|
||||
"name": name,
|
||||
"description": description,
|
||||
"steps": steps
|
||||
}
|
||||
|
||||
steps_list = "\n".join([f"{i+1}. {step}" for i, step in enumerate(steps)])
|
||||
await message.channel.send(
|
||||
f"{confirmation_prompt}\n\n"
|
||||
f"**Steps:**\n{steps_list}\n\n"
|
||||
f"Reply **yes** to create it, or **no** to cancel."
|
||||
)
|
||||
return
|
||||
|
||||
await _create_routine_with_steps(message, token, name, description, steps)
|
||||
|
||||
elif action == "add_steps":
|
||||
routine_name = parsed.get("routine_name")
|
||||
steps = parsed.get("steps", [])
|
||||
|
||||
if not routine_name or not steps:
|
||||
await message.channel.send("Please specify the routine and steps to add.")
|
||||
return
|
||||
|
||||
# Find routine by name
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, None, routine_name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not routine_id:
|
||||
await message.channel.send(f"Which routine should I add steps to?")
|
||||
return
|
||||
|
||||
# Add each step
|
||||
success_count = 0
|
||||
for i, step_name in enumerate(steps):
|
||||
step_data = {
|
||||
"name": step_name,
|
||||
"description": "",
|
||||
"duration_seconds": None
|
||||
}
|
||||
resp, status = api_request("post", f"/api/routines/{routine_id}/steps", token, step_data)
|
||||
if status == 201:
|
||||
success_count += 1
|
||||
|
||||
if success_count == len(steps):
|
||||
await message.channel.send(f"✅ Added {success_count} step(s) to **{name}**!")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to create routine')}")
|
||||
await message.channel.send(f"Added {success_count} of {len(steps)} steps to **{name}**.")
|
||||
|
||||
elif action == "steps":
|
||||
routine_id = parsed.get("routine_id")
|
||||
name = parsed.get("name") or parsed.get("routine_name")
|
||||
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, routine_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not routine_id:
|
||||
await message.channel.send("Which routine's steps should I show?")
|
||||
return
|
||||
|
||||
resp, status = api_request("get", f"/api/routines/{routine_id}/steps", token)
|
||||
if status == 200:
|
||||
steps = resp if isinstance(resp, list) else []
|
||||
if not steps:
|
||||
await message.channel.send(f"**{name}** has no steps yet.")
|
||||
else:
|
||||
lines = [f"{i+1}. {s['name']}" for i, s in enumerate(steps)]
|
||||
await message.channel.send(f"**Steps in {name}:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch steps')}")
|
||||
|
||||
elif action == "schedule":
|
||||
routine_id = parsed.get("routine_id")
|
||||
name = parsed.get("name")
|
||||
days_of_week = parsed.get("days_of_week", [])
|
||||
times = parsed.get("times", [])
|
||||
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, routine_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not routine_id:
|
||||
await message.channel.send("Which routine should I schedule?")
|
||||
return
|
||||
|
||||
if not days_of_week and not times:
|
||||
await message.channel.send("When should this routine be scheduled? (e.g., 'Monday Wednesday Friday at 7am')")
|
||||
return
|
||||
|
||||
# Build schedule data
|
||||
schedule_data = {}
|
||||
if days_of_week:
|
||||
schedule_data["days_of_week"] = days_of_week
|
||||
if times:
|
||||
schedule_data["times"] = times
|
||||
|
||||
resp, status = api_request("put", f"/api/routines/{routine_id}/schedule", token, schedule_data)
|
||||
if status == 200:
|
||||
days_str = ', '.join(days_of_week) if days_of_week else 'daily'
|
||||
times_str = ' at ' + ', '.join(times) if times else ''
|
||||
await message.channel.send(f"📅 Scheduled **{name}** for {days_str}{times_str}")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to schedule routine')}")
|
||||
|
||||
elif action == "start":
|
||||
routine_id = parsed.get("routine_id")
|
||||
name = parsed.get("name")
|
||||
|
||||
if not routine_id and name:
|
||||
# Look up routine by name
|
||||
resp, status = api_request("get", "/api/routines", token)
|
||||
if status == 200:
|
||||
routines = resp if isinstance(resp, list) else []
|
||||
# Find routine by name (case-insensitive partial match)
|
||||
matching = [r for r in routines if name.lower() in r['name'].lower() or r['name'].lower() in name.lower()]
|
||||
if matching:
|
||||
routine_id = matching[0]['id']
|
||||
name = matching[0]['name']
|
||||
else:
|
||||
await message.channel.send(f"I couldn't find a routine called '{name}'. Use 'list' to see your routines.")
|
||||
return
|
||||
else:
|
||||
await message.channel.send("Error looking up routine. Please try again.")
|
||||
return
|
||||
elif not routine_id:
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, routine_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not routine_id:
|
||||
await message.channel.send("Which routine would you like to start?")
|
||||
return
|
||||
|
||||
resp, status = api_request("post", f"/api/routines/{routine_id}/start", token)
|
||||
if status == 201:
|
||||
step = resp.get("current_step", {})
|
||||
await message.channel.send(f"Started! First step: **{step.get('name', 'Unknown')}**")
|
||||
total_steps = resp.get("total_steps", 0)
|
||||
current_step_num = resp.get("current_step_index", 0) + 1
|
||||
await message.channel.send(f"🚀 Started **{name}**!\n\nStep {current_step_num} of {total_steps}: **{step.get('name', 'Unknown')}**")
|
||||
elif status == 409:
|
||||
await message.channel.send(f"You already have an active session: {resp.get('error', '')}")
|
||||
await message.channel.send(f"⚠️ You already have an active session: {resp.get('error', '')}")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to start routine')}")
|
||||
|
||||
@@ -77,12 +212,16 @@ async def handle_routine(message, session, parsed):
|
||||
await message.channel.send("No active routine session.")
|
||||
return
|
||||
session_id = session_resp["session"]["id"]
|
||||
current_step = session_resp.get("session", {}).get("current_step_index", 0) + 1
|
||||
total_steps = session_resp.get("total_steps", 0)
|
||||
|
||||
resp, status = api_request("post", f"/api/sessions/{session_id}/complete-step", token)
|
||||
if status == 200:
|
||||
if resp.get("next_step"):
|
||||
await message.channel.send(f"Done! Next: **{resp['next_step'].get('name', 'Unknown')}**")
|
||||
next_step_num = current_step + 1
|
||||
await message.channel.send(f"✅ Done!\n\nStep {next_step_num} of {total_steps}: **{resp['next_step'].get('name', 'Unknown')}**")
|
||||
else:
|
||||
await message.channel.send("Completed all steps! Great job!")
|
||||
await message.channel.send("🎉 Completed all steps! Great job!")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to complete step')}")
|
||||
|
||||
@@ -92,10 +231,14 @@ async def handle_routine(message, session, parsed):
|
||||
await message.channel.send("No active routine session.")
|
||||
return
|
||||
session_id = session_resp["session"]["id"]
|
||||
current_step = session_resp.get("session", {}).get("current_step_index", 0) + 1
|
||||
total_steps = session_resp.get("total_steps", 0)
|
||||
|
||||
resp, status = api_request("post", f"/api/sessions/{session_id}/skip-step", token)
|
||||
if status == 200:
|
||||
if resp.get("next_step"):
|
||||
await message.channel.send(f"Skipped! Next: **{resp['next_step'].get('name', 'Unknown')}**")
|
||||
next_step_num = current_step + 1
|
||||
await message.channel.send(f"⏭️ Skipped!\n\nStep {next_step_num} of {total_steps}: **{resp['next_step'].get('name', 'Unknown')}**")
|
||||
else:
|
||||
await message.channel.send("All steps skipped! Routine ended.")
|
||||
else:
|
||||
@@ -109,23 +252,30 @@ async def handle_routine(message, session, parsed):
|
||||
session_id = session_resp["session"]["id"]
|
||||
resp, status = api_request("post", f"/api/sessions/{session_id}/cancel", token)
|
||||
if status == 200:
|
||||
await message.channel.send("Routine cancelled.")
|
||||
await message.channel.send("❌ Routine cancelled.")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to cancel')}")
|
||||
|
||||
elif action == "history":
|
||||
routine_id = parsed.get("routine_id")
|
||||
name = parsed.get("name")
|
||||
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, routine_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not routine_id:
|
||||
await message.channel.send("Which routine's history?")
|
||||
return
|
||||
|
||||
resp, status = api_request("get", f"/api/routines/{routine_id}/history", token)
|
||||
if status == 200:
|
||||
sessions = resp if isinstance(resp, list) else []
|
||||
if not sessions:
|
||||
await message.channel.send("No history yet.")
|
||||
else:
|
||||
lines = [f"- {s.get('status', 'unknown')} on {s.get('created_at', '')}" for s in sessions[:5]]
|
||||
await message.channel.send("**Recent sessions:**\n" + "\n".join(lines))
|
||||
lines = [f"- {s.get('status', 'unknown')} on {s.get('created_at', '')[:10]}" for s in sessions[:5]]
|
||||
await message.channel.send(f"**Recent sessions for {name}:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch history')}")
|
||||
|
||||
@@ -137,7 +287,7 @@ async def handle_routine(message, session, parsed):
|
||||
session_id = session_resp["session"]["id"]
|
||||
resp, status = api_request("post", f"/api/sessions/{session_id}/pause", token)
|
||||
if status == 200:
|
||||
await message.channel.send("Routine paused. Say 'resume' when ready to continue.")
|
||||
await message.channel.send("⏸️ Routine paused. Say 'resume' when ready to continue.")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to pause')}")
|
||||
|
||||
@@ -148,7 +298,7 @@ async def handle_routine(message, session, parsed):
|
||||
return
|
||||
resp, status = api_request("post", f"/api/sessions/{session_resp['session']['id']}/resume", token)
|
||||
if status == 200:
|
||||
await message.channel.send("Resumed! Let's keep going.")
|
||||
await message.channel.send("▶️ Resumed! Let's keep going.")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to resume')}")
|
||||
|
||||
@@ -161,7 +311,7 @@ async def handle_routine(message, session, parsed):
|
||||
reason = parsed.get("reason", "Aborted by user")
|
||||
resp, status = api_request("post", f"/api/sessions/{session_id}/abort", token, {"reason": reason})
|
||||
if status == 200:
|
||||
await message.channel.send("Routine aborted. No worries, you can try again later!")
|
||||
await message.channel.send("🛑 Routine aborted. No worries, you can try again later!")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to abort')}")
|
||||
|
||||
@@ -178,52 +328,89 @@ async def handle_routine(message, session, parsed):
|
||||
step_index = session_resp.get("session", {}).get("current_step_index", 0)
|
||||
resp, status = api_request("post", f"/api/sessions/{session_id}/note", token, {"step_index": step_index, "note": note})
|
||||
if status == 201:
|
||||
await message.channel.send(f"Note saved: {note}")
|
||||
await message.channel.send(f"📝 Note saved: {note}")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to save note')}")
|
||||
|
||||
elif action == "stats":
|
||||
routine_id = parsed.get("routine_id")
|
||||
if routine_id:
|
||||
resp, status = api_request("get", f"/api/routines/{routine_id}/stats", token)
|
||||
else:
|
||||
await message.channel.send("Which routine's stats? (Please specify routine)")
|
||||
name = parsed.get("name")
|
||||
|
||||
# Check if user wants all stats or specific routine
|
||||
if not routine_id and not name:
|
||||
# Get all streaks
|
||||
resp, status = api_request("get", "/api/routines/streaks", token)
|
||||
if status == 200:
|
||||
streaks = resp if isinstance(resp, list) else []
|
||||
if not streaks:
|
||||
await message.channel.send("No routine stats yet. Complete some routines!")
|
||||
else:
|
||||
lines = []
|
||||
for s in streaks:
|
||||
routine_name = s.get('routine_name', 'Unknown')
|
||||
current = s.get('current_streak', 0)
|
||||
longest = s.get('longest_streak', 0)
|
||||
lines.append(f"- **{routine_name}**: {current} day streak (best: {longest})")
|
||||
await message.channel.send("**Your Routine Stats:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch stats')}")
|
||||
return
|
||||
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, routine_id, name)
|
||||
if not found:
|
||||
return
|
||||
|
||||
if not routine_id:
|
||||
await message.channel.send("Which routine's stats?")
|
||||
return
|
||||
|
||||
resp, status = api_request("get", f"/api/routines/{routine_id}/stats", token)
|
||||
if status == 200:
|
||||
completion = resp.get('completion_rate_percent', 0)
|
||||
completed = resp.get('completed', 0)
|
||||
total = resp.get('total_sessions', 0)
|
||||
avg_duration = resp.get('avg_duration_minutes', 0)
|
||||
|
||||
await message.channel.send(
|
||||
f"**{resp.get('routine_name')} Stats:**\n"
|
||||
f"- Completion rate: {resp.get('completion_rate_percent')}%\n"
|
||||
f"- Completed: {resp.get('completed')}/{resp.get('total_sessions')}\n"
|
||||
f"- Avg duration: {resp.get('avg_duration_minutes')} min"
|
||||
f"**{resp.get('routine_name', name)} Stats:**\n"
|
||||
f"- Completion rate: {completion}%\n"
|
||||
f"- Completed: {completed}/{total} sessions\n"
|
||||
f"- Avg duration: {avg_duration} min"
|
||||
)
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch stats')}")
|
||||
|
||||
elif action == "streak":
|
||||
routine_id = parsed.get("routine_id")
|
||||
if routine_id:
|
||||
resp, status = api_request("get", f"/api/routines/{routine_id}/streak", token)
|
||||
else:
|
||||
resp, status = api_request("get", "/api/routines/streaks", token)
|
||||
if status == 200:
|
||||
streaks = resp if isinstance(resp, list) else []
|
||||
if not streaks:
|
||||
await message.channel.send("No streaks yet. Complete routines to build streaks!")
|
||||
name = parsed.get("name")
|
||||
|
||||
if routine_id or name:
|
||||
routine_id, name, found = await _find_routine_by_name(message, token, routine_id, name)
|
||||
if not found:
|
||||
return
|
||||
if routine_id:
|
||||
resp, status = api_request("get", f"/api/routines/{routine_id}/streak", token)
|
||||
if status == 200:
|
||||
await message.channel.send(
|
||||
f"**{resp.get('routine_name', name)}** 🔥\n"
|
||||
f"Current streak: {resp.get('current_streak', 0)} days\n"
|
||||
f"Longest streak: {resp.get('longest_streak', 0)} days"
|
||||
)
|
||||
else:
|
||||
lines = [f"- {s.get('routine_name')}: {s.get('current_streak')} day streak" for s in streaks]
|
||||
await message.channel.send("**Your streaks:**\n" + "\n".join(lines))
|
||||
return
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch streaks')}")
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch streak')}")
|
||||
return
|
||||
|
||||
# Get all streaks
|
||||
resp, status = api_request("get", "/api/routines/streaks", token)
|
||||
if status == 200:
|
||||
await message.channel.send(
|
||||
f"**{resp.get('routine_name')}**\n"
|
||||
f"Current streak: {resp.get('current_streak')} days\n"
|
||||
f"Longest streak: {resp.get('longest_streak')} days"
|
||||
)
|
||||
streaks = resp if isinstance(resp, list) else []
|
||||
if not streaks:
|
||||
await message.channel.send("No streaks yet. Complete routines to build streaks! 🔥")
|
||||
else:
|
||||
lines = [f"- {s.get('routine_name')}: {s.get('current_streak')} day streak 🔥" for s in streaks]
|
||||
await message.channel.send("**Your Streaks:**\n" + "\n".join(lines))
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch streak')}")
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to fetch streaks')}")
|
||||
|
||||
elif action == "templates":
|
||||
resp, status = api_request("get", "/api/templates", token)
|
||||
@@ -244,7 +431,7 @@ async def handle_routine(message, session, parsed):
|
||||
return
|
||||
resp, status = api_request("post", f"/api/templates/{template_id}/clone", token)
|
||||
if status == 201:
|
||||
await message.channel.send(f"Cloned! Created routine: **{resp.get('name')}**")
|
||||
await message.channel.send(f"✅ Cloned! Created routine: **{resp.get('name')}**")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to clone template')}")
|
||||
|
||||
@@ -267,7 +454,7 @@ async def handle_routine(message, session, parsed):
|
||||
return
|
||||
resp, status = api_request("post", f"/api/routines/{routine_id}/tags", token, {"tag_ids": [tag_id]})
|
||||
if status == 200:
|
||||
await message.channel.send(f"Added tag **{tag_name}** to routine!")
|
||||
await message.channel.send(f"🏷️ Added tag **{tag_name}** to routine!")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to add tag')}")
|
||||
|
||||
@@ -275,6 +462,84 @@ async def handle_routine(message, session, parsed):
|
||||
await message.channel.send(f"Unknown action: {action}. Try: list, create, start, complete, skip, cancel, history, pause, resume, abort, note, stats, streak, templates, clone, or tag.")
|
||||
|
||||
|
||||
async def _create_routine(message, token, name, description):
|
||||
"""Helper to create a routine."""
|
||||
data = {"name": name, "description": description}
|
||||
resp, status = api_request("post", "/api/routines", token, data)
|
||||
if status == 201:
|
||||
await message.channel.send(f"✅ Created routine **{name}**!")
|
||||
else:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to create routine')}")
|
||||
|
||||
|
||||
async def _create_routine_with_steps(message, token, name, description, steps):
|
||||
"""Helper to create a routine with steps."""
|
||||
# First create the routine
|
||||
data = {"name": name, "description": description}
|
||||
resp, status = api_request("post", "/api/routines", token, data)
|
||||
|
||||
if status != 201:
|
||||
await message.channel.send(f"Error: {resp.get('error', 'Failed to create routine')}")
|
||||
return
|
||||
|
||||
routine_id = resp.get("id")
|
||||
|
||||
# Add each step
|
||||
success_count = 0
|
||||
for i, step_name in enumerate(steps):
|
||||
step_data = {
|
||||
"name": step_name,
|
||||
"description": "",
|
||||
"duration_seconds": None
|
||||
}
|
||||
step_resp, step_status = api_request("post", f"/api/routines/{routine_id}/steps", token, step_data)
|
||||
if step_status == 201:
|
||||
success_count += 1
|
||||
|
||||
await message.channel.send(f"✅ Created **{name}** with {success_count} step(s)!")
|
||||
|
||||
|
||||
async def _find_routine_by_name(message, token, routine_id, name):
|
||||
"""Helper to find routine by name if ID not provided. Returns (routine_id, name, found)."""
|
||||
if routine_id:
|
||||
return routine_id, name, True
|
||||
|
||||
if not name:
|
||||
return None, None, True # Will prompt user later
|
||||
|
||||
# Look up routine by name
|
||||
resp, status = api_request("get", "/api/routines", token)
|
||||
if status != 200:
|
||||
await message.channel.send("Error looking up routine. Please try again.")
|
||||
return None, None, False
|
||||
|
||||
routines = resp if isinstance(resp, list) else []
|
||||
|
||||
# Try exact match first
|
||||
matching = [r for r in routines if r['name'].lower() == name.lower()]
|
||||
|
||||
# Then try partial match
|
||||
if not matching:
|
||||
matching = [r for r in routines if name.lower() in r['name'].lower() or r['name'].lower() in name.lower()]
|
||||
|
||||
if not matching:
|
||||
await message.channel.send(f"❌ I couldn't find a routine called '{name}'.\n\nYour routines:\n" +
|
||||
"\n".join([f"- {r['name']}" for r in routines[:10]]))
|
||||
return None, None, False
|
||||
|
||||
if len(matching) > 1:
|
||||
# Multiple matches - show list
|
||||
lines = [f"{i+1}. {r['name']}" for i, r in enumerate(matching[:5])]
|
||||
await message.channel.send(
|
||||
f"🔍 I found multiple routines matching '{name}':\n" +
|
||||
"\n".join(lines) +
|
||||
"\n\nPlease specify which one (e.g., 'start 1' or say the full name)."
|
||||
)
|
||||
return None, None, False
|
||||
|
||||
return matching[0]['id'], matching[0]['name'], True
|
||||
|
||||
|
||||
def api_request(method, endpoint, token, data=None):
|
||||
import requests
|
||||
import os
|
||||
|
||||
Reference in New Issue
Block a user