Upload 164 files

src/apis/controllers/destination_controller.py

@@ -66,27 +66,65 @@ async def destination_recommendation_func(
             }
             for i in output
         ]
-        return output
-    characteristic_extract_response: CharacteristicExtractor = (
-        await characteristic_extractor_chain.ainvoke({"query": query})
-    )
-    lat, lon = get_lat_long_location(characteristic_extract_response.main_place)
-    response = get_places(
-        lat,
-        lon,
-        5000,
-        available_categories.get(characteristic_extract_response.kind, None),
-        top_k,
-    )
-    output = json.loads(response.body)
-    if tool_chat:
-        output = [
-            {
-                "name": i["name"],
-                "address": i["address"],
-                "distance_km": i["distance_km"],
-            }
-            for i in output
-        ]
+        return {"characteristic": output, "geoapify": []}
+    else:
+        import asyncio
+
+        # Define async tasks for both operations
+        async def get_geoapify_results():
+            characteristic_extract_response: CharacteristicExtractor = (
+                await characteristic_extractor_chain.ainvoke({"query": query})
+            )
+            lat, lon = get_lat_long_location(characteristic_extract_response.main_place)
+            response = get_places(
+                lat,
+                lon,
+                5000,
+                available_categories.get(characteristic_extract_response.kind, None),
+                top_k,
+            )
+            output_geo = json.loads(response.body)
+            if tool_chat:
+                output_geo = [
+                    {
+                        "name": i["name"],
+                        "address": i["address"],
+                        "distance_km": i["distance_km"],
+                    }
+                    for i in output_geo
+                ]
+            return output_geo
+
+        async def get_characteristic_results():
+            output_characteristic = await destination_suggestion_controller(
+                query, user_id, top_k
+            )
+            output_characteristic = [
+                {
+                    "name": i,
+                    "map_url": "https://www.google.com/maps/search/109.23333,13.76667",
+                }
+                for i in output_characteristic
+            ]
+            return output_characteristic
+
+        # Run both tasks concurrently
+        output_geo_task = asyncio.create_task(get_geoapify_results())
+        output_characteristic_task = asyncio.create_task(get_characteristic_results())
+
+        # Wait for both tasks to complete
+        output_geo, output_characteristic = await asyncio.gather(
+            output_geo_task, output_characteristic_task
+        )
+
+        # If tool_chat mode, return just the geoapify results
+        if tool_chat:
+            return output_geo
+
+        logger.info(f"output_geo {output_geo}")
+        logger.info(f"output_characteristic {output_characteristic}")
 
-    return output
+        return {
+            "geoapify": output_geo,
+            "characteristic": output_characteristic,
+        }

src/apis/controllers/post_controller.py

@@ -9,6 +9,7 @@ from bson import ObjectId
 import math
 from src.utils.helper import deserialize_objectid
 from typing import List
+import random
 
 
 async def create_a_post_controller(
@@ -78,9 +79,13 @@ async def list_all_posts_controller_priority(
                 method="GET",
                 url=f"https://abao77-triventure-personalize.hf.space/model/get_recommendation_destinations/{user_id}/5",
             )
-            top_5_destinations = response_recommendation_destinations.get("destination_ids", [])
+            top_5_destinations = response_recommendation_destinations.get(
+                "destination_ids", []
+            )
             # top_5_destinations = []
-            destinations_list = response_recommendation_destinations.get("destinations_list", None)
+            destinations_list = response_recommendation_destinations.get(
+                "destinations_list", None
+            )
 
         start_time = time.time()
         PAGE_SIZE = 10
@@ -91,7 +96,6 @@ async def list_all_posts_controller_priority(
 
         excluded_ids = [deserialize_objectid(pid) for pid in view_post_ids]
 
-        # Tạo filter cho 2 nhóm
         top_filter = {
             "destination_id": {"$in": top_5_destinations},
             "_id": {"$nin": excluded_ids},
@@ -112,6 +116,7 @@ async def list_all_posts_controller_priority(
             limit=TOP_LIMIT,
             skip=skip_top,
         )
+        random.shuffle(top_posts)
 
         other_posts = await PostCRUD.find_many_with_score(
             filter=other_filter,
@@ -119,8 +124,6 @@ async def list_all_posts_controller_priority(
             limit=OTHER_LIMIT,
             skip=skip_other,
         )
-
-            # Xen kẽ
         combined_posts = []
         i = j = 0
         while len(combined_posts) < PAGE_SIZE and (
@@ -133,8 +136,15 @@ async def list_all_posts_controller_priority(
                 combined_posts.append(other_posts[j])
                 j += 1
 
-        user_ids = list({deserialize_objectid(post.get("user_id")) for post in combined_posts})
-        destination_ids = list({deserialize_objectid(post.get("destination_id")) for post in combined_posts})
+        user_ids = list(
+            {deserialize_objectid(post.get("user_id")) for post in combined_posts}
+        )
+        destination_ids = list(
+            {
+                deserialize_objectid(post.get("destination_id"))
+                for post in combined_posts
+            }
+        )
         post_ids = [serialize_datetime(post["_id"]) for post in combined_posts]
 
         user_infos_result = await UserCRUD.read({"_id": {"$in": user_ids}})
@@ -242,13 +252,17 @@ async def list_all_posts_controller(user_id: str, page: int = 1):
 
         # Get unique user and destination IDs
         user_ids = list({deserialize_objectid(post.get("user_id")) for post in posts})
-        destination_ids = list({deserialize_objectid(post.get("destination_id")) for post in posts})
-        
+        destination_ids = list(
+            {deserialize_objectid(post.get("destination_id")) for post in posts}
+        )
+
         # Use $in operator for batch lookups
         user_infos = await UserCRUD.read({"_id": {"$in": user_ids}})
         print("user_infos", user_infos)
-        destination_infos = await DestinationCRUD.read({"_id": {"$in": destination_ids}})
-        
+        destination_infos = await DestinationCRUD.read(
+            {"_id": {"$in": destination_ids}}
+        )
+
         # Create user info map
         user_info_map = {
             info.get("_id"): {
@@ -259,20 +273,19 @@ async def list_all_posts_controller(user_id: str, page: int = 1):
             for info in user_infos
             if info
         }
-        
+
         # Create destination info map
         destination_info_map = {
             info.get("_id"): info.get("name") for info in destination_infos if info
         }
-        
+
         formatted_user_reactions_map = {}
         if user_id:
             all_post_ids = [serialize_datetime(post.get("_id")) for post in posts]
             # Use $in operator for batch lookup of reactions
-            reactions = await ReactionCRUD.read({
-                "user_id": user_id,
-                "post_id": {"$in": all_post_ids}
-            })
+            reactions = await ReactionCRUD.read(
+                {"user_id": user_id, "post_id": {"$in": all_post_ids}}
+            )
             for reaction in reactions:
                 if reaction:
                     post_id = reaction.get("post_id")
@@ -353,7 +366,7 @@ async def list_posts_by_destination_controller(
 
         # Get unique user_ids
         user_ids = list({deserialize_objectid(post.get("user_id")) for post in posts})
-        
+
         # Use $in operator for batch user lookup
         user_infos = await UserCRUD.read({"_id": {"$in": user_ids}})
         user_info_map = {