meeting-noter 0.5.1__py3-none-any.whl → 0.6.1__py3-none-any.whl

meeting_noter/audio/encoder.py

@@ -1,37 +1,21 @@
-"""MP3 encoding for audio recordings."""
+"""MP3 encoding for audio recordings using ffmpeg."""
 
 from __future__ import annotations
 
 import re
-import sys
+import subprocess
 import numpy as np
 from pathlib import Path
 from datetime import datetime
 from typing import Optional, Tuple
 
-# Try to import lameenc, provide helpful error if not available
+# Get bundled ffmpeg binary path
 try:
-    import lameenc
-    LAMEENC_AVAILABLE = True
+    import imageio_ffmpeg
+    FFMPEG_PATH = imageio_ffmpeg.get_ffmpeg_exe()
 except ImportError:
-    LAMEENC_AVAILABLE = False
-    lameenc = None
-
-
-def _check_lameenc():
-    """Check if lameenc is available, raise helpful error if not."""
-    if not LAMEENC_AVAILABLE:
-        print("\n" + "=" * 60, file=sys.stderr)
-        print("ERROR: MP3 encoding requires the 'lame' library", file=sys.stderr)
-        print("=" * 60, file=sys.stderr)
-        print("\nTo fix this, run:", file=sys.stderr)
-        print("\n    brew install lame", file=sys.stderr)
-        print("\nThen reinstall meeting-noter:", file=sys.stderr)
-        print("\n    pip install --force-reinstall meeting-noter", file=sys.stderr)
-        print("\n" + "=" * 60 + "\n", file=sys.stderr)
-        raise ImportError(
-            "lameenc not available. Install LAME first: brew install lame"
-        )
+    # Fallback to system ffmpeg
+    FFMPEG_PATH = "ffmpeg"
 
 
 def _sanitize_filename(name: str, max_length: int = 50) -> str:
@@ -62,24 +46,42 @@ def _is_timestamp_name(name: str) -> bool:
 
 
 class MP3Encoder:
-    """Encodes audio data to MP3 format."""
+    """Encodes audio data to MP3 format using ffmpeg."""
 
     def __init__(
         self,
+        output_path: Path,
         sample_rate: int = 16000,
         channels: int = 1,
         bitrate: int = 128,
-        quality: int = 2,
     ):
-        _check_lameenc()
+        self.output_path = output_path
         self.sample_rate = sample_rate
         self.channels = channels
