ss

app.py

@@ -101,22 +101,6 @@ def process_audio(audio_file):
         # Analyze music with MusicAnalyzer
         music_analysis = music_analyzer.analyze_music(audio_file)
         
-        # Extract time signature from MusicAnalyzer result
-        time_signature = music_analysis["rhythm_analysis"]["estimated_time_signature"]
-        
-        # Ensure time signature is one of the supported ones (4/4, 3/4, 2/4, 6/8)
-        if time_signature not in ["4/4", "3/4", "2/4", "6/8"]:
-            time_signature = "4/4"  # Default to 4/4 if unsupported
-            music_analysis["rhythm_analysis"]["estimated_time_signature"] = time_signature
-        
-        # Analyze beat patterns and create lyrics template using MusicAnalyzer's time signature
-        beat_analysis = beat_analyzer.analyze_beat_pattern(audio_file, time_signature=time_signature)
-        lyric_templates = beat_analyzer.create_lyric_template(beat_analysis)
-        
-        # Store these in the music_analysis dict for use in lyrics generation
-        music_analysis["beat_analysis"] = beat_analysis
-        music_analysis["lyric_templates"] = lyric_templates
-        
         # Extract key information
         tempo = music_analysis["rhythm_analysis"]["tempo"]
         emotion = music_analysis["emotion_analysis"]["primary_emotion"]
@@ -151,6 +135,27 @@ def process_audio(audio_file):
         genre_results_text = format_genre_results(top_genres)
         primary_genre = top_genres[0][0]
         
