Update breed_recommendation.py

breed_recommendation.py

@@ -528,92 +528,83 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                     elem_id="recommendation-output"
                 )
 
-                # 處理推薦請求的函數
                 def on_find_match_click(*args):
                     try:
-                        # 顯示 loading 狀態
-                        yield loading_html.update(visible=True)
-
-                        # 創建用戶偏好對象
-                        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]
-                        )
-
-                        # 獲取推薦結果
-                        recommendations = get_breed_recommendations(user_prefs, top_n=10)
-
-                        # 儲存搜尋歷史
-                        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]
-
-                        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
-                        )
-
-                        # 隱藏 loading 狀態並返回結果
-                        return [
-                            loading_html.update(visible=False),
-                            format_recommendation_html(recommendations, is_description_search=False)
-                        ]
-
+                        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]
+                            )
+                
+                            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]
+                
+                            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
+                            )
+                
+                            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 [
-                            loading_html.update(visible=False),
-                            "Oops! Something went wrong while finding your perfect match. Please try again!"
-                        ]
+                        return "Oops! Something went wrong while finding your perfect match. Please try again!"
 
                 # 設置按鈕點擊事件
                 get_recommendations_btn.click(
                     fn=on_find_match_click,
                     inputs=[
                         living_space,
-                        yard_access,
+                        yard_access,        
                         exercise_time,
-                        exercise_type,
+                        exercise_type,      
                         grooming_commitment,
                         experience_level,
-                        time_availability,
+                        time_availability, 
                         has_children,
                         children_age,
                         noise_tolerance
                     ],
-                    outputs=[loading_html, recommendation_output]
+                    outputs=recommendation_output
                 )
 
     # 返回頁面組件