-        self.encoder = lameenc.Encoder()
-        self.encoder.set_bit_rate(bitrate)
-        self.encoder.set_in_sample_rate(sample_rate)
-        self.encoder.set_channels(channels)
-        self.encoder.set_quality(quality)  # 2 = high quality
-        self._buffer = bytearray()
+        self.bitrate = bitrate
+        self._process: Optional[subprocess.Popen] = None
+        self._start_ffmpeg()
+
+    def _start_ffmpeg(self):
+        """Start ffmpeg process for encoding."""
+        cmd = [
+            FFMPEG_PATH,
+            "-y",  # Overwrite output
+            "-f", "s16le",  # Input format: signed 16-bit little-endian PCM
+            "-ar", str(self.sample_rate),  # Sample rate
+            "-ac", str(self.channels),  # Channels
+            "-i", "pipe:0",  # Read from stdin
+            "-codec:a", "libmp3lame",  # MP3 encoder
+            "-b:a", f"{self.bitrate}k",  # Bitrate
+            "-f", "mp3",  # Output format
+            str(self.output_path),
+        ]
+        self._process = subprocess.Popen(
+            cmd,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
 
     def encode_chunk(self, audio: np.ndarray) -> bytes:
         """Encode a chunk of audio data.
@@ -88,16 +90,29 @@ class MP3Encoder:
             audio: Float32 audio data, values between -1 and 1
 
         Returns:
-            MP3 encoded bytes
+            Empty bytes (ffmpeg writes directly to file)
         """
+        if self._process is None or self._process.stdin is None:
+            return b""
+
         # Convert float32 to int16
         int_data = (audio * 32767).astype(np.int16)
-        mp3_data = self.encoder.encode(int_data.tobytes())
-        return mp3_data
+        try:
+            self._process.stdin.write(int_data.tobytes())
+        except BrokenPipeError:
+            pass
+        return b""  # ffmpeg writes to file, not returning data
 
     def finalize(self) -> bytes:
-        """Finalize encoding and return remaining data."""
-        return self.encoder.flush()
+        """Finalize encoding."""
+        if self._process is not None and self._process.stdin is not None:
+            try:
+                self._process.stdin.close()
+            except Exception:
+                pass
+            self._process.wait()
+            self._process = None
+        return b""
 
 
 class RecordingSession:
@@ -115,7 +130,6 @@ class RecordingSession:
         self.channels = channels
         self.meeting_name = meeting_name
         self.encoder: Optional[MP3Encoder] = None
-        self.file_handle = None
         self.filepath: Optional[Path] = None
         self.start_time: Optional[datetime] = None
         self.total_samples = 0
@@ -139,22 +153,20 @@ class RecordingSession:
         self.filepath = self.output_dir / filename
 
         self.encoder = MP3Encoder(
+            output_path=self.filepath,
             sample_rate=self.sample_rate,
             channels=self.channels,
         )
-        self.file_handle = open(self.filepath, "wb")
         self.total_samples = 0
 
         return self.filepath
 
     def write(self, audio: np.ndarray):
         """Write audio data to the recording."""
-        if self.encoder is None or self.file_handle is None:
+        if self.encoder is None:
             raise RuntimeError("Recording session not started")
 
-        mp3_data = self.encoder.encode_chunk(audio)
-        if mp3_data:
-            self.file_handle.write(mp3_data)
+        self.encoder.encode_chunk(audio)
         self.total_samples += len(audio)
 
     def stop(self) -> Tuple[Optional[Path], float]:
@@ -166,13 +178,9 @@ class RecordingSession:
         duration = 0.0
         filepath = self.filepath
 
-        if self.encoder and self.file_handle:
-            # Write final data
-            final_data = self.encoder.finalize()
-            if final_data:
-                self.file_handle.write(final_data)
-            self.file_handle.close()
-
+        if self.encoder:
+            # Finalize encoding
+            self.encoder.finalize()
             duration = self.total_samples / self.sample_rate
 
             # Delete if too short (less than 5 seconds)
@@ -181,7 +189,6 @@ class RecordingSession:
                 filepath = None
 
         self.encoder = None
-        self.file_handle = None
         self.filepath = None
         self.start_time = None
         self.total_samples = 0

meeting_noter/transcription/engine.py

@@ -8,13 +8,39 @@ from datetime import datetime
 from typing import Optional
 
 
+def _get_bundled_model_path() -> Optional[Path]:
+    """Check if bundled model is available via meeting-noter-models package."""
+    try:
+        from meeting_noter_models import get_model_path, MODEL_NAME
+        model_path = get_model_path()
+        if model_path.exists() and (model_path / "model.bin").exists():
+            return model_path
+    except ImportError:
+        pass
+    return None
+
+
 def get_model(model_size: str = "tiny.en"):
     """Load the Whisper model.
 
-    Models are cached after first download (~75MB for tiny.en).
+    Priority:
+    1. Bundled model from meeting-noter-models package (offline)
+    2. Download from Hugging Face Hub (cached after first download)
     """
     from faster_whisper import WhisperModel
 
+    # Check for bundled model first (for offline use)
+    bundled_path = _get_bundled_model_path()
+    if bundled_path and model_size == "tiny.en":
+        click.echo(f"Loading bundled model '{model_size}'...")
+        model = WhisperModel(
+            str(bundled_path),
+            device="cpu",
+            compute_type="int8",
+        )
+        return model
+
+    # Fall back to Hugging Face download
     click.echo(f"Loading model '{model_size}'...")
 
     # Use INT8 for CPU efficiency

{meeting_noter-0.5.1.dist-info → meeting_noter-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meeting-noter
-Version: 0.5.1
+Version: 0.6.1
 Summary: Offline meeting transcription for macOS with automatic meeting detection
 Author: Victor
 License: MIT
@@ -28,14 +28,15 @@ Requires-Dist: numpy>=1.24
 Requires-Dist: faster-whisper>=1.0.0
 Requires-Dist: rumps>=0.4.0
 Requires-Dist: PyQt6>=6.5.0
+Requires-Dist: imageio-ffmpeg>=0.4.9
 Requires-Dist: pyobjc-framework-Cocoa>=9.0; sys_platform == "darwin"
 Requires-Dist: pyobjc-framework-Quartz>=9.0; sys_platform == "darwin"
 Requires-Dist: pyobjc-framework-ScreenCaptureKit>=9.0; sys_platform == "darwin"
 Requires-Dist: pyobjc-framework-AVFoundation>=9.0; sys_platform == "darwin"
 Requires-Dist: pyobjc-framework-CoreMedia>=9.0; sys_platform == "darwin"
 Requires-Dist: pyobjc-framework-libdispatch>=9.0; sys_platform == "darwin"
-Provides-Extra: mp3
-Requires-Dist: lameenc>=1.5.0; extra == "mp3"
+Provides-Extra: offline
+Requires-Dist: meeting-noter-models>=0.1.0; extra == "offline"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -59,11 +60,7 @@ Offline meeting transcription tool for macOS. Captures both your voice and meeti
 ## Installation
 
 ```bash
-# Install dependencies
-brew install ffmpeg lame pkg-config python@3.12
-
-# Install meeting-noter (use Python 3.12 for best compatibility)
-pipx install meeting-noter --python /opt/homebrew/bin/python3.12
+pipx install meeting-noter
 ```
 
 Or with pip:
@@ -71,6 +68,8 @@ Or with pip:
 pip install meeting-noter
 ```
 
+No system dependencies required - ffmpeg is bundled automatically.
+
 ## Quick Start
 
 **Menu Bar App** (recommended):
@@ -208,10 +207,7 @@ Config file: `~/.config/meeting-noter/config.json`
 ## Requirements
 
 - macOS 12.3+ (for ScreenCaptureKit)
-- Python 3.9+ (3.12 recommended for best compatibility)
-- FFmpeg (`brew install ffmpeg`) - required for audio processing
-- LAME (`brew install lame`) - required for MP3 encoding
-- pkg-config (`brew install pkg-config`) - required for building dependencies
+- Python 3.9+
 
 ## License
 

{meeting_noter-0.5.1.dist-info → meeting_noter-0.6.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ meeting_noter/menubar.py,sha256=Gn6p8y5jA_HCWf1T3ademxH-vndpONHkf9vUlKs6XEo,1437
 meeting_noter/mic_monitor.py,sha256=Dzt7RZT7-X5US7mT2I247UguR-uLWK0BZDnjiehLD-A,13634
 meeting_noter/audio/__init__.py,sha256=O7PU8CxHSHxMeHbc9Jdwt9kePLQzsPh81GQU7VHCtBY,44
 meeting_noter/audio/capture.py,sha256=fDrT5oXfva8vdFlht9cv60NviKbksw2QeJ8eOtI19uE,6469
-meeting_noter/audio/encoder.py,sha256=C-lGn6S-1KmvfeXMaP032XhifDNMe6sa0RKDZHoZlio,6374
+meeting_noter/audio/encoder.py,sha256=6UgEYLFACSQEIx2nhH1Qq-cBh3qPJziMGkrm39k6Nz8,6401
 meeting_noter/audio/system_audio.py,sha256=jbHGjNCerI19weXap0a90Ik17lVTCT1hCEgRKYke-p8,13016
 meeting_noter/gui/__init__.py,sha256=z5GxxaeXyjqyEa9ox0dQxuL5u_BART0bi7cI6rfntEI,103
 meeting_noter/gui/__main__.py,sha256=A2HWdYod0bTgjQQIi21O7XpmgxLH36e_X0aygEUZLls,146
@@ -31,9 +31,9 @@ meeting_noter/resources/icon_32.png,sha256=Bw6hJXqkd-d1OfDpFv2om7Stex7daedxnpXt3
 meeting_noter/resources/icon_512.png,sha256=o7X3ngYcppcIAAk9AcfPx94MUmrsPRp0qBTpb9SzfX8,5369
 meeting_noter/resources/icon_64.png,sha256=TqG7Awx3kK8YdiX1e_z1odZonosZyQI2trlkNZCzUoI,607
 meeting_noter/transcription/__init__.py,sha256=7GY9diP06DzFyoli41wddbrPv5bVDzH35bmnWlIJev4,29
-meeting_noter/transcription/engine.py,sha256=HK2J2QOBNIDm1MXW-gkagXP8C8cqUfK_WylHQD_LqOI,6320
-meeting_noter-0.5.1.dist-info/METADATA,sha256=7JlWzxnwRDqLfauYCMWS_TB19ZvKgWG-TI-RCbI9jhU,7032
-meeting_noter-0.5.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-meeting_noter-0.5.1.dist-info/entry_points.txt,sha256=rKNhzjSF5-e3bLRr8LVe22FeiwcacXabCvNpoEXfu4I,56
-meeting_noter-0.5.1.dist-info/top_level.txt,sha256=9Tuq04_0SXM0OXOHVbOHkHkB5tG3fqkrMrfzCMpbLpY,14
-meeting_noter-0.5.1.dist-info/RECORD,,
+meeting_noter/transcription/engine.py,sha256=G9NcSS6Q-UhW7PlQ0E85hQXn6BWao64nIvyw4NR2yxI,7208
+meeting_noter-0.6.1.dist-info/METADATA,sha256=KCJbo3BWGaFyysbFWkUDi7SMsd-65P_fNLCmiNAFOVk,6741
+meeting_noter-0.6.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+meeting_noter-0.6.1.dist-info/entry_points.txt,sha256=rKNhzjSF5-e3bLRr8LVe22FeiwcacXabCvNpoEXfu4I,56
+meeting_noter-0.6.1.dist-info/top_level.txt,sha256=9Tuq04_0SXM0OXOHVbOHkHkB5tG3fqkrMrfzCMpbLpY,14
+meeting_noter-0.6.1.dist-info/RECORD,,