PyPI - lyrics-transcriber - Versions diffs - 0.41.0__py3-none-any.whl → 0.42.0__py3-none-any.whl - Mend

lyrics-transcriber 0.41.0py3-none-any.whl → 0.42.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (77) hide show

lyrics_transcriber/frontend/dist/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Lyrics Transcriber Analyzer</title>
-    <script type="module" crossorigin src="/assets/index-DKnNJHRK.js"></script>
+    <script type="module" crossorigin src="/assets/index-coH8y7gV.js"></script>
   </head>
   <body>
     <div id="root"></div>

lyrics_transcriber/frontend/package.json CHANGED Viewed

@@ -18,8 +18,11 @@
     "@emotion/styled": "^11.14.0",
     "@mui/icons-material": "^6.3.0",
     "@mui/material": "^6.3.0",
+    "@mui/system": "^6.4.3",
+    "nanoid": "^5.0.9",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react-dom": "^18.3.1",
+    "zod": "^3.24.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.17.0",
@@ -34,5 +37,6 @@
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.18.2",
     "vite": "^6.0.5"
-  }
+  },
+  "packageManager": "yarn@4.6.0"
 }

lyrics_transcriber/frontend/src/App.tsx CHANGED Viewed

@@ -12,16 +12,21 @@ export default function App() {
   const [error, setError] = useState<string | null>(null)
   const [apiClient, setApiClient] = useState<ApiClient | null>(null)
   const [isReadOnly, setIsReadOnly] = useState(true)
+  const [audioHash, setAudioHash] = useState<string>('')
   useEffect(() => {
     // Parse query parameters
     const params = new URLSearchParams(window.location.search)
     const encodedApiUrl = params.get('baseApiUrl')
+    const audioHashParam = params.get('audioHash')
     if (encodedApiUrl) {
       const baseApiUrl = decodeURIComponent(encodedApiUrl)
       setApiClient(new LiveApiClient(baseApiUrl))
       setIsReadOnly(false)
+      if (audioHashParam) {
+        setAudioHash(audioHashParam)
+      }
       // Fetch initial data
       fetchData(baseApiUrl)
     } else {
@@ -34,6 +39,7 @@ export default function App() {
     try {
       const client = new LiveApiClient(baseUrl)
       const data = await client.getCorrectionData()
+      console.log('Full correction data from API:', data)
       setData(data)
     } catch (err) {
       const error = err as Error
@@ -52,9 +58,18 @@ export default function App() {
       try {
         const text = await file.text()
-        console.log('File contents:', text.slice(0, 500) + '...') // Show first 500 chars
         const parsedData = JSON.parse(text) as CorrectionData
-        console.log('Parsed file data:', parsedData)
+        console.log('File data loaded:', {
+          sampleGap: parsedData.gap_sequences?.[0],
+          sampleWord: parsedData.corrected_segments?.[0]?.words?.[0],
+          sampleCorrection: parsedData.corrections?.[0]
+        })
+        // Validate the structure
+        if (!parsedData.corrected_segments || !parsedData.gap_sequences) {
+          throw new Error('Invalid file format: missing required fields')
+        }
         setData(parsedData)
       } catch (err) {
         const error = err as Error
@@ -189,6 +204,7 @@ export default function App() {
         onShowMetadata={() => setShowMetadata(true)}
         apiClient={apiClient}
         isReadOnly={isReadOnly}
+        audioHash={audioHash}
       />
       {renderMetadataModal()}
     </Box>

lyrics_transcriber/frontend/src/api.ts CHANGED Viewed

@@ -1,10 +1,15 @@
 import { CorrectionData } from './types';
+import { validateCorrectionData } from './validation';
 // New file to handle API communication
 export interface ApiClient {
     getCorrectionData: () => Promise<CorrectionData>;
     submitCorrections: (data: CorrectionData) => Promise<void>;
-    getAudioUrl: () => string;
+    getAudioUrl: (audioHash: string) => string;
+    generatePreviewVideo: (data: CorrectionData) => Promise<PreviewVideoResponse>;
+    getPreviewVideoUrl: (previewHash: string) => string;
+    updateHandlers: (enabledHandlers: string[]) => Promise<CorrectionData>;
+    isUpdatingHandlers?: boolean;
 }
 // Add new interface for the minimal update payload
@@ -13,18 +18,34 @@ interface CorrectionUpdate {
     corrected_segments: CorrectionData['corrected_segments'];
 }
+// Add new interface for preview response
+interface PreviewVideoResponse {
+    status: "success" | "error";
+    preview_hash?: string;
+    message?: string;
+}
 export class LiveApiClient implements ApiClient {
     constructor(private baseUrl: string) {
         this.baseUrl = baseUrl.replace(/\/$/, '')
     }
+    public isUpdatingHandlers = false;
     async getCorrectionData(): Promise<CorrectionData> {
         const response = await fetch(`${this.baseUrl}/correction-data`);
         if (!response.ok) {
             throw new Error(`API error: ${response.statusText}`);
         }
-        const data = await response.json();
-        return data;
+        const rawData = await response.json();
+        try {
+            // This will throw if validation fails
+            return validateCorrectionData(rawData);
+        } catch (error) {
+            console.error('Data validation failed:', error);
+            throw new Error('Invalid data received from server: missing or incorrect fields');
+        }
     }
     async submitCorrections(data: CorrectionData): Promise<void> {
@@ -47,8 +68,68 @@ export class LiveApiClient implements ApiClient {
         }
     }
-    getAudioUrl(): string {
-        return `${this.baseUrl}/audio`
+    getAudioUrl(audioHash: string): string {
+        return `${this.baseUrl}/audio/${audioHash}`
+    }
+    async generatePreviewVideo(data: CorrectionData): Promise<PreviewVideoResponse> {
+        // Extract only the needed fields, just like in submitCorrections
+        const updatePayload: CorrectionUpdate = {
+            corrections: data.corrections,
+            corrected_segments: data.corrected_segments
+        };
+        const response = await fetch(`${this.baseUrl}/preview-video`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(updatePayload)
+        });
+        if (!response.ok) {
+            return {
+                status: 'error',
+                message: `API error: ${response.statusText}`
+            };
+        }
+        return await response.json();
+    }
+    getPreviewVideoUrl(previewHash: string): string {
+        return `${this.baseUrl}/preview-video/${previewHash}`;
+    }
+    async updateHandlers(enabledHandlers: string[]): Promise<CorrectionData> {
+        console.log('API: Starting handler update...');
+        this.isUpdatingHandlers = true;
+        console.log('API: Set isUpdatingHandlers to', this.isUpdatingHandlers);
+        try {
+            const response = await fetch(`${this.baseUrl}/handlers`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(enabledHandlers)
+            });
+            if (!response.ok) {
+                throw new Error(`API error: ${response.statusText}`);
+            }
+            const data = await response.json();
+            if (data.status === 'error') {
+                throw new Error(data.message || 'Failed to update handlers');
+            }
+            console.log('API: Handler update successful');
+            return validateCorrectionData(data.data);
+        } finally {
+            this.isUpdatingHandlers = false;
+            console.log('API: Set isUpdatingHandlers to', this.isUpdatingHandlers);
+        }
     }
 }
@@ -62,7 +143,23 @@ export class FileOnlyClient implements ApiClient {
         throw new Error('Not supported in file-only mode');
     }
-    getAudioUrl(): string {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getAudioUrl(_audioHash: string): string {
+        throw new Error('Not supported in file-only mode');
+    }
+    async generatePreviewVideo(): Promise<PreviewVideoResponse> {
+        throw new Error('Not supported in file-only mode');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getPreviewVideoUrl(_previewHash: string): string {
+        throw new Error('Not supported in file-only mode');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async updateHandlers(_enabledHandlers: string[]): Promise<CorrectionData> {
         throw new Error('Not supported in file-only mode');
     }
 }

lyrics_transcriber/frontend/src/components/AudioPlayer.tsx CHANGED Viewed

@@ -6,10 +6,11 @@ import { ApiClient } from '../api'
 interface AudioPlayerProps {
     apiClient: ApiClient | null,
-    onTimeUpdate?: (time: number) => void
+    onTimeUpdate?: (time: number) => void,
+    audioHash: string
 }
-export default function AudioPlayer({ apiClient, onTimeUpdate }: AudioPlayerProps) {
+export default function AudioPlayer({ apiClient, onTimeUpdate, audioHash }: AudioPlayerProps) {
     const [isPlaying, setIsPlaying] = useState(false)
     const [currentTime, setCurrentTime] = useState(0)
     const [duration, setDuration] = useState(0)
@@ -18,7 +19,7 @@ export default function AudioPlayer({ apiClient, onTimeUpdate }: AudioPlayerProp
     useEffect(() => {
         if (!apiClient) return
-        const audio = new Audio(apiClient.getAudioUrl())
+        const audio = new Audio(apiClient.getAudioUrl(audioHash))
         audioRef.current = audio
         // Add requestAnimationFrame for smoother updates
@@ -55,7 +56,7 @@ export default function AudioPlayer({ apiClient, onTimeUpdate }: AudioPlayerProp
             audio.src = ''
             audioRef.current = null
         }
-    }, [apiClient, onTimeUpdate])
+    }, [apiClient, onTimeUpdate, audioHash])
     const handlePlayPause = () => {
         if (!audioRef.current) return
@@ -130,7 +131,7 @@ export default function AudioPlayer({ apiClient, onTimeUpdate }: AudioPlayerProp
             <Typography variant="body2" color="text.secondary" sx={{ mr: 1 }}>
                 Playback:
             </Typography>
             <IconButton
                 onClick={handlePlayPause}
                 size="small"
@@ -148,7 +149,7 @@ export default function AudioPlayer({ apiClient, onTimeUpdate }: AudioPlayerProp
                 max={duration}
                 onChange={handleSeek}
                 size="small"
-                sx={{
+                sx={{
                     width: 200,
                     mx: 1,
                     '& .MuiSlider-thumb': {

lyrics_transcriber/frontend/src/components/DetailsModal.tsx CHANGED Viewed

@@ -9,32 +9,78 @@ import {
 } from '@mui/material'
 import CloseIcon from '@mui/icons-material/Close'
 import { ModalContent } from './LyricsAnalyzer'
+import { WordCorrection, ReferenceSource, AnchorSequence } from '../types'
+import { getWordsFromIds } from './shared/utils/wordUtils'
 interface DetailsModalProps {
     open: boolean
     content: ModalContent | null
     onClose: () => void
+    allCorrections: WordCorrection[]
+    referenceLyrics?: Record<string, ReferenceSource>
+}
+function formatReferenceWords(content: ModalContent | null, referenceLyrics?: Record<string, ReferenceSource>): string {
+    if (!content || !referenceLyrics) return ''
+    return Object.entries(content.data.reference_word_ids)
+        .map(([source, wordIds]) => {
+            const words = getWordsFromIds(
+                referenceLyrics[source]?.segments ?? [],
+                wordIds
+            )
+            return `${source}: "${words.map(w => w.text).join(' ')}"`
+        })
+        .join('\n')
+}
+function getAnchorText(anchorId: string | null, anchors: AnchorSequence[], referenceLyrics?: Record<string, ReferenceSource>): string {
+    if (!anchorId || !referenceLyrics) return anchorId || ''
+    const anchor = anchors.find(a => a.id === anchorId)
+    if (!anchor) return anchorId
+    // Get the first source's words as representative text
+    const firstSource = Object.entries(anchor.reference_word_ids)[0]
+    if (!firstSource) return anchorId
+    const [source, wordIds] = firstSource
+    const words = getWordsFromIds(
+        referenceLyrics[source]?.segments ?? [],
+        wordIds
+    )
+    return `${anchorId} ("${words.map(w => w.text).join(' ')}")`
 }
 export default function DetailsModal({
     open,
     content,
     onClose,
+    allCorrections,
+    referenceLyrics
 }: DetailsModalProps) {
     if (!content) return null
+    const referenceWordsText = formatReferenceWords(content, referenceLyrics)
+    const relevantCorrections = content.type === 'gap' ? allCorrections.filter(c =>
+        c.word_id === content.data.wordId ||
+        c.corrected_word_id === content.data.wordId ||
+        content.data.transcribed_word_ids.includes(c.word_id)
+    ) : []
+    const isCorrected = content.type === 'gap' && relevantCorrections.length > 0
     const getCurrentWord = () => {
         if (content.type === 'gap') {
             return content.data.word
         } else if (content.type === 'anchor') {
-            return content.data.word ?? content.data.words[0]
+            return content.data.word ?? ''
         }
         return ''
     }
-    const isCorrected = content.type === 'gap' && content.data.corrections?.length > 0
     const renderContent = () => {
+        const anchorWords = content.type === 'anchor' ? content.data.transcribed_word_ids?.length ?? 0 : 0
         switch (content.type) {
             case 'anchor':
                 return (
@@ -45,16 +91,17 @@ export default function DetailsModal({
                         />
                         <GridItem
                             title="Full Text"
-                            value={`"${content.data.text}"`}
+                            value={`"${content.data.word ?? ''}"`}
                         />
                         <GridItem title="Word ID" value={content.data.wordId} />
-                        <GridItem title="Length" value={`${content.data.length} words`} />
                         <GridItem
-                            title="Reference Word IDs"
-                            value={content.data.reference_word_ids ?
-                                Object.entries(content.data.reference_word_ids).map(([source, ids]) => (
-                                    `${source}: ${ids?.join(', ') ?? 'No IDs'}`
-                                )).join('\n') : 'No reference word IDs'
+                            title="Length"
+                            value={`${anchorWords} words`}
+                        />
+                        <GridItem
+                            title="Reference Words"
+                            value={
+                                <pre style={{ margin: 0, whiteSpace: 'pre-wrap' }}>{referenceWordsText}</pre>
                             }
                         />
                         <GridItem title="Confidence" value={content.data.confidence?.toFixed(3) ?? 'N/A'} />
@@ -82,66 +129,45 @@ export default function DetailsModal({
                             title="Selected Word"
                             value={`"${getCurrentWord()}"`}
                         />
-                        <GridItem
-                            title="Current Text"
-                            value={`"${content.data.words?.map(word => {
-                                const wordCorrection = content.data.corrections?.find(
-                                    c => c.original_word === word
-                                )
-                                return wordCorrection ? wordCorrection.corrected_word : word
-                            }).join(' ') ?? content.data.word}"`}
-                        />
                         <GridItem
                             title="Word ID"
                             value={content.data.wordId}
                         />
                         <GridItem
                             title="Length"
-                            value={`${content.data.length} words`}
+                            value={`${content.data.transcribed_word_ids?.length ?? 0} words`}
                         />
-                        {content.data.preceding_anchor && (
+                        {content.data.preceding_anchor_id && (
                             <GridItem
                                 title="Preceding Anchor"
-                                value={`"${content.data.preceding_anchor.text}"`}
+                                value={getAnchorText(content.data.preceding_anchor_id, content.data.anchor_sequences, referenceLyrics)}
                             />
                         )}
-                        <GridItem
-                            title="Transcribed Text"
-                            value={`"${content.data.text}"`}
-                        />
-                        {content.data.following_anchor && (
+                        {content.data.following_anchor_id && (
                             <GridItem
                                 title="Following Anchor"
-                                value={`"${content.data.following_anchor.text}"`}
+                                value={getAnchorText(content.data.following_anchor_id, content.data.anchor_sequences, referenceLyrics)}
                             />
                         )}
-                        {content.data.reference_words && (
-                            <GridItem
-                                title="Reference Words"
-                                value={
-                                    <>
-                                        {content.data.reference_words.spotify && (
-                                            <Typography>Spotify: "{content.data.reference_words.spotify.join(' ')}"</Typography>
-                                        )}
-                                        {content.data.reference_words.genius && (
-                                            <Typography>Genius: "{content.data.reference_words.genius.join(' ')}"</Typography>
-                                        )}
-                                    </>
-                                }
-                            />
-                        )}
-                        {isCorrected && content.data.corrections && (
+                        <GridItem
+                            title="Reference Words"
+                            value={
+                                <pre style={{ margin: 0, whiteSpace: 'pre-wrap' }}>{referenceWordsText}</pre>
+                            }
+                        />
+                        {isCorrected && (
                             <GridItem
                                 title="Correction Details"
                                 value={
                                     <>
-                                        {content.data.corrections.map((correction, index) => (
+                                        {relevantCorrections.map((correction, index) => (
                                             <Box key={index} sx={{ mb: 2, p: 1, border: '1px solid #ccc', borderRadius: '4px' }}>
                                                 <Typography variant="subtitle2" fontWeight="bold">Correction {index + 1}</Typography>
                                                 <Typography>Original: <strong>"{correction.original_word}"</strong></Typography>
                                                 <Typography>Corrected: <strong>"{correction.corrected_word}"</strong></Typography>
                                                 <Typography>Word ID: {correction.word_id}</Typography>
                                                 <Typography>Confidence: {correction.confidence?.toFixed(3) ?? 'N/A'}</Typography>
+                                                <Typography>Handler: {correction.handler}</Typography>
                                                 <Typography>Source: {correction.source}</Typography>
                                                 <Typography>Reason: {correction.reason}</Typography>
                                                 {correction.is_deletion && <Typography>Is Deletion: Yes</Typography>}
@@ -154,7 +180,7 @@ export default function DetailsModal({
                                                         <Box sx={{ pl: 2 }}>
                                                             {Object.entries(correction.alternatives).map(([word, score]) => (
                                                                 <Typography key={word}>
-                                                                    "{word}": {score?.toFixed(3) ?? 'N/A'}
+                                                                    "{word}": {(score || 0).toFixed(3)}
                                                                 </Typography>
                                                             ))}
                                                         </Box>
@@ -178,24 +204,25 @@ export default function DetailsModal({
         <Dialog
             open={open}
             onClose={onClose}
-            maxWidth="sm"
+            maxWidth="md"
             fullWidth
         >
-            <IconButton
-                onClick={onClose}
-                sx={{
-                    position: 'absolute',
-                    right: 8,
-                    top: 8,
-                }}
-            >
-                <CloseIcon />
-            </IconButton>
             <DialogTitle>
-                {content.type === 'gap' && (isCorrected ? 'Corrected ' : 'Uncorrected ')}
+                {content.type === 'gap' && (
+                    isCorrected ? 'Corrected ' : 'Uncorrected '
+                )}
                 {content.type.charAt(0).toUpperCase() + content.type.slice(1)} Details - "{getCurrentWord()}"
+                <IconButton
+                    aria-label="close"
+                    onClick={onClose}
+                    sx={{ position: 'absolute', right: 8, top: 8 }}
+                >
+                    <CloseIcon />
+                </IconButton>
             </DialogTitle>
-            <DialogContent dividers>{renderContent()}</DialogContent>
+            <DialogContent>
+                {renderContent()}
+            </DialogContent>
         </Dialog>
     )
 }

lyrics-transcriber 0.41.0__py3-none-any.whl → 0.42.0__py3-none-any.whl

lyrics-transcriber 0.41.0py3-none-any.whl → 0.42.0py3-none-any.whl