fix: Resolve protobuf dependency conflict for pyannote.audio 4.x

- Update protobuf from <5.0.0 to >=5.0.0 (required by opentelemetry-proto)
- Update streamlit minimum version to >=1.30.0 (protobuf 5.x compatible)
- Update regular Dockerfile to match GPU dockerfile structure
- Install PyTorch CPU version in regular Dockerfile for consistency
This commit is contained in:
Your Name
2026-01-05 11:30:56 -05:00
parent 4dd3c7600e
commit efee0b0abe
2 changed files with 11 additions and 7 deletions

View File

@ -15,12 +15,14 @@ RUN apt-get update && apt-get install -y \
# Copy requirements first for better Docker layer caching # Copy requirements first for better Docker layer caching
COPY requirements.txt . COPY requirements.txt .
# Install Python dependencies with pinned versions # Upgrade pip and install build tools
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --upgrade pip setuptools wheel
# Optional: Install CUDA-specific PyTorch if GPU support needed # Install PyTorch CPU version first (for non-GPU builds)
# Uncomment and modify for your CUDA version: RUN pip install --no-cache-dir torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
# RUN pip install --force-reinstall torch==2.1.0+cu118 torchvision==0.16.0+cu118 torchaudio==2.1.0+cu118 --index-url https://download.pytorch.org/whl/cu118
# Install remaining Python dependencies
RUN pip install --no-cache-dir -r requirements.txt
# Copy application code # Copy application code
COPY . . COPY . .

View File

@ -1,6 +1,7 @@
# OBS Recording Transcriber Dependencies # OBS Recording Transcriber Dependencies
# Core dependencies # Core dependencies
streamlit>=1.26.0 # streamlit>=1.30.0 required for protobuf>=5.0 compatibility
streamlit>=1.30.0
moviepy>=1.0.3 moviepy>=1.0.3
openai-whisper>=20231117 openai-whisper>=20231117
requests>=2.28.0 requests>=2.28.0
@ -28,7 +29,8 @@ pytorch-lightning>=2.0.0
# Other dependencies # Other dependencies
iso639>=0.1.4 iso639>=0.1.4
protobuf>=3.20.0,<5.0.0 # protobuf>=5.0 required by opentelemetry (pyannote.audio dependency)
protobuf>=5.0.0
matplotlib>=3.5.0 matplotlib>=3.5.0
soundfile>=0.10.3 soundfile>=0.10.3
ffmpeg-python>=0.2.0 ffmpeg-python>=0.2.0