+        # Override time signature for pop and disco genres to always be 4/4
+        if any(genre.lower() in primary_genre.lower() for genre in ['pop', 'disco']):
+            music_analysis["rhythm_analysis"]["estimated_time_signature"] = "4/4"
+            time_signature = "4/4"
+        else:
+            # Use detected time signature for other genres
+            time_signature = music_analysis["rhythm_analysis"]["estimated_time_signature"]
+            
+            # Ensure time signature is one of the supported ones (4/4, 3/4, 6/8)
+            if time_signature not in ["4/4", "3/4", "6/8"]:
+                time_signature = "4/4"  # Default to 4/4 if unsupported
+                music_analysis["rhythm_analysis"]["estimated_time_signature"] = time_signature
+        
+        # Analyze beat patterns and create lyrics template using the time signature
+        beat_analysis = beat_analyzer.analyze_beat_pattern(audio_file, time_signature=time_signature)
+        lyric_templates = beat_analyzer.create_lyric_template(beat_analysis)
+        
+        # Store these in the music_analysis dict for use in lyrics generation
+        music_analysis["beat_analysis"] = beat_analysis
+        music_analysis["lyric_templates"] = lyric_templates
+        
         # Prepare analysis summary
         analysis_summary = f"""
 ### Music Analysis Results

beat_analysis.py

@@ -15,12 +15,11 @@ except LookupError:
 class BeatAnalyzer:
     def __init__(self):
         # Mapping for standard stress patterns by time signature
-        # Simplified to only include 4/4, 3/4, 2/4, and 6/8
+        # Simplified to only include 4/4, 3/4, and 6/8
         self.stress_patterns = {
             # Format: Strong (1.0), Medium (0.5), Weak (0.0)
             "4/4": [1.0, 0.0, 0.5, 0.0],  # Strong, weak, medium, weak
             "3/4": [1.0, 0.0, 0.0],       # Strong, weak, weak
-            "2/4": [1.0, 0.0],            # Strong, weak
             "6/8": [1.0, 0.0, 0.0, 0.5, 0.0, 0.0]   # Strong, weak, weak, medium, weak, weak
         }
         
@@ -58,6 +57,28 @@ class BeatAnalyzer:
         # making them ideal for our beat-matching algorithm
         self.supported_genres = ['pop', 'rock', 'country', 'disco', 'metal']
         
+        # Common time signatures and their beat patterns with weights for prior probability
+        # Simplified to only include 4/4, 3/4, and 6/8
+        self.common_time_signatures = {
+            "4/4": {"beats_per_bar": 4, "beat_pattern": [1.0, 0.2, 0.5, 0.2], "weight": 0.55},
+            "3/4": {"beats_per_bar": 3, "beat_pattern": [1.0, 0.2, 0.3], "weight": 0.30},
+            "6/8": {"beats_per_bar": 6, "beat_pattern": [1.0, 0.2, 0.3, 0.8, 0.2, 0.3], "weight": 0.15}
+        }
+        
+        # Add common accent patterns for different time signatures
+        self.accent_patterns = {
+            "4/4": [[1, 0, 0, 0], [1, 0, 2, 0], [1, 0, 2, 0, 3, 0, 2, 0]],
+            "3/4": [[1, 0, 0], [1, 0, 2]],
+            "6/8": [[1, 0, 0, 2, 0, 0], [1, 0, 0, 2, 0, 3]]
+        }
+        
+        # Expected rhythm density (relative note density per beat) for different time signatures
+        self.rhythm_density = {
+            "4/4": [1.0, 0.7, 0.8, 0.6],
+            "3/4": [1.0, 0.6, 0.7],
+            "6/8": [1.0, 0.5, 0.4, 0.8, 0.5, 0.4]
+        }
+        
     @lru_cache(maxsize=128)
     def count_syllables(self, word):
         """Count syllables in a word using CMU dictionary if available, otherwise use rule-based method."""
@@ -157,11 +178,6 @@ class BeatAnalyzer:
                     stress = "M"  # Medium
                 else:  # Other beats (weak)
                     stress = "W"  # Weak
-            elif time_signature == "2/4":
-                if metrical_position == 0:  # First beat (strongest)
-                    stress = "S"  # Strong
-                else:  # Second beat (weak)
-                    stress = "W"  # Weak
             else:
                 # Default pattern for other time signatures
                 if metrical_position == 0:

emotionanalysis.py

@@ -36,19 +36,17 @@ class MusicAnalyzer:
         self.key_names = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']
         
         # Common time signatures and their beat patterns with weights for prior probability
-        # Simplified to only include 4/4, 3/4, 2/4, and 6/8
+        # Simplified to only include 4/4, 3/4, and 6/8
         self.common_time_signatures = {
             "4/4": {"beats_per_bar": 4, "beat_pattern": [1.0, 0.2, 0.5, 0.2], "weight": 0.45},
             "3/4": {"beats_per_bar": 3, "beat_pattern": [1.0, 0.2, 0.3], "weight": 0.25},
-            "2/4": {"beats_per_bar": 2, "beat_pattern": [1.0, 0.3], "weight": 0.15},
-            "6/8": {"beats_per_bar": 6, "beat_pattern": [1.0, 0.2, 0.3, 0.8, 0.2, 0.3], "weight": 0.15}
+            "6/8": {"beats_per_bar": 6, "beat_pattern": [1.0, 0.2, 0.3, 0.8, 0.2, 0.3], "weight": 0.30}
         }
         
         # Add common accent patterns for different time signatures
         self.accent_patterns = {
             "4/4": [[1, 0, 0, 0], [1, 0, 2, 0], [1, 0, 2, 0, 3, 0, 2, 0]],
             "3/4": [[1, 0, 0], [1, 0, 2]],
-            "2/4": [[1, 0], [1, 2]],
             "6/8": [[1, 0, 0, 2, 0, 0], [1, 0, 0, 2, 0, 3]]
         }
         
@@ -56,8 +54,7 @@ class MusicAnalyzer:
         self.rhythm_density = {
             "4/4": [1.0, 0.7, 0.8, 0.6],
             "3/4": [1.0, 0.6, 0.7],
-            "6/8": [1.0, 0.5, 0.4, 0.8, 0.5, 0.4],
-            "2/4": [1.0, 0.6]
+            "6/8": [1.0, 0.5, 0.4, 0.8, 0.5, 0.4]
         }
 
     def load_audio(self, file_path, sr=22050, duration=None):
@@ -343,16 +340,10 @@ class MusicAnalyzer:
             for ts in self.common_time_signatures:
                 score = 0
                 
-                if ts == "4/4" or ts == "2/4":
-                    # Look for ratios close to 2 or 4
+                if ts == "4/4" or ts == "6/8":
+                    # Look for ratios close to 4 or 6
                     for ratio in tempo_ratios:
-                        if abs(ratio - 2) < 0.2 or abs(ratio - 4) < 0.2:
-                            score += 1
-                
-                elif ts == "3/4" or ts == "6/8":
-                    # Look for ratios close to 3 or 6
-                    for ratio in tempo_ratios:
-                        if abs(ratio - 3) < 0.2 or abs(ratio - 6) < 0.3:
+                        if abs(ratio - 4) < 0.2 or abs(ratio - 6) < 0.3:
                             score += 1
                 
                 # Normalize score
@@ -440,7 +431,7 @@ class MusicAnalyzer:
     def _estimate_from_tempo(self, tempo):
         """Use tempo to help estimate likely time signature"""
         # Statistical tendencies: slower tempos often in compound meters (6/8)
-        # Fast tempos often favor simple meters (2/4)
+        # Fast tempos favor 4/4
         
         scores = {}
         
@@ -449,7 +440,6 @@ class MusicAnalyzer:
             scores = {
                 "4/4": 0.5,
                 "3/4": 0.4,
-                "2/4": 0.3,
                 "6/8": 0.7
             }
         elif 70 <= tempo <= 120:
@@ -457,14 +447,12 @@ class MusicAnalyzer:
             scores = {
                 "4/4": 0.7,
                 "3/4": 0.6,
-                "2/4": 0.4,
                 "6/8": 0.3
             }
         else:
-            # Fast tempos favor simpler meters
+            # Fast tempos favor 4/4
             scores = {
-                "4/4": 0.6,
-                "2/4": 0.7,
+                "4/4": 0.8,
                 "3/4": 0.4,
                 "6/8": 0.2
             }