Upload tool

tool.py

@@ -1,7 +1,7 @@
 from smolagents.tools import Tool
 import pronouncing
-import json
 import string
+import json
 
 class ParodyWordSuggestionTool(Tool):
     name = "parody_word_suggester"
@@ -52,6 +52,16 @@ class ParodyWordSuggestionTool(Tool):
                 max_length = max(len(word_phone_list), len(target_phone_list))
                 min_length = min(len(word_phone_list), len(target_phone_list))
             
+                # Initial consonant bonus
+                initial_match_score = 0
+                if word_phone_list[0].rstrip('012') == target_phone_list[0].rstrip('012'):
+                    initial_match_score = 1.0  # Reduced bonus for matching first consonant
+            
+                # Check if syllable counts match
+                target_syl = pronouncing.syllable_count(target_phones)
+                word_syl = pronouncing.syllable_count(word_phones)
+                syllable_match = 1.0 if target_syl == word_syl else 0.0
+            
                 for i in range(max_length):
                     if i >= min_length:
                         break
@@ -65,30 +75,21 @@ class ParodyWordSuggestionTool(Tool):
                     # Match without stress numbers
                     elif w_phone.rstrip('012') == t_phone.rstrip('012'):
                         phonetic_matches += 0.8
-                    # Consonant match at start
-                    else:
-                        # Check if current phone is a consonant
-                        has_vowel = False
-                        vowels = ['A', 'E', 'I', 'O', 'U']
-                        for vowel in vowels:
-                            if vowel in w_phone:
-                                has_vowel = True
-                                break
-                    
-                        if i == 0 and not has_vowel:
-                            if w_phone.rstrip('012') == t_phone.rstrip('012'):
-                                phonetic_matches += 0.5
             
-                phonetic_similarity = phonetic_matches / max_length
+                phonetic_similarity = (phonetic_matches / max_length) + initial_match_score
             
-                # Calculate rhyme similarity (focusing on end phones)
-                rhyme_score = 1.0 if word_phone_list[-1] == target_phone_list[-1] else 0.0
+                # Rhyme score (focusing on vowel and end consonant)
+                rhyme_score = 0
                 if len(word_phone_list) > 1 and len(target_phone_list) > 1:
-                    if word_phone_list[-2] == target_phone_list[-2]:
+                    # Check final syllable (vowel + final consonant)
+                    if word_phone_list[-1] == target_phone_list[-1]:  # End consonant match
                         rhyme_score += 1.0
+                    if word_phone_list[-2] == target_phone_list[-2]:  # Vowel match
+                        rhyme_score += 2.0  # Higher weight for vowel match
             
-                # Combined score (weighing both phonetic similarity and rhyming)
-                similarity = (phonetic_similarity * 0.6) + (rhyme_score * 0.4)
+                # Combined score with new weights prioritizing rhyme
+                # 50% rhyme, 30% syllable match, 20% phonetic similarity
+                similarity = (rhyme_score * 0.5) + (syllable_match * 0.3) + (phonetic_similarity * 0.2)
             
                 if similarity >= min_similarity:
                     suggestions.append({
@@ -96,6 +97,8 @@ class ParodyWordSuggestionTool(Tool):
                         "similarity": round(similarity, 3),
                         "phonetic_similarity": round(phonetic_similarity, 3),
                         "rhyme_score": round(rhyme_score, 3),
+                        "syllable_match": syllable_match,
+                        "initial_match": initial_match_score > 0,
                         "syllables": pronouncing.syllable_count(word_phones),
                         "phones": word_phones,
                     })