Merge speaker diarization feature into main#22
Open
gpwclark wants to merge 1 commit into
Open
Conversation
Resolved conflicts between main and feature/speaker-diarization-2: - Combined blog processing (from main) with speaker diarization features - Merged CLI arguments from both branches - Integrated both BlogProcessor and AudioProcessor in service.py - Combined database schema changes (failed_items/processing_state from main, speaker identity tables from feature) - Merged feeds.toml entries from both branches - Kept protobuf changes moved to pinkhaus-models (removed old transcription_pb2.py) - Added sentencepiece dependency for speaker diarization
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolved conflicts between main and feature/speaker-diarization-2: