Update breed_recommendation.py

breed_recommendation.py

@@ -125,6 +125,63 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                     elem_id="recommendation-output"  # 添加唯一ID以便追蹤
                 )
 
+        # def on_find_match_click(*args):
+        #     try:
+        #         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
+        #         )
+
+        #         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 "Error getting recommendations"
+
+
         def on_find_match_click(*args):
             try:
                 user_prefs = UserPreferences(
@@ -144,18 +201,20 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                     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_results = []
+                for i, rec in enumerate(recommendations, 1):
+                    history_result = {
+                        'breed': rec['breed'],
+                        'rank': i,  # 確保有排名
+                        'overall_score': float(rec['final_score']),  # 確保分數為數字
+                        'scores': rec.get('scores', {}),  # 保存詳細分數
+                    }
+                    history_results.append(history_result)
+        
+                # 保存搜尋記錄
                 history_component.save_search(
                     user_preferences={
                         'living_space': args[0],
@@ -168,18 +227,18 @@ def create_recommendation_tab(UserPreferences, get_breed_recommendations, format
                         'has_children': args[7],
                         'children_age': args[8] if args[7] else None,
                         'noise_tolerance': args[9],
-                        'search_type': 'Criteria'  
                     },
-                    results=history_results
+                    results=history_results,  # 傳遞處理後的結果
+                    search_type='criteria'
                 )
-
+        
                 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 "Error getting recommendations"
+        
 
         get_recommendations_btn.click(
             fn=on_find_match_click,