karaoke-gen 0.96.0__py3-none-any.whl → 0.101.0__py3-none-any.whl

backend/services/email_service.py

@@ -14,7 +14,9 @@ import html
 import logging
 import os
 from abc import ABC, abstractmethod
+from datetime import datetime, timedelta, timezone
 from typing import Optional, List
+from zoneinfo import ZoneInfo
 
 from backend.config import get_settings
 from karaoke_gen.utils import sanitize_filename
@@ -34,8 +36,21 @@ class EmailProvider(ABC):
         html_content: str,
         text_content: Optional[str] = None,
         cc_emails: Optional[List[str]] = None,
+        bcc_emails: Optional[List[str]] = None,
+        from_email_override: Optional[str] = None,
     ) -> bool:
-        """Send an email. Returns True if successful."""
+        """
+        Send an email. Returns True if successful.
+
+        Args:
+            to_email: Recipient email address
+            subject: Email subject
+            html_content: HTML content
+            text_content: Plain text content (optional)
+            cc_emails: CC recipients (optional)
+            bcc_emails: BCC recipients (optional)
+            from_email_override: Override the default sender email (optional, for multi-tenant)
+        """
         pass
 
 
@@ -53,11 +68,17 @@ class ConsoleEmailProvider(EmailProvider):
         html_content: str,
         text_content: Optional[str] = None,
         cc_emails: Optional[List[str]] = None,
+        bcc_emails: Optional[List[str]] = None,
+        from_email_override: Optional[str] = None,
     ) -> bool:
         logger.info("=" * 60)
+        if from_email_override:
+            logger.info(f"FROM: {from_email_override}")
         logger.info(f"EMAIL TO: {to_email}")
         if cc_emails:
             logger.info(f"CC: {', '.join(cc_emails)}")
+        if bcc_emails:
+            logger.info(f"BCC: {', '.join(bcc_emails)}")
         logger.info(f"SUBJECT: {subject}")
         logger.info("-" * 60)
         logger.info(text_content or html_content)
@@ -85,6 +106,8 @@ class PreviewEmailProvider(EmailProvider):
         html_content: str,
         text_content: Optional[str] = None,
         cc_emails: Optional[List[str]] = None,
+        bcc_emails: Optional[List[str]] = None,
+        from_email_override: Optional[str] = None,
     ) -> bool:
         self.last_to_email = to_email
         self.last_subject = subject
@@ -115,16 +138,21 @@ class SendGridEmailProvider(EmailProvider):
         html_content: str,
         text_content: Optional[str] = None,
         cc_emails: Optional[List[str]] = None,
+        bcc_emails: Optional[List[str]] = None,
+        from_email_override: Optional[str] = None,
     ) -> bool:
         try:
             # Import here to avoid requiring sendgrid in all environments
             from sendgrid import SendGridAPIClient
-            from sendgrid.helpers.mail import Mail, Email, To, Content, Cc
+            from sendgrid.helpers.mail import Mail, Email, To, Content, Cc, Bcc
 
             sg = SendGridAPIClient(api_key=self.api_key)
 
