monkeyplug-enhanced 2.2.2__tar.gz → 2.2.3__tar.gz

{monkeyplug_enhanced-2.2.2 → monkeyplug_enhanced-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monkeyplug-enhanced
-Version: 2.2.2
+Version: 2.2.3
 Summary: Enhanced fork of monkeyplug — censors profanity in audio files using speech recognition with Groq API, AI instrumental generation, and batch processing.
 Project-URL: Homepage, https://github.com/ljbred08/monkeyplug
 Project-URL: Issues, https://github.com/ljbred08/monkeyplug/issues
@@ -19,6 +19,7 @@ Requires-Dist: numpy>=1.24.0
 Requires-Dist: requests==2.32.5
 Requires-Dist: sherpa-onnx>=1.10.0
 Requires-Dist: soundfile>=0.12.0
+Requires-Dist: tqdm>=4.65.0
 Description-Content-Type: text/markdown
 
 # monkeyplug-enhanced

{monkeyplug_enhanced-2.2.2 → monkeyplug_enhanced-2.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monkeyplug-enhanced"
-version = "2.2.2"
+version = "2.2.3"
 authors = [
   { name="Seth Grover", email="mero.mero.guero@gmail.com" },
   { name="Lincoln Brown", email="link@brown.fm" },
@@ -26,6 +26,7 @@ dependencies = [
     "sherpa-onnx>=1.10.0",
     "numpy>=1.24.0",
     "soundfile>=0.12.0",
+    "tqdm>=4.65.0",
 ]
 
 [project.urls]

{monkeyplug_enhanced-2.2.2 → monkeyplug_enhanced-2.2.3}/src/monkeyplug/monkeyplug.py

@@ -17,6 +17,7 @@ import shutil
 import string
 import sys
 import wave
+from tqdm import tqdm
 
 from urllib.parse import urlparse
 from itertools import tee
@@ -683,7 +684,17 @@ class Plugger(object):
             # Extract, separate, and get instrumental file
             if self.instrumentalSegments:
                 try:
+                    # Update progress bar to show extraction starting
+                    if hasattr(self, '_progress') and self._progress and not self.debug:
+                        self._progress.update(1)
+                        self._progress.total = 3
+                        self._progress.set_description("Extracting instrumental")
+
                     self.instrumentalFileSpec = self._create_combined_profanity_file()
+
+                    # Update progress after extraction completes
+                    if hasattr(self, '_progress') and self._progress and not self.debug:
+                        self._progress.update(1)
                     if self.instrumentalFileSpec:
                         self.instrumentalMode = True
                         self._build_instrumental_filters()
@@ -899,8 +910,55 @@ class Plugger(object):
     ######## EncodeCleanAudio ####################################################
     def EncodeCleanAudio(self):
         if (self.forceDespiteTag is True) or (GetMonkeyplugTagged(self.inputFileSpec, debug=self.debug) is False):
+            # Initialize progress (only when not in debug mode)
+            progress = None
+            if not self.debug:
+                # Determine first action
+                if not self.inputTranscript:
+                    initial_desc = "Transcribing"
+                else:
+                    initial_desc = "Processing"
+
+                progress = tqdm(
+                    total=1,  # Will be updated based on actual steps
+                    desc=initial_desc,
+                    unit="step",
+                    disable=False,
+                    bar_format='{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}<{remaining}]',
+                )
+
+            # Store progress reference for use in CreateCleanMuteList
+            self._progress = progress
+
             self.CreateCleanMuteList()
 
+            # Update progress after CreateCleanMuteList
+            if progress:
+                did_extraction = (
+                    hasattr(self, 'autoGenerateMode') and
+                    self.autoGenerateMode and
+                    hasattr(self, 'segMapping') and
+                    self.segMapping
+                )
+
+                if not self.inputTranscript and not did_extraction:
+                    # Transcription done inside CreateCleanMuteList, no extraction
+                    progress.update(1)
+                    progress.total = 2
+                    progress.set_description("Encoding")
+                elif not self.inputTranscript and did_extraction:
+                    # Both transcription and extraction handled inside CreateCleanMuteList
+                    # Just set description to encoding
+                    progress.set_description("Encoding")
+                elif self.inputTranscript and did_extraction:
+                    # Extraction handled inside CreateCleanMuteList (no transcription update needed)
+                    progress.total = 2
+                    progress.set_description("Encoding")
+                else:
+                    # No transcription, no extraction - just encoding
+                    progress.total = 1
+                    progress.set_description("Encoding")
+
             # Handle instrumental mode differently
             if self.instrumentalMode:
                 # Use instrumental splicing
@@ -981,8 +1039,19 @@ class Plugger(object):
 
             SetMonkeyplugTag(self.outputFileSpec, debug=self.debug)
 
+            # Complete progress
+            if progress:
+                progress.update(1)
+                progress.close()
+
         else:
             shutil.copyfile(self.inputFileSpec, self.outputFileSpec)
+            if progress:
+                progress.close()
+
+        # Clean up progress reference
+        if hasattr(self, '_progress'):
+            delattr(self, '_progress')
 
         return self.outputFileSpec