This commit is contained in:
2025-06-07 14:44:58 +09:00
parent 6830d06ed4
commit ffb9ba644e
2 changed files with 217 additions and 129 deletions

View File

@ -3,7 +3,7 @@ import {
openAI_ClassifyFeed, openAI_ClassifyFeed,
openAI_GeneratePodcastContent, openAI_GeneratePodcastContent,
} from "../services/llm.js"; } from "../services/llm.js";
import { generateTTS } from "../services/tts.js"; import { generateTTS, generateTTSWithoutQueue } from "../services/tts.js";
import { import {
saveFeed, saveFeed,
getFeedByUrl, getFeedByUrl,
@ -208,15 +208,30 @@ async function processUnprocessedArticles(): Promise<void> {
console.log(`🎯 Found ${unprocessedArticles.length} unprocessed articles`); console.log(`🎯 Found ${unprocessedArticles.length} unprocessed articles`);
// Track articles that successfully generated audio // Track articles that successfully generated audio AND episodes
const successfullyGeneratedArticles: string[] = []; let successfullyGeneratedCount = 0;
for (const article of unprocessedArticles) { for (const article of unprocessedArticles) {
try { try {
await generatePodcastForArticle(article); const episodeCreated = await generatePodcastForArticle(article);
// Only mark as processed and update RSS if episode was actually created
if (episodeCreated) {
await markArticleAsProcessed(article.id); await markArticleAsProcessed(article.id);
console.log(`✅ Podcast generated for: ${article.title}`); console.log(`✅ Podcast generated for: ${article.title}`);
successfullyGeneratedArticles.push(article.id); successfullyGeneratedCount++;
// Update RSS immediately after each successful episode creation
console.log(`📻 Updating podcast RSS after successful episode creation...`);
try {
await updatePodcastRSS();
console.log(`📻 RSS updated successfully for: ${article.title}`);
} catch (rssError) {
console.error(`❌ Failed to update RSS after episode creation for: ${article.title}`, rssError);
}
} else {
console.warn(`⚠️ Episode creation failed for: ${article.title} - not marking as processed`);
}
} catch (error) { } catch (error) {
console.error( console.error(
`❌ Failed to generate podcast for article: ${article.title}`, `❌ Failed to generate podcast for article: ${article.title}`,
@ -226,10 +241,9 @@ async function processUnprocessedArticles(): Promise<void> {
} }
} }
// Only update RSS if at least one article was successfully processed console.log(`🎯 Batch processing completed: ${successfullyGeneratedCount} episodes successfully created`);
if (successfullyGeneratedArticles.length > 0) { if (successfullyGeneratedCount === 0) {
console.log(`📻 Updating podcast RSS for ${successfullyGeneratedArticles.length} new episodes...`); console.log(` No episodes were successfully created in this batch`);
await updatePodcastRSS();
} }
} catch (error) { } catch (error) {
console.error("💥 Error processing unprocessed articles:", error); console.error("💥 Error processing unprocessed articles:", error);
@ -242,6 +256,8 @@ async function processUnprocessedArticles(): Promise<void> {
*/ */
async function processRetryQueue(): Promise<void> { async function processRetryQueue(): Promise<void> {
const { getQueueItems, updateQueueItemStatus, removeFromQueue } = await import("../services/database.js"); const { getQueueItems, updateQueueItemStatus, removeFromQueue } = await import("../services/database.js");
const { Database } = await import("bun:sqlite");
const db = new Database(config.paths.dbPath);
console.log("🔄 Processing TTS retry queue..."); console.log("🔄 Processing TTS retry queue...");
@ -256,41 +272,65 @@ async function processRetryQueue(): Promise<void> {
for (const item of queueItems) { for (const item of queueItems) {
try { try {
console.log(`🔁 Retrying TTS generation for: ${item.itemId} (attempt ${item.retryCount + 1})`); console.log(`🔁 Retrying TTS generation for: ${item.itemId} (attempt ${item.retryCount + 1}/3)`);
// Mark as processing // Mark as processing
await updateQueueItemStatus(item.id, 'processing'); await updateQueueItemStatus(item.id, 'processing');
// Attempt TTS generation // Attempt TTS generation without re-queuing on failure
await generateTTS(item.itemId, item.scriptText, item.retryCount); const audioFilePath = await generateTTSWithoutQueue(item.itemId, item.scriptText, item.retryCount);
// Success - remove from queue // Success - remove from queue and update RSS
await removeFromQueue(item.id); await removeFromQueue(item.id);
console.log(`✅ TTS retry successful for: ${item.itemId}`); console.log(`✅ TTS retry successful for: ${item.itemId}`);
// Update RSS immediately after successful retry
console.log(`📻 Updating podcast RSS after successful retry...`);
try {
await updatePodcastRSS();
console.log(`📻 RSS updated successfully after retry for: ${item.itemId}`);
} catch (rssError) {
console.error(`❌ Failed to update RSS after retry for: ${item.itemId}`, rssError);
}
} catch (error) { } catch (error) {
console.error(`❌ TTS retry failed for: ${item.itemId}`, error); console.error(`❌ TTS retry failed for: ${item.itemId}`, error);
try {
if (item.retryCount >= 2) { if (item.retryCount >= 2) {
// Max retries reached, mark as failed // Max retries reached, mark as failed
await updateQueueItemStatus(item.id, 'failed'); await updateQueueItemStatus(item.id, 'failed');
console.log(`💀 Max retries reached for: ${item.itemId}, marking as failed`); console.log(`💀 Max retries reached for: ${item.itemId}, marking as failed`);
} else { } else {
// Reset to pending for next retry // Increment retry count and reset to pending for next retry
await updateQueueItemStatus(item.id, 'pending'); const updatedRetryCount = item.retryCount + 1;
const stmt = db.prepare("UPDATE tts_queue SET retry_count = ?, status = 'pending' WHERE id = ?");
stmt.run(updatedRetryCount, item.id);
console.log(`🔄 Updated retry count to ${updatedRetryCount} for: ${item.itemId}`);
}
} catch (dbError) {
console.error(`❌ Failed to update queue status for: ${item.itemId}`, dbError);
} }
} }
} }
} catch (error) { } catch (error) {
console.error("💥 Error processing retry queue:", error); console.error("💥 Error processing retry queue:", error);
throw error; throw error;
} finally {
// Clean up database connection
try {
db.close();
} catch (closeError) {
console.warn("⚠️ Warning: Failed to close database connection:", closeError);
}
} }
} }
/** /**
* Generate podcast for a single article * Generate podcast for a single article
* Returns true if episode was successfully created, false otherwise
*/ */
async function generatePodcastForArticle(article: any): Promise<void> { async function generatePodcastForArticle(article: any): Promise<boolean> {
console.log(`🎤 Generating podcast for: ${article.title}`); console.log(`🎤 Generating podcast for: ${article.title}`);
try { try {
@ -315,14 +355,44 @@ async function generatePodcastForArticle(article: any): Promise<void> {
// Generate unique ID for the episode // Generate unique ID for the episode
const episodeId = crypto.randomUUID(); const episodeId = crypto.randomUUID();
// Generate TTS audio // Generate TTS audio - this is the critical step that can fail
const audioFilePath = await generateTTS(episodeId, podcastContent); let audioFilePath: string;
try {
audioFilePath = await generateTTS(episodeId, podcastContent);
console.log(`🔊 Audio generated: ${audioFilePath}`); console.log(`🔊 Audio generated: ${audioFilePath}`);
} catch (ttsError) {
console.error(`❌ TTS generation failed for ${article.title}:`, ttsError);
// Check if error indicates item was added to retry queue
const errorMessage = ttsError instanceof Error ? ttsError.message : String(ttsError);
if (errorMessage.includes('added to retry queue')) {
console.log(`📋 Article will be retried later via TTS queue: ${article.title}`);
// Don't mark as processed - leave it for retry
return false;
} else {
console.error(`💀 TTS generation permanently failed for ${article.title} - max retries exceeded`);
// Max retries exceeded, don't create episode but mark as processed to avoid infinite retry
return false;
}
}
// Verify audio file was actually created and is valid
try {
const audioStats = await getAudioFileStats(audioFilePath);
if (audioStats.size === 0) {
console.error(`❌ Audio file is empty for ${article.title}: ${audioFilePath}`);
return false;
}
} catch (statsError) {
console.error(`❌ Cannot access audio file for ${article.title}: ${audioFilePath}`, statsError);
return false;
}
// Get audio file stats // Get audio file stats
const audioStats = await getAudioFileStats(audioFilePath); const audioStats = await getAudioFileStats(audioFilePath);
// Save episode // Save episode - only if we have valid audio
try {
await saveEpisode({ await saveEpisode({
articleId: article.id, articleId: article.id,
title: `${category}: ${article.title}`, title: `${category}: ${article.title}`,
@ -334,12 +404,17 @@ async function generatePodcastForArticle(article: any): Promise<void> {
}); });
console.log(`💾 Episode saved for article: ${article.title}`); console.log(`💾 Episode saved for article: ${article.title}`);
return true;
} catch (saveError) {
console.error(`❌ Failed to save episode for ${article.title}:`, saveError);
return false;
}
} catch (error) { } catch (error) {
console.error( console.error(
`💥 Error generating podcast for article: ${article.title}`, `💥 Error generating podcast for article: ${article.title}`,
error, error,
); );
throw error; return false;
} }
} }

View File

@ -12,7 +12,11 @@ const defaultVoiceStyle: VoiceStyle = {
styleId: config.voicevox.styleId, styleId: config.voicevox.styleId,
}; };
export async function generateTTS( /**
* Generate TTS without adding to retry queue on failure
* Used for retry queue processing to avoid infinite loops
*/
export async function generateTTSWithoutQueue(
itemId: string, itemId: string,
scriptText: string, scriptText: string,
retryCount: number = 0, retryCount: number = 0,
@ -25,10 +29,7 @@ export async function generateTTS(
throw new Error("Script text is required for TTS generation"); throw new Error("Script text is required for TTS generation");
} }
const maxRetries = 2; console.log(`TTS生成開始: ${itemId} (試行回数: ${retryCount + 1})`);
try {
console.log(`TTS生成開始: ${itemId} (試行回数: ${retryCount + 1}/${maxRetries + 1})`);
const encodedText = encodeURIComponent(scriptText); const encodedText = encodeURIComponent(scriptText);
const queryUrl = `${config.voicevox.host}/audio_query?text=${encodedText}&speaker=${defaultVoiceStyle.styleId}`; const queryUrl = `${config.voicevox.host}/audio_query?text=${encodedText}&speaker=${defaultVoiceStyle.styleId}`;
@ -117,12 +118,24 @@ export async function generateTTS(
console.log(`TTS生成完了: ${itemId}`); console.log(`TTS生成完了: ${itemId}`);
return path.basename(mp3FilePath); return path.basename(mp3FilePath);
}
export async function generateTTS(
itemId: string,
scriptText: string,
retryCount: number = 0,
): Promise<string> {
const maxRetries = 2;
try {
return await generateTTSWithoutQueue(itemId, scriptText, retryCount);
} catch (error) { } catch (error) {
console.error(`TTS生成エラー: ${itemId} (試行回数: ${retryCount + 1})`, error); console.error(`TTS生成エラー: ${itemId} (試行回数: ${retryCount + 1})`, error);
if (retryCount < maxRetries) { if (retryCount < maxRetries) {
// Add to queue for retry only on initial failure
const { addToQueue } = await import("../services/database.js"); const { addToQueue } = await import("../services/database.js");
await addToQueue(itemId, scriptText, retryCount + 1); await addToQueue(itemId, scriptText, retryCount);
throw new Error(`TTS generation failed, added to retry queue: ${error}`); throw new Error(`TTS generation failed, added to retry queue: ${error}`);
} else { } else {
throw new Error(`TTS generation failed after ${maxRetries + 1} attempts: ${error}`); throw new Error(`TTS generation failed after ${maxRetries + 1} attempts: ${error}`);