+            # Use override sender if provided (for multi-tenant)
+            sender_email = from_email_override or self.from_email
+
             message = Mail(
-                from_email=Email(self.from_email, self.from_name),
+                from_email=Email(sender_email, self.from_name),
                 to_emails=To(to_email),
                 subject=subject,
                 html_content=Content("text/html", html_content)
@@ -144,6 +172,19 @@ class SendGridEmailProvider(EmailProvider):
                 for cc_email in unique_cc_emails:
                     message.add_cc(Cc(cc_email))
 
+            # Add BCC recipients if provided (deduplicated and normalized)
+            if bcc_emails:
+                seen = set()
+                unique_bcc_emails = []
+                for bcc_email in bcc_emails:
+                    normalized = bcc_email.strip().lower()
+                    if normalized and normalized not in seen:
+                        seen.add(normalized)
+                        unique_bcc_emails.append(bcc_email.strip())
+
+                for bcc_email in unique_bcc_emails:
+                    message.add_bcc(Bcc(bcc_email))
+
             if text_content:
                 message.add_content(Content("text/plain", text_content))
 
@@ -151,7 +192,8 @@ class SendGridEmailProvider(EmailProvider):
 
             if response.status_code >= 200 and response.status_code < 300:
                 cc_info = f" (CC: {', '.join(cc_emails)})" if cc_emails else ""
-                logger.info(f"Email sent to {to_email}{cc_info} via SendGrid")
+                bcc_info = f" (BCC: {', '.join(bcc_emails)})" if bcc_emails else ""
+                logger.info(f"Email sent to {to_email}{cc_info}{bcc_info} via SendGrid")
                 return True
             else:
                 logger.error(f"SendGrid returned status {response.status_code}")
@@ -200,13 +242,19 @@ class EmailService:
         """Check if a real email provider is configured (not just console logging)."""
         return isinstance(self.provider, SendGridEmailProvider)
 
-    def send_magic_link(self, email: str, token: str) -> bool:
+    def send_magic_link(
+        self,
+        email: str,
+        token: str,
+        sender_email: Optional[str] = None,
+    ) -> bool:
         """
         Send a magic link email for authentication.
 
         Args:
             email: User's email address
             token: Magic link token
+            sender_email: Override sender email address (for multi-tenant)
 
         Returns:
             True if email was sent successfully
@@ -264,7 +312,9 @@ If you didn't request this email, you can safely ignore it.
 © {self._get_year()} Nomad Karaoke
 """
 
-        return self.provider.send_email(email, subject, html_content, text_content)
+        return self.provider.send_email(
+            email, subject, html_content, text_content, from_email_override=sender_email
+        )
 
     def send_credits_added(self, email: str, credits: int, total_credits: int) -> bool:
         """
@@ -1017,6 +1067,7 @@ Thanks for being part of making Nomad Karaoke better!
             html_content=html_content,
             text_content=message_content,
             cc_emails=cc_emails,
+            bcc_emails=["done@nomadkaraoke.com"],
         )
 
     def send_action_reminder(
@@ -1080,6 +1131,202 @@ Thanks for being part of making Nomad Karaoke better!
             text_content=message_content,
         )
 
+    def send_made_for_you_order_confirmation(
+        self,
+        to_email: str,
+        artist: str,
+        title: str,
+        job_id: str,
+        notes: Optional[str] = None,
+    ) -> bool:
+        """
+        Send order confirmation email to customer for made-for-you orders.
+
+        Args:
+            to_email: Customer's email address
+            artist: Artist name
+            title: Song title
+            job_id: Order/job ID for reference
+            notes: Optional customer notes
+
+        Returns:
+            True if email was sent successfully
+        """
+        subject = f"Order Confirmed: {artist} - {title} | Nomad Karaoke"
+
+        extra_styles = """
+        .order-details {
+            background-color: #f8fafc;
+            border-radius: 8px;
+            padding: 20px;
+            margin: 20px 0;
+        }
+        .order-details h3 {
+            margin-top: 0;
+            color: #1e293b;
+        }
+        .order-details p {
+            margin: 8px 0;
+            color: #475569;
+        }
+        .highlight {
+            color: #059669;
+            font-weight: bold;
+        }
+"""
+
+        notes_html = ""
+        notes_text = ""
+        if notes:
+            notes_html = f"<p><strong>Your Notes:</strong> {html.escape(notes)}</p>"
+            notes_text = f"\nYour Notes: {notes}"
+
+        content = f"""
+    <h2>Thank You for Your Order!</h2>
+
+    <div class="order-details">
+        <h3>Order Details</h3>
+        <p><strong>Order ID:</strong> {html.escape(job_id)}</p>
+        <p><strong>Artist:</strong> {html.escape(artist)}</p>
+        <p><strong>Title:</strong> {html.escape(title)}</p>
+        {notes_html}
+    </div>
+
+    <p>Our team will create your custom karaoke video within <span class="highlight">24 hours</span>.</p>
+
+    <p>You'll receive an email with download links as soon as your video is ready.</p>
+
+    <p><strong>No action needed</strong> - sit back and we'll take care of everything!</p>
+"""
+
+        text_content = f"""Thank You for Your Order!
+
+Order Details:
+Order ID: {job_id}
+Artist: {artist}
+Title: {title}{notes_text}
+
+Our team will create your custom karaoke video within 24 hours.
+
+You'll receive an email with download links as soon as your video is ready.
+
+No action needed - sit back and we'll take care of everything!
+"""
+
+        html_content = self._build_email_html(content, extra_styles)
+
+        return self.provider.send_email(
+            to_email=to_email,
+            subject=subject,
+            html_content=html_content,
+            text_content=text_content,
+            bcc_emails=["done@nomadkaraoke.com"],
+        )
+
+    def send_made_for_you_admin_notification(
+        self,
+        to_email: str,
+        customer_email: str,
+        artist: str,
+        title: str,
+        job_id: str,
+        admin_login_token: str,
+        notes: Optional[str] = None,
+        audio_source_count: int = 0,
+    ) -> bool:
+        """
+        Send notification email to admin for new made-for-you orders.
+
+        Args:
+            to_email: Admin email address
+            customer_email: Customer's email address
+            artist: Artist name
+            title: Song title
+            job_id: Job ID for reference
+            admin_login_token: Token for one-click admin login
+            notes: Optional customer notes
+            audio_source_count: Number of audio sources found
+
+        Returns:
+            True if email was sent successfully
+        """
+        subject = f"Karaoke Order: {artist} - {title} [ID: {job_id}]"
+
+        extra_styles = """
+        .order-info {
+            background-color: #f8fafc;
+            border-radius: 8px;
+            padding: 20px;
+            margin: 20px 0;
+        }
+        .order-info p {
+            margin: 8px 0;
+        }
+        .action-button {
+            display: inline-block;
+            background-color: #2563eb;
+            color: white !important;
+            padding: 12px 24px;
+            border-radius: 6px;
+            text-decoration: none;
+            font-weight: bold;
+            margin-top: 16px;
+        }
+"""
+
+        notes_html = ""
+        notes_text = ""
+        if notes:
+            notes_html = f"<p><strong>Customer Notes:</strong> {html.escape(notes)}</p>"
+            notes_text = f"\nCustomer Notes: {notes}"
+
+        # Calculate deadline (24 hours from now, converted to Eastern Time)
+        deadline_utc = datetime.now(timezone.utc) + timedelta(hours=24)
+        eastern_tz = ZoneInfo("America/New_York")
+        deadline_eastern = deadline_utc.astimezone(eastern_tz)
+        # Use "ET" (Eastern Time) to be correct for both EST and EDT
+        deadline_str = deadline_eastern.strftime("%B %d, %Y at %I:%M %p") + " ET"
+
+        # Link to /app/ with admin login token for one-click access
+        app_url = f"{self.frontend_url.rstrip('/')}/app/?admin_token={admin_login_token}"
+
+        content = f"""
+    <div class="order-info">
+        <p><strong>Order / Job ID:</strong> {html.escape(job_id)}</p>
+        <p><strong>Customer:</strong> {html.escape(customer_email)}</p>
+        <p><strong>Artist:</strong> {html.escape(artist)}</p>
+        <p><strong>Title:</strong> {html.escape(title)}</p>
+        <p><strong>Audio Sources Found:</strong> {audio_source_count}</p>
+        {notes_html}
+        <p><strong>Deliver By:</strong> {deadline_str}</p>
+        <p style="margin-top: 16px;"><strong>Action Required:</strong> Select an audio source to start processing.</p>
+        <a href="{app_url}" class="action-button">Open Job</a>
+    </div>
+"""
+
+        text_content = f"""New Karaoke Order
+
+Order / Job ID: {job_id}
+Customer: {customer_email}
+Artist: {artist}
+Title: {title}
+Audio Sources Found: {audio_source_count}{notes_text}
+Deliver By: {deadline_str}
+
+Action Required: Select an audio source to start processing.
+
+Open Job: {app_url}
+"""
+
+        html_content = self._build_email_html(content, extra_styles)
+
+        return self.provider.send_email(
+            to_email=to_email,
+            subject=subject,
+            html_content=html_content,
+            text_content=text_content,
+        )
+
 
 # Global instance
 _email_service = None

backend/services/encoding_service.py

@@ -25,6 +25,11 @@ from backend.config import get_settings
 
 logger = logging.getLogger(__name__)
 
+# Retry configuration for handling transient failures (e.g., worker restarts)
+MAX_RETRIES = 3
+INITIAL_BACKOFF_SECONDS = 2.0
+MAX_BACKOFF_SECONDS = 10.0
+
 
 class EncodingService:
     """Service for dispatching encoding jobs to GCE worker."""
@@ -68,6 +73,81 @@ class EncodingService:
         """Check if GCE preview encoding is enabled and configured."""
         return self.settings.use_gce_preview_encoding and self.is_configured
 
+    async def _request_with_retry(
+        self,
+        method: str,
+        url: str,
+        headers: Dict[str, str],
+        json_payload: Optional[Dict[str, Any]] = None,
+        timeout: float = 30.0,
+        job_id: str = "unknown",
+    ) -> Dict[str, Any]:
+        """
+        Make an HTTP request with retry logic for transient failures.
+
+        This handles connection errors that occur when the GCE worker is
+        restarting (e.g., during deployments) by retrying with exponential backoff.
+
+        Args:
+            method: HTTP method (GET, POST)
+            url: Request URL
+            headers: Request headers
+            json_payload: JSON body for POST requests
+            timeout: Request timeout in seconds
+            job_id: Job ID for logging
+
+        Returns:
+            Dict with keys:
+                - status (int): HTTP status code
+                - json (Any): Parsed JSON response body (if status 200, else None)
+                - text (str): Raw response text (if status != 200, else None)
+
+        Raises:
+            aiohttp.ClientConnectorError: If all retries fail due to connection errors
+            aiohttp.ServerDisconnectedError: If all retries fail due to server disconnect
+            asyncio.TimeoutError: If all retries fail due to timeout
+        """
+        last_exception = None
+        backoff = INITIAL_BACKOFF_SECONDS
+
+        for attempt in range(MAX_RETRIES + 1):
+            try:
+                async with aiohttp.ClientSession() as session:
+                    if method.upper() == "POST":
+                        async with session.post(
+                            url, json=json_payload, headers=headers, timeout=timeout
+                        ) as resp:
+                            # Return a copy of the response data since we exit the context
+                            return {
+                                "status": resp.status,
+                                "json": await resp.json() if resp.status == 200 else None,
+                                "text": await resp.text() if resp.status != 200 else None,
+                            }
+                    else:  # GET
+                        async with session.get(
+                            url, headers=headers, timeout=timeout
+                        ) as resp:
+                            return {
+                                "status": resp.status,
+                                "json": await resp.json() if resp.status == 200 else None,
+                                "text": await resp.text() if resp.status != 200 else None,
+                            }
+            except (aiohttp.ClientConnectorError, aiohttp.ServerDisconnectedError, asyncio.TimeoutError) as e:
+                last_exception = e
+                if attempt < MAX_RETRIES:
+                    logger.warning(
+                        f"[job:{job_id}] GCE worker connection failed (attempt {attempt + 1}/{MAX_RETRIES + 1}): {e}. "
+                        f"Retrying in {backoff:.1f}s..."
+                    )
+                    await asyncio.sleep(backoff)
+                    backoff = min(backoff * 2, MAX_BACKOFF_SECONDS)
+                else:
+                    logger.error(
+                        f"[job:{job_id}] GCE worker connection failed after {MAX_RETRIES + 1} attempts: {e}"
+                    )
+
+        raise last_exception
+
     async def submit_encoding_job(
         self,
         job_id: str,
@@ -106,17 +186,23 @@ class EncodingService:
 
         logger.info(f"[job:{job_id}] Submitting encoding job to GCE worker: {url}")
 
-        async with aiohttp.ClientSession() as session:
-            async with session.post(url, json=payload, headers=headers, timeout=30) as resp:
-                if resp.status == 401:
-                    raise RuntimeError("Invalid API key for encoding worker")
-                if resp.status == 409:
-                    raise RuntimeError(f"Encoding job {job_id} already exists")
-                if resp.status != 200:
-                    text = await resp.text()
-                    raise RuntimeError(f"Failed to submit encoding job: {resp.status} - {text}")
+        resp = await self._request_with_retry(
+            method="POST",
+            url=url,
+            headers=headers,
+            json_payload=payload,
+            timeout=30.0,
+            job_id=job_id,
+        )
+
+        if resp["status"] == 401:
+            raise RuntimeError("Invalid API key for encoding worker")
+        if resp["status"] == 409:
+            raise RuntimeError(f"Encoding job {job_id} already exists")
+        if resp["status"] != 200:
+            raise RuntimeError(f"Failed to submit encoding job: {resp['status']} - {resp['text']}")
 
-                return await resp.json()
+        return resp["json"]
 
     async def get_job_status(self, job_id: str) -> Dict[str, Any]:
         """
@@ -136,17 +222,22 @@ class EncodingService:
         url = f"{self._url}/status/{job_id}"
         headers = {"X-API-Key": self._api_key}
 
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url, headers=headers, timeout=30) as resp:
-                if resp.status == 401:
-                    raise RuntimeError("Invalid API key for encoding worker")
-                if resp.status == 404:
-                    raise RuntimeError(f"Encoding job {job_id} not found")
-                if resp.status != 200:
-                    text = await resp.text()
-                    raise RuntimeError(f"Failed to get job status: {resp.status} - {text}")
+        resp = await self._request_with_retry(
+            method="GET",
+            url=url,
+            headers=headers,
+            timeout=30.0,
+            job_id=job_id,
+        )
 
