diff --git a/.env.example b/.env.example index 1e4c482..123c652 100644 --- a/.env.example +++ b/.env.example @@ -65,3 +65,43 @@ MEALIE_API_TOKEN=your-mealie-api-token # Email Encryption Key (32-byte URL-safe base64) # Generate with: python -c "from cryptography.fernet import Fernet; print(Fernet.generate_key().decode())" FERNET_KEY=your-fernet-key-here + +# Twilio Configuration (WhatsApp) +TWILIO_ACCOUNT_SID=your-twilio-account-sid +TWILIO_AUTH_TOKEN=your-twilio-auth-token +TWILIO_WHATSAPP_NUMBER=whatsapp:+14155238886 +# Comma-separated list of WhatsApp numbers allowed to use the service (e.g., whatsapp:+1234567890) +# Use * to allow any number +ALLOWED_WHATSAPP_NUMBERS= +# Set to false to disable Twilio signature validation in development +TWILIO_SIGNATURE_VALIDATION=true +# If behind a reverse proxy, set this to your public webhook URL so signature validation works +# TWILIO_WEBHOOK_URL=https://your-domain.com/api/whatsapp/webhook +# Rate limiting: max messages per window (default: 10 messages per 60 seconds) +# WHATSAPP_RATE_LIMIT_MAX=10 +# WHATSAPP_RATE_LIMIT_WINDOW=60 + +# Mailgun Configuration (Email channel) +MAILGUN_API_KEY= +MAILGUN_DOMAIN= +MAILGUN_WEBHOOK_SIGNING_KEY= +EMAIL_HMAC_SECRET= +# Rate limiting: max emails per window (default: 5 per 300 seconds) +# EMAIL_RATE_LIMIT_MAX=5 +# EMAIL_RATE_LIMIT_WINDOW=300 +# Set to false to disable Mailgun signature validation in development +MAILGUN_SIGNATURE_VALIDATION=true + +# Obsidian Configuration (headless sync) +# Auth token from Obsidian account (Settings → Account → API token) +OBSIDIAN_AUTH_TOKEN=your-obsidian-auth-token +# Vault ID to sync (found in Obsidian sync settings) +OBSIDIAN_VAULT_ID=your-vault-id +# End-to-end encryption password (if vault uses E2E encryption) +OBSIDIAN_E2E_PASSWORD= +# Device name shown in Obsidian sync activity +OBSIDIAN_DEVICE_NAME=simbarag +# Set to true to run continuous sync in the background +OBSIDIAN_CONTINUOUS_SYNC=false +# Local path to Obsidian vault (where files are synced) +OBSIDIAN_VAULT_PATH=/app/data/obsidian diff --git a/.gitignore b/.gitignore index 7c1950e..4c5cffd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ chromadb_openai/ chroma_db/ database/ *.db + +obvault/ +.claude diff --git a/CLAUDE.md b/CLAUDE.md index a2e51c1..2c76099 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -11,21 +11,21 @@ SimbaRAG is a RAG (Retrieval-Augmented Generation) conversational AI system for ### Development ```bash -# Start dev environment with hot reload -docker compose -f docker-compose.dev.yml up --build +# Start environment +docker compose up --build # View logs -docker compose -f docker-compose.dev.yml logs -f raggr +docker compose logs -f raggr ``` ### Database Migrations (Aerich/Tortoise ORM) ```bash # Generate migration (must run in Docker with DB access) -docker compose -f docker-compose.dev.yml exec raggr aerich migrate --name describe_change +docker compose exec raggr aerich migrate --name describe_change # Apply migrations (auto-runs on startup, manual if needed) -docker compose -f docker-compose.dev.yml exec raggr aerich upgrade +docker compose exec raggr aerich upgrade # View migration history docker compose exec raggr aerich history diff --git a/Dockerfile b/Dockerfile index 3468728..339da5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,9 @@ WORKDIR /app RUN apt-get update && apt-get install -y \ build-essential \ curl \ - && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ + && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ && apt-get install -y nodejs \ - && npm install -g yarn \ + && npm install -g yarn obsidian-headless \ && rm -rf /var/lib/apt/lists/* \ && curl -LsSf https://astral.sh/uv/install.sh | sh diff --git a/app.py b/app.py index 50a3893..e4751da 100644 --- a/app.py +++ b/app.py @@ -1,17 +1,19 @@ -import os import logging +import os from dotenv import load_dotenv from quart import Quart, jsonify, render_template, request, send_from_directory from quart_jwt_extended import JWTManager, get_jwt_identity, jwt_refresh_token_required -from tortoise.contrib.quart import register_tortoise +from tortoise import Tortoise import blueprints.conversation import blueprints.conversation.logic import blueprints.email import blueprints.rag import blueprints.users +import blueprints.whatsapp import blueprints.users.models +from config.db import TORTOISE_CONFIG from main import consult_simba_oracle # Load environment variables @@ -36,6 +38,7 @@ app = Quart( ) app.config["JWT_SECRET_KEY"] = os.getenv("JWT_SECRET_KEY", "SECRET_KEY") +app.config["MAX_CONTENT_LENGTH"] = 10 * 1024 * 1024 # 10 MB upload limit jwt = JWTManager(app) # Register blueprints @@ -43,33 +46,18 @@ app.register_blueprint(blueprints.users.user_blueprint) app.register_blueprint(blueprints.conversation.conversation_blueprint) app.register_blueprint(blueprints.email.email_blueprint) app.register_blueprint(blueprints.rag.rag_blueprint) +app.register_blueprint(blueprints.whatsapp.whatsapp_blueprint) -# Database configuration with environment variable support -DATABASE_URL = os.getenv( - "DATABASE_URL", "postgres://raggr:raggr_dev_password@localhost:5432/raggr" -) - -TORTOISE_CONFIG = { - "connections": {"default": DATABASE_URL}, - "apps": { - "models": { - "models": [ - "blueprints.conversation.models", - "blueprints.users.models", - "blueprints.email.models", - "aerich.models", - ] - }, - }, -} - -# Initialize Tortoise ORM -register_tortoise( - app, - config=TORTOISE_CONFIG, - generate_schemas=False, # Disabled - using Aerich for migrations -) +# Initialize Tortoise ORM with lifecycle hooks +@app.while_serving +async def lifespan(): + logging.info("Initializing Tortoise ORM...") + await Tortoise.init(config=TORTOISE_CONFIG) + logging.info("Tortoise ORM initialized successfully") + yield + logging.info("Closing Tortoise ORM connections...") + await Tortoise.close_connections() # Serve React static files diff --git a/blueprints/conversation/__init__.py b/blueprints/conversation/__init__.py index a29ab7c..d19ace2 100644 --- a/blueprints/conversation/__init__.py +++ b/blueprints/conversation/__init__.py @@ -1,12 +1,19 @@ import datetime +import json +import logging +import uuid -from quart import Blueprint, jsonify, request +from quart import Blueprint, Response, jsonify, make_response, request from quart_jwt_extended import ( get_jwt_identity, jwt_refresh_token_required, ) import blueprints.users.models +from utils.image_process import analyze_user_image +from utils.image_upload import ImageValidationError, process_image +from utils.s3_client import get_image as s3_get_image +from utils.s3_client import upload_image as s3_upload_image from .agents import main_agent from .logic import ( @@ -19,11 +26,41 @@ from .models import ( PydConversation, PydListConversation, ) +from .prompts import SIMBA_SYSTEM_PROMPT conversation_blueprint = Blueprint( "conversation_api", __name__, url_prefix="/api/conversation" ) +_SYSTEM_PROMPT = SIMBA_SYSTEM_PROMPT + + +def _build_messages_payload( + conversation, query_text: str, image_description: str | None = None +) -> list: + recent_messages = ( + conversation.messages[-10:] + if len(conversation.messages) > 10 + else conversation.messages + ) + messages_payload = [{"role": "system", "content": _SYSTEM_PROMPT}] + for msg in recent_messages[:-1]: # Exclude the message we just added + role = "user" if msg.speaker == "user" else "assistant" + text = msg.text + if msg.image_key and role == "user": + text = f"[User sent an image]\n{text}" + messages_payload.append({"role": role, "content": text}) + + # Build the current user message with optional image description + if image_description: + content = f"[Image analysis: {image_description}]" + if query_text: + content = f"{query_text}\n\n{content}" + else: + content = query_text + messages_payload.append({"role": "user", "content": content}) + return messages_payload + @conversation_blueprint.post("/query") @jwt_refresh_token_required @@ -42,68 +79,7 @@ async def query(): user=user, ) - # Build conversation history from recent messages (last 10 for context) - recent_messages = ( - conversation.messages[-10:] - if len(conversation.messages) > 10 - else conversation.messages - ) - - messages_payload = [ - { - "role": "system", - "content": """You are a helpful cat assistant named Simba that understands veterinary terms. When there are questions to you specifically, they are referring to Simba the cat. Answer the user in as if you were a cat named Simba. Don't act too catlike. Be assertive. - -SIMBA FACTS (as of January 2026): -- Name: Simba -- Species: Feline (Domestic Short Hair / American Short Hair) -- Sex: Male, Neutered -- Date of Birth: August 8, 2016 (approximately 9 years 5 months old) -- Color: Orange -- Current Weight: 16 lbs (as of 1/8/2026) -- Owner: Ryan Chen -- Location: Long Island City, NY -- Veterinarian: Court Square Animal Hospital - -Medical Conditions: -- Hypertrophic Cardiomyopathy (HCM): Diagnosed 12/11/2025. Concentric left ventricular hypertrophy with no left atrial dilation. Grade II-III/VI systolic heart murmur. No cardiac medications currently needed. Must avoid Domitor, acepromazine, and ketamine during anesthesia. -- Dental Issues: Prior extraction of teeth 307 and 407 due to resorption. Tooth 107 extracted on 1/8/2026. Early resorption lesions present on teeth 207, 309, and 409. - -Recent Medical Events: -- 1/8/2026: Dental cleaning and tooth 107 extraction. Prescribed Onsior for 3 days. Oravet sealant applied. -- 12/11/2025: Echocardiogram confirming HCM diagnosis. Pre-op bloodwork was normal. -- 12/1/2025: Visited for decreased appetite/nausea. Received subcutaneous fluids and Cerenia. - -Diet & Lifestyle: -- Diet: Hill's I/D wet and dry food -- Supplements: Plaque Off -- Indoor only cat, only pet in the household - -Upcoming Appointments: -- Rabies Vaccine: Due 2/19/2026 -- Routine Examination: Due 6/1/2026 -- FVRCP-3yr Vaccine: Due 10/2/2026 - -IMPORTANT: When users ask factual questions about Simba's health, medical history, veterinary visits, medications, weight, or any information that would be in documents, you MUST use the simba_search tool to retrieve accurate information before answering. Do not rely on general knowledge - always search the documents for factual questions. - -BUDGET & FINANCE (YNAB Integration): -You have access to Ryan's budget data through YNAB (You Need A Budget). When users ask about financial matters, use the appropriate YNAB tools: -- Use ynab_budget_summary for overall budget health and status questions -- Use ynab_search_transactions to find specific purchases or spending at particular stores -- Use ynab_category_spending to analyze spending by category for a month -- Use ynab_insights to provide spending trends, patterns, and recommendations -Always use these tools when asked about budgets, spending, transactions, or financial health.""", - } - ] - - # Add recent conversation history - for msg in recent_messages[:-1]: # Exclude the message we just added - role = "user" if msg.speaker == "user" else "assistant" - messages_payload.append({"role": role, "content": msg.text}) - - # Add current query - messages_payload.append({"role": "user", "content": query}) - + messages_payload = _build_messages_payload(conversation, query) payload = {"messages": messages_payload} response = await main_agent.ainvoke(payload) @@ -117,6 +93,142 @@ Always use these tools when asked about budgets, spending, transactions, or fina return jsonify({"response": message}) +@conversation_blueprint.post("/upload-image") +@jwt_refresh_token_required +async def upload_image(): + current_user_uuid = get_jwt_identity() + await blueprints.users.models.User.get(id=current_user_uuid) + + files = await request.files + form = await request.form + file = files.get("file") + conversation_id = form.get("conversation_id") + + if not file or not conversation_id: + return jsonify({"error": "file and conversation_id are required"}), 400 + + file_bytes = file.read() + content_type = file.content_type or "image/jpeg" + + try: + processed_bytes, output_content_type = process_image(file_bytes, content_type) + except ImageValidationError as e: + return jsonify({"error": str(e)}), 400 + + ext = output_content_type.split("/")[-1] + if ext == "jpeg": + ext = "jpg" + key = f"conversations/{conversation_id}/{uuid.uuid4()}.{ext}" + + await s3_upload_image(processed_bytes, key, output_content_type) + + return jsonify( + { + "image_key": key, + "image_url": f"/api/conversation/image/{key}", + } + ) + + +@conversation_blueprint.get("/image/") +@jwt_refresh_token_required +async def serve_image(image_key: str): + try: + image_bytes, content_type = await s3_get_image(image_key) + except Exception: + return jsonify({"error": "Image not found"}), 404 + + return Response( + image_bytes, + content_type=content_type, + headers={"Cache-Control": "private, max-age=3600"}, + ) + + +@conversation_blueprint.post("/stream-query") +@jwt_refresh_token_required +async def stream_query(): + current_user_uuid = get_jwt_identity() + user = await blueprints.users.models.User.get(id=current_user_uuid) + data = await request.get_json() + query_text = data.get("query") + conversation_id = data.get("conversation_id") + image_key = data.get("image_key") + conversation = await get_conversation_by_id(conversation_id) + await conversation.fetch_related("messages") + await add_message_to_conversation( + conversation=conversation, + message=query_text or "", + speaker="user", + user=user, + image_key=image_key, + ) + + # If an image was uploaded, analyze it with the vision model + image_description = None + if image_key: + try: + image_bytes, _ = await s3_get_image(image_key) + image_description = await analyze_user_image(image_bytes) + logging.info(f"Image analysis complete for {image_key}") + except Exception as e: + logging.error(f"Failed to analyze image: {e}") + image_description = "[Image could not be analyzed]" + + messages_payload = _build_messages_payload( + conversation, query_text or "", image_description + ) + payload = {"messages": messages_payload} + + async def event_generator(): + final_message = None + try: + async for event in main_agent.astream_events(payload, version="v2"): + event_type = event.get("event") + + if event_type == "on_tool_start": + yield f"data: {json.dumps({'type': 'tool_start', 'tool': event['name']})}\n\n" + + elif event_type == "on_tool_end": + yield f"data: {json.dumps({'type': 'tool_end', 'tool': event['name']})}\n\n" + + elif event_type == "on_chain_end": + output = event.get("data", {}).get("output") + if isinstance(output, dict): + msgs = output.get("messages", []) + if msgs: + last_msg = msgs[-1] + content = getattr(last_msg, "content", None) + if isinstance(content, str) and content: + final_message = content + + except Exception as e: + yield f"data: {json.dumps({'type': 'error', 'message': str(e)})}\n\n" + + if final_message: + await add_message_to_conversation( + conversation=conversation, + message=final_message, + speaker="simba", + user=user, + ) + yield f"data: {json.dumps({'type': 'response', 'message': final_message})}\n\n" + else: + yield f"data: {json.dumps({'type': 'error', 'message': 'No response generated'})}\n\n" + + yield "data: [DONE]\n\n" + + return await make_response( + event_generator(), + 200, + { + "Content-Type": "text/event-stream", + "Cache-Control": "no-cache", + "X-Accel-Buffering": "no", + }, + ) + + @conversation_blueprint.route("/") @jwt_refresh_token_required async def get_conversation(conversation_id: str): @@ -134,6 +246,7 @@ async def get_conversation(conversation_id: str): "text": msg.text, "speaker": msg.speaker.value, "created_at": msg.created_at.isoformat(), + "image_key": msg.image_key, } ) name = conversation.name diff --git a/blueprints/conversation/agents.py b/blueprints/conversation/agents.py index 56514dc..c5c7739 100644 --- a/blueprints/conversation/agents.py +++ b/blueprints/conversation/agents.py @@ -9,6 +9,7 @@ from langchain_openai import ChatOpenAI from tavily import AsyncTavilyClient from blueprints.rag.logic import query_vector_store +from utils.obsidian_service import ObsidianService from utils.ynab_service import YNABService # Load environment variables @@ -40,6 +41,32 @@ except (ValueError, Exception) as e: print(f"YNAB service not initialized: {e}") ynab_enabled = False +# Initialize Obsidian service (will only work if OBSIDIAN_VAULT_PATH is set) +try: + obsidian_service = ObsidianService() + obsidian_enabled = True +except (ValueError, Exception) as e: + print(f"Obsidian service not initialized: {e}") + obsidian_enabled = False + + +@tool +def get_current_date() -> str: + """Get today's date in a human-readable format. + + Use this tool when you need to: + - Reference today's date in your response + - Answer questions like "what is today's date" + - Format dates in messages or documents + - Calculate time periods relative to today + + Returns: + Today's date in YYYY-MM-DD format + """ + from datetime import date + + return date.today().isoformat() + @tool async def web_search(query: str) -> str: @@ -279,8 +306,291 @@ def ynab_insights(months_back: int = 3) -> str: return f"Error generating insights: {str(e)}" +@tool +async def obsidian_search_notes(query: str) -> str: + """Search through Obsidian vault notes for information. + + Use this tool when you need to: + - Find information in personal notes + - Research past ideas or thoughts from your vault + - Look up information stored in markdown files + - Search for content that would be in your notes + + Args: + query: The search query to look up in your Obsidian vault + + Returns: + Relevant notes with their content and metadata + """ + if not obsidian_enabled: + return "Obsidian integration is not configured. Please set OBSIDIAN_VAULT_PATH environment variable." + + try: + # Query ChromaDB for obsidian documents + serialized, docs = await query_vector_store(query=query) + return serialized + + except Exception as e: + return f"Error searching Obsidian notes: {str(e)}" + + +@tool +async def obsidian_read_note(relative_path: str) -> str: + """Read a specific note from your Obsidian vault. + + Use this tool when you want to: + - Read the full content of a specific note + - Get detailed information from a particular markdown file + - Access content from a known note path + + Args: + relative_path: Path to note relative to vault root (e.g., "notes/my-note.md") + + Returns: + Full content and metadata of the requested note + """ + if not obsidian_enabled: + return "Obsidian integration is not configured. Please set OBSIDIAN_VAULT_PATH environment variable." + + try: + note = obsidian_service.read_note(relative_path) + content_data = note["content"] + + result = f"File: {note['path']}\n\n" + result += f"Frontmatter:\n{content_data['metadata']}\n\n" + result += f"Content:\n{content_data['content']}\n\n" + result += f"Tags: {', '.join(content_data['tags'])}\n" + result += f"Contains {len(content_data['wikilinks'])} wikilinks and {len(content_data['embeds'])} embeds" + + return result + + except FileNotFoundError: + return f"Note not found at '{relative_path}'. Please check the path is correct." + except Exception as e: + return f"Error reading note: {str(e)}" + + +@tool +async def obsidian_create_note( + title: str, + content: str, + folder: str = "notes", + tags: str = "", +) -> str: + """Create a new note in your Obsidian vault. + + Use this tool when you want to: + - Save research findings or ideas to your vault + - Create a new document with a specific title + - Write notes for future reference + + Args: + title: The title of the note (will be used as filename) + content: The body content of the note + folder: The folder where to create the note (default: "notes") + tags: Comma-separated list of tags to add (default: "") + + Returns: + Path to the created note + """ + if not obsidian_enabled: + return "Obsidian integration is not configured. Please set OBSIDIAN_VAULT_PATH environment variable." + + try: + # Parse tags from comma-separated string + tag_list = [tag.strip() for tag in tags.split(",") if tag.strip()] + + relative_path = obsidian_service.create_note( + title=title, + content=content, + folder=folder, + tags=tag_list, + ) + + return f"Successfully created note: {relative_path}" + + except Exception as e: + return f"Error creating note: {str(e)}" + + +@tool +def journal_get_today() -> str: + """Get today's daily journal note, including all tasks and log entries. + + Use this tool when the user asks about: + - What's on their plate today + - Today's tasks or to-do list + - Today's journal entry + - What they've logged today + + Returns: + The full content of today's daily note, or a message if it doesn't exist. + """ + if not obsidian_enabled: + return "Obsidian integration is not configured." + + try: + note = obsidian_service.get_daily_note() + if not note["found"]: + return f"No daily note found for {note['date']}. Use journal_add_task to create one." + return f"Daily note for {note['date']}:\n\n{note['content']}" + except Exception as e: + return f"Error reading daily note: {str(e)}" + + +@tool +def journal_get_tasks(date: str = "") -> str: + """Get tasks from a daily journal note. + + Use this tool when the user asks about: + - Open or pending tasks for a day + - What tasks are done or not done + - Task status for today or a specific date + + Args: + date: Date in YYYY-MM-DD format (optional, defaults to today) + + Returns: + List of tasks with their completion status. + """ + if not obsidian_enabled: + return "Obsidian integration is not configured." + + try: + from datetime import datetime as dt + + parsed_date = dt.strptime(date, "%Y-%m-%d") if date else None + result = obsidian_service.get_daily_tasks(parsed_date) + + if not result["found"]: + return f"No daily note found for {result['date']}." + + if not result["tasks"]: + return f"No tasks found in the {result['date']} note." + + lines = [f"Tasks for {result['date']}:"] + for task in result["tasks"]: + status = "[x]" if task["done"] else "[ ]" + lines.append(f"- {status} {task['text']}") + return "\n".join(lines) + except Exception as e: + return f"Error reading tasks: {str(e)}" + + +@tool +def journal_add_task(task: str, date: str = "") -> str: + """Add a task to a daily journal note. + + Use this tool when the user wants to: + - Add a task or to-do to today's note + - Remind themselves to do something + - Track a new item in their daily note + + Args: + task: The task description to add + date: Date in YYYY-MM-DD format (optional, defaults to today) + + Returns: + Confirmation of the added task. + """ + if not obsidian_enabled: + return "Obsidian integration is not configured." + + try: + from datetime import datetime as dt + + parsed_date = dt.strptime(date, "%Y-%m-%d") if date else None + result = obsidian_service.add_task_to_daily_note(task, parsed_date) + + if result["success"]: + note_date = date or dt.now().strftime("%Y-%m-%d") + extra = " (created new note)" if result["created_note"] else "" + return f"Added task '{task}' to {note_date}{extra}." + return "Failed to add task." + except Exception as e: + return f"Error adding task: {str(e)}" + + +@tool +def journal_complete_task(task: str, date: str = "") -> str: + """Mark a task as complete in a daily journal note. + + Use this tool when the user wants to: + - Check off a task as done + - Mark something as completed + - Update task status in their daily note + + Args: + task: The task text to mark complete (exact or partial match) + date: Date in YYYY-MM-DD format (optional, defaults to today) + + Returns: + Confirmation that the task was marked complete. + """ + if not obsidian_enabled: + return "Obsidian integration is not configured." + + try: + from datetime import datetime as dt + + parsed_date = dt.strptime(date, "%Y-%m-%d") if date else None + result = obsidian_service.complete_task_in_daily_note(task, parsed_date) + + if result["success"]: + return f"Marked '{result['completed_task']}' as complete." + return f"Could not complete task: {result.get('error', 'unknown error')}" + except Exception as e: + return f"Error completing task: {str(e)}" + + +@tool +async def obsidian_create_task( + title: str, + content: str = "", + folder: str = "tasks", + due_date: str = "", + tags: str = "", +) -> str: + """Create a new task note in your Obsidian vault. + + Use this tool when you want to: + - Create a task to remember to do something + - Add a task with a due date + - Track tasks in your vault + + Args: + title: The title of the task + content: The description of the task (optional) + folder: The folder to place the task (default: "tasks") + due_date: Due date in YYYY-MM-DD format (optional) + tags: Comma-separated list of tags to add (optional) + + Returns: + Path to the created task note + """ + if not obsidian_enabled: + return "Obsidian integration is not configured. Please set OBSIDIAN_VAULT_PATH environment variable." + + try: + # Parse tags from comma-separated string + tag_list = [tag.strip() for tag in tags.split(",") if tag.strip()] + + relative_path = obsidian_service.create_task( + title=title, + content=content, + folder=folder, + due_date=due_date or None, + tags=tag_list, + ) + + return f"Successfully created task: {relative_path}" + + except Exception as e: + return f"Error creating task: {str(e)}" + + # Create tools list based on what's available -tools = [simba_search, web_search] +tools = [get_current_date, simba_search, web_search] if ynab_enabled: tools.extend( [ @@ -290,6 +600,19 @@ if ynab_enabled: ynab_insights, ] ) +if obsidian_enabled: + tools.extend( + [ + obsidian_search_notes, + obsidian_read_note, + obsidian_create_note, + obsidian_create_task, + journal_get_today, + journal_get_tasks, + journal_add_task, + journal_complete_task, + ] + ) # Llama 3.1 supports native function calling via OpenAI-compatible API main_agent = create_agent(model=model_with_fallback, tools=tools) diff --git a/blueprints/conversation/logic.py b/blueprints/conversation/logic.py index 8129ffc..4586d19 100644 --- a/blueprints/conversation/logic.py +++ b/blueprints/conversation/logic.py @@ -16,12 +16,14 @@ async def add_message_to_conversation( message: str, speaker: str, user: blueprints.users.models.User, + image_key: str | None = None, ) -> ConversationMessage: print(conversation, message, speaker) message = await ConversationMessage.create( text=message, speaker=speaker, conversation=conversation, + image_key=image_key, ) return message diff --git a/blueprints/conversation/models.py b/blueprints/conversation/models.py index e0e5ad1..1a73b6b 100644 --- a/blueprints/conversation/models.py +++ b/blueprints/conversation/models.py @@ -41,6 +41,7 @@ class ConversationMessage(Model): ) created_at = fields.DatetimeField(auto_now_add=True) speaker = fields.CharEnumField(enum_type=Speaker, max_length=10) + image_key = fields.CharField(max_length=512, null=True, default=None) class Meta: table = "conversation_messages" diff --git a/blueprints/conversation/prompts.py b/blueprints/conversation/prompts.py new file mode 100644 index 0000000..a54147b --- /dev/null +++ b/blueprints/conversation/prompts.py @@ -0,0 +1,57 @@ +SIMBA_SYSTEM_PROMPT = """You are a helpful cat assistant named Simba that understands veterinary terms. When there are questions to you specifically, they are referring to Simba the cat. Answer the user in as if you were a cat named Simba. Don't act too catlike. Be assertive. + +SIMBA FACTS (as of January 2026): +- Name: Simba +- Species: Feline (Domestic Short Hair / American Short Hair) +- Sex: Male, Neutered +- Date of Birth: August 8, 2016 (approximately 9 years 5 months old) +- Color: Orange +- Current Weight: 16 lbs (as of 1/8/2026) +- Owner: Ryan Chen +- Location: Long Island City, NY +- Veterinarian: Court Square Animal Hospital + +Medical Conditions: +- Hypertrophic Cardiomyopathy (HCM): Diagnosed 12/11/2025. Concentric left ventricular hypertrophy with no left atrial dilation. Grade II-III/VI systolic heart murmur. No cardiac medications currently needed. Must avoid Domitor, acepromazine, and ketamine during anesthesia. +- Dental Issues: Prior extraction of teeth 307 and 407 due to resorption. Tooth 107 extracted on 1/8/2026. Early resorption lesions present on teeth 207, 309, and 409. + +Recent Medical Events: +- 1/8/2026: Dental cleaning and tooth 107 extraction. Prescribed Onsior for 3 days. Oravet sealant applied. +- 12/11/2025: Echocardiogram confirming HCM diagnosis. Pre-op bloodwork was normal. +- 12/1/2025: Visited for decreased appetite/nausea. Received subcutaneous fluids and Cerenia. + +Diet & Lifestyle: +- Diet: Hill's I/D wet and dry food +- Supplements: Plaque Off +- Indoor only cat, only pet in the household + +Upcoming Appointments: +- Rabies Vaccine: Due 2/19/2026 +- Routine Examination: Due 6/1/2026 +- FVRCP-3yr Vaccine: Due 10/2/2026 + +IMPORTANT: When users ask factual questions about Simba's health, medical history, veterinary visits, medications, weight, or any information that would be in documents, you MUST use the simba_search tool to retrieve accurate information before answering. Do not rely on general knowledge - always search the documents for factual questions. + +BUDGET & FINANCE (YNAB Integration): +You have access to Ryan's budget data through YNAB (You Need A Budget). When users ask about financial matters, use the appropriate YNAB tools: +- Use ynab_budget_summary for overall budget health and status questions +- Use ynab_search_transactions to find specific purchases or spending at particular stores +- Use ynab_category_spending to analyze spending by category for a month +- Use ynab_insights to provide spending trends, patterns, and recommendations +Always use these tools when asked about budgets, spending, transactions, or financial health. + +NOTES & RESEARCH (Obsidian Integration): +You have access to Ryan's Obsidian vault through the Obsidian integration. When users ask about research, personal notes, or information that might be stored in markdown files, use the appropriate Obsidian tools: +- Use obsidian_search_notes to search through your vault for relevant information +- Use obsidian_read_note to read the full content of a specific note by path +- Use obsidian_create_note to save new findings, ideas, or research to your vault +- Use obsidian_create_task to create task notes with due dates +Always use these tools when users ask about notes, research, ideas, tasks, or when you want to save information for future reference. + +DAILY JOURNAL (Task Tracking): +You have access to Ryan's daily journal notes. Each note lives at journal/YYYY/YYYY-MM-DD.md and has two sections: tasks and log. +- Use journal_get_today to read today's full daily note (tasks + log) +- Use journal_get_tasks to list tasks (done/pending) for today or a specific date +- Use journal_add_task to add a new task to today's (or a given date's) note +- Use journal_complete_task to check off a task as done +Use these tools when Ryan asks about today's tasks, wants to add something to his list, or wants to mark a task complete.""" diff --git a/blueprints/email/__init__.py b/blueprints/email/__init__.py index 707c0d9..738e273 100644 --- a/blueprints/email/__init__.py +++ b/blueprints/email/__init__.py @@ -1,16 +1,227 @@ -""" -Email blueprint for IMAP email ingestion. +import os +import hmac +import hashlib +import logging +import functools +import time +from collections import defaultdict -Provides API endpoints for managing email accounts and querying email content. -Admin-only access enforced via lldap_admin group membership. -""" +import httpx +from quart import Blueprint, request -from quart import Blueprint +from blueprints.users.models import User +from blueprints.conversation.logic import ( + get_conversation_for_user, + add_message_to_conversation, +) +from blueprints.conversation.agents import main_agent +from blueprints.conversation.prompts import SIMBA_SYSTEM_PROMPT +from . import models # noqa: F401 — register Tortoise ORM models +from .helpers import generate_email_token, get_user_email_address # noqa: F401 -# Import models for Tortoise ORM registration -from . import models # noqa: F401 +email_blueprint = Blueprint("email_api", __name__, url_prefix="/api/email") -# Create blueprint -email_blueprint = Blueprint("email", __name__, url_prefix="/api/email") +logger = logging.getLogger(__name__) -# Routes will be added in Phase 2 +# Rate limiting: per-sender message timestamps +_rate_limit_store: dict[str, list[float]] = defaultdict(list) + +RATE_LIMIT_MAX = int(os.getenv("EMAIL_RATE_LIMIT_MAX", "5")) +RATE_LIMIT_WINDOW = int(os.getenv("EMAIL_RATE_LIMIT_WINDOW", "300")) + +MAX_MESSAGE_LENGTH = 2000 + + +# --- Mailgun signature validation --- + + +def validate_mailgun_signature(f): + """Decorator to validate Mailgun webhook signatures.""" + + @functools.wraps(f) + async def decorated_function(*args, **kwargs): + if os.getenv("MAILGUN_SIGNATURE_VALIDATION", "true").lower() == "false": + return await f(*args, **kwargs) + + signing_key = os.getenv("MAILGUN_WEBHOOK_SIGNING_KEY") + if not signing_key: + logger.error("MAILGUN_WEBHOOK_SIGNING_KEY not set — rejecting request") + return "", 406 + + form_data = await request.form + timestamp = form_data.get("timestamp", "") + token = form_data.get("token", "") + signature = form_data.get("signature", "") + + if not timestamp or not token or not signature: + logger.warning("Missing Mailgun signature fields") + return "", 406 + + expected = hmac.new( + signing_key.encode(), + f"{timestamp}{token}".encode(), + hashlib.sha256, + ).hexdigest() + + if not hmac.compare_digest(expected, signature): + logger.warning("Invalid Mailgun signature") + return "", 406 + + return await f(*args, **kwargs) + + return decorated_function + + +# --- Rate limiting --- + + +def _check_rate_limit(sender: str) -> bool: + """Check if a sender has exceeded the rate limit. + + Returns True if the request is allowed, False if rate-limited. + """ + now = time.monotonic() + cutoff = now - RATE_LIMIT_WINDOW + + timestamps = _rate_limit_store[sender] + _rate_limit_store[sender] = [t for t in timestamps if t > cutoff] + + if len(_rate_limit_store[sender]) >= RATE_LIMIT_MAX: + return False + + _rate_limit_store[sender].append(now) + return True + + +# --- Send reply via Mailgun API --- + + +async def send_email_reply( + to: str, subject: str, body: str, in_reply_to: str | None = None +): + """Send a reply email via the Mailgun API.""" + api_key = os.getenv("MAILGUN_API_KEY") + domain = os.getenv("MAILGUN_DOMAIN") + if not api_key or not domain: + logger.error("MAILGUN_API_KEY or MAILGUN_DOMAIN not configured") + return + + data = { + "from": f"Simba ", + "to": to, + "subject": f"Re: {subject}" if not subject.startswith("Re:") else subject, + "text": body, + } + if in_reply_to: + data["h:In-Reply-To"] = in_reply_to + + async with httpx.AsyncClient() as client: + resp = await client.post( + f"https://api.mailgun.net/v3/{domain}/messages", + auth=("api", api_key), + data=data, + ) + if resp.status_code != 200: + logger.error(f"Mailgun send failed ({resp.status_code}): {resp.text}") + else: + logger.info(f"Sent email reply to {to}") + + +# --- Webhook route --- + + +@email_blueprint.route("/webhook", methods=["POST"]) +@validate_mailgun_signature +async def webhook(): + """Handle inbound emails forwarded by Mailgun.""" + form_data = await request.form + sender = form_data.get("sender", "") + recipient = form_data.get("recipient", "") + body = form_data.get("stripped-text", "") + subject = form_data.get("subject", "(no subject)") + message_id = form_data.get("Message-Id", "") + + # Extract token from recipient: ask+@domain + local_part = recipient.split("@")[0] if "@" in recipient else "" + if "+" not in local_part: + logger.info(f"Ignoring email to {recipient} — no token in address") + return "", 200 + + token = local_part.split("+", 1)[1] + + # Lookup user by token + user = await User.filter(email_hmac_token=token, email_enabled=True).first() + if not user: + logger.info(f"No user found for email token {token}") + return "", 200 + + # Rate limit + if not _check_rate_limit(sender): + logger.warning(f"Rate limit exceeded for email sender {sender}") + return "", 200 + + # Clean up body + body = (body or "").strip() + if not body: + logger.info(f"Ignoring empty email from {sender}") + return "", 200 + + if len(body) > MAX_MESSAGE_LENGTH: + body = body[:MAX_MESSAGE_LENGTH] + logger.info(f"Truncated long email from {sender} to {MAX_MESSAGE_LENGTH} chars") + + logger.info( + f"Processing email from {sender} for user {user.username}: {body[:100]}" + ) + + # Get or create conversation + try: + conversation = await get_conversation_for_user(user=user) + await conversation.fetch_related("messages") + except Exception as e: + logger.error(f"Failed to get conversation for user {user.username}: {e}") + return "", 200 + + # Add user message + await add_message_to_conversation( + conversation=conversation, + message=body, + speaker="user", + user=user, + ) + + # Build messages payload + try: + messages = await conversation.messages.all() + recent_messages = list(messages)[-10:] + + messages_payload = [{"role": "system", "content": SIMBA_SYSTEM_PROMPT}] + for msg in recent_messages[:-1]: + role = "user" if msg.speaker == "user" else "assistant" + messages_payload.append({"role": role, "content": msg.text}) + messages_payload.append({"role": "user", "content": body}) + + logger.info(f"Invoking LangChain agent with {len(messages_payload)} messages") + response = await main_agent.ainvoke({"messages": messages_payload}) + response_text = response.get("messages", [])[-1].content + except Exception as e: + logger.error(f"Error invoking agent for email: {e}") + response_text = "Sorry, I'm having trouble thinking right now." + + # Save response + await add_message_to_conversation( + conversation=conversation, + message=response_text, + speaker="simba", + user=user, + ) + + # Send reply email + await send_email_reply( + to=sender, + subject=subject, + body=response_text, + in_reply_to=message_id, + ) + + return "", 200 diff --git a/blueprints/email/helpers.py b/blueprints/email/helpers.py new file mode 100644 index 0000000..d094579 --- /dev/null +++ b/blueprints/email/helpers.py @@ -0,0 +1,14 @@ +import hmac +import hashlib + + +def generate_email_token(user_id: str, secret: str) -> str: + """Generate a 16-char hex HMAC token for a user's email address.""" + return hmac.new( + secret.encode(), str(user_id).encode(), hashlib.sha256 + ).hexdigest()[:16] + + +def get_user_email_address(token: str, domain: str) -> str: + """Return the routable email address for a given token.""" + return f"ask+{token}@{domain}" diff --git a/blueprints/rag/__init__.py b/blueprints/rag/__init__.py index 610539c..ed57bd4 100644 --- a/blueprints/rag/__init__.py +++ b/blueprints/rag/__init__.py @@ -1,7 +1,7 @@ from quart import Blueprint, jsonify from quart_jwt_extended import jwt_refresh_token_required -from .logic import get_vector_store_stats, index_documents, vector_store +from .logic import fetch_obsidian_documents, get_vector_store_stats, index_documents, index_obsidian_documents, vector_store from blueprints.users.decorators import admin_required rag_blueprint = Blueprint("rag_api", __name__, url_prefix="/api/rag") @@ -45,3 +45,15 @@ async def trigger_reindex(): return jsonify({"status": "success", "stats": stats}) except Exception as e: return jsonify({"status": "error", "message": str(e)}), 500 + + +@rag_blueprint.post("/index-obsidian") +@admin_required +async def trigger_obsidian_index(): + """Index all Obsidian markdown documents into vector store. Admin only.""" + try: + result = await index_obsidian_documents() + stats = get_vector_store_stats() + return jsonify({"status": "success", "result": result, "stats": stats}) + except Exception as e: + return jsonify({"status": "error", "message": str(e)}), 500 diff --git a/blueprints/rag/logic.py b/blueprints/rag/logic.py index f694640..08c123a 100644 --- a/blueprints/rag/logic.py +++ b/blueprints/rag/logic.py @@ -8,6 +8,7 @@ from langchain_openai import OpenAIEmbeddings from langchain_text_splitters import RecursiveCharacterTextSplitter from .fetchers import PaperlessNGXService +from utils.obsidian_service import ObsidianService # Load environment variables load_dotenv() @@ -58,12 +59,75 @@ async def fetch_documents_from_paperless_ngx() -> list[Document]: async def index_documents(): + """Index Paperless-NGX documents into vector store.""" documents = await fetch_documents_from_paperless_ngx() splits = text_splitter.split_documents(documents) await vector_store.aadd_documents(documents=splits) +async def fetch_obsidian_documents() -> list[Document]: + """Fetch all markdown documents from Obsidian vault. + + Returns: + List of LangChain Document objects with source='obsidian' metadata. + """ + obsidian_service = ObsidianService() + documents = [] + + for md_path in obsidian_service.walk_vault(): + try: + # Read markdown file + with open(md_path, "r", encoding="utf-8") as f: + content = f.read() + + # Parse metadata + parsed = obsidian_service.parse_markdown(content, md_path) + + # Create LangChain Document with obsidian source + document = Document( + page_content=parsed["content"], + metadata={ + "source": "obsidian", + "filepath": parsed["filepath"], + "tags": parsed["tags"], + "created_at": parsed["metadata"].get("created_at"), + **{k: v for k, v in parsed["metadata"].items() if k not in ["created_at", "created_by"]}, + }, + ) + documents.append(document) + + except Exception as e: + print(f"Error reading {md_path}: {e}") + continue + + return documents + + +async def index_obsidian_documents(): + """Index all Obsidian markdown documents into vector store. + + Deletes existing obsidian source chunks before re-indexing. + """ + obsidian_service = ObsidianService() + documents = await fetch_obsidian_documents() + + if not documents: + print("No Obsidian documents found to index") + return {"indexed": 0} + + # Delete existing obsidian chunks + existing_results = vector_store.get(where={"source": "obsidian"}) + if existing_results.get("ids"): + await vector_store.adelete(existing_results["ids"]) + + # Split and index documents + splits = text_splitter.split_documents(documents) + await vector_store.aadd_documents(documents=splits) + + return {"indexed": len(documents)} + + async def query_vector_store(query: str): retrieved_docs = await vector_store.asimilarity_search(query, k=2) serialized = "\n\n".join( diff --git a/blueprints/users/__init__.py b/blueprints/users/__init__.py index 5412c50..58c9edf 100644 --- a/blueprints/users/__init__.py +++ b/blueprints/users/__init__.py @@ -7,7 +7,9 @@ from quart_jwt_extended import ( ) from .models import User from .oidc_service import OIDCUserService +from .decorators import admin_required from config.oidc_config import oidc_config +import os import secrets import httpx from urllib.parse import urlencode @@ -131,6 +133,21 @@ async def oidc_callback(): except Exception as e: return jsonify({"error": f"ID token verification failed: {str(e)}"}), 400 + # Fetch userinfo to get groups (older Authelia versions only include groups there) + userinfo_endpoint = discovery.get("userinfo_endpoint") + if userinfo_endpoint: + access_token_str = tokens.get("access_token") + if access_token_str: + async with httpx.AsyncClient() as client: + userinfo_response = await client.get( + userinfo_endpoint, + headers={"Authorization": f"Bearer {access_token_str}"}, + ) + if userinfo_response.status_code == 200: + userinfo = userinfo_response.json() + if "groups" in userinfo and "groups" not in claims: + claims["groups"] = userinfo["groups"] + # Get or create user from OIDC claims user = await OIDCUserService.get_or_create_user_from_oidc(claims) @@ -186,3 +203,122 @@ async def login(): refresh_token=refresh_token, user={"id": str(user.id), "username": user.username}, ) + + +@user_blueprint.route("/me", methods=["GET"]) +@jwt_refresh_token_required +async def me(): + user_id = get_jwt_identity() + user = await User.get_or_none(id=user_id) + if not user: + return jsonify({"error": "User not found"}), 404 + return jsonify({ + "id": str(user.id), + "username": user.username, + "email": user.email, + "is_admin": user.is_admin(), + }) + + +@user_blueprint.route("/admin/users", methods=["GET"]) +@admin_required +async def list_users(): + from blueprints.email.helpers import get_user_email_address + users = await User.all().order_by("username") + mailgun_domain = os.getenv("MAILGUN_DOMAIN", "") + return jsonify([ + { + "id": str(u.id), + "username": u.username, + "email": u.email, + "whatsapp_number": u.whatsapp_number, + "auth_provider": u.auth_provider, + "email_enabled": u.email_enabled, + "email_address": get_user_email_address(u.email_hmac_token, mailgun_domain) if u.email_hmac_token and u.email_enabled else None, + } + for u in users + ]) + + +@user_blueprint.route("/admin/users//whatsapp", methods=["PUT"]) +@admin_required +async def set_whatsapp(user_id): + data = await request.get_json() + number = (data or {}).get("whatsapp_number", "").strip() + if not number: + return jsonify({"error": "whatsapp_number is required"}), 400 + + user = await User.get_or_none(id=user_id) + if not user: + return jsonify({"error": "User not found"}), 404 + + conflict = await User.filter(whatsapp_number=number).exclude(id=user_id).first() + if conflict: + return jsonify({"error": "That WhatsApp number is already linked to another account"}), 409 + + user.whatsapp_number = number + await user.save() + return jsonify({ + "id": str(user.id), + "username": user.username, + "email": user.email, + "whatsapp_number": user.whatsapp_number, + "auth_provider": user.auth_provider, + }) + + +@user_blueprint.route("/admin/users//whatsapp", methods=["DELETE"]) +@admin_required +async def unlink_whatsapp(user_id): + user = await User.get_or_none(id=user_id) + if not user: + return jsonify({"error": "User not found"}), 404 + + user.whatsapp_number = None + await user.save() + return jsonify({"ok": True}) + + +@user_blueprint.route("/admin/users//email", methods=["PUT"]) +@admin_required +async def toggle_email(user_id): + """Enable email channel for a user, generating an HMAC token.""" + from blueprints.email.helpers import generate_email_token, get_user_email_address + user = await User.get_or_none(id=user_id) + if not user: + return jsonify({"error": "User not found"}), 404 + + email_secret = os.getenv("EMAIL_HMAC_SECRET") + if not email_secret: + return jsonify({"error": "EMAIL_HMAC_SECRET not configured"}), 500 + + mailgun_domain = os.getenv("MAILGUN_DOMAIN", "") + + if not user.email_hmac_token: + user.email_hmac_token = generate_email_token(user.id, email_secret) + user.email_enabled = True + await user.save() + + return jsonify({ + "id": str(user.id), + "username": user.username, + "email": user.email, + "whatsapp_number": user.whatsapp_number, + "auth_provider": user.auth_provider, + "email_enabled": user.email_enabled, + "email_address": get_user_email_address(user.email_hmac_token, mailgun_domain), + }) + + +@user_blueprint.route("/admin/users//email", methods=["DELETE"]) +@admin_required +async def disable_email(user_id): + """Disable email channel and clear the token.""" + user = await User.get_or_none(id=user_id) + if not user: + return jsonify({"error": "User not found"}), 404 + + user.email_enabled = False + user.email_hmac_token = None + await user.save() + return jsonify({"ok": True}) diff --git a/blueprints/users/models.py b/blueprints/users/models.py index 51d86d0..82ea099 100644 --- a/blueprints/users/models.py +++ b/blueprints/users/models.py @@ -10,6 +10,11 @@ class User(Model): username = fields.CharField(max_length=255) password = fields.BinaryField(null=True) # Hashed - nullable for OIDC users email = fields.CharField(max_length=100, unique=True) + whatsapp_number = fields.CharField(max_length=30, unique=True, null=True, index=True) + + # Email channel fields + email_enabled = fields.BooleanField(default=False) + email_hmac_token = fields.CharField(max_length=16, unique=True, null=True, index=True) # OIDC fields oidc_subject = fields.CharField( diff --git a/blueprints/whatsapp/__init__.py b/blueprints/whatsapp/__init__.py new file mode 100644 index 0000000..6b94efd --- /dev/null +++ b/blueprints/whatsapp/__init__.py @@ -0,0 +1,212 @@ +import os +import logging +import asyncio +import functools +import time +from collections import defaultdict +from quart import Blueprint, request, jsonify, abort +from twilio.request_validator import RequestValidator +from twilio.twiml.messaging_response import MessagingResponse + +from blueprints.users.models import User +from blueprints.conversation.logic import ( + get_conversation_for_user, + add_message_to_conversation, + get_conversation_transcript, +) +from blueprints.conversation.agents import main_agent +from blueprints.conversation.prompts import SIMBA_SYSTEM_PROMPT + +whatsapp_blueprint = Blueprint("whatsapp_api", __name__, url_prefix="/api/whatsapp") + +# Configure logging +logger = logging.getLogger(__name__) + +# Rate limiting: per-number message timestamps +# Format: {phone_number: [timestamp1, timestamp2, ...]} +_rate_limit_store: dict[str, list[float]] = defaultdict(list) + +# Configurable via env: max messages per window (default: 10 per 60s) +RATE_LIMIT_MAX = int(os.getenv("WHATSAPP_RATE_LIMIT_MAX", "10")) +RATE_LIMIT_WINDOW = int(os.getenv("WHATSAPP_RATE_LIMIT_WINDOW", "60")) + +# Max message length to process (WhatsApp max is 4096, but we cap for LLM sanity) +MAX_MESSAGE_LENGTH = 2000 + + +def _twiml_response(text: str) -> tuple[str, int]: + """Helper to return a TwiML MessagingResponse.""" + resp = MessagingResponse() + resp.message(text) + return str(resp), 200 + + +def _check_rate_limit(phone_number: str) -> bool: + """Check if a phone number has exceeded the rate limit. + + Returns True if the request is allowed, False if rate-limited. + Also cleans up expired entries. + """ + now = time.monotonic() + cutoff = now - RATE_LIMIT_WINDOW + + # Remove expired timestamps + timestamps = _rate_limit_store[phone_number] + _rate_limit_store[phone_number] = [t for t in timestamps if t > cutoff] + + if len(_rate_limit_store[phone_number]) >= RATE_LIMIT_MAX: + return False + + _rate_limit_store[phone_number].append(now) + return True + + +def validate_twilio_request(f): + """Decorator to validate that the request comes from Twilio. + + Validates the X-Twilio-Signature header using the TWILIO_AUTH_TOKEN. + Set TWILIO_WEBHOOK_URL if behind a reverse proxy (e.g., ngrok, Caddy) + so the validated URL matches what Twilio signed against. + Set TWILIO_SIGNATURE_VALIDATION=false to disable in development. + """ + @functools.wraps(f) + async def decorated_function(*args, **kwargs): + if os.getenv("TWILIO_SIGNATURE_VALIDATION", "true").lower() == "false": + return await f(*args, **kwargs) + + auth_token = os.getenv("TWILIO_AUTH_TOKEN") + if not auth_token: + logger.error("TWILIO_AUTH_TOKEN not set — rejecting request") + abort(403) + + twilio_signature = request.headers.get("X-Twilio-Signature") + if not twilio_signature: + logger.warning("Missing X-Twilio-Signature header") + abort(403) + + # Use configured webhook URL if behind a proxy, otherwise use request URL + url = os.getenv("TWILIO_WEBHOOK_URL") or request.url + form_data = await request.form + + validator = RequestValidator(auth_token) + if not validator.validate(url, form_data, twilio_signature): + logger.warning(f"Invalid Twilio signature for URL: {url}") + abort(403) + + return await f(*args, **kwargs) + return decorated_function + + +@whatsapp_blueprint.route("/webhook", methods=["POST"]) +@validate_twilio_request +async def webhook(): + """ + Handle incoming WhatsApp messages from Twilio. + """ + form_data = await request.form + from_number = form_data.get("From") # e.g., "whatsapp:+1234567890" + body = form_data.get("Body") + + if not from_number or not body: + return _twiml_response("Invalid message received.") if from_number else ("Missing From or Body", 400) + + # Strip whitespace and check for empty body + body = body.strip() + if not body: + return _twiml_response("I received an empty message. Please send some text!") + + # Rate limiting + if not _check_rate_limit(from_number): + logger.warning(f"Rate limit exceeded for {from_number}") + return _twiml_response("You're sending messages too quickly. Please wait a moment and try again.") + + # Truncate overly long messages + if len(body) > MAX_MESSAGE_LENGTH: + body = body[:MAX_MESSAGE_LENGTH] + logger.info(f"Truncated long message from {from_number} to {MAX_MESSAGE_LENGTH} chars") + + logger.info(f"Received WhatsApp message from {from_number}: {body[:100]}") + + # Identify or create user + user = await User.filter(whatsapp_number=from_number).first() + + if not user: + # Check if number is in allowlist + allowed_numbers = os.getenv("ALLOWED_WHATSAPP_NUMBERS", "").split(",") + if from_number not in allowed_numbers and "*" not in allowed_numbers: + return _twiml_response("Sorry, you are not authorized to use this service.") + + # Create a new user for this WhatsApp number + username = f"wa_{from_number.split(':')[-1]}" + try: + user = await User.create( + username=username, + email=f"{username}@whatsapp.simbarag.local", + whatsapp_number=from_number, + auth_provider="whatsapp" + ) + logger.info(f"Created new user for WhatsApp: {username}") + except Exception as e: + logger.error(f"Failed to create user for {from_number}: {e}") + return _twiml_response("Sorry, something went wrong setting up your account. Please try again later.") + + # Get or create a conversation for this user + try: + conversation = await get_conversation_for_user(user=user) + await conversation.fetch_related("messages") + except Exception as e: + logger.error(f"Failed to get conversation for user {user.username}: {e}") + return _twiml_response("Sorry, something went wrong. Please try again later.") + + # Add user message to conversation + await add_message_to_conversation( + conversation=conversation, + message=body, + speaker="user", + user=user, + ) + + # Get transcript for context + transcript = await get_conversation_transcript(user=user, conversation=conversation) + + # Build messages payload for LangChain agent with system prompt and conversation history + try: + # Get last 10 messages for conversation history + messages = await conversation.messages.all() + recent_messages = list(messages)[-10:] + + # Build messages payload + messages_payload = [{"role": "system", "content": SIMBA_SYSTEM_PROMPT}] + + # Add recent conversation history (exclude the message we just added) + for msg in recent_messages[:-1]: + role = "user" if msg.speaker == "user" else "assistant" + messages_payload.append({"role": role, "content": msg.text}) + + # Add current query + messages_payload.append({"role": "user", "content": body}) + + # Invoke LangChain agent + logger.info(f"Invoking LangChain agent with {len(messages_payload)} messages") + response = await main_agent.ainvoke({"messages": messages_payload}) + response_text = response.get("messages", [])[-1].content + + # Log YNAB availability + if os.getenv("YNAB_ACCESS_TOKEN"): + logger.info("YNAB integration is available for this conversation") + else: + logger.info("YNAB integration is not configured") + + except Exception as e: + logger.error(f"Error invoking agent: {e}") + response_text = "Sorry, I'm having trouble thinking right now. 😿" + + # Add Simba's response to conversation + await add_message_to_conversation( + conversation=conversation, + message=response_text, + speaker="simba", + user=user, + ) + + return _twiml_response(response_text) diff --git a/aerich_config.py b/config/db.py similarity index 56% rename from aerich_config.py rename to config/db.py index d194c65..0bab327 100644 --- a/aerich_config.py +++ b/config/db.py @@ -1,15 +1,14 @@ import os + from dotenv import load_dotenv -# Load environment variables load_dotenv() -# Database configuration with environment variable support -# Use DATABASE_PATH for relative paths or DATABASE_URL for full connection strings -DATABASE_PATH = os.getenv("DATABASE_PATH", "database/raggr.db") -DATABASE_URL = os.getenv("DATABASE_URL", f"sqlite://{DATABASE_PATH}") +DATABASE_URL = os.getenv( + "DATABASE_URL", "postgres://raggr:raggr_dev_password@localhost:5432/raggr" +) -TORTOISE_ORM = { +TORTOISE_CONFIG = { "connections": {"default": DATABASE_URL}, "apps": { "models": { diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml deleted file mode 100644 index 29feb0b..0000000 --- a/docker-compose.dev.yml +++ /dev/null @@ -1,71 +0,0 @@ -services: - postgres: - image: postgres:16-alpine - environment: - - POSTGRES_USER=raggr - - POSTGRES_PASSWORD=raggr_dev_password - - POSTGRES_DB=raggr - ports: - - "5432:5432" - volumes: - - postgres_data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U raggr"] - interval: 5s - timeout: 5s - retries: 5 - - # raggr service disabled - run locally for development - # raggr: - # build: - # context: . - # dockerfile: Dockerfile.dev - # image: torrtle/simbarag:dev - # ports: - # - "8080:8080" - # env_file: - # - .env - # environment: - # - PAPERLESS_TOKEN=${PAPERLESS_TOKEN} - # - BASE_URL=${BASE_URL} - # - OLLAMA_URL=${OLLAMA_URL:-http://localhost:11434} - # - CHROMADB_PATH=/app/data/chromadb - # - OPENAI_API_KEY=${OPENAI_API_KEY} - # - JWT_SECRET_KEY=${JWT_SECRET_KEY} - # - OIDC_ISSUER=${OIDC_ISSUER} - # - OIDC_CLIENT_ID=${OIDC_CLIENT_ID} - # - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET} - # - OIDC_REDIRECT_URI=${OIDC_REDIRECT_URI} - # - OIDC_USE_DISCOVERY=${OIDC_USE_DISCOVERY:-true} - # - DATABASE_URL=postgres://raggr:raggr_dev_password@postgres:5432/raggr - # - FLASK_ENV=development - # - PYTHONUNBUFFERED=1 - # - NODE_ENV=development - # - TAVILY_KEY=${TAVILIY_KEY} - # depends_on: - # postgres: - # condition: service_healthy - # volumes: - # - chromadb_data:/app/data/chromadb - # - ./migrations:/app/migrations # Bind mount for migrations (bidirectional) - # develop: - # watch: - # # Sync+restart on any file change in root directory - # - action: sync+restart - # path: . - # target: /app - # ignore: - # - __pycache__/ - # - "*.pyc" - # - "*.pyo" - # - "*.pyd" - # - .git/ - # - chromadb/ - # - node_modules/ - # - raggr-frontend/dist/ - # - docs/ - # - .venv/ - -volumes: - chromadb_data: - postgres_data: diff --git a/docker-compose.yml b/docker-compose.yml index b9cd7b8..88f91a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,18 +32,41 @@ services: - CHROMADB_PATH=/app/data/chromadb - OPENAI_API_KEY=${OPENAI_API_KEY} - JWT_SECRET_KEY=${JWT_SECRET_KEY} + - LLAMA_SERVER_URL=${LLAMA_SERVER_URL} + - LLAMA_MODEL_NAME=${LLAMA_MODEL_NAME} - OIDC_ISSUER=${OIDC_ISSUER} - OIDC_CLIENT_ID=${OIDC_CLIENT_ID} - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET} - OIDC_REDIRECT_URI=${OIDC_REDIRECT_URI} - OIDC_USE_DISCOVERY=${OIDC_USE_DISCOVERY:-true} - DATABASE_URL=${DATABASE_URL:-postgres://raggr:changeme@postgres:5432/raggr} - - TAVILY_KEY=${TAVILIY_KEY} + - TAVILY_API_KEY=${TAVILIY_API_KEY} + - YNAB_ACCESS_TOKEN=${YNAB_ACCESS_TOKEN} + - YNAB_BUDGET_ID=${YNAB_BUDGET_ID} + - TWILIO_ACCOUNT_SID=${TWILIO_ACCOUNT_SID} + - TWILIO_AUTH_TOKEN=${TWILIO_AUTH_TOKEN} + - TWILIO_WHATSAPP_NUMBER=${TWILIO_WHATSAPP_NUMBER} + - ALLOWED_WHATSAPP_NUMBERS=${ALLOWED_WHATSAPP_NUMBERS} + - TWILIO_SIGNATURE_VALIDATION=${TWILIO_SIGNATURE_VALIDATION:-true} + - TWILIO_WEBHOOK_URL=${TWILIO_WEBHOOK_URL:-} + - OBSIDIAN_AUTH_TOKEN=${OBSIDIAN_AUTH_TOKEN} + - OBSIDIAN_VAULT_ID=${OBSIDIAN_VAULT_ID} + - OBSIDIAN_E2E_PASSWORD=${OBSIDIAN_E2E_PASSWORD} + - OBSIDIAN_DEVICE_NAME=${OBSIDIAN_DEVICE_NAME} + - OBSIDIAN_CONTINUOUS_SYNC=${OBSIDIAN_CONTINUOUS_SYNC:-false} + - OBSIDIAN_VAULT_PATH=${OBSIDIAN_VAULT_PATH:-/app/data/obsidian} + - S3_ENDPOINT_URL=${S3_ENDPOINT_URL} + - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID} + - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY} + - S3_BUCKET_NAME=${S3_BUCKET_NAME:-asksimba-images} + - S3_REGION=${S3_REGION:-garage} + - OLLAMA_HOST=${OLLAMA_HOST:-http://localhost:11434} depends_on: postgres: condition: service_healthy volumes: - chromadb_data:/app/data/chromadb + - ./obvault:/app/data/obsidian restart: unless-stopped volumes: diff --git a/main.py b/main.py index d424dfd..c974f73 100644 --- a/main.py +++ b/main.py @@ -225,6 +225,10 @@ def filter_indexed_files(docs): def reindex(): with sqlite3.connect("database/visited.db") as conn: c = conn.cursor() + # Ensure the table exists before trying to delete from it + c.execute( + "CREATE TABLE IF NOT EXISTS indexed_documents (id INTEGER PRIMARY KEY AUTOINCREMENT, paperless_id INTEGER)" + ) c.execute("DELETE FROM indexed_documents") conn.commit() diff --git a/migrations/models/2_20260228125713_add_whatsapp_number.py b/migrations/models/2_20260228125713_add_whatsapp_number.py new file mode 100644 index 0000000..000225f --- /dev/null +++ b/migrations/models/2_20260228125713_add_whatsapp_number.py @@ -0,0 +1,42 @@ +from tortoise import BaseDBAsyncClient + +RUN_IN_TRANSACTION = True + + +async def upgrade(db: BaseDBAsyncClient) -> str: + return """ + ALTER TABLE "users" ADD "whatsapp_number" VARCHAR(20) UNIQUE;""" + + +async def downgrade(db: BaseDBAsyncClient) -> str: + return """ + DROP INDEX IF EXISTS "uid_users_whatsap_e6b586"; + ALTER TABLE "users" DROP COLUMN "whatsapp_number";""" + + +MODELS_STATE = ( + "eJztmm1v4jgQx78Kyquu1KtatnRX1emkQOkttwuceNinXhWZxECuiZ2NnaWo6nc/2yTESR" + "wgFCjs8aYtYw+2fx5n/p70SXOxBR1yVsPoJ/QJoDZG2nXpSUPAhewPZftpSQOeF7dyAwUD" + "RziYUk/RAgaE+sCkrHEIHAKZyYLE9G0vHAwFjsON2GQdbTSKTQGyfwTQoHgE6Rj6rOHunp" + "ltZMFHSKKP3oMxtKFjJeZtW3xsYTfo1BO2fr9xcyt68uEGhomdwEVxb29KxxjNuweBbZ1x" + "H942ggj6gEJLWgafZbjsyDSbMTNQP4DzqVqxwYJDEDgchvb7MEAmZ1ASI/Efl39oBfAw1B" + "ytjShn8fQ8W1W8ZmHV+FC1D3rn5O3VG7FKTOjIF42CiPYsHAEFM1fBNQYpfmdQ1sbAV6OM" + "+qdgsomugzEyxBzjGIpARoDWo6a54NFwIBrRMftYrlQWYPysdwRJ1kugxCyuZ1HfCpvKsz" + "aONEZo+pAv2QA0C/KGtVDbhWqYSc8UUit0PYv+2FPAbA1WGznT8BAs4NtrNOvdnt78m6/E" + "JeSHIxDpvTpvKQvrNGU9uUptxfxLSl8avQ8l/rH0vd2qp2N/3q/3XeNzAgHFBsITA1jSeY" + "2sEZjExgaetebGJj2PG/uqGxtOXtpXAn2jWAaRXF6QRsK57XAT108aPPUOH5Q5g8PIwrvF" + "PrRH6COcCoQNNg+ATFWyCEVHP/yafYUWW+NZ+GAyVyNyULDVsTVBOsueerem39Q1wXAAzI" + "cJ8C0jB6YLCQEjSLJAq6Hn7ccOdObSTM1SFnDN2Tfu51Mlj61ghctYYpSgl21yy27aAhBb" + "txWOzUdaQGeJCpYgriaGDXkjj6L4oEUxhY+KlN9jVjXKqP+hiOJFqbz+tZfI4pH0PWnqX9" + "8kMvmnduvPqLsklWuf2tWjQv4VhVRWIRMPggeVGOAXyDoK3IwUSOyu5P7KR0frd+ud6xLP" + "6P+gbqNZ1a9LxHYHQFttixO3zIvzFS6ZF+e5d0zelDpAcqIp9phXuG7ymX+gEtZMFbxeKG" + "XT9bO9pbhU0yrCpai23aaSE3cGhXSL7hL5Wo0f7aM2O3xtxvexaNFS9jkUjbaDwqUHCJlg" + "XxGZVRsBf6qGKXulYA6mdHb/2dcrvQpeletVWW4xZNVGS+98U0veqL8ct9VvvbqeogtdYD" + "tFonTusJkQXX7iNxmgF+eriZ5FqicjeyZjQAl7pBtMSQ7yZKYapsJ1LazpUN0t1fIqUMv5" + "TMsZpNi2TIMEg3+hqbiM5fNM+x0izG08Q9n1aGx4Pv5pW8UCNOO4u8SkOdgEzgsye5JrZZ" + "UgreQHaSUTpI4FPGPk48BTlEX/6rZbaqQptxTQPmKrvLNsk56WHJvQ+63hvbvfjmriK19c" + "m0mXYVJpin/BsTbzP6nNHN9e/hIbO385krljL3uzlPlXnc28Xtpnfb/b10o69G1zrCnKEW" + "HL6aKCBIj77E1FooFy3nAoCxIccyoYwp1/1XuJeLn3W/ni8t3l+7dXl+9ZFzGTueXdgodB" + "o9VbUoDgB0FZNczXepLLsfwQS2d2NIoI5ln3wwS4lesxG5FCpEjv+RJZcnkteby1Qs7G5H" + "GBbLv59PL8Hy/ZG1k=" +) diff --git a/migrations/models/3_20260313000000_add_email_fields.py b/migrations/models/3_20260313000000_add_email_fields.py new file mode 100644 index 0000000..b4e5651 --- /dev/null +++ b/migrations/models/3_20260313000000_add_email_fields.py @@ -0,0 +1,46 @@ +from tortoise import BaseDBAsyncClient + +RUN_IN_TRANSACTION = True + + +async def upgrade(db: BaseDBAsyncClient) -> str: + return """ + ALTER TABLE "users" ADD "email_enabled" BOOL NOT NULL DEFAULT FALSE; + ALTER TABLE "users" ADD "email_hmac_token" VARCHAR(16) UNIQUE; + CREATE INDEX "idx_users_email_h_a1b2c3" ON "users" ("email_hmac_token");""" + + +async def downgrade(db: BaseDBAsyncClient) -> str: + return """ + DROP INDEX IF EXISTS "idx_users_email_h_a1b2c3"; + ALTER TABLE "users" DROP COLUMN "email_hmac_token"; + ALTER TABLE "users" DROP COLUMN "email_enabled";""" + + +MODELS_STATE = ( + "eJztmm1v4jgQx78Kyquu1KtaKN1VdTopUHrLbYEThX3qVZFJXMg1sbOJsxRV/e5nm4Q4jg" + "OEAoU93rRl7CH2z2PP35M+ay62oBOc1DH6Cf0AEBsj7bL0rCHgQvqHsv24pAHPS1qZgYCB" + "wx1MoSdvAYOA+MAktPEBOAGkJgsGpm970cNQ6DjMiE3a0UbDxBQi+0cIDYKHkIygTxvu7q" + "nZRhZ8gkH80Xs0HmzoWKlx2xZ7NrcbZOJxW7/fvLrmPdnjBoaJndBFSW9vQkYYzbqHoW2d" + "MB/WNoQI+oBAS5gGG2U07dg0HTE1ED+Es6FaicGCDyB0GAzt94cQmYxBiT+J/Tj/QyuAh6" + "JmaG1EGIvnl+mskjlzq8YeVf+od48qF+/4LHFAhj5v5ES0F+4ICJi6cq4JSP47g7I+Ar4a" + "ZdxfgkkHugrG2JBwTGIoBhkDWo2a5oInw4FoSEb0Y7lanYPxs97lJGkvjhLTuJ5GfTtqKk" + "/bGNIEoelDNmUDkCzIK9pCbBeqYaY9JaRW5HoS/7GjgOkcrA5yJtEmmMO312w1bnt66282" + "EzcIfjgckd5rsJYyt04k69GFtBSzLyl9afY+ltjH0vdOuyHH/qxf77vGxgRCgg2ExwawhP" + "0aW2MwqYUNPWvFhU17Hhb2TRc2GrywrgH0jWIZRHB5RRqJxrbFRVw9abDU+/CozBkMRhbe" + "NfahPUSf4IQjbNJxAGSqkkUkOvrR1+wqtMSajMIH45kaEYOCzo7OCZJp9tRv6/pVQ+MMB8" + "B8HAPfMnJgujAIwBAGWaC1yPP6Uxc6M2mmZikKuNb0G3fzVMljy1nhMhYYpehlm9yyK1sA" + "ovO2omezJ82hs0AFCxCXE8OGuJAHUbzXopjAJ0XK71GrGmXcf19E8bxU3vjaS2XxWPoetf" + "Sv71KZ/KbT/jPuLkjl+k2ndlDIv6KQyirkwIPgUSUG2AWygUI3IwVSqyu4v/HW0fq3je5l" + "iWX0f9Bts1XTL0uB7Q6AttwSp26ZZ6dLXDLPTnPvmKxJ2kBioil2zCtc13nm76mENaWC1y" + "ulrFw/21mKCzWtIlyKattNKjl+Z1BIt/guka/V2NY+aLP912ZsHYsWLUWffdFoWyhceiAI" + "xthXRGbNRsCfqGGKXhLMwYRM7z+7eqVXwasxvSrKLYqs1mzr3W9qyRv3F+O29q3X0CW60A" + "W2UyRKZw7rCdHFO36dAXp2upzomad6MrJnPAIkoEe6QZXkIE9mqmEqXFfCKofqdqlWloFa" + "yWdaySDlQWZAxKan2vgYOxCgOQEq+srbnzpv6jAtmqoL7P9O5ya1/2tN+Urbb9UaNHg5Zt" + "rJnkqhZrunhDtygUk1wiNUKMsFu1/y3cOIPbtY5hiQr6zCKXAhRyy2LdMIwsG/0FSUD/KB" + "yn57CHMjWZ9e6EeG5+OftlXsSM04bk9KaQ42gfMKLZrmWl3mWK3mH6vVzLHqWMAzhj4OPU" + "Uh/6/bTluNVHKTgPYRneWdZZvkuOTYAbnfGN67+83ofDbz+dVEuXAoCSv2BYdq4v+kmnh4" + "3/5LLOzsdV6mKrToXWjmn8vW80J0l2+k230RqkPfNkeaooAWtRzPK6GBpM/O1NCaKOednL" + "KExjBLwRCt/JvepPnr6N/KZ+fvzz9ULs4/0C58JDPL+zmHQXwNyS+ZsY2grHPnaz3B5VAw" + "S6Qz3RpFBPO0+34C3EhBhz6RQKRI7/kSWXB5K3m8sdLj2uRxgWy7/vTy8h9Mf/k3" +) diff --git a/migrations/models/4_20260404080201_add_image_key.py b/migrations/models/4_20260404080201_add_image_key.py new file mode 100644 index 0000000..e15fdbc --- /dev/null +++ b/migrations/models/4_20260404080201_add_image_key.py @@ -0,0 +1,43 @@ +from tortoise import BaseDBAsyncClient + +RUN_IN_TRANSACTION = True + + +async def upgrade(db: BaseDBAsyncClient) -> str: + return """ + ALTER TABLE "conversation_messages" ADD "image_key" VARCHAR(512);""" + + +async def downgrade(db: BaseDBAsyncClient) -> str: + return """ + ALTER TABLE "conversation_messages" DROP COLUMN "image_key";""" + + +MODELS_STATE = ( + "eJztmmtv4jgUhv8KyqeO1K0KvcyoWq0UWrrDToFVC3PrVpFJXPCS2JnEGYqq/ve1TUIcx6" + "GkBQqzfGnLsQ+xH1/Oe076aHjEgW54cE7wTxiEgCKCjbPKo4GBB9kf2vb9igF8P23lBgr6" + "rnCwpZ6iBfRDGgCbssZ74IaQmRwY2gHy44fhyHW5kdisI8KD1BRh9COCFiUDSIcwYA23d8" + "yMsAMfYJh89EfWPYKukxk3cvizhd2iE1/Yer3mxaXoyR/Xt2ziRh5Oe/sTOiR41j2KkHPA" + "fXjbAGIYAAodaRp8lPG0E9N0xMxAgwjOhuqkBgfeg8jlMIzf7yNscwYV8ST+4/gPowQehp" + "qjRZhyFo9P01mlcxZWgz/q/KN5vXd0+k7MkoR0EIhGQcR4Eo6Agqmr4JqCFL9zKM+HINCj" + "TPorMNlAX4IxMaQc0z2UgEwAvYya4YEHy4V4QIfsY+3kZA7Gz+a1IMl6CZSE7evprm/HTb" + "VpG0eaIrQDyKdsAZoHecFaKPKgHmbWU0HqxK4HyR8bCpjNwelgdxIfgjl8u81W46Zrtv7m" + "M/HC8IcrEJndBm+pCetEse6dKksx+5LKl2b3Y4V/rHzvtBvq3p/16343+JhARImFydgCjn" + "ReE2sCJrOwke+8cGGznruFfdOFjQcvrWsIA6tcBJFcXhFG4rGtcRFfHjR46L0faWMGh5GH" + "d0kCiAb4E5wIhE02DoBtXbCIRUcv/ppNhZZa01EEYDxTI/KmYLNjc4J0Gj3Nm3PzomEIhn" + "1gj8YgcKwCmB4MQzCAYR5oPfa8/HQN3Zk007OUBVxr+o2beasUsRWsSI1IjDL08k1ezVMt" + "ALN5O/Gz+ZPm0HlGBUsQFxPDlryQO1G81aKYwgdNyO8yqx5l0n9bRPG8UN742s1E8UT67r" + "XMr+8ykfyq0/4z6S5J5fOrTn2nkH9FIZVXyKEPwUgnBngC2cCRl5MCmdWV3N/46Bi9m8b1" + "WYVH9H/wTbNVN88qIfL6wFhsiTNZZvVwgSSzeliYY/Km7AFCHoss1ghOyqTqGacX8V2/9M" + "qCPKnWFiDJehWiFG3KZSQH7XIhU+O6zPi5pemArRQPX5kWqLXIjaX4bH6g2S5l84RVqmKR" + "f2lkcJKXFetefk3udO7261y+jmULwLLPtujdNRSBfRCGYxJodmYdYRBM9DBlLwVmf0Knue" + "TGxeg58Opc+8vSlSGrN9vm9Td9+pD0l/dt/Vu3YSp0oQeQW2aXzhyWs0WfP/HL3KDVw8UE" + "5DwFmZOQ4yGgIbvSLabK+0WSXQ9T47oUObleqkeLQD0qZnqUQyo2mQUxn57u4BPiQoDnbF" + "DZVz3+zHlVl2nZUF3i/Hc6V5nzX2+q5YFeq95gm1dgZp3QVAo1210t3KEHbKYRRlCjLJ85" + "/YrvFu7Y6uki14Ca/ku3wKm6YwlybCuM+v9CW1OKKQaq+m0hzJVEfRDRoeUH5Cdyyl2pOc" + "f1SSnDJTZwX6FFlRx9kWv1pPhaPcldq64DfGsQkMjXvBT566bT1iNV3BSgPcxmeesgm+5X" + "XBTSu5Xhvb1bjc7nM59fmVWLsIqw4l+wq8z+Tyqzu/9d+CUWdvZqNFcVeu69cu4f9Zbzcn" + "mTM9L1vlQ2YYDsoaEpoMUt+/NKaCDtszE1tCYueL+pLaFxzMpmiFf+TTNp8Wr/t1r1+P3x" + "h6PT4w+sixjJzPJ+zmWQpCHFJTN+ELR17mKtJ7nsCmapdGZHo4xgnnbfToArKeiwJ1KINe" + "G9WCJLLm8lj1dWelyaPC4RbZcfXp7+AzcBYwM=" +) diff --git a/pyproject.toml b/pyproject.toml index 71cf605..5cc22dd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ "pony>=0.7.19", "flask-login>=0.6.3", "quart>=0.20.0", - "tortoise-orm>=0.25.1", + "tortoise-orm>=0.25.1,<1.0.0", "quart-jwt-extended>=0.1.0", "pre-commit>=4.3.0", "tortoise-orm-stubs>=1.0.2", @@ -37,9 +37,12 @@ dependencies = [ "ynab>=1.3.0", "aioimaplib>=2.0.1", "html2text>=2025.4.15", + "ollama>=0.6.1", + "twilio>=9.10.2", + "aioboto3>=13.0.0", ] [tool.aerich] -tortoise_orm = "app.TORTOISE_CONFIG" +tortoise_orm = "config.db.TORTOISE_CONFIG" location = "./migrations" src_folder = "./." diff --git a/raggr-frontend/package.json b/raggr-frontend/package.json index 2ff56a9..a07bc6d 100644 --- a/raggr-frontend/package.json +++ b/raggr-frontend/package.json @@ -12,11 +12,15 @@ }, "dependencies": { "axios": "^1.12.2", + "class-variance-authority": "^0.7.1", + "clsx": "^2.1.1", + "lucide-react": "^0.577.0", "marked": "^16.3.0", "npm-watch": "^0.13.0", "react": "^19.1.1", "react-dom": "^19.1.1", "react-markdown": "^10.1.0", + "tailwind-merge": "^3.5.0", "watch": "^1.0.2" }, "devDependencies": { diff --git a/raggr-frontend/public/apple-touch-icon.png b/raggr-frontend/public/apple-touch-icon.png new file mode 100644 index 0000000..d3e884a Binary files /dev/null and b/raggr-frontend/public/apple-touch-icon.png differ diff --git a/raggr-frontend/public/manifest.json b/raggr-frontend/public/manifest.json new file mode 100644 index 0000000..f5e9768 --- /dev/null +++ b/raggr-frontend/public/manifest.json @@ -0,0 +1,14 @@ +{ + "name": "Ask Simba", + "short_name": "Simba", + "description": "Chat with Simba - your AI cat companion", + "start_url": "/", + "display": "standalone", + "background_color": "#FAF8F2", + "theme_color": "#2A4D38", + "icons": [ + { "src": "/pwa-icon-192.png", "sizes": "192x192", "type": "image/png" }, + { "src": "/pwa-icon-512.png", "sizes": "512x512", "type": "image/png" }, + { "src": "/pwa-icon-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } + ] +} diff --git a/raggr-frontend/public/pwa-icon-192.png b/raggr-frontend/public/pwa-icon-192.png new file mode 100644 index 0000000..336bb91 Binary files /dev/null and b/raggr-frontend/public/pwa-icon-192.png differ diff --git a/raggr-frontend/public/pwa-icon-512.png b/raggr-frontend/public/pwa-icon-512.png new file mode 100644 index 0000000..0d7254c Binary files /dev/null and b/raggr-frontend/public/pwa-icon-512.png differ diff --git a/raggr-frontend/public/sw.js b/raggr-frontend/public/sw.js new file mode 100644 index 0000000..3422a03 --- /dev/null +++ b/raggr-frontend/public/sw.js @@ -0,0 +1,46 @@ +const CACHE = 'simba-v1'; + +self.addEventListener('install', (e) => { + self.skipWaiting(); +}); + +self.addEventListener('activate', (e) => { + e.waitUntil( + caches.keys().then((keys) => + Promise.all(keys.filter((k) => k !== CACHE).map((k) => caches.delete(k))) + ) + ); + self.clients.claim(); +}); + +self.addEventListener('fetch', (e) => { + const { request } = e; + const url = new URL(request.url); + + // Network-only for API calls + if (url.pathname.startsWith('/api/')) return; + + // Cache-first for fingerprinted static assets + if (url.pathname.startsWith('/static/')) { + e.respondWith( + caches.match(request).then( + (cached) => + cached || + fetch(request).then((res) => { + const clone = res.clone(); + caches.open(CACHE).then((c) => c.put(request, clone)); + return res; + }) + ) + ); + return; + } + + // Network-first for navigation (offline fallback to cache) + if (request.mode === 'navigate') { + e.respondWith( + fetch(request).catch(() => caches.match(request)) + ); + return; + } +}); diff --git a/raggr-frontend/rsbuild.config.ts b/raggr-frontend/rsbuild.config.ts index 16771fc..47888b0 100644 --- a/raggr-frontend/rsbuild.config.ts +++ b/raggr-frontend/rsbuild.config.ts @@ -4,7 +4,16 @@ import { pluginReact } from '@rsbuild/plugin-react'; export default defineConfig({ plugins: [pluginReact()], html: { - title: 'Raggr', + title: 'Ask Simba', favicon: './src/assets/favicon.svg', + tags: [ + { tag: 'link', attrs: { rel: 'manifest', href: '/manifest.json' } }, + { tag: 'meta', attrs: { name: 'theme-color', content: '#2A4D38' } }, + { tag: 'link', attrs: { rel: 'apple-touch-icon', href: '/apple-touch-icon.png' } }, + { tag: 'meta', attrs: { name: 'apple-mobile-web-app-capable', content: 'yes' } }, + ], + }, + output: { + copy: [{ from: './public', to: '.' }], }, }); diff --git a/raggr-frontend/src/App.css b/raggr-frontend/src/App.css index bfe41ef..a699380 100644 --- a/raggr-frontend/src/App.css +++ b/raggr-frontend/src/App.css @@ -1,7 +1,173 @@ +@import url('https://fonts.googleapis.com/css2?family=Nunito:wght@400;500;600;700;800&family=Playfair+Display:ital,wght@0,600;0,700;1,600&display=swap'); @import "tailwindcss"; -body { - margin: 0; - font-family: Inter, Avenir, Helvetica, Arial, sans-serif; - background-color: #F9F5EB; +@theme { + /* === Animal Crossing × Claude Palette === */ + + /* Backgrounds */ + --color-cream: #FAF8F2; + --color-cream-dark: #F0EBDF; + --color-warm-white: #FFFDF9; + + /* Forest / Nook Green system */ + --color-forest: #2A4D38; + --color-forest-mid: #345E46; + --color-forest-light: #4D7A5E; + --color-leaf: #5E9E70; + --color-leaf-dark: #3D7A52; + --color-leaf-light: #B8DEC4; + --color-leaf-pale: #EBF7EE; + + /* Amber / warm accents */ + --color-amber-glow: #E8943A; + --color-amber-dark: #C97828; + --color-amber-soft: #F5C882; + --color-amber-pale: #FFF4E0; + + /* Neutrals */ + --color-charcoal: #2C2420; + --color-warm-gray: #7A7268; + --color-sand: #DECFB8; + --color-sand-light: #EDE3D4; + --color-blush: #F2D1B3; + + /* Sidebar */ + --color-sidebar-bg: #2A4D38; + --color-sidebar-hover: #345E46; + --color-sidebar-active: #3D6E52; + + /* Fonts */ + --font-display: 'Playfair Display', Georgia, serif; + --font-body: 'Nunito', 'Nunito Sans', system-ui, sans-serif; } + +* { + box-sizing: border-box; +} + +body { + margin: 0; + font-family: var(--font-body); + background-color: var(--color-cream); + color: var(--color-charcoal); + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/* ── Scrollbar ─────────────────────────────────────── */ +::-webkit-scrollbar { width: 5px; } +::-webkit-scrollbar-track { background: transparent; } +::-webkit-scrollbar-thumb { background: var(--color-sand); border-radius: 99px; } +::-webkit-scrollbar-thumb:hover { background: var(--color-warm-gray); } + +/* ── Markdown in answer bubbles ─────────────────────── */ +.markdown-content p { margin: 0.5em 0; line-height: 1.7; } +.markdown-content p:first-child { margin-top: 0; } +.markdown-content p:last-child { margin-bottom: 0; } + +.markdown-content h1, +.markdown-content h2, +.markdown-content h3 { + font-family: var(--font-display); + font-weight: 600; + margin: 1em 0 0.4em; + line-height: 1.3; + color: var(--color-charcoal); +} +.markdown-content h1 { font-size: 1.2rem; } +.markdown-content h2 { font-size: 1.05rem; } +.markdown-content h3 { font-size: 0.95rem; } + +.markdown-content ul, +.markdown-content ol { padding-left: 1.4em; margin: 0.5em 0; } +.markdown-content li { margin: 0.3em 0; line-height: 1.6; } + +.markdown-content code { + background: rgba(0,0,0,0.06); + padding: 0.15em 0.4em; + border-radius: 5px; + font-size: 0.85em; + font-family: 'SF Mono', 'Fira Code', 'Cascadia Code', monospace; +} + +.markdown-content pre { + background: var(--color-charcoal); + color: #F0EBDF; + padding: 1em 1.1em; + border-radius: 12px; + overflow-x: auto; + margin: 0.8em 0; +} +.markdown-content pre code { background: none; padding: 0; color: inherit; } + +.markdown-content a { + color: var(--color-leaf-dark); + text-decoration: underline; + text-underline-offset: 2px; +} + +.markdown-content blockquote { + border-left: 3px solid var(--color-amber-soft); + padding-left: 1em; + margin: 0.75em 0; + color: var(--color-warm-gray); + font-style: italic; +} + +.markdown-content strong { font-weight: 700; } +.markdown-content em { font-style: italic; } + +/* ── Animations ─────────────────────────────────────── */ +@keyframes fadeSlideUp { + from { opacity: 0; transform: translateY(10px); } + to { opacity: 1; transform: translateY(0); } +} +.message-enter { + animation: fadeSlideUp 0.3s ease-out forwards; +} + +@keyframes catPulse { + 0%, 80%, 100% { opacity: 0.25; transform: scale(0.75); } + 40% { opacity: 1; transform: scale(1); } +} +.loading-dot { animation: catPulse 1.4s ease-in-out infinite; } +.loading-dot:nth-child(2) { animation-delay: 0.2s; } +.loading-dot:nth-child(3) { animation-delay: 0.4s; } + +@keyframes shimmer { + 0% { background-position: -200% 0; } + 100% { background-position: 200% 0; } +} +.skeleton-shimmer { + background: linear-gradient(90deg, + var(--color-sand-light) 25%, + var(--color-cream) 50%, + var(--color-sand-light) 75% + ); + background-size: 200% 100%; + animation: shimmer 1.8s ease-in-out infinite; +} + +/* ── Toggle switch ──────────────────────────────────── */ +.toggle-track { + width: 36px; + height: 20px; + border-radius: 99px; + background: var(--color-sand); + position: relative; + transition: background 0.2s; + cursor: pointer; +} +.toggle-track.checked { background: var(--color-leaf); } +.toggle-thumb { + width: 14px; + height: 14px; + background: white; + border-radius: 99px; + position: absolute; + top: 3px; + left: 3px; + transition: transform 0.2s; + box-shadow: 0 1px 3px rgba(0,0,0,0.15); +} +.toggle-track.checked .toggle-thumb { transform: translateX(16px); } diff --git a/raggr-frontend/src/App.tsx b/raggr-frontend/src/App.tsx index 970cd2d..85339ad 100644 --- a/raggr-frontend/src/App.tsx +++ b/raggr-frontend/src/App.tsx @@ -5,6 +5,7 @@ import { AuthProvider } from "./contexts/AuthContext"; import { ChatScreen } from "./components/ChatScreen"; import { LoginScreen } from "./components/LoginScreen"; import { conversationService } from "./api/conversationService"; +import catIcon from "./assets/cat.png"; const AppContainer = () => { const [isAuthenticated, setAuthenticated] = useState(false); @@ -44,8 +45,15 @@ const AppContainer = () => { // Show loading state while checking authentication if (isChecking) { return ( -
-
Loading...
+
+ Simba +

