From 86cc269b3affcf8fc5ccbcc68cc4eff192276822 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 3 Mar 2026 08:22:19 -0500 Subject: [PATCH] yeet --- .env.example | 29 ++ .gitignore | 3 + CLAUDE.md | 10 +- Dockerfile | 4 +- app.py | 23 +- blueprints/conversation/__init__.py | 153 ++++-- blueprints/conversation/agents.py | 325 ++++++++++++- blueprints/rag/__init__.py | 14 +- blueprints/rag/logic.py | 64 +++ blueprints/users/models.py | 1 + blueprints/whatsapp/__init__.py | 254 ++++++++++ docker-compose.dev.yml | 71 --- docker-compose.yml | 19 +- main.py | 4 + .../2_20260228125713_add_whatsapp_number.py | 42 ++ pyproject.toml | 4 +- raggr-frontend/src/App.css | 169 ++++++- raggr-frontend/src/App.tsx | 12 +- raggr-frontend/src/components/ChatScreen.tsx | 128 +++-- raggr-frontend/src/components/LoginScreen.tsx | 104 ++-- startup.sh | 15 +- tickets.md | 189 ++++++++ utils/obsidian_service.py | 446 ++++++++++++++++++ uv.lock | 54 ++- 24 files changed, 1899 insertions(+), 238 deletions(-) create mode 100644 blueprints/whatsapp/__init__.py delete mode 100644 docker-compose.dev.yml create mode 100644 migrations/models/2_20260228125713_add_whatsapp_number.py create mode 100644 tickets.md create mode 100644 utils/obsidian_service.py diff --git a/.env.example b/.env.example index 017b0e2..14071c9 100644 --- a/.env.example +++ b/.env.example @@ -54,3 +54,32 @@ OIDC_USE_DISCOVERY=true YNAB_ACCESS_TOKEN=your-ynab-personal-access-token # Optional: Specify a budget ID, or leave empty to use the default/first budget YNAB_BUDGET_ID= + +# 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 + +# 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 a8369f8..c558b74 100644 --- a/app.py +++ b/app.py @@ -1,20 +1,25 @@ +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.rag import blueprints.users +import blueprints.whatsapp import blueprints.users.models from main import consult_simba_oracle # Load environment variables load_dotenv() +# Configure logging +logging.basicConfig(level=logging.INFO) + app = Quart( __name__, static_folder="raggr-frontend/dist/static", @@ -28,6 +33,7 @@ jwt = JWTManager(app) app.register_blueprint(blueprints.users.user_blueprint) app.register_blueprint(blueprints.conversation.conversation_blueprint) app.register_blueprint(blueprints.rag.rag_blueprint) +app.register_blueprint(blueprints.whatsapp.whatsapp_blueprint) # Database configuration with environment variable support @@ -48,12 +54,15 @@ TORTOISE_CONFIG = { }, } -# 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..517e006 100644 --- a/blueprints/conversation/__init__.py +++ b/blueprints/conversation/__init__.py @@ -1,6 +1,7 @@ import datetime +import json -from quart import Blueprint, jsonify, request +from quart import Blueprint, jsonify, make_response, request from quart_jwt_extended import ( get_jwt_identity, jwt_refresh_token_required, @@ -24,35 +25,7 @@ conversation_blueprint = Blueprint( "conversation_api", __name__, url_prefix="/api/conversation" ) - -@conversation_blueprint.post("/query") -@jwt_refresh_token_required -async def query(): - current_user_uuid = get_jwt_identity() - user = await blueprints.users.models.User.get(id=current_user_uuid) - data = await request.get_json() - query = data.get("query") - conversation_id = data.get("conversation_id") - conversation = await get_conversation_by_id(conversation_id) - await conversation.fetch_related("messages") - await add_message_to_conversation( - conversation=conversation, - message=query, - speaker="user", - 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. +_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 @@ -92,18 +65,57 @@ You have access to Ryan's budget data through YNAB (You Need A Budget). When use - 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.""", - } - ] +Always use these tools when asked about budgets, spending, transactions, or financial health. - # Add recent conversation history +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.""" + + +def _build_messages_payload(conversation, query_text: str) -> 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" messages_payload.append({"role": role, "content": msg.text}) + messages_payload.append({"role": "user", "content": query_text}) + return messages_payload - # Add current query - messages_payload.append({"role": "user", "content": query}) +@conversation_blueprint.post("/query") +@jwt_refresh_token_required +async def query(): + current_user_uuid = get_jwt_identity() + user = await blueprints.users.models.User.get(id=current_user_uuid) + data = await request.get_json() + query = data.get("query") + conversation_id = data.get("conversation_id") + conversation = await get_conversation_by_id(conversation_id) + await conversation.fetch_related("messages") + await add_message_to_conversation( + conversation=conversation, + message=query, + speaker="user", + user=user, + ) + + messages_payload = _build_messages_payload(conversation, query) payload = {"messages": messages_payload} response = await main_agent.ainvoke(payload) @@ -117,6 +129,75 @@ Always use these tools when asked about budgets, spending, transactions, or fina return jsonify({"response": message}) +@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") + conversation = await get_conversation_by_id(conversation_id) + await conversation.fetch_related("messages") + await add_message_to_conversation( + conversation=conversation, + message=query_text, + speaker="user", + user=user, + ) + + messages_payload = _build_messages_payload(conversation, query_text) + 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): 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/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/models.py b/blueprints/users/models.py index 51d86d0..bb3f2d9 100644 --- a/blueprints/users/models.py +++ b/blueprints/users/models.py @@ -10,6 +10,7 @@ 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) # OIDC fields oidc_subject = fields.CharField( diff --git a/blueprints/whatsapp/__init__.py b/blueprints/whatsapp/__init__.py new file mode 100644 index 0000000..e71b5c3 --- /dev/null +++ b/blueprints/whatsapp/__init__.py @@ -0,0 +1,254 @@ +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 + +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: + # System prompt with Simba's facts and medical information + 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.""" + + # 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": 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/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..5fa3914 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,18 +32,35 @@ 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} 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/pyproject.toml b/pyproject.toml index 3d79e3e..0827bbb 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", @@ -35,6 +35,8 @@ dependencies = [ "jq>=1.10.0", "tavily-python>=0.7.17", "ynab>=1.3.0", + "ollama>=0.6.1", + "twilio>=9.10.2", ] [tool.aerich] diff --git a/raggr-frontend/src/App.css b/raggr-frontend/src/App.css index bfe41ef..d99d3e9 100644 --- a/raggr-frontend/src/App.css +++ b/raggr-frontend/src/App.css @@ -1,7 +1,170 @@ @import "tailwindcss"; +@import url('https://fonts.googleapis.com/css2?family=Nunito:wght@400;500;600;700&family=Playfair+Display:ital,wght@0,600;0,700;1,600&display=swap'); + +@theme { + --color-cream: #FBF7F0; + --color-cream-dark: #F3EDE2; + --color-warm-white: #FFFDF9; + --color-amber-glow: #E8943A; + --color-amber-soft: #F5C882; + --color-amber-pale: #FFF0D6; + --color-forest: #2D5A3D; + --color-forest-light: #3D763A; + --color-forest-pale: #E8F5E4; + --color-charcoal: #2C2420; + --color-warm-gray: #8A7E74; + --color-sand: #D4C5B0; + --color-sand-light: #E8DED0; + --color-blush: #F2D1B3; + --color-sidebar-bg: #2C2420; + --color-sidebar-hover: #3D352F; + --color-sidebar-active: #4A3F38; + --font-display: 'Playfair Display', Georgia, serif; + --font-body: 'Nunito', -apple-system, BlinkMacSystemFont, sans-serif; +} + +* { + box-sizing: border-box; +} body { - margin: 0; - font-family: Inter, Avenir, Helvetica, Arial, sans-serif; - background-color: #F9F5EB; + 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 styling */ +::-webkit-scrollbar { + width: 6px; +} +::-webkit-scrollbar-track { + background: transparent; +} +::-webkit-scrollbar-thumb { + background: var(--color-sand); + border-radius: 3px; +} +::-webkit-scrollbar-thumb:hover { + background: var(--color-warm-gray); +} + +/* Markdown content styling in answer bubbles */ +.markdown-content h1, +.markdown-content h2, +.markdown-content h3 { + font-family: var(--font-display); + font-weight: 600; + margin-top: 1em; + margin-bottom: 0.5em; + line-height: 1.3; +} +.markdown-content h1 { font-size: 1.25rem; } +.markdown-content h2 { font-size: 1.1rem; } +.markdown-content h3 { font-size: 1rem; } + +.markdown-content p { + margin: 0.5em 0; + line-height: 1.65; +} + +.markdown-content ul, +.markdown-content ol { + padding-left: 1.5em; + margin: 0.5em 0; +} + +.markdown-content li { + margin: 0.25em 0; + line-height: 1.6; +} + +.markdown-content code { + background: rgba(0, 0, 0, 0.06); + padding: 0.15em 0.4em; + border-radius: 4px; + font-size: 0.88em; + font-family: 'SF Mono', 'Fira Code', monospace; +} + +.markdown-content pre { + background: var(--color-charcoal); + color: #F3EDE2; + padding: 1em; + border-radius: 8px; + overflow-x: auto; + margin: 0.75em 0; +} + +.markdown-content pre code { + background: none; + padding: 0; + color: inherit; +} + +.markdown-content a { + color: var(--color-forest); + text-decoration: underline; + text-underline-offset: 2px; +} + +.markdown-content blockquote { + border-left: 3px solid var(--color-amber-glow); + padding-left: 1em; + margin: 0.75em 0; + color: var(--color-warm-gray); + font-style: italic; +} + +/* Loading skeleton animation */ +@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; +} + +/* Fade-in animation for messages */ +@keyframes fadeSlideUp { + from { + opacity: 0; + transform: translateY(12px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +.message-enter { + animation: fadeSlideUp 0.35s ease-out forwards; +} + +/* Subtle pulse for loading dots */ +@keyframes catPulse { + 0%, 80%, 100% { opacity: 0.3; transform: scale(0.8); } + 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; } + +/* Textarea focus glow */ +textarea:focus { + outline: none; + box-shadow: 0 0 0 2px var(--color-amber-soft); } 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/components/ChatScreen.tsx b/raggr-frontend/src/components/ChatScreen.tsx index 8e358ec..5b57bac 100644 --- a/raggr-frontend/src/components/ChatScreen.tsx +++ b/raggr-frontend/src/components/ChatScreen.tsx @@ -94,8 +94,6 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { })); setConversations(parsedConversations); setSelectedConversation(parsedConversations[0]); - console.log(parsedConversations); - console.log("JELLYFISH@"); } catch (error) { console.error("Failed to load messages:", error); } @@ -120,8 +118,6 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { useEffect(() => { const loadMessages = async () => { - console.log(selectedConversation); - console.log("JELLYFISH"); if (selectedConversation == null) return; try { const conversation = await conversationService.getConversation( @@ -154,7 +150,6 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { setIsLoading(true); if (simbaMode) { - console.log("simba mode activated"); const randomIndex = Math.floor(Math.random() * simbaAnswers.length); const randomElement = simbaAnswers[randomIndex]; setAnswer(randomElement); @@ -219,43 +214,62 @@ export const ChatScreen = ({ setAuthenticated }: ChatScreenProps) => { } }; + const handleLogout = () => { + localStorage.removeItem("access_token"); + localStorage.removeItem("refresh_token"); + setAuthenticated(false); + }; + return ( -
- {/* Sidebar - Expanded */} +
+ {/* Sidebar */}