-                return await resp.json()
+        if resp["status"] == 401:
+            raise RuntimeError("Invalid API key for encoding worker")
+        if resp["status"] == 404:
+            raise RuntimeError(f"Encoding job {job_id} not found")
+        if resp["status"] != 200:
+            raise RuntimeError(f"Failed to get job status: {resp['status']} - {resp['text']}")
+
+        return resp["json"]
 
     async def wait_for_completion(
         self,
@@ -296,17 +387,23 @@ class EncodingService:
 
         logger.info(f"[job:{job_id}] Submitting preview encoding job to GCE worker: {url}")
 
-        async with aiohttp.ClientSession() as session:
-            async with session.post(url, json=payload, headers=headers, timeout=30) as resp:
-                if resp.status == 401:
-                    raise RuntimeError("Invalid API key for encoding worker")
-                if resp.status == 409:
-                    raise RuntimeError(f"Preview encoding job {job_id} already exists")
-                if resp.status != 200:
-                    text = await resp.text()
-                    raise RuntimeError(f"Failed to submit preview encoding job: {resp.status} - {text}")
-
-                return await resp.json()
+        resp = await self._request_with_retry(
+            method="POST",
+            url=url,
+            headers=headers,
+            json_payload=payload,
+            timeout=30.0,
+            job_id=job_id,
+        )
+
+        if resp["status"] == 401:
+            raise RuntimeError("Invalid API key for encoding worker")
+        if resp["status"] == 409:
+            raise RuntimeError(f"Preview encoding job {job_id} already exists")
+        if resp["status"] != 200:
+            raise RuntimeError(f"Failed to submit preview encoding job: {resp['status']} - {resp['text']}")
+
+        return resp["json"]
 
     async def encode_preview_video(
         self,

backend/services/firestore_service.py

@@ -116,6 +116,7 @@ class FirestoreService:
         created_after: Optional[datetime] = None,
         created_before: Optional[datetime] = None,
         user_email: Optional[str] = None,
+        tenant_id: Optional[str] = None,
         limit: int = 100
     ) -> List[Job]:
         """
@@ -128,6 +129,7 @@ class FirestoreService:
             created_after: Filter jobs created after this datetime
             created_before: Filter jobs created before this datetime
             user_email: Filter by user_email (owner of the job)
+            tenant_id: Filter by tenant_id (white-label portal scoping)
             limit: Maximum number of jobs to return
 
         Returns:
@@ -150,6 +152,10 @@ class FirestoreService:
             if user_email:
                 query = query.where(filter=FieldFilter('user_email', '==', user_email.lower()))
 
+            # Filter by tenant_id (white-label portal scoping)
+            if tenant_id:
+                query = query.where(filter=FieldFilter('tenant_id', '==', tenant_id))
+
             # Date range filters
             if created_after:
                 query = query.where(filter=FieldFilter('created_at', '>=', created_after))

backend/services/job_manager.py

@@ -23,6 +23,16 @@ from backend.services.storage_service import StorageService
 logger = logging.getLogger(__name__)
 
 
+def _mask_email(email: str) -> str:
+    """Mask email for logging to protect PII. Shows first char + domain."""
+    if not email or "@" not in email:
+        return "***"
+    local, domain = email.split("@", 1)
+    if len(local) <= 1:
+        return f"*@{domain}"
+    return f"{local[0]}***@{domain}"
+
+
 class JobManager:
     """Manager for job lifecycle and state."""
     
@@ -34,10 +44,21 @@ class JobManager:
     def create_job(self, job_create: JobCreate) -> Job:
         """
         Create a new job with initial state PENDING.
-        
+
         Jobs start in PENDING state and transition to DOWNLOADING
         when a worker picks them up.
+
+        Raises:
+            ValueError: If theme_id is not provided (all jobs require a theme)
         """
+        # Enforce theme requirement - all jobs must have a theme
+        # This prevents unstyled videos from ever being generated
+        if not job_create.theme_id:
+            raise ValueError(
+                "theme_id is required for all jobs. "
+                "Use get_theme_service().get_default_theme_id() to get the default theme."
+            )
+
         job_id = str(uuid.uuid4())[:8]
         
         now = datetime.utcnow()
@@ -74,6 +95,12 @@ class JobManager:
             keep_brand_code=job_create.keep_brand_code,
             # Request metadata (for tracking and filtering)
             request_metadata=job_create.request_metadata,
+            # Tenant scoping
+            tenant_id=job_create.tenant_id,
+            # Made-for-you order fields
+            made_for_you=job_create.made_for_you,
+            customer_email=job_create.customer_email,
+            customer_notes=job_create.customer_notes,
         )
         
         self.firestore.create_job(job)
@@ -114,6 +141,7 @@ class JobManager:
         created_after: Optional[datetime] = None,
         created_before: Optional[datetime] = None,
         user_email: Optional[str] = None,
+        tenant_id: Optional[str] = None,
         limit: int = 100
     ) -> List[Job]:
         """
@@ -126,6 +154,7 @@ class JobManager:
             created_after: Filter jobs created after this datetime
             created_before: Filter jobs created before this datetime
             user_email: Filter by user_email (job owner)
+            tenant_id: Filter by tenant_id (white-label portal scoping)
             limit: Maximum number of jobs to return
 
         Returns:
@@ -138,6 +167,7 @@ class JobManager:
             created_after=created_after,
             created_before=created_before,
             user_email=user_email,
+            tenant_id=tenant_id,
             limit=limit
         )
     