+ waking up simba... +

); } diff --git a/raggr-frontend/src/api/conversationService.ts b/raggr-frontend/src/api/conversationService.ts index f5bfa1a..788089e 100644 --- a/raggr-frontend/src/api/conversationService.ts +++ b/raggr-frontend/src/api/conversationService.ts @@ -1,10 +1,19 @@ import { userService } from "./userService"; +export type SSEEvent = + | { type: "tool_start"; tool: string } + | { type: "tool_end"; tool: string } + | { type: "response"; message: string } + | { type: "error"; message: string }; + +export type SSEEventCallback = (event: SSEEvent) => void; + interface Message { id: string; text: string; speaker: "user" | "simba"; created_at: string; + image_key?: string | null; } interface Conversation { @@ -112,6 +121,94 @@ class ConversationService { return await response.json(); } + + async uploadImage( + file: File, + conversationId: string, + ): Promise<{ image_key: string; image_url: string }> { + const formData = new FormData(); + formData.append("file", file); + formData.append("conversation_id", conversationId); + + const response = await userService.fetchWithRefreshToken( + `${this.conversationBaseUrl}/upload-image`, + { + method: "POST", + body: formData, + }, + { skipContentType: true }, + ); + + if (!response.ok) { + const data = await response.json(); + throw new Error(data.error || "Failed to upload image"); + } + + return await response.json(); + } + + getImageUrl(imageKey: string): string { + return `/api/conversation/image/${imageKey}`; + } + + async streamQuery( + query: string, + conversation_id: string, + onEvent: SSEEventCallback, + signal?: AbortSignal, + imageKey?: string, + ): Promise { + const body: Record = { query, conversation_id }; + if (imageKey) { + body.image_key = imageKey; + } + + const response = await userService.fetchWithRefreshToken( + `${this.conversationBaseUrl}/stream-query`, + { + method: "POST", + body: JSON.stringify(body), + signal, + }, + ); + + if (!response.ok) { + throw new Error("Failed to stream query"); + } + + await this._readSSEStream(response, onEvent); + } + + private async _readSSEStream( + response: Response, + onEvent: SSEEventCallback, + ): Promise { + const reader = response.body!.getReader(); + const decoder = new TextDecoder(); + let buffer = ""; + + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + const parts = buffer.split("\n\n"); + buffer = parts.pop() ?? ""; + + for (const part of parts) { + const line = part.trim(); + if (!line.startsWith("data: ")) continue; + const data = line.slice(6); + if (data === "[DONE]") return; + try { + const event = JSON.parse(data) as SSEEvent; + onEvent(event); + } catch { + // ignore malformed events + } + } + } + } } export const conversationService = new ConversationService(); diff --git a/raggr-frontend/src/api/userService.ts b/raggr-frontend/src/api/userService.ts index 7254960..52e4f4c 100644 --- a/raggr-frontend/src/api/userService.ts +++ b/raggr-frontend/src/api/userService.ts @@ -106,14 +106,15 @@ class UserService { async fetchWithRefreshToken( url: string, options: RequestInit = {}, + { skipContentType = false }: { skipContentType?: boolean } = {}, ): Promise { const refreshToken = localStorage.getItem("refresh_token"); // Add authorization header - const headers = { - "Content-Type": "application/json", - ...(options.headers || {}), - ...(refreshToken && { Authorization: `Bearer ${refreshToken}` }), + const headers: Record = { + ...(skipContentType ? {} : { "Content-Type": "application/json" }), + ...((options.headers as Record) || {}), + ...(refreshToken ? { Authorization: `Bearer ${refreshToken}` } : {}), }; let response = await fetch(url, { ...options, headers }); @@ -134,6 +135,67 @@ class UserService { return response; } + + async getMe(): Promise<{ id: string; username: string; email: string; is_admin: boolean }> { + const response = await this.fetchWithRefreshToken(`${this.baseUrl}/me`); + if (!response.ok) throw new Error("Failed to fetch user profile"); + return response.json(); + } + + async adminListUsers(): Promise { + const response = await this.fetchWithRefreshToken(`${this.baseUrl}/admin/users`); + if (!response.ok) throw new Error("Failed to list users"); + return response.json(); + } + + async adminSetWhatsapp(userId: string, number: string): Promise { + const response = await this.fetchWithRefreshToken( + `${this.baseUrl}/admin/users/${userId}/whatsapp`, + { method: "PUT", body: JSON.stringify({ whatsapp_number: number }) }, + ); + if (response.status === 409) { + const data = await response.json(); + throw new Error(data.error ?? "WhatsApp number already in use"); + } + if (!response.ok) throw new Error("Failed to set WhatsApp number"); + return response.json(); + } + + async adminUnlinkWhatsapp(userId: string): Promise { + const response = await this.fetchWithRefreshToken( + `${this.baseUrl}/admin/users/${userId}/whatsapp`, + { method: "DELETE" }, + ); + if (!response.ok) throw new Error("Failed to unlink WhatsApp number"); + } + + async adminToggleEmail(userId: string): Promise { + const response = await this.fetchWithRefreshToken( + `${this.baseUrl}/admin/users/${userId}/email`, + { method: "PUT" }, + ); + if (!response.ok) throw new Error("Failed to enable email"); + return response.json(); + } + + async adminDisableEmail(userId: string): Promise { + const response = await this.fetchWithRefreshToken( + `${this.baseUrl}/admin/users/${userId}/email`, + { method: "DELETE" }, + ); + if (!response.ok) throw new Error("Failed to disable email"); + } } +export interface AdminUserRecord { + id: string; + username: string; + email: string; + whatsapp_number: string | null; + auth_provider: string; + email_enabled: boolean; + email_address: string | null; +} + +export { UserService }; export const userService = new UserService(); diff --git a/raggr-frontend/src/assets/cat.png b/raggr-frontend/src/assets/cat.png index a718a59..0d7254c 100644 Binary files a/raggr-frontend/src/assets/cat.png and b/raggr-frontend/src/assets/cat.png differ diff --git a/raggr-frontend/src/components/AdminPanel.tsx b/raggr-frontend/src/components/AdminPanel.tsx new file mode 100644 index 0000000..6b55853 --- /dev/null +++ b/raggr-frontend/src/components/AdminPanel.tsx @@ -0,0 +1,312 @@ +import { useEffect, useState } from "react"; +import { X, Phone, PhoneOff, Pencil, Check, Mail, Copy } from "lucide-react"; +import { userService, type AdminUserRecord } from "../api/userService"; +import { cn } from "../lib/utils"; +import { Button } from "./ui/button"; +import { Input } from "./ui/input"; +import { + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow, +} from "./ui/table"; + +type Props = { + onClose: () => void; +}; + +export const AdminPanel = ({ onClose }: Props) => { + const [users, setUsers] = useState([]); + const [loading, setLoading] = useState(true); + const [editingId, setEditingId] = useState(null); + const [editValue, setEditValue] = useState(""); + const [rowError, setRowError] = useState>({}); + const [rowSuccess, setRowSuccess] = useState>({}); + + useEffect(() => { + userService + .adminListUsers() + .then(setUsers) + .catch(() => {}) + .finally(() => setLoading(false)); + }, []); + + const startEdit = (user: AdminUserRecord) => { + setEditingId(user.id); + setEditValue(user.whatsapp_number ?? ""); + setRowError((p) => ({ ...p, [user.id]: "" })); + setRowSuccess((p) => ({ ...p, [user.id]: "" })); + }; + + const cancelEdit = () => { + setEditingId(null); + setEditValue(""); + }; + + const saveWhatsapp = async (userId: string) => { + setRowError((p) => ({ ...p, [userId]: "" })); + try { + const updated = await userService.adminSetWhatsapp(userId, editValue); + setUsers((p) => p.map((u) => (u.id === userId ? updated : u))); + setRowSuccess((p) => ({ ...p, [userId]: "Saved ✓" })); + setEditingId(null); + setTimeout(() => setRowSuccess((p) => ({ ...p, [userId]: "" })), 2000); + } catch (err) { + setRowError((p) => ({ + ...p, + [userId]: err instanceof Error ? err.message : "Failed to save", + })); + } + }; + + const unlinkWhatsapp = async (userId: string) => { + setRowError((p) => ({ ...p, [userId]: "" })); + try { + await userService.adminUnlinkWhatsapp(userId); + setUsers((p) => + p.map((u) => (u.id === userId ? { ...u, whatsapp_number: null } : u)), + ); + setRowSuccess((p) => ({ ...p, [userId]: "Unlinked ✓" })); + setTimeout(() => setRowSuccess((p) => ({ ...p, [userId]: "" })), 2000); + } catch (err) { + setRowError((p) => ({ + ...p, + [userId]: err instanceof Error ? err.message : "Failed to unlink", + })); + } + }; + + const toggleEmail = async (userId: string) => { + setRowError((p) => ({ ...p, [userId]: "" })); + try { + const updated = await userService.adminToggleEmail(userId); + setUsers((p) => p.map((u) => (u.id === userId ? updated : u))); + setRowSuccess((p) => ({ ...p, [userId]: "Email enabled ✓" })); + setTimeout(() => setRowSuccess((p) => ({ ...p, [userId]: "" })), 2000); + } catch (err) { + setRowError((p) => ({ + ...p, + [userId]: err instanceof Error ? err.message : "Failed to enable email", + })); + } + }; + + const disableEmail = async (userId: string) => { + setRowError((p) => ({ ...p, [userId]: "" })); + try { + await userService.adminDisableEmail(userId); + setUsers((p) => + p.map((u) => (u.id === userId ? { ...u, email_enabled: false, email_address: null } : u)), + ); + setRowSuccess((p) => ({ ...p, [userId]: "Email disabled ✓" })); + setTimeout(() => setRowSuccess((p) => ({ ...p, [userId]: "" })), 2000); + } catch (err) { + setRowError((p) => ({ + ...p, + [userId]: err instanceof Error ? err.message : "Failed to disable email", + })); + } + }; + + const copyToClipboard = (text: string, userId: string) => { + navigator.clipboard.writeText(text); + setRowSuccess((p) => ({ ...p, [userId]: "Copied ✓" })); + setTimeout(() => setRowSuccess((p) => ({ ...p, [userId]: "" })), 2000); + }; + + return ( +
e.target === e.currentTarget && onClose()} + > +
+ {/* Header */} +
+
+
+ +
+

+ Admin · User Integrations +

+
+ +
+ + {/* Body */} +
+ {loading ? ( +
+
+ + + +
+ Loading users… +
+ ) : ( + + + + Username + Email + WhatsApp + Email + Actions + + + + {users.map((user) => ( + + + {user.username} + + {user.email} + + {editingId === user.id ? ( +
+ setEditValue(e.target.value)} + placeholder="whatsapp:+15551234567" + className="w-52" + autoFocus + onKeyDown={(e) => + e.key === "Enter" && saveWhatsapp(user.id) + } + /> + {rowError[user.id] && ( + + {rowError[user.id]} + + )} +
+ ) : ( +
+ + {user.whatsapp_number ?? "—"} + + {rowSuccess[user.id] && ( + + {rowSuccess[user.id]} + + )} + {rowError[user.id] && ( + + {rowError[user.id]} + + )} +
+ )} + + +
+ {user.email_enabled && user.email_address ? ( +
+ + {user.email_address} + + +
+ ) : ( + — + )} +
+ + + {editingId === user.id ? ( +
+ + +
+ ) : ( +
+ + {user.whatsapp_number && ( + + )} + {user.email_enabled ? ( + + ) : ( + + )} +
+ )} + + + ))} + +
+ )} +
+
+
+ ); +}; diff --git a/raggr-frontend/src/components/AnswerBubble.tsx b/raggr-frontend/src/components/AnswerBubble.tsx index 1433a98..db4207e 100644 --- a/raggr-frontend/src/components/AnswerBubble.tsx +++ b/raggr-frontend/src/components/AnswerBubble.tsx @@ -1,4 +1,5 @@ import ReactMarkdown from "react-markdown"; +import { cn } from "../lib/utils"; type AnswerBubbleProps = { text: string; @@ -7,25 +8,32 @@ type AnswerBubbleProps = { export const AnswerBubble = ({ text, loading }: AnswerBubbleProps) => { return ( -
- {loading ? ( -
-
-
-
-
-
-
-
-
+
+
+ {/* amber accent bar */} +
+ +
+ {loading ? ( +
+ + + +
+ ) : ( +
+ {text} +
+ )}
- ) : ( -
- - {"🐈: " + text} - -
- )} +
); }; diff --git a/raggr-frontend/src/components/ChatScreen.tsx b/raggr-frontend/src/components/ChatScreen.tsx index 8e358ec..b1c6216 100644 --- a/raggr-frontend/src/components/ChatScreen.tsx +++ b/raggr-frontend/src/components/ChatScreen.tsx @@ -1,19 +1,20 @@ import { useEffect, useState, useRef } from "react"; +import { LogOut, Shield, PanelLeftClose, PanelLeftOpen, Menu, X } from "lucide-react"; import { conversationService } from "../api/conversationService"; +import { userService } from "../api/userService"; import { QuestionBubble } from "./QuestionBubble"; import { AnswerBubble } from "./AnswerBubble"; +import { ToolBubble } from "./ToolBubble"; import { MessageInput } from "./MessageInput"; import { ConversationList } from "./ConversationList"; +import { AdminPanel } from "./AdminPanel"; +import { cn } from "../lib/utils"; import catIcon from "../assets/cat.png"; type Message = { text: string; - speaker: "simba" | "user"; -}; - -type QuestionAnswer = { - question: string; - answer: string; + speaker: "simba" | "user" | "tool"; + image_key?: string | null; }; type Conversation = { @@ -25,22 +26,37 @@ type ChatScreenProps = { setAuthenticated: (isAuth: boolean) => void; }; +const TOOL_MESSAGES: Record = { + simba_search: "🔍 Searching Simba's records...", + web_search: "🌐 Searching the web...", + get_current_date: "📅 Checking today's date...", + ynab_budget_summary: "💰 Checking budget summary...", + ynab_search_transactions: "💳 Looking up transactions...", + ynab_category_spending: "📊 Analyzing category spending...", + ynab_insights: "📈 Generating budget insights...", + obsidian_search_notes: "📝 Searching notes...", + obsidian_read_note: "📖 Reading note...", + obsidian_create_note: "✏️ Saving note...", + obsidian_create_task: "✅ Creating task...", + journal_get_today: "📔 Reading today's journal...", + journal_get_tasks: "📋 Getting tasks...", + journal_add_task: "➕ Adding task...", + journal_complete_task: "✔️ Completing task...", +}; + export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { const [query, setQuery] = useState(""); - const [answer, setAnswer] = useState(""); const [simbaMode, setSimbaMode] = useState(false); - const [questionsAnswers, setQuestionsAnswers] = useState( - [], - ); const [messages, setMessages] = useState([]); - const [conversations, setConversations] = useState([ - { title: "simba meow meow", id: "uuid" }, - ]); + const [conversations, setConversations] = useState([]); const [showConversations, setShowConversations] = useState(false); const [selectedConversation, setSelectedConversation] = useState(null); const [sidebarCollapsed, setSidebarCollapsed] = useState(false); const [isLoading, setIsLoading] = useState(false); + const [isAdmin, setIsAdmin] = useState(false); + const [showAdminPanel, setShowAdminPanel] = useState(false); + const [pendingImage, setPendingImage] = useState(null); const messagesEndRef = useRef(null); const isMountedRef = useRef(true); @@ -51,67 +67,49 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { messagesEndRef.current?.scrollIntoView({ behavior: "smooth" }); }; - // Cleanup effect to handle component unmounting useEffect(() => { isMountedRef.current = true; return () => { isMountedRef.current = false; - // Abort any pending requests when component unmounts - if (abortControllerRef.current) { - abortControllerRef.current.abort(); - } + abortControllerRef.current?.abort(); }; }, []); const handleSelectConversation = (conversation: Conversation) => { setShowConversations(false); setSelectedConversation(conversation); - const loadMessages = async () => { + const load = async () => { try { - const fetchedConversation = await conversationService.getConversation( - conversation.id, - ); + const fetched = await conversationService.getConversation(conversation.id); setMessages( - fetchedConversation.messages.map((message) => ({ - text: message.text, - speaker: message.speaker, - })), + fetched.messages.map((m) => ({ text: m.text, speaker: m.speaker, image_key: m.image_key })), ); - } catch (error) { - console.error("Failed to load messages:", error); + } catch (err) { + console.error("Failed to load messages:", err); } }; - loadMessages(); + load(); }; const loadConversations = async () => { try { - const fetchedConversations = - await conversationService.getAllConversations(); - const parsedConversations = fetchedConversations.map((conversation) => ({ - id: conversation.id, - title: conversation.name, - })); - setConversations(parsedConversations); - setSelectedConversation(parsedConversations[0]); - console.log(parsedConversations); - console.log("JELLYFISH@"); - } catch (error) { - console.error("Failed to load messages:", error); + const fetched = await conversationService.getAllConversations(); + const parsed = fetched.map((c) => ({ id: c.id, title: c.name })); + setConversations(parsed); + } catch (err) { + console.error("Failed to load conversations:", err); } }; const handleCreateNewConversation = async () => { - const newConversation = await conversationService.createConversation(); + const newConv = await conversationService.createConversation(); await loadConversations(); - setSelectedConversation({ - title: newConversation.name, - id: newConversation.id, - }); + setSelectedConversation({ title: newConv.name, id: newConv.id }); }; useEffect(() => { loadConversations(); + userService.getMe().then((me) => setIsAdmin(me.is_admin)).catch(() => {}); }, []); useEffect(() => { @@ -119,90 +117,101 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { }, [messages]); useEffect(() => { - const loadMessages = async () => { - console.log(selectedConversation); - console.log("JELLYFISH"); - if (selectedConversation == null) return; + const load = async () => { + if (!selectedConversation) return; try { - const conversation = await conversationService.getConversation( - selectedConversation.id, - ); - // Update the conversation title in case it changed - setSelectedConversation({ - id: conversation.id, - title: conversation.name, - }); - setMessages( - conversation.messages.map((message) => ({ - text: message.text, - speaker: message.speaker, - })), - ); - } catch (error) { - console.error("Failed to load messages:", error); + const conv = await conversationService.getConversation(selectedConversation.id); + setSelectedConversation({ id: conv.id, title: conv.name }); + setMessages(conv.messages.map((m) => ({ text: m.text, speaker: m.speaker, image_key: m.image_key }))); + } catch (err) { + console.error("Failed to load messages:", err); } }; - loadMessages(); + load(); }, [selectedConversation?.id]); const handleQuestionSubmit = async () => { - if (!query.trim() || isLoading) return; // Don't submit empty messages or while loading + if ((!query.trim() && !pendingImage) || isLoading) return; + + let activeConversation = selectedConversation; + if (!activeConversation) { + const newConv = await conversationService.createConversation(); + activeConversation = { title: newConv.name, id: newConv.id }; + setSelectedConversation(activeConversation); + setConversations((prev) => [activeConversation!, ...prev]); + } + + // Capture pending image before clearing state + const imageFile = pendingImage; const currMessages = messages.concat([{ text: query, speaker: "user" }]); setMessages(currMessages); - setQuery(""); // Clear input immediately after submission + setQuery(""); + setPendingImage(null); setIsLoading(true); if (simbaMode) { - console.log("simba mode activated"); - const randomIndex = Math.floor(Math.random() * simbaAnswers.length); - const randomElement = simbaAnswers[randomIndex]; - setAnswer(randomElement); - setQuestionsAnswers( - questionsAnswers.concat([ - { - question: query, - answer: randomElement, - }, - ]), - ); + const randomElement = simbaAnswers[Math.floor(Math.random() * simbaAnswers.length)]; + setMessages((prev) => prev.concat([{ text: randomElement, speaker: "simba" }])); setIsLoading(false); return; } - // Create a new AbortController for this request const abortController = new AbortController(); abortControllerRef.current = abortController; try { - const result = await conversationService.sendQuery( + // Upload image first if present + let imageKey: string | undefined; + if (imageFile) { + const uploadResult = await conversationService.uploadImage( + imageFile, + activeConversation.id, + ); + imageKey = uploadResult.image_key; + + // Update the user message with the image key + setMessages((prev) => { + const updated = [...prev]; + // Find the last user message we just added + for (let i = updated.length - 1; i >= 0; i--) { + if (updated[i].speaker === "user") { + updated[i] = { ...updated[i], image_key: imageKey }; + break; + } + } + return updated; + }); + } + + await conversationService.streamQuery( query, - selectedConversation.id, + activeConversation.id, + (event) => { + if (!isMountedRef.current) return; + if (event.type === "tool_start") { + const friendly = TOOL_MESSAGES[event.tool] ?? `🔧 Using ${event.tool}...`; + setMessages((prev) => prev.concat([{ text: friendly, speaker: "tool" }])); + } else if (event.type === "response") { + setMessages((prev) => prev.concat([{ text: event.message, speaker: "simba" }])); + } else if (event.type === "error") { + console.error("Stream error:", event.message); + } + }, abortController.signal, - ); - setQuestionsAnswers( - questionsAnswers.concat([{ question: query, answer: result.response }]), - ); - setMessages( - currMessages.concat([{ text: result.response, speaker: "simba" }]), + imageKey, ); } catch (error) { - // Ignore abort errors (these are intentional cancellations) if (error instanceof Error && error.name === "AbortError") { console.log("Request was aborted"); } else { console.error("Failed to send query:", error); - // If session expired, redirect to login if (error instanceof Error && error.message.includes("Session expired")) { setAuthenticated(false); } } } finally { - // Only update loading state if component is still mounted - if (isMountedRef.current) { - setIsLoading(false); - } - // Clear the abort controller reference + if (isMountedRef.current) setIsLoading(false); abortControllerRef.current = null; } }; @@ -211,128 +220,216 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { setQuery(event.target.value); }; - const handleKeyDown = (event: React.KeyboardEvent) => { - // Submit on Enter, but allow Shift+Enter for new line - if (event.key === "Enter" && !event.shiftKey) { - event.preventDefault(); + const handleKeyDown = (event: React.ChangeEvent) => { + const kev = event as unknown as React.KeyboardEvent; + if (kev.key === "Enter" && !kev.shiftKey) { + kev.preventDefault(); handleQuestionSubmit(); } }; + const handleLogout = () => { + localStorage.removeItem("access_token"); + localStorage.removeItem("refresh_token"); + setAuthenticated(false); + }; + return ( -
- {/* Sidebar - Expanded */} +
+ {/* ── Desktop Sidebar ─────────────────────────────── */} - {/* Main chat area */} -
+ {/* Admin Panel modal */} + {showAdminPanel && setShowAdminPanel(false)} />} + + {/* ── Main chat area ──────────────────────────────── */} +
{/* Mobile header */} -
-
- Simba -

asksimba!

-
-
-
- {/* Messages area */} - {selectedConversation && ( -
-
-

- {selectedConversation.title || "Untitled Conversation"} -

-
-
- )} -
- {/* Floating conversation name */} - -
+ {messages.length === 0 ? ( + /* ── Empty / homepage state ── */ +
+ {/* Mobile conversation drawer */} {showConversations && ( -
+
)} - {messages.map((msg, index) => { - if (msg.speaker === "simba") { - return ; - } - return ; - })} - {isLoading && } -
+
+
+ Simba +
+

+ Ask me anything +

+
+ setPendingImage(file)} + onClearImage={() => setPendingImage(null)} + /> +
-
+ ) : ( + /* ── Active chat state ── */ + <> +
+
+ {/* Mobile conversation drawer */} + {showConversations && ( +
+ +
+ )} - {/* Input area */} -
-
- -
-
+ {messages.map((msg, index) => { + if (msg.speaker === "tool") + return ; + if (msg.speaker === "simba") + return ; + return ; + })} + + {isLoading && } +
+
+
+ +
+
+ +
+
+ + )}
); diff --git a/raggr-frontend/src/components/ConversationList.tsx b/raggr-frontend/src/components/ConversationList.tsx index a245ab0..5553ac7 100644 --- a/raggr-frontend/src/components/ConversationList.tsx +++ b/raggr-frontend/src/components/ConversationList.tsx @@ -1,6 +1,8 @@ import { useState, useEffect } from "react"; - +import { Plus } from "lucide-react"; +import { cn } from "../lib/utils"; import { conversationService } from "../api/conversationService"; + type Conversation = { title: string; id: string; @@ -10,60 +12,80 @@ type ConversationProps = { conversations: Conversation[]; onSelectConversation: (conversation: Conversation) => void; onCreateNewConversation: () => void; + selectedId?: string; + variant?: "dark" | "light"; }; export const ConversationList = ({ conversations, onSelectConversation, onCreateNewConversation, + selectedId, + variant = "dark", }: ConversationProps) => { - const [conservations, setConversations] = useState(conversations); + const [items, setItems] = useState(conversations); useEffect(() => { - const loadConversations = async () => { + const load = async () => { try { - let fetchedConversations = - await conversationService.getAllConversations(); - - if (conversations.length == 0) { + let fetched = await conversationService.getAllConversations(); + if (fetched.length === 0) { await conversationService.createConversation(); - fetchedConversations = - await conversationService.getAllConversations(); + fetched = await conversationService.getAllConversations(); } - setConversations( - fetchedConversations.map((conversation) => ({ - id: conversation.id, - title: conversation.name, - })), - ); - } catch (error) { - console.error("Failed to load messages:", error); + setItems(fetched.map((c) => ({ id: c.id, title: c.name }))); + } catch (err) { + console.error("Failed to load conversations:", err); } }; - loadConversations(); + load(); }, []); + // Keep in sync when parent updates conversations + useEffect(() => { + setItems(conversations); + }, [conversations]); + return ( -
- {conservations.map((conversation) => { +
+ {/* New thread button */} + + + {/* Conversation items */} + {items.map((conv) => { + const isActive = conv.id === selectedId; return ( -
onSelectConversation(conversation)} +
+ {conv.title} + ); })} -
onCreateNewConversation()} - > -

+ Start a new thread

-
); }; diff --git a/raggr-frontend/src/components/LoginScreen.tsx b/raggr-frontend/src/components/LoginScreen.tsx index 1270aac..0d51733 100644 --- a/raggr-frontend/src/components/LoginScreen.tsx +++ b/raggr-frontend/src/components/LoginScreen.tsx @@ -1,6 +1,8 @@ import { useState, useEffect } from "react"; import { userService } from "../api/userService"; import { oidcService } from "../api/oidcService"; +import catIcon from "../assets/cat.png"; +import { cn } from "../lib/utils"; type LoginScreenProps = { setAuthenticated: (isAuth: boolean) => void; @@ -13,25 +15,17 @@ export const LoginScreen = ({ setAuthenticated }: LoginScreenProps) => { useEffect(() => { const initAuth = async () => { - // First, check for OIDC callback parameters const callbackParams = oidcService.getCallbackParamsFromURL(); - if (callbackParams) { - // Handle OIDC callback try { setIsLoggingIn(true); const result = await oidcService.handleCallback( callbackParams.code, - callbackParams.state + callbackParams.state, ); - - // Store tokens localStorage.setItem("access_token", result.access_token); localStorage.setItem("refresh_token", result.refresh_token); - - // Clear URL parameters oidcService.clearCallbackParams(); - setAuthenticated(true); setIsChecking(false); return; @@ -44,15 +38,10 @@ export const LoginScreen = ({ setAuthenticated }: LoginScreenProps) => { return; } } - - // Check if user is already authenticated const isValid = await userService.validateToken(); - if (isValid) { - setAuthenticated(true); - } + if (isValid) setAuthenticated(true); setIsChecking(false); }; - initAuth(); }, [setAuthenticated]); @@ -60,70 +49,113 @@ export const LoginScreen = ({ setAuthenticated }: LoginScreenProps) => { try { setIsLoggingIn(true); setError(""); - - // Get authorization URL from backend const authUrl = await oidcService.initiateLogin(); - - // Redirect to Authelia window.location.href = authUrl; - } catch (err) { + } catch { setError("Failed to initiate login. Please try again."); - console.error("OIDC login error:", err); setIsLoggingIn(false); } }; - // Show loading state while checking authentication or processing callback if (isChecking || isLoggingIn) { return ( -
-
-
-

- {isLoggingIn ? "Logging in..." : "Checking authentication..."} -

-
+
+ {/* Subtle dot grid */} +
+
+
+ Simba
+

+ {isLoggingIn ? "letting you in..." : "checking credentials..."} +

); } return ( -
-
-
-
-
-
-

- I AM LOOKING FOR A DESIGNER. THIS APP WILL REMAIN UGLY UNTIL A - DESIGNER COMES. -

-
-
-

ask simba!

-
+
+ {/* Background dot texture */} +
- {error && ( -
- {error} -
- )} + {/* Decorative background blobs */} +
+
-
- Click below to login with Authelia -
-
- - +
+ {/* Branding */} +
+
+
+ Simba
+

+ asksimba +

+

+ your feline knowledge companion +

+ + {/* Card */} +
+ {error && ( +
+ {error} +
+ )} + +

+ Sign in to start chatting with Simba +

+ + +
+ +

+ ✦ meow ✦ +

); diff --git a/raggr-frontend/src/components/MessageInput.tsx b/raggr-frontend/src/components/MessageInput.tsx index 6b37623..bd9af95 100644 --- a/raggr-frontend/src/components/MessageInput.tsx +++ b/raggr-frontend/src/components/MessageInput.tsx @@ -1,12 +1,18 @@ -import { useEffect, useState, useRef } from "react"; +import { useRef, useState } from "react"; +import { ArrowUp, ImagePlus, X } from "lucide-react"; +import { cn } from "../lib/utils"; +import { Textarea } from "./ui/textarea"; type MessageInputProps = { handleQueryChange: (event: React.ChangeEvent) => void; handleKeyDown: (event: React.ChangeEvent) => void; handleQuestionSubmit: () => void; - setSimbaMode: (sdf: boolean) => void; + setSimbaMode: (val: boolean) => void; query: string; isLoading: boolean; + pendingImage: File | null; + onImageSelect: (file: File) => void; + onClearImage: () => void; }; export const MessageInput = ({ @@ -16,41 +22,127 @@ export const MessageInput = ({ handleQuestionSubmit, setSimbaMode, isLoading, + pendingImage, + onImageSelect, + onClearImage, }: MessageInputProps) => { + const [simbaMode, setLocalSimbaMode] = useState(false); + const fileInputRef = useRef(null); + + const toggleSimbaMode = () => { + const next = !simbaMode; + setLocalSimbaMode(next); + setSimbaMode(next); + }; + + const handleFileChange = (e: React.ChangeEvent) => { + const file = e.target.files?.[0]; + if (file) { + onImageSelect(file); + } + // Reset so the same file can be re-selected + e.target.value = ""; + }; + + const canSend = !isLoading && (query.trim() || pendingImage); + return ( -
-
-