added latest models

app/db.py

@@ -1,11 +1,7 @@
 import os
-import time
-import logging
-from sqlalchemy import create_engine, event
+from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, DeclarativeBase
-from sqlalchemy.exc import OperationalError
 
-logger = logging.getLogger(__name__)
 
 DATABASE_URL = os.getenv("DATABASE_URL", "sqlite:///./app.db")
 
@@ -26,46 +22,16 @@ else:
         pool_recycle=280,     # recycle before Neon's ~5 min idle timeout
         pool_size=5,
         max_overflow=10,
-        connect_args={
-            "connect_timeout": 10,  # Connection timeout in seconds
-        }
     )
 
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 
 def get_db():
-    """
-    Database session dependency with retry logic for transient connection errors.
-    Retries on DNS resolution failures and temporary network issues.
-    """
-    max_retries = 3
-    last_error = None
-    
-    for attempt in range(max_retries):
-        try:
-            db = SessionLocal()
-            yield db
-            return
-        except OperationalError as e:
-            last_error = e
-            error_msg = str(e).lower()
-            
-            # Only retry on transient network errors
-            if any(x in error_msg for x in ['name resolution', 'connection refused', 'timeout', 'temporarily unavailable']):
-                logger.warning(f"Database connection failed (attempt {attempt + 1}/{max_retries}): {e}")
-                if attempt < max_retries - 1:
-                    time.sleep(1.0 * (attempt + 1))  # Exponential backoff
-                    continue
-            
-            # Non-transient error, don't retry
-            raise
-        finally:
-            if 'db' in locals():
-                db.close()
-    
-    # All retries exhausted
-    logger.error(f"Database connection failed after {max_retries} attempts")
-    raise last_error
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
 
 

app/main.py