@@ -402,6 +432,7 @@ class JobManager:
         """
         Schedule sending a job completion email.
 
+        For made-for-you orders, also transfers ownership from admin to customer.
         Uses asyncio to fire-and-forget the email sending.
         """
         import asyncio
@@ -418,11 +449,22 @@ class JobManager:
             dropbox_url = state_data.get('dropbox_link')
             brand_code = state_data.get('brand_code')
 
+            # For made-for-you orders, send to customer and transfer ownership
+            recipient_email = job.user_email
+            if job.made_for_you and job.customer_email:
+                recipient_email = job.customer_email
+                # Transfer ownership from admin to customer (non-blocking - email still goes out if this fails)
+                try:
+                    self.update_job(job.job_id, {'user_email': job.customer_email})
+                    logger.info(f"Transferred ownership of made-for-you job {job.job_id} to {_mask_email(job.customer_email)}")
+                except Exception as e:
+                    logger.error(f"Failed to transfer ownership for job {job.job_id}: {e}")
+
             # Create async task (fire-and-forget)
             async def send_email():
                 await notification_service.send_job_completion_email(
                     job_id=job.job_id,
-                    user_email=job.user_email,
+                    user_email=recipient_email,
                     user_name=None,  # Could fetch from user service if needed
                     artist=job.artist,
                     title=job.title,