karaoke-gen 0.103.1__py3-none-any.whl → 0.107.0__py3-none-any.whl

karaoke_gen/nextjs_frontend/out/sw.js

@@ -0,0 +1,183 @@
+/**
+ * Service Worker for Web Push Notifications
+ *
+ * Handles push events and notification clicks for the Karaoke Generator PWA.
+ * This service worker is registered by the ServiceWorkerRegistration component.
+ */
+
+// Cache name for static assets (versioned for updates)
+const CACHE_VERSION = 'v1';
+const STATIC_CACHE = `karaoke-gen-static-${CACHE_VERSION}`;
+
+// Assets to cache for offline support
+const STATIC_ASSETS = [
+  '/nomad-logo.png',
+  '/nomad-karaoke-logo.svg',
+  '/favicon.ico',
+];
+
+/**
+ * Install event - cache static assets
+ */
+self.addEventListener('install', (event) => {
+  console.log('[SW] Installing service worker...');
+  event.waitUntil(
+    caches.open(STATIC_CACHE).then((cache) => {
+      return cache.addAll(STATIC_ASSETS);
+    }).then(() => {
+      console.log('[SW] Static assets cached');
+      return self.skipWaiting(); // Activate immediately
+    })
+  );
+});
+
+/**
+ * Activate event - clean up old caches
+ */
+self.addEventListener('activate', (event) => {
+  console.log('[SW] Activating service worker...');
+  event.waitUntil(
+    caches.keys().then((cacheNames) => {
+      return Promise.all(
+        cacheNames
+          .filter((name) => name.startsWith('karaoke-gen-') && name !== STATIC_CACHE)
+          .map((name) => {
+            console.log('[SW] Deleting old cache:', name);
+            return caches.delete(name);
+          })
+      );
+    }).then(() => {
+      console.log('[SW] Service worker activated');
+      return self.clients.claim(); // Take control of all pages
+    })
+  );
+});
+
+/**
+ * Push event - show notification when push message received
+ */
+self.addEventListener('push', (event) => {
+  console.log('[SW] Push event received');
+
+  let data = {
+    title: 'Karaoke Generator',
+    body: 'You have a notification',
+    icon: '/nomad-logo.png',
+    tag: 'default',
+    url: '/app/',
+  };
+
+  // Parse push data if available
+  if (event.data) {
+    try {
+      const payload = event.data.json();
+      data = {
+        title: payload.title || data.title,
+        body: payload.body || data.body,
+        icon: payload.icon || data.icon,
+        tag: payload.tag || data.tag,
+        url: payload.url || data.url,
+      };
+    } catch (err) {
+      console.error('[SW] Error parsing push data:', err);
+      // Try as text
+      const text = event.data.text();
+      if (text) {
+        data.body = text;
+      }
+    }
+  }
+
+  // Show the notification
+  const options = {
+    body: data.body,
+    icon: data.icon,
+    badge: '/favicon-32x32.png',
+    tag: data.tag, // Replaces notifications with same tag
+    renotify: true, // Vibrate/sound even if replacing
+    requireInteraction: true, // Don't auto-dismiss
+    data: {
+      url: data.url,
+    },
+    // Actions for the notification (optional)
+    actions: [
+      {
+        action: 'open',
+        title: 'Open',
+      },
+      {
+        action: 'dismiss',
+        title: 'Dismiss',
+      },
+    ],
+  };
+
+  event.waitUntil(
+    self.registration.showNotification(data.title, options)
+  );
+});
+
+/**
+ * Notification click event - open the app or focus existing window
+ */
+self.addEventListener('notificationclick', (event) => {
+  console.log('[SW] Notification clicked:', event.action);
+
+  event.notification.close();
+
+  // Handle dismiss action
+  if (event.action === 'dismiss') {
+    return;
+  }
+
+  // Get the URL to open
+  const url = event.notification.data?.url || '/app/';
+  const fullUrl = new URL(url, self.location.origin).href;
+
+  // Try to focus an existing window or open a new one
+  event.waitUntil(
+    self.clients.matchAll({ type: 'window', includeUncontrolled: true }).then((clients) => {
+      // Check if there's already a window open
+      for (const client of clients) {
+        // If we find a matching URL, focus it
+        if (client.url === fullUrl && 'focus' in client) {
+          return client.focus();
+        }
+      }
+
+      // Check if there's any window from our origin
+      for (const client of clients) {
+        if (client.url.startsWith(self.location.origin) && 'focus' in client) {
+          // Navigate the existing window and focus it
+          return client.navigate(fullUrl).then((client) => client?.focus());
+        }
+      }
+
+      // No existing window, open a new one
+      if (self.clients.openWindow) {
+        return self.clients.openWindow(fullUrl);
+      }
+    })
+  );
+});
+
+/**
+ * Notification close event - cleanup if needed
+ */
+self.addEventListener('notificationclose', (event) => {
+  console.log('[SW] Notification closed');
+  // Could track analytics here if desired
+});
+
+/**
+ * Message event - handle messages from the main app
+ */
+self.addEventListener('message', (event) => {
+  console.log('[SW] Message received:', event.data);
+
+  if (event.data?.type === 'SKIP_WAITING') {
+    self.skipWaiting();
+  }
+});
+
+console.log('[SW] Service worker loaded');

karaoke_gen/utils/cli_args.py

