Move nlp processing to next server
This commit is contained in:
parent
99dbcd004c
commit
521eda6cff
2 changed files with 104 additions and 63 deletions
|
|
@ -1,31 +1,23 @@
|
||||||
|
import { NextRequest, NextResponse } from 'next/server';
|
||||||
import nlp from 'compromise';
|
import nlp from 'compromise';
|
||||||
|
|
||||||
// Text preprocessing function to clean and normalize text
|
const MAX_BLOCK_LENGTH = 300;
|
||||||
export const preprocessSentenceForAudio = (text: string): string => {
|
|
||||||
|
const preprocessSentenceForAudio = (text: string): string => {
|
||||||
return text
|
return text
|
||||||
// Replace URLs with descriptive text including domain
|
|
||||||
.replace(/\S*(?:https?:\/\/|www\.)([^\/\s]+)(?:\/\S*)?/gi, '- (link to $1) -')
|
.replace(/\S*(?:https?:\/\/|www\.)([^\/\s]+)(?:\/\S*)?/gi, '- (link to $1) -')
|
||||||
// Remove special characters except basic punctuation
|
|
||||||
//.replace(/[^\w\s.,!?;:'"()-]/g, ' ')
|
|
||||||
// Fix hyphenated words at line breaks (word- word -> wordword)
|
|
||||||
.replace(/(\w+)-\s+(\w+)/g, '$1$2')
|
.replace(/(\w+)-\s+(\w+)/g, '$1$2')
|
||||||
// Replace multiple spaces with single space
|
|
||||||
.replace(/\s+/g, ' ')
|
.replace(/\s+/g, ' ')
|
||||||
// Trim whitespace
|
|
||||||
.trim();
|
.trim();
|
||||||
};
|
};
|
||||||
|
|
||||||
const MAX_BLOCK_LENGTH = 300; // Maximum characters per block
|
const splitIntoSentences = (text: string): string[] => {
|
||||||
|
|
||||||
export const splitIntoSentences = (text: string): string[] => {
|
|
||||||
// Split text into paragraphs first
|
|
||||||
const paragraphs = text.split(/\n+/);
|
const paragraphs = text.split(/\n+/);
|
||||||
const blocks: string[] = [];
|
const blocks: string[] = [];
|
||||||
|
|
||||||
for (const paragraph of paragraphs) {
|
for (const paragraph of paragraphs) {
|
||||||
if (!paragraph.trim()) continue;
|
if (!paragraph.trim()) continue;
|
||||||
|
|
||||||
// Preprocess each paragraph
|
|
||||||
const cleanedText = preprocessSentenceForAudio(paragraph);
|
const cleanedText = preprocessSentenceForAudio(paragraph);
|
||||||
const doc = nlp(cleanedText);
|
const doc = nlp(cleanedText);
|
||||||
const rawSentences = doc.sentences().out('array') as string[];
|
const rawSentences = doc.sentences().out('array') as string[];
|
||||||
|
|
@ -35,19 +27,16 @@ export const splitIntoSentences = (text: string): string[] => {
|
||||||
for (const sentence of rawSentences) {
|
for (const sentence of rawSentences) {
|
||||||
const trimmedSentence = sentence.trim();
|
const trimmedSentence = sentence.trim();
|
||||||
|
|
||||||
// If adding this sentence would exceed the limit, start a new block
|
|
||||||
if (currentBlock && (currentBlock.length + trimmedSentence.length + 1) > MAX_BLOCK_LENGTH) {
|
if (currentBlock && (currentBlock.length + trimmedSentence.length + 1) > MAX_BLOCK_LENGTH) {
|
||||||
blocks.push(currentBlock.trim());
|
blocks.push(currentBlock.trim());
|
||||||
currentBlock = trimmedSentence;
|
currentBlock = trimmedSentence;
|
||||||
} else {
|
} else {
|
||||||
// Add to current block with a space if not empty
|
|
||||||
currentBlock = currentBlock
|
currentBlock = currentBlock
|
||||||
? `${currentBlock} ${trimmedSentence}`
|
? `${currentBlock} ${trimmedSentence}`
|
||||||
: trimmedSentence;
|
: trimmedSentence;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the last block if not empty
|
|
||||||
if (currentBlock) {
|
if (currentBlock) {
|
||||||
blocks.push(currentBlock.trim());
|
blocks.push(currentBlock.trim());
|
||||||
}
|
}
|
||||||
|
|
@ -55,3 +44,25 @@ export const splitIntoSentences = (text: string): string[] => {
|
||||||
|
|
||||||
return blocks;
|
return blocks;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export async function POST(req: NextRequest) {
|
||||||
|
try {
|
||||||
|
const { text } = await req.json();
|
||||||
|
if (!text) {
|
||||||
|
return NextResponse.json({ error: 'No text provided' }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text.length <= MAX_BLOCK_LENGTH) {
|
||||||
|
// Single sentence preprocessing
|
||||||
|
const cleanedText = preprocessSentenceForAudio(text);
|
||||||
|
return NextResponse.json({ sentences: [cleanedText] });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Full text splitting into sentences
|
||||||
|
const sentences = splitIntoSentences(text);
|
||||||
|
return NextResponse.json({ sentences });
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error processing text:', error);
|
||||||
|
return NextResponse.json({ error: 'Failed to process text' }, { status: 500 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -29,7 +29,6 @@ import toast from 'react-hot-toast';
|
||||||
import { useParams } from 'next/navigation';
|
import { useParams } from 'next/navigation';
|
||||||
|
|
||||||
import { useConfig } from '@/contexts/ConfigContext';
|
import { useConfig } from '@/contexts/ConfigContext';
|
||||||
import { splitIntoSentences, preprocessSentenceForAudio } from '@/utils/nlp';
|
|
||||||
import { audioBufferToURL } from '@/utils/audio';
|
import { audioBufferToURL } from '@/utils/audio';
|
||||||
import { useAudioCache } from '@/hooks/audio/useAudioCache';
|
import { useAudioCache } from '@/hooks/audio/useAudioCache';
|
||||||
import { useVoiceManagement } from '@/hooks/audio/useVoiceManagement';
|
import { useVoiceManagement } from '@/hooks/audio/useVoiceManagement';
|
||||||
|
|
@ -152,51 +151,71 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
|
||||||
*/
|
*/
|
||||||
const setText = useCallback((text: string) => {
|
const setText = useCallback((text: string) => {
|
||||||
console.log('Setting page text:', text);
|
console.log('Setting page text:', text);
|
||||||
const newSentences = splitIntoSentences(text);
|
|
||||||
|
|
||||||
// If skipBlank is enabled and there's no text
|
fetch('/api/nlp', {
|
||||||
if (isPlaying && skipBlank && newSentences.length === 0) {
|
method: 'POST',
|
||||||
if (isEPUB && locationChangeHandlerRef.current) {
|
headers: { 'Content-Type': 'application/json' },
|
||||||
// For EPUB, use the location handler to move to next section
|
body: JSON.stringify({ text }),
|
||||||
locationChangeHandlerRef.current('next');
|
})
|
||||||
|
.then(response => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to process text');
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
})
|
||||||
|
.then(({ sentences: newSentences }) => {
|
||||||
|
// If skipBlank is enabled and there's no text
|
||||||
|
if (isPlaying && skipBlank && newSentences.length === 0) {
|
||||||
|
if (isEPUB && locationChangeHandlerRef.current) {
|
||||||
|
locationChangeHandlerRef.current('next');
|
||||||
|
|
||||||
toast.success('Skipping blank section', {
|
toast.success('Skipping blank section', {
|
||||||
id: `epub-section-skip`,
|
id: `epub-section-skip`,
|
||||||
iconTheme: {
|
iconTheme: {
|
||||||
primary: 'var(--accent)',
|
primary: 'var(--accent)',
|
||||||
secondary: 'var(--background)',
|
secondary: 'var(--background)',
|
||||||
},
|
},
|
||||||
|
style: {
|
||||||
|
background: 'var(--background)',
|
||||||
|
color: 'var(--accent)',
|
||||||
|
},
|
||||||
|
duration: 1000,
|
||||||
|
position: 'top-center',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
} else if (currDocPageNumber < currDocPages!) {
|
||||||
|
incrementPage();
|
||||||
|
|
||||||
|
toast.success(`Skipping blank page ${currDocPageNumber}`, {
|
||||||
|
id: `page-${currDocPageNumber}`,
|
||||||
|
iconTheme: {
|
||||||
|
primary: 'var(--accent)',
|
||||||
|
secondary: 'var(--background)',
|
||||||
|
},
|
||||||
|
style: {
|
||||||
|
background: 'var(--background)',
|
||||||
|
color: 'var(--accent)',
|
||||||
|
},
|
||||||
|
duration: 1000,
|
||||||
|
position: 'top-center',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setSentences(newSentences);
|
||||||
|
setNextPageLoading(false);
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('Error processing text:', error);
|
||||||
|
toast.error('Failed to process text', {
|
||||||
style: {
|
style: {
|
||||||
background: 'var(--background)',
|
background: 'var(--background)',
|
||||||
color: 'var(--accent)',
|
color: 'var(--accent)',
|
||||||
},
|
},
|
||||||
duration: 1000,
|
duration: 3000,
|
||||||
position: 'top-center',
|
|
||||||
});
|
});
|
||||||
return;
|
});
|
||||||
} else if (currDocPageNumber < currDocPages!) {
|
|
||||||
// For PDF, increment the page
|
|
||||||
incrementPage();
|
|
||||||
|
|
||||||
toast.success(`Skipping blank page ${currDocPageNumber}`, {
|
|
||||||
id: `page-${currDocPageNumber}`,
|
|
||||||
iconTheme: {
|
|
||||||
primary: 'var(--accent)',
|
|
||||||
secondary: 'var(--background)',
|
|
||||||
},
|
|
||||||
style: {
|
|
||||||
background: 'var(--background)',
|
|
||||||
color: 'var(--accent)',
|
|
||||||
},
|
|
||||||
duration: 1000,
|
|
||||||
position: 'top-center',
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setSentences(newSentences);
|
|
||||||
setNextPageLoading(false);
|
|
||||||
}, [isPlaying, skipBlank, currDocPageNumber, currDocPages, incrementPage, isEPUB]);
|
}, [isPlaying, skipBlank, currDocPageNumber, currDocPages, incrementPage, isEPUB]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -437,7 +456,18 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
|
||||||
// Only set processing state if not preloading
|
// Only set processing state if not preloading
|
||||||
if (!preload) setIsProcessing(true);
|
if (!preload) setIsProcessing(true);
|
||||||
|
|
||||||
const cleanedSentence = preprocessSentenceForAudio(sentence);
|
// Preprocess the sentence using the NLP API
|
||||||
|
const response = await fetch('/api/nlp', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ text: sentence }),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to process sentence');
|
||||||
|
}
|
||||||
|
|
||||||
|
const { sentences: [cleanedSentence] } = await response.json();
|
||||||
const audioBuffer = await getAudio(cleanedSentence);
|
const audioBuffer = await getAudio(cleanedSentence);
|
||||||
|
|
||||||
return audioBufferToURL(audioBuffer!);
|
return audioBufferToURL(audioBuffer!);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue