Update breed_recommendation.py

breed_recommendation.py

@@ -531,68 +531,13 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                 )
 
                 def on_find_match_click(*args):
+                    """
+                    1. 先顯示處理狀態
+                    2. 執行推薦邏輯
+                    3. 返回最終結果
+                    """
                     try:
-                        # 立即顯示處理狀態
-                        status_html = """
-                            <div id="loading-status" style="
-                                text-align: center;
-                                padding: 20px;
-                                margin: 20px 0;
-                                background: linear-gradient(to right, rgba(66, 153, 225, 0.1), rgba(72, 187, 120, 0.1));
-                                border-radius: 10px;
-                                opacity: 1;
-                            ">
-                                <div style="font-size: 40px; margin-bottom: 10px;">🐕</div>
-                                <div style="
-                                    color: #2D3748;
-                                    font-size: 1.2em;
-                                    margin-bottom: 10px;
-                                    font-weight: 500;
-                                ">Finding your perfect match...</div>
-                                <div id="status-dots" style="
-                                    display: flex;
-                                    justify-content: center;
-                                    gap: 8px;
-                                    margin: 15px 0;
-                                ">
-                                    <span style="
-                                        width: 10px;
-                                        height: 10px;
-                                        background: #4299e1;
-                                        border-radius: 50%;
-                                        display: inline-block;
-                                        animation: pulse 1s infinite;
-                                    "></span>
-                                    <span style="
-                                        width: 10px;
-                                        height: 10px;
-                                        background: #4299e1;
-                                        border-radius: 50%;
-                                        display: inline-block;
-                                        animation: pulse 1s infinite .2s;
-                                    "></span>
-                                    <span style="
-                                        width: 10px;
-                                        height: 10px;
-                                        background: #4299e1;
-                                        border-radius: 50%;
-                                        display: inline-block;
-                                        animation: pulse 1s infinite .4s;
-                                    "></span>
-                                </div>
-                                <style>
-                                    @keyframes pulse {
-                                        0%, 100% { transform: scale(1); opacity: 1; }
-                                        50% { transform: scale(1.5); opacity: 0.7; }
-                                    }
-                                </style>
-                            </div>
-                        """
-                        
-                        # 返回載入狀態
-                        yield gr.HTML(status_html)
-                        
-                        # 建立用戶偏好
+                        # 創建用戶偏好對象
                         user_prefs = UserPreferences(
                             living_space=args[0],
                             yard_access=args[1],       
@@ -641,27 +586,16 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                             results=history_results
                         )
                 
-                        # 返回最終結果
-                        yield format_recommendation_html(recommendations, is_description_search=False)
+                        return format_recommendation_html(recommendations, is_description_search=False)
                 
                     except Exception as e:
                         print(f"Error in find match: {str(e)}")
                         import traceback
                         print(traceback.format_exc())
-                        yield gr.HTML("""
-                            <div style="
-                                text-align: center;
-                                padding: 20px;
-                                background: rgba(255, 0, 0, 0.1);
-                                border-radius: 10px;
-                                margin: 20px 0;
-                            ">
-                                <p style="
-                                    color: #d32f2f;
-                                    font-size: 1.1em;
-                                    margin: 0;
-                                ">
-                                    🐾 Oops! Something went wrong. Please try again!
+                        return gr.HTML("""
+                            <div style="text-align: center; padding: 20px; background: rgba(255, 0, 0, 0.1); border-radius: 10px; margin: 20px 0;">
+                                <p style="color: #d32f2f; font-size: 1.1em; margin: 0;">
+                                    🐾 抱歉出了點問題，請再試一次！
                                 </p>
                             </div>
                         """)
@@ -682,8 +616,7 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                         noise_tolerance
                     ],
                     outputs=recommendation_output,
-                    show_progress=True,  # 顯示進度
-                    queue=False  # 允許連續點擊
+                    show_progress="full",  # 使用 Gradio 內建的進度顯示
                 )
 
     # 返回頁面組件