karaoke-gen 0.99.3__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/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."""
     
@@ -85,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)
@@ -125,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]:
         """
@@ -137,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:
@@ -149,6 +167,7 @@ class JobManager:
             created_after=created_after,
             created_before=created_before,
             user_email=user_email,
+            tenant_id=tenant_id,
             limit=limit
         )
     
@@ -413,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
@@ -429,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,

backend/services/stripe_service.py

@@ -46,11 +46,12 @@ CREDIT_PACKAGES = {
     },
 }
 
-# Done-for-you service package (not a credit package - creates a job directly)
-DONE_FOR_YOU_PACKAGE = {
+# Made-for-you service package (not a credit package - creates a job directly)
+MADE_FOR_YOU_PACKAGE = {
     "price_cents": 1500,  # $15.00
-    "name": "Done For You Karaoke Video",
-    "description": "Full-service karaoke video creation with 24-hour delivery",
+    "name": "Made For You Karaoke Video",
+    "description": "Professional 4K karaoke video with perfectly synced lyrics, delivered to your email within 24 hours",
+    "images": ["https://gen.nomadkaraoke.com/nomad-logo.png"],
 }
 
 
@@ -65,6 +66,10 @@ class StripeService:
         self.frontend_url = os.getenv("FRONTEND_URL", "https://gen.nomadkaraoke.com")
         # After consolidation, buy URL is the same as frontend URL
         self.buy_url = os.getenv("BUY_URL", self.frontend_url)
+        # Payment method configuration ID from Stripe Dashboard
+        # Enables Google Pay, Apple Pay, Link, and other wallet methods
+        # Get this from: Dashboard > Settings > Payment methods > [Your Config] > Copy ID
+        self.payment_method_config = os.getenv("STRIPE_PAYMENT_METHOD_CONFIG")
 
         if self.secret_key:
             stripe.api_key = self.secret_key
@@ -72,6 +77,11 @@ class StripeService:
         else:
             logger.warning("STRIPE_SECRET_KEY not set - payments disabled")
 
+        if self.payment_method_config:
+            logger.info(f"Using payment method config: {self.payment_method_config}")
+        else:
+            logger.info("No STRIPE_PAYMENT_METHOD_CONFIG set - using Stripe defaults")
+
     def is_configured(self) -> bool:
         """Check if Stripe is properly configured."""
         return bool(self.secret_key)
@@ -113,32 +123,40 @@ class StripeService:
             if not cancel_url:
                 cancel_url = f"{self.buy_url}?cancelled=true"
 
-            # Create checkout session
-            session = stripe.checkout.Session.create(
-                payment_method_types=['card'],
-                line_items=[{
+            # Build checkout session params
+            session_params = {
+                # Omit payment_method_types to auto-enable Apple Pay, Google Pay, Link, etc.
+                'line_items': [{
                     'price_data': {
                         'currency': 'usd',
                         'product_data': {
                             'name': package['name'],
                             'description': package['description'],
+                            'images': ['https://gen.nomadkaraoke.com/nomad-logo.png'],
                         },
                         'unit_amount': package['price_cents'],
                     },
                     'quantity': 1,
                 }],
-                mode='payment',
-                success_url=success_url,
-                cancel_url=cancel_url,
-                customer_email=user_email,
-                metadata={
+                'mode': 'payment',
+                'success_url': success_url,
+                'cancel_url': cancel_url,
+                'customer_email': user_email,
+                'metadata': {
                     'package_id': package_id,
                     'credits': str(package['credits']),
                     'user_email': user_email,
                 },
                 # Allow promotion codes
-                allow_promotion_codes=True,
-            )
+                'allow_promotion_codes': True,
+            }
+
+            # Add payment method configuration if set (enables Google Pay, Link, etc.)
+            if self.payment_method_config:
+                session_params['payment_method_configuration'] = self.payment_method_config
+
+            # Create checkout session
+            session = stripe.checkout.Session.create(**session_params)
 
             logger.info(f"Created checkout session {session.id} for {user_email}, package {package_id}")
             return True, session.url, "Checkout session created"
@@ -150,7 +168,7 @@ class StripeService:
             logger.error(f"Error creating checkout session: {e}")
             return False, None, "Failed to create checkout session"
 
-    def create_done_for_you_checkout_session(
+    def create_made_for_you_checkout_session(
         self,
         customer_email: str,
         artist: str,
@@ -162,7 +180,7 @@ class StripeService:
         cancel_url: Optional[str] = None,
     ) -> Tuple[bool, Optional[str], str]:
         """
-        Create a Stripe Checkout session for a done-for-you order.
+        Create a Stripe Checkout session for a made-for-you order.
 
         This is for the full-service karaoke video creation where Nomad Karaoke
         handles all the work (lyrics review, instrumental selection, etc.).
@@ -192,7 +210,7 @@ class StripeService:
 
             # Build metadata for job creation after payment
             metadata = {
-                'order_type': 'done_for_you',
+                'order_type': 'made_for_you',
                 'customer_email': customer_email,
                 'artist': artist,
                 'title': title,
@@ -204,39 +222,47 @@ class StripeService:
                 # Truncate notes to fit Stripe's 500 char limit per metadata value
                 metadata['notes'] = notes[:500] if len(notes) > 500 else notes
 
-            # Create checkout session
-            session = stripe.checkout.Session.create(
-                payment_method_types=['card'],
-                line_items=[{
+            # Build checkout session params
+            session_params = {
+                # Omit payment_method_types to auto-enable Apple Pay, Google Pay, Link, etc.
+                'line_items': [{
                     'price_data': {
                         'currency': 'usd',
                         'product_data': {
-                            'name': DONE_FOR_YOU_PACKAGE['name'],
-                            'description': f"{artist} - {title}",
+                            'name': f"Karaoke Video: {artist} - {title}",
+                            'description': MADE_FOR_YOU_PACKAGE['description'],
+                            'images': MADE_FOR_YOU_PACKAGE['images'],
                         },
-                        'unit_amount': DONE_FOR_YOU_PACKAGE['price_cents'],
+                        'unit_amount': MADE_FOR_YOU_PACKAGE['price_cents'],
                     },
                     'quantity': 1,
                 }],
-                mode='payment',
-                success_url=success_url,
-                cancel_url=cancel_url,
-                customer_email=customer_email,
-                metadata=metadata,
-                allow_promotion_codes=True,
-            )
+                'mode': 'payment',
+                'success_url': success_url,
+                'cancel_url': cancel_url,
+                'customer_email': customer_email,
+                'metadata': metadata,
+                'allow_promotion_codes': True,
+            }
+
+            # Add payment method configuration if set (enables Google Pay, Link, etc.)
+            if self.payment_method_config:
+                session_params['payment_method_configuration'] = self.payment_method_config
+
+            # Create checkout session
+            session = stripe.checkout.Session.create(**session_params)
 
             logger.info(
-                f"Created done-for-you checkout session {session.id} for {customer_email}, "
+                f"Created made-for-you checkout session {session.id} for {customer_email}, "
                 f"song: {artist} - {title}"
             )
             return True, session.url, "Checkout session created"
 
         except stripe.error.StripeError as e:
-            logger.error(f"Stripe error creating done-for-you checkout session: {e}")
+            logger.error(f"Stripe error creating made-for-you checkout session: {e}")
             return False, None, f"Payment error: {str(e)}"
         except Exception as e:
-            logger.error(f"Error creating done-for-you checkout session: {e}")
+            logger.error(f"Error creating made-for-you checkout session: {e}")
             return False, None, "Failed to create checkout session"
 
     def verify_webhook_signature(self, payload: bytes, signature: str) -> Tuple[bool, Optional[Dict], str]: