cam/MAIA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[V0.4] Added TODOs

Browse Source
This commit is contained in:
c-d-p
2025-04-21 23:47:38 +02:00
parent 5df6ae35cc
commit c0a58b45f4
26 changed files with 589 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
backend/modules/nlp/__pycache__/api.cpython-312.pyc
View File

Binary file not shown.

BIN
backend/modules/nlp/__pycache__/service.cpython-312.pyc
View File

Binary file not shown.

70
backend/modules/nlp/api.py
View File

@@ -15,6 +15,10 @@ from modules.nlp.models import ChatMessage # Import ChatMessage model
from modules.calendar.service import create_calendar_event, get_calendar_events, update_calendar_event, delete_calendar_event
from modules.calendar.models import CalendarEvent
from modules.calendar.schemas import CalendarEventCreate, CalendarEventUpdate
# Import TODO services, schemas, and model
from modules.todo import service as todo_service
from modules.todo.models import Todo
from modules.todo.schemas import TodoCreate, TodoUpdate
router = APIRouter(prefix="/nlp", tags=["nlp"])
@@ -31,6 +35,18 @@ def format_calendar_events(events: List[CalendarEvent]) -> List[str]:
formatted.append(f"- {title} ({start_str}{' - ' + end_str if end_str else ''})")
return formatted
# Helper to format TODO items (expects list of Todo models)
def format_todos(todos: List[Todo]) -> List[str]:
if not todos:
return ["Your TODO list is empty."]
formatted = ["Here is your TODO list:"]
for todo in todos:
status = "[X]" if todo.complete else "[ ]"
date_str = f" (Due: {todo.date.strftime('%Y-%m-%d')})" if todo.date else ""
remind_str = " (Reminder)" if todo.remind else ""
formatted.append(f"- {status} {todo.task}{date_str}{remind_str} (ID: {todo.id})")
return formatted
# Update the response model for the endpoint
@router.post("/process-command", response_model=ProcessCommandResponse)
def process_command(request_data: ProcessCommandRequest, current_user: User = Depends(get_current_user), db: Session = Depends(get_db)):
@@ -129,6 +145,60 @@ def process_command(request_data: ProcessCommandRequest, current_user: User = De
# ---------------------------------
return ProcessCommandResponse(responses=responses)
# --- Add TODO Cases ---
case "get_todos":
todos: List[Todo] = todo_service.get_todos(db, user=current_user, **params)
formatted_responses = format_todos(todos)
responses.extend(formatted_responses)
# --- Save Additional AI Responses ---
for resp in formatted_responses:
save_chat_message(db, user_id=current_user.id, sender=MessageSender.AI, text=resp)
# ----------------------------------
return ProcessCommandResponse(responses=responses)
case "add_todo":
todo_data = TodoCreate(**params)
created_todo = todo_service.create_todo(db, todo=todo_data, user=current_user)
add_response = f"Added TODO: '{created_todo.task}' (ID: {created_todo.id})."
responses.append(add_response)
# --- Save Additional AI Response ---
save_chat_message(db, user_id=current_user.id, sender=MessageSender.AI, text=add_response)
# ---------------------------------
return ProcessCommandResponse(responses=responses)
case "update_todo":
todo_id = params.pop('todo_id', None)
if todo_id is None:
error_msg = "TODO ID is required for update."
save_chat_message(db, user_id=current_user.id, sender=MessageSender.AI, text=error_msg)
raise HTTPException(status_code=400, detail=error_msg)
todo_data = TodoUpdate(**params)
updated_todo = todo_service.update_todo(db, todo_id=todo_id, todo_update=todo_data, user=current_user)
update_response = f"Updated TODO ID {updated_todo.id}: '{updated_todo.task}'."
if 'complete' in params:
status = "complete" if params['complete'] else "incomplete"
update_response += f" Marked as {status}."
responses.append(update_response)
# --- Save Additional AI Response ---
save_chat_message(db, user_id=current_user.id, sender=MessageSender.AI, text=update_response)
# ---------------------------------
return ProcessCommandResponse(responses=responses)
case "delete_todo":
todo_id = params.get('todo_id')
if todo_id is None:
error_msg = "TODO ID is required for delete."
save_chat_message(db, user_id=current_user.id, sender=MessageSender.AI, text=error_msg)
raise HTTPException(status_code=400, detail=error_msg)
deleted_todo = todo_service.delete_todo(db, todo_id=todo_id, user=current_user)
delete_response = f"Deleted TODO ID {deleted_todo.id}: '{deleted_todo.task}'."
responses.append(delete_response)
# --- Save Additional AI Response ---
save_chat_message(db, user_id=current_user.id, sender=MessageSender.AI, text=delete_response)
# ---------------------------------
return ProcessCommandResponse(responses=responses)
# --- End TODO Cases ---
case _:
print(f"Warning: Unhandled intent '{intent}' reached api.py match statement.")
# The initial response_text was already saved

56
backend/modules/nlp/service.py
View File

@@ -9,10 +9,9 @@ from typing import List # Import List
# Import the new model and Enum
from .models import ChatMessage, MessageSender
# from core.config import settings
from core.config import settings
# client = genai.Client(api_key=settings.GOOGLE_API_KEY)
client = genai.Client(api_key="AIzaSyBrte_mETZJce8qE6cRTSz_fHOjdjlShBk")
client = genai.Client(api_key=settings.GOOGLE_API_KEY)
### Base prompt for MAIA, used for inital user requests
SYSTEM_PROMPT = """
@@ -24,10 +23,14 @@ Available functions/intents:
3. add_calendar_event(title: str, description: str, start: datetime, end: Optional[datetime], location: str): Add a new event.
4. update_calendar_event(event_id: int, title: Optional[str], description: Optional[str], start: Optional[datetime], end: Optional[datetime], location: Optional[str]): Update an existing event. Requires event_id.
5. delete_calendar_event(event_id: int): Delete an event. Requires event_id.
6. clarification_needed(request: str): Use this if the user's request is ambiguous or lacks necessary information (like event_id for update/delete). The original user request should be passed in the 'request' parameter.
6. get_todos(): Retrieve the user's TODO list.
7. add_todo(task: str, date: Optional[datetime], remind: Optional[bool]): Add a new task to the user's TODO list.
8. update_todo(todo_id: int, task: Optional[str], date: Optional[datetime], remind: Optional[bool], complete: Optional[bool]): Update an existing TODO item. Requires todo_id.
9. delete_todo(todo_id: int): Delete a TODO item. Requires todo_id.
10. clarification_needed(request: str): Use this if the user's request is ambiguous or lacks necessary information (like event_id or todo_id for update/delete). The original user request should be passed in the 'request' parameter.
**IMPORTANT:** Respond ONLY with JSON containing BOTH "intent" and "params", AND a "response_text" field.
- "response_text" should be a friendly, user-facing message confirming the action taken, providing the answer, or asking for clarification.
- "response_text" should be a friendly, user-facing message confirming the action taken, providing the answer, asking for clarification OR can be empty if the query does not require a response to the user.
Examples:
@@ -38,7 +41,7 @@ MAIA:
"params": {
"title": "Meeting",
"description": "Project X",
"start": "2025-04-19 15:00:00.000000+00:00",
"start": "2025-04-22 15:00:00.000000+00:00",
"end": null,
"location": null
},
@@ -65,6 +68,47 @@ MAIA:
"response_text": "Okay, I can help with that. Could you please provide the ID or more specific details about the 'team sync' event you want me to delete?"
}
User: Add 'Buy groceries' to my todo list
MAIA:
{
"intent": "add_todo",
"params": {
"task": "Buy groceries",
"date": null,
"remind": false
},
"response_text": "I've added 'Buy groceries' to your TODO list."
}
User: Show me my todos
MAIA:
{
"intent": "get_todos",
"params": {},
"response_text": "Okay, fetching your TODO list now."
}
User: Mark task 15 as complete
MAIA:
{
"intent": "update_todo",
"params": {
"todo_id": 15,
"complete": true
},
"response_text": "Got it, I've marked task 15 as complete."
}
User: Delete task 2
MAIA:
{
"intent": "delete_todo",
"params": {
"todo_id": 2
},
"response_text": "Okay, I've deleted task 2 from your list."
}
The datetime right now is """+str(datetime.now(timezone.utc))+""".
"""