Update breed_recommendation.py

breed_recommendation.py

@@ -530,64 +530,101 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
 
                 def on_find_match_click(*args):
                     try:
-                        with gr.Progress() as progress:
-                            # 創建用戶偏好對象
-                            user_prefs = UserPreferences(
-                                living_space=args[0],
-                                yard_access=args[1],       
-                                exercise_time=args[2],
-                                exercise_type=args[3],      
-                                grooming_commitment=args[4],
-                                experience_level=args[5],
-                                time_availability=args[6],   
-                                has_children=args[7],
-                                children_age=args[8] if args[7] else None,
-                                noise_tolerance=args[9],
-                                space_for_play=True if args[0] != "apartment" else False,
-                                other_pets=False,
-                                climate="moderate",
-                                health_sensitivity="medium",
-                                barking_acceptance=args[9]
-                            )
+                        yield gr.HTML("""
+                            <div style="
+                                text-align: center;
+                                padding: 20px;
+                                background: linear-gradient(to right, rgba(66, 153, 225, 0.1), rgba(72, 187, 120, 0.1));
+                                border-radius: 10px;
+                                margin: 20px 0;
+                            ">
+                                <div style="font-size: 40px; margin-bottom: 10px;">🐕</div>
+                                <p style="
+                                    color: #2D3748;
+                                    font-size: 1.2em;
+                                    margin: 0;
+                                ">
+                                    Finding your perfect match...
+                                    <br>
+                                    <span style="font-size: 0.9em; color: #4A5568;">
+                                        This may take a few moments
+                                    </span>
+                                </p>
+                            </div>
+                        """)
+                        # 創建用戶偏好對象
+                        user_prefs = UserPreferences(
+                            living_space=args[0],
+                            yard_access=args[1],       
+                            exercise_time=args[2],
+                            exercise_type=args[3],      
+                            grooming_commitment=args[4],
+                            experience_level=args[5],
+                            time_availability=args[6],   
+                            has_children=args[7],
+                            children_age=args[8] if args[7] else None,
+                            noise_tolerance=args[9],
+                            space_for_play=True if args[0] != "apartment" else False,
+                            other_pets=False,
+                            climate="moderate",
+                            health_sensitivity="medium",
+                            barking_acceptance=args[9]
+                        )
                 
-                            progress(0.3, desc="Finding your perfect match...")
-                            recommendations = get_breed_recommendations(user_prefs, top_n=10)
-                            
-                            progress(0.6, desc="Analyzing compatibility...")
-                            history_results = [{
-                                'breed': rec['breed'],
-                                'rank': rec['rank'],
-                                'overall_score': rec['final_score'],
-                                'base_score': rec['base_score'],
-                                'bonus_score': rec['bonus_score'],
-                                'scores': rec['scores']
-                            } for rec in recommendations]
+                        # 獲取推薦結果
+                        recommendations = get_breed_recommendations(user_prefs, top_n=10)
                 
-                            progress(0.8, desc="Preparing results...")
-                            history_component.save_search(
-                                user_preferences={
-                                    'living_space': args[0],
-                                    'yard_access': args[1],
-                                    'exercise_time': args[2],
-                                    'exercise_type': args[3],
-                                    'grooming_commitment': args[4],
-                                    'experience_level': args[5],
-                                    'time_availability': args[6],
-                                    'has_children': args[7],
-                                    'children_age': args[8] if args[7] else None,
-                                    'noise_tolerance': args[9],
-                                    'search_type': 'Criteria'  
-                                },
-                                results=history_results
-                            )
+                        # 儲存搜尋歷史
+                        history_results = [{
+                            'breed': rec['breed'],
+                            'rank': rec['rank'],
+                            'overall_score': rec['final_score'],
+                            'base_score': rec['base_score'],
+                            'bonus_score': rec['bonus_score'],
+                            'scores': rec['scores']
+                        } for rec in recommendations]
                 
-                            return format_recommendation_html(recommendations, is_description_search=False)
+                        history_component.save_search(
+                            user_preferences={
+                                'living_space': args[0],
+                                'yard_access': args[1],
+                                'exercise_time': args[2],
+                                'exercise_type': args[3],
+                                'grooming_commitment': args[4],
+                                'experience_level': args[5],
+                                'time_availability': args[6],
+                                'has_children': args[7],
+                                'children_age': args[8] if args[7] else None,
+                                'noise_tolerance': args[9],
+                                'search_type': 'Criteria'  
+                            },
+                            results=history_results
+                        )
+                
+                        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())
-                        return "Oops! Something went wrong while finding your perfect match. 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;
+                                ">
+                                    🐾 Oops! Something went wrong while finding your perfect match. 
+                                    <br>Please try again!
+                                </p>
+                            </div>
+                        """)
 
                 # 設置按鈕點擊事件
                 get_recommendations_btn.click(