@@ -360,10 +360,10 @@ def create_parser(prog: str = "karaoke-gen") -> argparse.ArgumentParser:
     )
     remote_group.add_argument(
         "--review-ui-url",
-        default=os.environ.get('REVIEW_UI_URL', os.environ.get('LYRICS_REVIEW_UI_URL', 'https://gen.nomadkaraoke.com/lyrics')),
-        help="Lyrics review UI URL. For remote mode: defaults to 'https://gen.nomadkaraoke.com/lyrics'. "
+        default=os.environ.get('REVIEW_UI_URL', os.environ.get('LYRICS_REVIEW_UI_URL', 'https://gen.nomadkaraoke.com')),
+        help="Frontend base URL for remote mode. Defaults to 'https://gen.nomadkaraoke.com'. "
+             "Review UIs are at /app/jobs/{id}/review and /app/jobs/{id}/instrumental. "
              "For local mode: defaults to bundled frontend (from lyrics_transcriber/frontend/). "
-             "Use 'http://localhost:5173' to develop against Vite dev server. "
              "(env: REVIEW_UI_URL or LYRICS_REVIEW_UI_URL)",
     )
     remote_group.add_argument(

karaoke_gen/utils/gen_cli.py

@@ -318,7 +318,11 @@ async def async_main():
     # This enables local iteration on the frontend without redeploying
     if hasattr(args, 'review_ui_url') and args.review_ui_url:
         # Check if user provided a custom value (not the default hosted URL)
+        # For local karaoke-gen CLI, we want to use the bundled local frontend by default
+        # Only set LYRICS_REVIEW_UI_URL if user explicitly provides a dev server URL
         default_hosted_urls = [
+            'https://gen.nomadkaraoke.com',
+            'https://gen.nomadkaraoke.com/',
             'https://gen.nomadkaraoke.com/lyrics',
             'https://gen.nomadkaraoke.com/lyrics/'
         ]

karaoke_gen/utils/remote_cli.py

@@ -1506,26 +1506,10 @@ class JobMonitor:
     
     def open_review_ui(self, job_id: str) -> None:
         """Open the lyrics review UI in browser."""
-        # Build the review URL with the API endpoint
-        base_api_url = f"{self.config.service_url}/api/review/{job_id}"
-        encoded_api_url = urllib.parse.quote(base_api_url, safe='')
-        
-        # Try to get audio hash and review token from job data
-        audio_hash = ''
-        review_token = ''
-        try:
-            job_data = self.client.get_job(job_id)
-            audio_hash = job_data.get('audio_hash', '')
-            review_token = job_data.get('review_token', '')
-        except Exception:
-            pass
-        
-        url = f"{self.config.review_ui_url}/?baseApiUrl={encoded_api_url}"
-        if audio_hash:
-            url += f"&audioHash={audio_hash}"
-        if review_token:
-            url += f"&reviewToken={review_token}"
-        
+        # Build the review URL using the consolidated frontend route
+        frontend_base = self.config.review_ui_url.rstrip('/')
+        url = f"{frontend_base}/app/jobs/{job_id}/review"
+
         self.logger.info(f"Opening lyrics review UI: {url}")
         self.open_browser(url)
     
@@ -1914,26 +1898,10 @@ class JobMonitor:
 
     def _open_instrumental_review_and_wait(self, job_id: str) -> None:
         """Open browser to instrumental review UI and wait for selection."""
-        # Get instrumental token from job data
-        instrumental_token = ''
-        try:
-            job_data = self.client.get_job(job_id)
-            instrumental_token = job_data.get('instrumental_token', '')
-        except Exception:
-            pass
-        
-        # Build the review URL with API endpoint and token
-        # The instrumental UI is hosted at /instrumental/ on the frontend domain
-        base_api_url = f"{self.config.service_url}/api/jobs/{job_id}"
-        encoded_api_url = urllib.parse.quote(base_api_url, safe='')
-        
-        # Use /instrumental/ path on the frontend (same domain as review_ui_url but different path)
-        # review_ui_url is like https://gen.nomadkaraoke.com/lyrics, we want /instrumental/
-        frontend_base = self.config.review_ui_url.rsplit('/', 1)[0]  # Remove /lyrics
-        review_url = f"{frontend_base}/instrumental/?baseApiUrl={encoded_api_url}"
-        if instrumental_token:
-            review_url += f"&instrumentalToken={instrumental_token}"
-        
+        # Build the review URL using the consolidated frontend route
+        frontend_base = self.config.review_ui_url.rstrip('/')
+        review_url = f"{frontend_base}/app/jobs/{job_id}/instrumental"
+
         self.logger.info("")
         self.logger.info("=" * 60)
         self.logger.info("OPENING BROWSER FOR INSTRUMENTAL REVIEW")

{karaoke_gen-0.103.1.dist-info → karaoke_gen-0.107.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karaoke-gen
-Version: 0.103.1
+Version: 0.107.0
 Summary: Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens.
 License: MIT
 License-File: LICENSE
@@ -77,6 +77,7 @@ Requires-Dist: python-dotenv (>=1.0.0)
 Requires-Dist: python-levenshtein (>=0.26)
 Requires-Dist: python-multipart (>=0.0.20,<0.0.21)
 Requires-Dist: python-slugify (>=8)
+Requires-Dist: pywebpush (>=2.0.0)
 Requires-Dist: requests (>=2)
 Requires-Dist: sendgrid (>=6.10.0)
 Requires-Dist: shortuuid (>=1.0.13)