feat: Add category filters (한영혼합, 숫자혼합, 긴문장) to leaderboard

app.py

@@ -374,7 +374,12 @@ def arena():
 
 @app.route("/leaderboard")
 def leaderboard():
-    tts_leaderboard = get_leaderboard_data(ModelType.TTS)
+    # 카테고리별 리더보드 데이터
+    tts_leaderboard_all = get_leaderboard_data(ModelType.TTS, 'all')
+    tts_leaderboard_mixed_lang = get_leaderboard_data(ModelType.TTS, 'mixed_lang')
+    tts_leaderboard_with_numbers = get_leaderboard_data(ModelType.TTS, 'with_numbers')
+    tts_leaderboard_long_text = get_leaderboard_data(ModelType.TTS, 'long_text')
+    
     voting_stats = get_voting_statistics()  # Get voting statistics
 
     # Initialize personal leaderboard data
@@ -394,7 +399,11 @@ def leaderboard():
 
     return render_template(
         "leaderboard.html",
-        tts_leaderboard=tts_leaderboard,
+        tts_leaderboard=tts_leaderboard_all,
+        tts_leaderboard_all=tts_leaderboard_all,
+        tts_leaderboard_mixed_lang=tts_leaderboard_mixed_lang,
+        tts_leaderboard_with_numbers=tts_leaderboard_with_numbers,
+        tts_leaderboard_long_text=tts_leaderboard_long_text,
         tts_personal_leaderboard=tts_personal_leaderboard,
         tts_key_dates=tts_key_dates,
         formatted_tts_dates=formatted_tts_dates,

models.py

@@ -319,38 +319,57 @@ def record_vote(user_id, text, chosen_model_id, rejected_model_id, model_type,
     return vote, None
 
 
-def get_leaderboard_data(model_type):
+import re
+
+def categorize_text(text):
+    """
+    텍스트를 카테고리로 분류
+    Returns: list of categories the text belongs to
+    """
+    categories = ['all']  # 모든 텍스트는 'all'에 포함
+    
+    # 한영혼합: 알파벳 5글자 이상
+    alphabet_count = len(re.findall(r'[a-zA-Z]', text))
+    if alphabet_count >= 5:
+        categories.append('mixed_lang')
+    
+    # 숫자혼합: 숫자 2개 이상
+    digit_count = len(re.findall(r'\d', text))
+    if digit_count >= 2:
+        categories.append('with_numbers')
+    
+    # 긴문장: 50글자 이상
+    if len(text) >= 50:
+        categories.append('long_text')
+    
+    return categories
+
+
+def get_leaderboard_data(model_type, category='all'):
     """
-    Get leaderboard data for the specified model type.
+    Get leaderboard data for the specified model type and category.
     Only includes votes that count for the public leaderboard.
     Only shows active models.
 
     Args:
         model_type (str): The model type ('tts' or 'conversational')
+        category (str): Category filter ('all', 'mixed_lang', 'with_numbers', 'long_text')
 
     Returns:
         list: List of dictionaries containing model data for the leaderboard
     """
-    query = Model.query.filter_by(model_type=model_type, is_active=True)
-
-    # Get active models with >0 votes ordered by ELO score
-    # Note: Model.match_count now only includes votes that count for public leaderboard
-    models = query.filter(Model.match_count > 0).order_by(Model.current_elo.desc()).all()
-
-    result = []
-    for rank, model in enumerate(models, 1):
-        # Determine tier based on rank
-        if rank <= 2:
-            tier = "tier-s"
-        elif rank <= 4:
-            tier = "tier-a"
-        elif rank <= 7:
-            tier = "tier-b"
-        else:
-            tier = ""
-
-        result.append(
-            {
+    # 활성 모델 가져오기
+    active_models = Model.query.filter_by(model_type=model_type, is_active=True).all()
+    
+    if category == 'all':
+        # 기존 로직: Model 테이블의 집계 데이터 사용
+        models = [m for m in active_models if m.match_count > 0]
+        models.sort(key=lambda x: x.current_elo, reverse=True)
+        
+        result = []
+        for rank, model in enumerate(models, 1):
+            tier = "tier-s" if rank <= 2 else "tier-a" if rank <= 4 else "tier-b" if rank <= 7 else ""
+            result.append({
                 "rank": rank,
                 "id": model.id,
                 "name": model.name,
@@ -360,9 +379,60 @@ def get_leaderboard_data(model_type):
                 "elo": int(model.current_elo),
                 "tier": tier,
                 "is_open": model.is_open,
-            }
-        )
-
+            })
+        return result
+    
+    # 카테고리별 필터링: Vote 테이블에서 직접 계산
+    active_model_ids = {m.id for m in active_models}
+    
+    # 해당 카테고리에 맞는 투표 가져오기
+    all_votes = Vote.query.filter(
+        Vote.model_type == model_type,
+        Vote.counts_for_public_leaderboard == True
+    ).all()
+    
+    # 카테고리에 맞는 투표만 필터링
+    filtered_votes = []
+    for vote in all_votes:
+        text_categories = categorize_text(vote.text)
+        if category in text_categories:
+            filtered_votes.append(vote)
+    
+    # 모델별 승/패 계산
+    model_stats = {m.id: {"wins": 0, "matches": 0, "model": m} for m in active_models}
+    
+    for vote in filtered_votes:
+        if vote.model_chosen in active_model_ids:
+            model_stats[vote.model_chosen]["wins"] += 1
+            model_stats[vote.model_chosen]["matches"] += 1
+        if vote.model_rejected in active_model_ids:
+            model_stats[vote.model_rejected]["matches"] += 1
+    
+    # 승률 계산 및 정렬
+    result = []
+    for model_id, stats in model_stats.items():
+        if stats["matches"] > 0:
+            win_rate = (stats["wins"] / stats["matches"]) * 100
+            result.append({
+                "id": model_id,
+                "name": stats["model"].name,
+                "model_url": stats["model"].model_url,
+                "win_rate": f"{win_rate:.0f}%",
+                "total_votes": stats["matches"],
+                "elo": int(1500 + (win_rate - 50) * 10),  # 간단한 ELO 추정
+                "is_open": stats["model"].is_open,
+                "_win_rate_num": win_rate,
+            })
+    
+    # 승률로 정렬
+    result.sort(key=lambda x: x["_win_rate_num"], reverse=True)
+    
+    # 랭크와 티어 추가
+    for rank, item in enumerate(result, 1):
+        item["rank"] = rank
+        item["tier"] = "tier-s" if rank <= 2 else "tier-a" if rank <= 4 else "tier-b" if rank <= 7 else ""
+        del item["_win_rate_num"]
+    
     return result
 
 

templates/leaderboard.html

@@ -919,6 +919,75 @@
         visibility: visible;
         opacity: 1;
     }
+
+    /* Category filter styles */
+    .category-filter {
+        display: flex;
+        gap: 8px;
+        margin-bottom: 20px;
+        flex-wrap: wrap;
+        justify-content: center;
+    }
+
+    .category-btn {
+        padding: 8px 16px;
+        border: 2px solid var(--border-color);
+        border-radius: 20px;
+        background: white;
+        color: var(--text-color);
+        font-size: 13px;
+        font-weight: 500;
+        cursor: pointer;
+        transition: all 0.2s ease;
+        display: flex;
+        align-items: center;
+        gap: 6px;
+    }
+
+    .category-btn:hover {
+        border-color: var(--primary-color);
+        color: var(--primary-color);
+    }
+
+    .category-btn.active {
+        background: var(--primary-color);
+        border-color: var(--primary-color);
+        color: white;
+    }
+
+    .category-btn .category-count {
+        background: rgba(0, 0, 0, 0.1);
+        padding: 2px 8px;
+        border-radius: 10px;
+        font-size: 11px;
+    }
+
+    .category-btn.active .category-count {
+        background: rgba(255, 255, 255, 0.2);
+    }
+
+    .category-description {
+        text-align: center;
+        font-size: 13px;
+        color: #888;
+        margin-bottom: 16px;
+    }
+
+    @media (prefers-color-scheme: dark) {
+        .category-btn {
+            background: var(--light-gray);
+            border-color: var(--border-color);
+        }
+
+        .category-btn:hover {
+            border-color: var(--primary-color);
+        }
+
+        .category-btn.active {
+            background: var(--primary-color);
+            border-color: var(--primary-color);
+        }
+    }
 </style>
 {% endblock %}
 
@@ -994,52 +1063,177 @@
     </div>
 
     <div id="tts-public-leaderboard" class="leaderboard-view active">
-        {% if tts_leaderboard and tts_leaderboard|length > 0 %}
-        <div class="leaderboard-container">
-            <div class="leaderboard-header">
-                <div>Rank</div>
-                <div>Model</div>
-                <div style="text-align: right">Win Rate</div>
-                <div style="text-align: right" class="total-votes-header">Total Votes</div>
-                <div style="text-align: right">ELO</div>
+        <!-- Category Filter -->
+        <div class="category-filter">
+            <button class="category-btn active" data-category="all">
+                📊 전체
+                <span class="category-count">{{ tts_leaderboard_all|length }}</span>
+            </button>
+            <button class="category-btn" data-category="mixed_lang">
+                🔤 한영혼합
+                <span class="category-count">{{ tts_leaderboard_mixed_lang|length }}</span>
+            </button>
+            <button class="category-btn" data-category="with_numbers">
+                🔢 숫자혼합
+                <span class="category-count">{{ tts_leaderboard_with_numbers|length }}</span>
+            </button>
+            <button class="category-btn" data-category="long_text">
+                📝 긴문장
+                <span class="category-count">{{ tts_leaderboard_long_text|length }}</span>
+            </button>
+        </div>
+        <div class="category-description" id="category-description">
+            모든 투표 기준 순위
+        </div>
+
+        <!-- All Category Leaderboard -->
+        <div id="leaderboard-all" class="category-leaderboard">
+            {% if tts_leaderboard_all and tts_leaderboard_all|length > 0 %}
+            <div class="leaderboard-container">
+                <div class="leaderboard-header">
+                    <div>Rank</div>
+                    <div>Model</div>
+                    <div style="text-align: right">Win Rate</div>
+                    <div style="text-align: right" class="total-votes-header">Total Votes</div>
+                    <div style="text-align: right">ELO</div>
+                </div>
+                {% for model in tts_leaderboard_all %}
+                <div class="leaderboard-row {{ model.tier }}">
+                    <div class="rank">#{{ model.rank }}</div>
+                    <div class="model-name">
+                        <a href="{{ model.model_url }}" target="_blank" class="model-name-link">{{ model.name }}</a>
+                        <div class="license-icon">
+                            {% if not model.is_open %}
+                            <img src="{{ url_for('static', filename='closed.svg') }}" alt="Proprietary">
+                            <span class="tooltip">Proprietary model</span>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <div class="win-rate">{{ model.win_rate }}</div>
+                    <div class="total-votes">{{ model.total_votes }}</div>
+                    <div class="elo-score">{{ model.elo }}</div>
+                </div>
+                {% endfor %}
             </div>
-            
-            {% for model in tts_leaderboard %}
-            <div class="leaderboard-row {{ model.tier }}">
-                <div class="rank">#{{ model.rank }}</div>
-                <div class="model-name">
-                    <a href="{{ model.model_url }}" target="_blank" class="model-name-link">{{ model.name }}</a>
-                    <div class="license-icon">
-                        {% if not model.is_open %}
-                        <img src="{{ url_for('static', filename='closed.svg') }}" alt="Proprietary">
-                        <span class="tooltip">Proprietary model</span>
-                        {% endif %}
+            {% else %}
+            <div class="no-data">
+                <h3>No data available yet</h3>
+                <p>Be the first to vote and help build the leaderboard!</p>
+                <a href="{{ url_for('arena') }}" class="btn">Go to Arena</a>
+            </div>
+            {% endif %}
+        </div>
+
+        <!-- Mixed Language Leaderboard -->
+        <div id="leaderboard-mixed_lang" class="category-leaderboard" style="display: none;">
+            {% if tts_leaderboard_mixed_lang and tts_leaderboard_mixed_lang|length > 0 %}
+            <div class="leaderboard-container">
+                <div class="leaderboard-header">
+                    <div>Rank</div>
+                    <div>Model</div>
+                    <div style="text-align: right">Win Rate</div>
+                    <div style="text-align: right" class="total-votes-header">Total Votes</div>
+                    <div style="text-align: right">ELO</div>
+                </div>
+                {% for model in tts_leaderboard_mixed_lang %}
+                <div class="leaderboard-row {{ model.tier }}">
+                    <div class="rank">#{{ model.rank }}</div>
+                    <div class="model-name">
+                        <a href="{{ model.model_url }}" target="_blank" class="model-name-link">{{ model.name }}</a>
+                        <div class="license-icon">
+                            {% if not model.is_open %}
+                            <img src="{{ url_for('static', filename='closed.svg') }}" alt="Proprietary">
+                            <span class="tooltip">Proprietary model</span>
+                            {% endif %}
+                        </div>
                     </div>
-                    {% if model.id == "lanternfish-1" %}
-                    <div class="disputed-badge">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>
-                            <line x1="12" y1="9" x2="12" y2="13"/>
-                            <line x1="12" y1="17" x2="12" y2="17"/>
-                        </svg>
-                        <span>Disputed</span>
-                        <span class="tooltip">Potential vote manipulation</span>
+                    <div class="win-rate">{{ model.win_rate }}</div>
+                    <div class="total-votes">{{ model.total_votes }}</div>
+                    <div class="elo-score">{{ model.elo }}</div>
+                </div>
+                {% endfor %}
+            </div>
+            {% else %}
+            <div class="no-data">
+                <h3>한영혼합 데이터가 없습니다</h3>
+                <p>알파벳이 5글자 이상 포함된 문장에 대한 투표가 아직 없습니다.</p>
+            </div>
+            {% endif %}
+        </div>
+
+        <!-- Numbers Leaderboard -->
+        <div id="leaderboard-with_numbers" class="category-leaderboard" style="display: none;">
+            {% if tts_leaderboard_with_numbers and tts_leaderboard_with_numbers|length > 0 %}
+            <div class="leaderboard-container">
+                <div class="leaderboard-header">
+                    <div>Rank</div>
+                    <div>Model</div>
+                    <div style="text-align: right">Win Rate</div>
+                    <div style="text-align: right" class="total-votes-header">Total Votes</div>
+                    <div style="text-align: right">ELO</div>
+                </div>
+                {% for model in tts_leaderboard_with_numbers %}
+                <div class="leaderboard-row {{ model.tier }}">
+                    <div class="rank">#{{ model.rank }}</div>
+                    <div class="model-name">
+                        <a href="{{ model.model_url }}" target="_blank" class="model-name-link">{{ model.name }}</a>
+                        <div class="license-icon">
+                            {% if not model.is_open %}
+                            <img src="{{ url_for('static', filename='closed.svg') }}" alt="Proprietary">
+                            <span class="tooltip">Proprietary model</span>
+                            {% endif %}
+                        </div>
                     </div>
-                    {% endif %}
+                    <div class="win-rate">{{ model.win_rate }}</div>
+                    <div class="total-votes">{{ model.total_votes }}</div>
+                    <div class="elo-score">{{ model.elo }}</div>
                 </div>
-                <div class="win-rate">{{ model.win_rate }}</div>
-                <div class="total-votes">{{ model.total_votes }}</div>
-                <div class="elo-score">{{ model.elo }}</div>
+                {% endfor %}
             </div>
-            {% endfor %}
+            {% else %}
+            <div class="no-data">
+                <h3>숫자혼합 데이터가 없습니다</h3>
+                <p>숫자가 2개 이상 포함된 문장에 대한 투표가 아직 없습니다.</p>
+            </div>
+            {% endif %}
         </div>
-        {% else %}
-        <div class="no-data">
-            <h3>No data available yet</h3>
-            <p>Be the first to vote and help build the leaderboard! Compare models in the arena to see how they stack up.</p>
-            <a href="{{ url_for('arena') }}" class="btn">Go to Arena</a>
+
+        <!-- Long Text Leaderboard -->
+        <div id="leaderboard-long_text" class="category-leaderboard" style="display: none;">
+            {% if tts_leaderboard_long_text and tts_leaderboard_long_text|length > 0 %}
+            <div class="leaderboard-container">
+                <div class="leaderboard-header">
+                    <div>Rank</div>
+                    <div>Model</div>
+                    <div style="text-align: right">Win Rate</div>
+                    <div style="text-align: right" class="total-votes-header">Total Votes</div>
+                    <div style="text-align: right">ELO</div>
+                </div>
+                {% for model in tts_leaderboard_long_text %}
+                <div class="leaderboard-row {{ model.tier }}">
+                    <div class="rank">#{{ model.rank }}</div>
+                    <div class="model-name">
+                        <a href="{{ model.model_url }}" target="_blank" class="model-name-link">{{ model.name }}</a>
+                        <div class="license-icon">
+                            {% if not model.is_open %}
+                            <img src="{{ url_for('static', filename='closed.svg') }}" alt="Proprietary">
+                            <span class="tooltip">Proprietary model</span>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <div class="win-rate">{{ model.win_rate }}</div>
+                    <div class="total-votes">{{ model.total_votes }}</div>
+                    <div class="elo-score">{{ model.elo }}</div>
+                </div>
+                {% endfor %}
+            </div>
+            {% else %}
+            <div class="no-data">
+                <h3>긴문장 데이터가 없습니다</h3>
+                <p>50글자 이상인 문장에 대한 투표가 아직 없습니다.</p>
+            </div>
+            {% endif %}
         </div>
-        {% endif %}
     </div>
     
     <div id="tts-personal-leaderboard" class="leaderboard-view" style="display: none;">
@@ -1440,6 +1634,38 @@
         setupHistoricalView('tts');
         setupHistoricalView('conversational');
         */
+
+        // Category filter functionality
+        const categoryBtns = document.querySelectorAll('.category-btn');
+        const categoryLeaderboards = document.querySelectorAll('.category-leaderboard');
+        const categoryDescription = document.getElementById('category-description');
+        
+        const categoryDescriptions = {
+            'all': '모든 투표 기준 순위',
+            'mixed_lang': '알파벳 5글자 이상 포함된 문장 기준',
+            'with_numbers': '숫자 2개 이상 포함된 문장 기준',
+            'long_text': '50글자 이상 긴 문장 기준'
+        };
+        
+        categoryBtns.forEach(btn => {
+            btn.addEventListener('click', function() {
+                const category = this.dataset.category;
+                
+                // Update active button
+                categoryBtns.forEach(b => b.classList.remove('active'));
+                this.classList.add('active');
+                
+                // Update description
+                if (categoryDescription) {
+                    categoryDescription.textContent = categoryDescriptions[category] || '';
+                }
+                
+                // Show/hide leaderboards
+                categoryLeaderboards.forEach(lb => {
+                    lb.style.display = lb.id === `leaderboard-${category}` ? 'block' : 'none';
+                });
+            });
+        });
         
         // Final positioning after all DOM operations are complete
         setTimeout(positionSliders, 100);