@@ -49,18 +49,6 @@ default_lm = dspy.LM(default_model, max_tokens=3200,api_key=os.getenv(provider+'
 
 dspy.configure(lm=default_lm)
 
-# Session support for OAuth (Authlib requires request.session)
-# NOTE: SessionMiddleware must be added BEFORE CORSMiddleware (middlewares execute in reverse order)
-# For production HTTPS with cross-site OAuth, use same_site="none" with https_only=True
-is_production = os.getenv("SESSION_HTTPS_ONLY", "0") == "1"
-app.add_middleware(
-    SessionMiddleware,
-    secret_key=os.getenv("SESSION_SECRET", "change-this-session-secret"),
-    same_site="none" if is_production else "lax",  # "none" required for cross-site OAuth on HTTPS
-    https_only=is_production,
-    max_age=3600,  # 1 hour session lifetime
-)
-
 # CORS middleware - allow frontend to access backend
 frontend_url = os.getenv("FRONTEND_URL", "http://localhost:5173")
 # Support multiple origins (local dev + production)
@@ -73,6 +61,14 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+# Session support for OAuth (Authlib requires request.session)
+app.add_middleware(
+    SessionMiddleware,
+    secret_key=os.getenv("SESSION_SECRET", "change-this-session-secret"),
+    same_site="lax",
+    https_only=bool(int(os.getenv("SESSION_HTTPS_ONLY", "0"))),
+)
+
 
 from .schemas.auth import LoginRequest
 

app/oauth_google.py

@@ -1,5 +1,6 @@
 import os
 import logging
+import asyncio
 from urllib.parse import urlencode
 from fastapi import APIRouter, Request, Depends
 from authlib.integrations.starlette_client import OAuth
@@ -9,6 +10,7 @@ from .db import get_db
 from .models import User
 from .security import create_access_token
 from .services.subscription_service import subscription_service
+from .services.email_service import email_service, EmailServiceError
 
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api/auth/google", tags=["auth"])
@@ -38,14 +40,13 @@ async def login(request: Request):
 @router.get("/callback")
 async def callback(request: Request, db: Session = Depends(get_db)):
     try:
-        # Let authlib handle the OAuth state validation
         token = await oauth.google.authorize_access_token(request)
         userinfo = token.get("userinfo") or await oauth.google.parse_id_token(request, token)
         
         email = userinfo.get("email")
         if not email:
             logger.error("No email in Google OAuth response")
-            return RedirectResponse(url=f"{FRONTEND_URL}/?error=missing_email", status_code=302)
+            return RedirectResponse(url=f"{FRONTEND_URL}/?error=missing_email")
         
         user = db.query(User).filter(User.email == email).first()
         is_new_user = not user
@@ -67,20 +68,35 @@ async def callback(request: Request, db: Session = Depends(get_db)):
                 subscription_service.assign_free_tier(db, user)
             except Exception as e:
                 logger.error(f"Failed to assign free tier to user {user.id}: {e}")
+            
+            # Send welcome email asynchronously (non-blocking)
+            asyncio.create_task(_send_welcome_email(user))
         
         jwt_token = create_access_token(str(user.id), {"email": user.email})
-        return RedirectResponse(url=f"{FRONTEND_URL}/?{urlencode({'token': jwt_token})}", status_code=302)
+        return RedirectResponse(url=f"{FRONTEND_URL}/?{urlencode({'token': jwt_token})}")
     
     except Exception as e:
-        error_msg = str(e).lower()
         logger.error(f"OAuth callback error: {e}", exc_info=True)
-        
-        # Provide more specific error messages
-        if "state" in error_msg or "mismatch" in error_msg or "missingstateerror" in error_msg:
-            return RedirectResponse(url=f"{FRONTEND_URL}/?error=session_expired&message=Please try logging in again", status_code=302)
-        elif "token" in error_msg:
-            return RedirectResponse(url=f"{FRONTEND_URL}/?error=token_error&message=Authentication failed, please retry", status_code=302)
-        else:
-            return RedirectResponse(url=f"{FRONTEND_URL}/?error=login_failed&message=Login failed, please try again", status_code=302)
+        return RedirectResponse(url=f"{FRONTEND_URL}/?error=login_failed")
 
 
+async def _send_welcome_email(user: User):
+    """
+    Send welcome email to new user.
+    Runs asynchronously and doesn't block the OAuth flow.
+    
+    Args:
+        user: User object
+    """
+    try:
+        await email_service.send_welcome_email(
+            to_email=user.email,
+            user_name=user.name
+        )
+        logger.info(f"Welcome email sent to {user.email}")
+    except EmailServiceError as e:
+        # Log but don't fail the OAuth flow
+        logger.error(f"Failed to send welcome email to {user.email}: {e}")
+    except Exception as e:
+        # Catch all other errors to prevent breaking OAuth
+        logger.error(f"Unexpected error sending welcome email to {user.email}: {e}", exc_info=True)

app/routes/forms.py

@@ -14,7 +14,7 @@ from datetime import datetime
 
 from ..core.db import get_db
 from ..core.security import get_current_user
-from ..models import User, Form, FormQuestion, ConditionalRule, PublicForm, QuestionType, ConditionType, FormResponse as FormResponseModel, ResponseAnswer, ChatMessage as ChatMessageModel, FormUpload
+from ..models import User, Form, FormQuestion, ConditionalRule, PublicForm, QuestionType, ConditionType, FormResponse as FormResponseModel, ResponseAnswer, ChatMessage as ChatMessageModel, FormUpload, Subscription
 from ..schemas.form import (
     FormCreate, FormUpdate, FormResponse, FormGenerationResponse,
     QuestionCreate, QuestionUpdate, QuestionResponse,
@@ -24,9 +24,11 @@ from ..schemas.form import (
 )
 from ..services.form_creator import generate_form_spec, edit_form_spec, validate_question_type, validate_condition_type
 from ..services.credit_service import credit_service
+from ..services.email_service import email_service, EmailServiceError
 
 import logging
 import re
+import asyncio
 
 logger = logging.getLogger(__name__)
 
@@ -152,6 +154,18 @@ async def generate_form(
             db=db
         )
         
+        # Send feedback email asynchronously (non-blocking)
+        # Only send to users with paid plans (plan_id > 1)
+        form_count = db.query(Form).filter(Form.user_id == current_user.id).count()
+        task = asyncio.create_task(_send_feedback_email_if_eligible(
+            user_id=current_user.id,
+            user_email=current_user.email,
+            user_name=current_user.name,
+            form_count=form_count
+        ))
+        # Add done callback to log any exceptions
+        task.add_done_callback(lambda t: logger.error(f"Email task error: {t.exception()}") if t.exception() else None)
+        
         return FormGenerationResponse(
             form=FormResponse.model_validate(new_form),
             message="Form generated successfully"
@@ -1389,3 +1403,53 @@ async def chat_edit_form(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=f"Chat processing failed: {str(e)}"
         )
+
+
+async def _send_feedback_email_if_eligible(user_id: int, user_email: str, user_name: str, form_count: int):
+    """
+    Send feedback request email to eligible users (paid plans only).
+    Runs asynchronously and doesn't block the main request.
+    Creates its own database session to avoid session conflicts.
+    
+    Args:
+        user_id: User ID
+        user_email: User email address
+        user_name: User name
+        form_count: Number of forms the user has created
+    """
+    from ..core.db import SessionLocal
+    
+    # Create a new database session for this async task
+    db = SessionLocal()
+    
+    try:
+        # Get user's subscription
+        subscription = db.query(Subscription).filter(
+            Subscription.user_id == user_id
+        ).order_by(desc(Subscription.created_at)).first()
+        
+        # Only send to users with paid plans (plan_id > 1, as 1 is free tier)
+        if not subscription or not subscription.plan_id or subscription.plan_id <= 1:
+            logger.info(f"User {user_email} is on free tier (plan_id: {subscription.plan_id if subscription else 'None'}), skipping feedback email")
+            return
+        
+        logger.info(f"Attempting to send feedback email to {user_email} (plan_id: {subscription.plan_id})")
+        
+        # Send feedback request email
+        await email_service.send_feedback_request_email(
+            to_email=user_email,
+            user_name=user_name,
+            form_count=form_count
+        )
+        
+        logger.info(f"✅ Feedback email sent successfully to {user_email}")
+        
+    except EmailServiceError as e:
+        # Log but don't fail the request
+        logger.error(f"Failed to send feedback email to {user_email}: {e}")
+    except Exception as e:
+        # Catch all other errors to prevent breaking the main flow
+        logger.error(f"Unexpected error sending feedback email to {user_email}: {e}", exc_info=True)
+    finally:
+        # Always close the database session
+        db.close()

app/services/email_service.py

@@ -0,0 +1,277 @@
+"""
+Email service abstraction for sending transactional emails.
+Supports multiple email providers (Unosend, Resend, SendGrid, etc.)
+
+Architecture:
+- Strategy Pattern: BaseEmailProvider defines the interface
+- Factory Pattern: EmailService creates the appropriate provider
+- Dependency Injection: Providers can be injected for testing
+
+To add a new email provider:
+1. Create a class that inherits from BaseEmailProvider
+2. Implement the send_email() method
+3. Add the provider to _create_provider() in EmailService
+4. Set EMAIL_PROVIDER environment variable
+
+Example:
+    from app.services.email_service import email_service
+    
+    email_service.send_feedback_request_email(
+        to_email="user@example.com",
+        user_name="John Doe"
+    )
+"""
+import os
+import logging
+import asyncio
+from abc import ABC, abstractmethod
+from typing import Optional
+from pathlib import Path
+from concurrent.futures import ThreadPoolExecutor
+import httpx
+from jinja2 import Environment, FileSystemLoader, select_autoescape
+from unosend import Unosend
+
+logger = logging.getLogger(__name__)
+
+# Thread pool for running sync Unosend client in async context
+_executor = ThreadPoolExecutor(max_workers=3)
+
+
+class EmailServiceError(Exception):
+    """Base exception for email service errors"""
+    pass
+
+
+class BaseEmailProvider(ABC):
+    """Abstract base class for email providers"""
+    
+    @abstractmethod
+    async def send_email(
+        self,
+        to: str,
+        subject: str,
+        html_content: str,
+        from_email: Optional[str] = None
+    ) -> None:
+        """
+        Send an email asynchronously
+        
+        Args:
+            to: Recipient email address
+            subject: Email subject
+            html_content: HTML content of the email
+            from_email: Sender email (defaults to configured from_email)
+        
+        Raises:
+            EmailServiceError: If email sending fails
+        """
+        pass
+
+
+class UnosendEmailProvider(BaseEmailProvider):
+    """Unosend email provider implementation using official SDK"""
+    
+    def __init__(self, api_key: str, from_email: str):
+        """
+        Initialize Unosend provider
+        
+        Args:
+            api_key: Unosend API key
+            from_email: Default sender email address
+        """
+        self.api_key = api_key
+        self.from_email = from_email
+        self.client = None
+        
+        if not self.api_key:
+            logger.warning("UNOSEND_API_KEY not set - email sending will be disabled")
+        else:
+            self.client = Unosend(api_key=api_key)
+    
+    async def send_email(
+        self,
+        to: str,
+        subject: str,
+        html_content: str,
+        from_email: Optional[str] = None
+    ) -> None:
+        """Send an email using Unosend SDK (runs sync client in thread pool)"""
+        if not self.api_key or not self.client:
+            error_msg = "Cannot send email: UNOSEND_API_KEY not configured"
+            logger.error(error_msg)
+            raise EmailServiceError(error_msg)
+        
+        from_addr = from_email or self.from_email
+        
+        try:
+            # Run synchronous Unosend client in thread pool to avoid blocking
+            loop = asyncio.get_event_loop()
+            response = await loop.run_in_executor(
+                _executor,
+                lambda: self.client.emails.send(
+                    from_address=from_addr,
+                    to=to,
+                    subject=subject,
+                    html=html_content
+                )
+            )
+            
+            # Check response status
+            if hasattr(response, 'status_code') and response.status_code >= 400:
+                error_msg = f"Unosend API error (status {response.status_code})"
+                if hasattr(response, 'data'):
+                    error_msg += f": {response.data}"
+                logger.error(error_msg)
+                raise EmailServiceError(error_msg)
+            
+            logger.info(f"Email sent successfully to {to}")
+            return
+                    
+        except Exception as e:
+            error_msg = f"Error sending email to {to}: {str(e)}"
+            logger.error(error_msg, exc_info=True)
+            raise EmailServiceError(error_msg)
+
+
+class EmailService:
+    """
+    Email service abstraction layer.
+    Provides a consistent interface regardless of the underlying provider.
+    Uses Jinja2 templates for email content.
+    """
+    
+    def __init__(self, provider: Optional[BaseEmailProvider] = None):
+        """
+        Initialize email service with a provider.
+        If no provider is specified, uses the provider from EMAIL_PROVIDER env var.
+        
+        Args:
+            provider: Email provider instance (optional, defaults to configured provider)
+        """
+        if provider:
+            self.provider = provider
+        else:
+            self.provider = self._create_provider()
+        
+        # Initialize Jinja2 template environment
+        template_dir = Path(__file__).parent.parent / "templates" / "emails"
+        self.template_env = Environment(
+            loader=FileSystemLoader(str(template_dir)),
+            autoescape=select_autoescape(['html', 'xml'])
+        )
+    
+    def _create_provider(self) -> BaseEmailProvider:
+        """
+        Create email provider based on EMAIL_PROVIDER configuration.
+        Defaults to 'unosend' if not specified.
+        """
+        provider_name = os.getenv('EMAIL_PROVIDER', 'unosend').lower()
+        
+        if provider_name == 'unosend':
+            return UnosendEmailProvider(
+                api_key=os.getenv('UNOSEND_API_KEY'),
+                from_email=os.getenv('EMAIL_FROM_ADDRESS', 'noreply@autoform.ink')
+            )
+        # Add more providers here as needed:
+        # elif provider_name == 'resend':
+        #     return ResendEmailProvider(...)
+        # elif provider_name == 'sendgrid':
+        #     return SendGridEmailProvider(...)
+        else:
+            raise ValueError(
+                f"Unknown email provider: {provider_name}. "
+                f"Supported providers: unosend"
+            )
+    
+    def _render_template(self, template_name: str, **context) -> str:
+        """
+        Render an email template with the given context
+        
+        Args:
+            template_name: Name of the template file (e.g., 'feedback_request.html')
+            **context: Template variables
+        
+        Returns:
+            Rendered HTML string
+        """
+        try:
+            template = self.template_env.get_template(template_name)
+            return template.render(**context)
+        except Exception as e:
+            logger.error(f"Failed to render template {template_name}: {e}")
+            raise EmailServiceError(f"Template rendering failed: {str(e)}")
+    
+    async def send_feedback_request_email(
+        self,
+        to_email: str,
+        user_name: Optional[str] = None,
+        form_count: int = 0
+    ) -> None:
+        """
+        Send a feedback request email to a user who signed up or submitted a form
+        
+        Args:
+            to_email: Email address of the user
+            user_name: Name of the user (optional)
+            form_count: Number of forms the user has created
+        
+        Raises:
+            EmailServiceError: If email sending fails
+        """
+        # Render template with context
+        html_content = self._render_template(
+            'feedback_request.html',
+            user_name=user_name or 'there',
+            form_count=form_count,
+            app_name='AutoForm',
+            support_email=os.getenv('SUPPORT_EMAIL', os.getenv('EMAIL_FROM_ADDRESS', 'support@autoform.ink')),
+            frontend_url=os.getenv('FRONTEND_URL', 'http://localhost:5173')
+        )
+        
+        subject = "Quick question about your AutoForm experience"
+        
+        await self.provider.send_email(
+            to=to_email,
+            subject=subject,
+            html_content=html_content
+        )
+        
+        logger.info(f"Feedback request email sent to {to_email}")
+    
+    async def send_welcome_email(
+        self,
+        to_email: str,
+        user_name: Optional[str] = None
+    ) -> None:
+        """
+        Send a welcome email to a new user
+        
+        Args:
+            to_email: Email address of the user
+            user_name: Name of the user (optional)
+        
+        Raises:
+            EmailServiceError: If email sending fails
+        """
+        html_content = self._render_template(
+            'welcome.html',
+            user_name=user_name or 'there',
+            app_name='AutoForm',
+            frontend_url=os.getenv('FRONTEND_URL', 'http://localhost:5173')
+        )
+        
+        subject = "Welcome to AutoForm!"
+        
+        await self.provider.send_email(
+            to=to_email,
+            subject=subject,
+            html_content=html_content
+        )
+        
+        logger.info(f"Welcome email sent to {to_email}")
+
+
+# Global email service instance
+# Uses the provider specified in EMAIL_PROVIDER env var (defaults to 'unosend')
+email_service = EmailService()

app/templates/emails/feedback_request.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+</head>
+<body>
+<p>Hi {{ user_name or 'there' }},</p>
+
+<p>I noticed you just created a form with AutoForm. I wanted to check in and see how things are going.</p>
+
+<p>How was your experience? Is there anything we could improve? Any features you'd like to see?</p>
+
+<p>Just reply to this email with your thoughts - I read every response and your feedback directly shapes what we build next.</p>
+
+<p>Best,<br>
+Arslan</p>
+</body>
+</html>

app/templates/emails/welcome.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+</head>
+<body>
+<p>Hi {{ user_name or 'there' }},</p>
+
+<p>My name is Arslan and I am the Dev Lead at AutoForm. Thank you for signing up. I wanted to reach out to introduce myself and solicit any feedback good or bad.</p>
+
+<p>We're committed to building the best form building experience, and rely on users like you to let us know how things are going.</p>
+
+<p>Thanks for choosing AutoForm, and looking forward to helping!</p>
+
+<p>Best,<br>
+Arslan</p>
+</body>
+</html>

env.example

@@ -0,0 +1,118 @@
+# ============================================
+# AutoForm Backend Environment Configuration
+# ============================================
+# Copy this file to .env and fill in your actual values
+# DO NOT commit .env to version control!
+
+# ============================================
+# Database Configuration
+# ============================================
+# SQLite (for development)
+DATABASE_URL=sqlite:///./app.db
+
+# PostgreSQL (for production)
+# DATABASE_URL=postgresql://user:password@localhost:5432/autoform
+
+
+# ============================================
+# AI Model Configuration (Required)
+# ============================================
+# Choose ONE of the following providers
+
+# OpenAI
+DEFAULT_MODEL=gpt-4o-mini
+OPENAI_API_KEY=your_openai_api_key_here
+
+# Anthropic (Claude)
+# DEFAULT_MODEL=anthropic/claude-3-5-sonnet-20241022
+# ANTHROPIC_API_KEY=your_anthropic_api_key_here
+
+# Google (Gemini)
+# DEFAULT_MODEL=gemini/gemini-1.5-flash
+# GEMINI_API_KEY=your_gemini_api_key_here
+
+
+# ============================================
+# Frontend URL
+# ============================================
+FRONTEND_URL=http://localhost:5173
+
+
+# ============================================
+# Google OAuth (Required for Authentication)
+# ============================================
+GOOGLE_CLIENT_ID=your_google_client_id_here
+GOOGLE_CLIENT_SECRET=your_google_client_secret_here
+GOOGLE_REDIRECT_URI=http://localhost:8000/api/auth/google/callback
+
+
+# ============================================
+# Session Configuration
+# ============================================
+SESSION_SECRET=change-this-to-a-random-secret-key
+SESSION_HTTPS_ONLY=0
+
+
+# ============================================
+# Stripe Payment Configuration (Optional)
+# ============================================
+STRIPE_SECRET_KEY=sk_test_your_stripe_secret_key
+STRIPE_WEBHOOK_SECRET=whsec_your_webhook_secret
+
+# Stripe Product IDs
+STRIPE_FREE_PRODUCT_ID=prod_free
+STRIPE_PRO_PRODUCT_ID=prod_pro
+STRIPE_ULTRA_PRODUCT_ID=prod_ultra
+
+# Stripe Price IDs - Monthly
+STRIPE_FREE_PRICE_MONTHLY_ID=price_free_monthly
+STRIPE_PRO_PRICE_MONTHLY_ID=price_pro_monthly
+STRIPE_ULTRA_PRICE_MONTHLY_ID=price_ultra_monthly
+
+# Stripe Price IDs - Yearly
+STRIPE_FREE_PRICE_YEARLY_ID=price_free_yearly
+STRIPE_PRO_PRICE_YEARLY_ID=price_pro_yearly
+STRIPE_ULTRA_PRICE_YEARLY_ID=price_ultra_yearly
+
+
+# ============================================
+# Email Service Configuration (Optional)
+# ============================================
+EMAIL_PROVIDER=unosend
+UNOSEND_API_KEY=your_unosend_api_key_here
+EMAIL_FROM_ADDRESS=noreply@autoform.ink
+SUPPORT_EMAIL=support@autoform.ink
+
+
+# ============================================
+# AWS S3 Configuration (Optional - for file uploads)
+# ============================================
+AWS_ACCESS_KEY_ID=your_aws_access_key
+AWS_SECRET_ACCESS_KEY=your_aws_secret_key
+AWS_REGION=us-east-1
+S3_BUCKET_NAME=your-bucket-name
+S3_PREFIX=autoform/dev
+APP_ENV=dev
+
+
+# ============================================
+# Database Migration
+# ============================================
+# Set to 0 to disable automatic database migrations on startup
+AUTO_MIGRATE=1
+
+
+# ============================================
+# Notes
+# ============================================
+# Required for basic functionality:
+# - DATABASE_URL (or leave as SQLite for dev)
+# - DEFAULT_MODEL + corresponding API key (OPENAI_API_KEY, ANTHROPIC_API_KEY, or GEMINI_API_KEY)
+# - GOOGLE_CLIENT_ID + GOOGLE_CLIENT_SECRET (for OAuth login)
+# - SESSION_SECRET (change from default!)
+# - FRONTEND_URL
+
+# Optional features:
+# - Stripe keys (for payments)
+# - Unosend keys (for emails)
+# - AWS S3 keys (for file uploads/OG images)

requirements.txt

@@ -31,4 +31,6 @@ reportlab==4.0.7
 geoip2==4.8.0
 httpx==0.27.0
 Pillow==10.4.0
+Jinja2==3.1.6
+unosend==1.0.0