fix: dependency

utils/llm_caller.py

@@ -55,254 +55,254 @@ class LLMCaller:
             print(f"Error calling LLM: {e}")
             return f"Error: Unable to get LLM response - {str(e)}"
     
-async def query_with_rag(self, plan_request: PlanRequest, collection_name: Optional[str] = None) -> 'PlanResponse':
-    """
-    Perform RAG query using PlanRequest, embed query, search Qdrant, and generate complete PlanResponse via LLM
-    """
-    print(plan_request)
-    try:
-        # 1. Create query string from PlanRequest - updated for new fields
-        destination = plan_request.destination or plan_request.destination_place or "unknown destination"
-        duration = plan_request.duration or plan_request.trip_duration_days or 1
-        budget = plan_request.trip_price or 0
-        
-        query_text = f"Trip from {plan_request.start_place} to {destination}"
-        
-        # Add new fields to query
-        if plan_request.travelDates:
-            query_text += f" on {plan_request.travelDates}"
-        if duration:
-            query_text += f" for {duration} days"
-        if budget:
-            query_text += f" with budget {budget}"
-        if plan_request.theme:
-            query_text += f" {plan_request.theme} themed trip"
-        if plan_request.interests:
-            query_text += f" interested in {', '.join(plan_request.interests)}"
-        if plan_request.budgetTier:
-            query_text += f" {plan_request.budgetTier} budget tier"
-        
-        # 2. Generate embedding for the query
-        query_embedding = self.embedding_model.encode(query_text, normalize_embeddings=True).tolist()
-        
-        # 3. Search Qdrant for similar content
-        collection = collection_name or self.collection_name
-        top_k = plan_request.top_k or self.top_k
-        
-        search_results = self.qdrant.search(
-            collection_name=collection,
-            query_vector=query_embedding,
-            limit=top_k,
-            with_payload=True
-        )
-        
-        # 4. Convert search results to RetrievedItem format
-        retrieved_data = []
-        context_text = ""
-
-        print(f"Search results: {search_results['result']}")
-        for result in search_results['result']:
-            retrieved_item = RetrievedItem(
-                place_id=result.get('id', 'Unknown'),
-                place_name=result['payload'].get("place_name", "Unknown"),
-                score=result['score'],
+    async def query_with_rag(self, plan_request: PlanRequest, collection_name: Optional[str] = None) -> 'PlanResponse':
+        """
+        Perform RAG query using PlanRequest, embed query, search Qdrant, and generate complete PlanResponse via LLM
+        """
+        print(plan_request)
+        try:
+            # 1. Create query string from PlanRequest - updated for new fields
+            destination = plan_request.destination or plan_request.destination_place or "unknown destination"
+            duration = plan_request.duration or plan_request.trip_duration_days or 1
+            budget = plan_request.trip_price or 0
+            
+            query_text = f"Trip from {plan_request.start_place} to {destination}"
+            
+            # Add new fields to query
+            if plan_request.travelDates:
+                query_text += f" on {plan_request.travelDates}"
+            if duration:
+                query_text += f" for {duration} days"
+            if budget:
+                query_text += f" with budget {budget}"
+            if plan_request.theme:
+                query_text += f" {plan_request.theme} themed trip"
+            if plan_request.interests:
+                query_text += f" interested in {', '.join(plan_request.interests)}"
+            if plan_request.budgetTier:
+                query_text += f" {plan_request.budgetTier} budget tier"
+            
+            # 2. Generate embedding for the query
+            query_embedding = self.embedding_model.encode(query_text, normalize_embeddings=True).tolist()
+            
+            # 3. Search Qdrant for similar content
+            collection = collection_name or self.collection_name
+            top_k = plan_request.top_k or self.top_k
+            
+            search_results = self.qdrant.search(
+                collection_name=collection,
+                query_vector=query_embedding,
+                limit=top_k,
+                with_payload=True
             )
-            retrieved_data.append(retrieved_item)
-            context_text += f"\n{result['payload'].get('text', '')}"
+            
+            # 4. Convert search results to RetrievedItem format
+            retrieved_data = []
+            context_text = ""
 
-        # 5. Create detailed prompt for LLM - updated with new fields
-        llm_prompt = f"""
-        You are a travel planning assistant. Based on the trip request and travel context provided, generate a comprehensive trip plan in the exact JSON format specified below.
+            print(f"Search results: {search_results['result']}")
+            for result in search_results['result']:
+                retrieved_item = RetrievedItem(
+                    place_id=result.get('id', 'Unknown'),
+                    place_name=result['payload'].get("place_name", "Unknown"),
+                    score=result['score'],
+                )
+                retrieved_data.append(retrieved_item)
+                context_text += f"\n{result['payload'].get('text', '')}"
 
-        Trip Request:
-        - From: {plan_request.start_place}
-        - To: {destination}
-        - Travel Dates: {plan_request.travelDates or 'Flexible'}
-        - Duration: {duration} days
-        - Budget: {budget} ({plan_request.budgetTier or 'Not specified'} tier)
-        - Group Size: {plan_request.groupSize} people
-        - Interests: {', '.join(plan_request.interests) if plan_request.interests else 'Not specified'}
-        - Theme: {plan_request.theme or 'General travel'}
-        - Transport Preference: {plan_request.transportPref or 'Any'}
-        - Stay Preference: {plan_request.stayPref or 'Any'}
-        - Legacy Context: {getattr(plan_request, 'trip_context', None) or 'None'}
+            # 5. Create detailed prompt for LLM - updated with new fields
+            llm_prompt = f"""
+            You are a travel planning assistant. Based on the trip request and travel context provided, generate a comprehensive trip plan in the exact JSON format specified below.
 
-        Relevant Travel Context:
-        {context_text}
-        
-        ***Don't Explain or add any additional text outside the JSON format***.
-        Generate a response in this EXACT JSON format (no additional text before or after):
-        {{
-            "tripOverview": "A comprehensive 2-3 paragraph overview of the entire {duration}-day trip from {plan_request.start_place} to {destination}, highlighting the {plan_request.theme or 'travel'} theme and {', '.join(plan_request.interests) if plan_request.interests else 'general sightseeing'} interests",
-            "trip_plan": {{
-                "title": "Descriptive title for the {duration}-day {plan_request.theme or 'travel'} trip to {destination}",
-                "date": "{plan_request.travelDates or 'Flexible dates'}",
-                "timeline": [
-                    {{"t": "08:30", "detail": "Start of day activity"}},
-                    {{"t": "12:00", "detail": "Lunch break"}},
-                    {{"t": "14:00", "detail": "Afternoon activity"}},
-                    {{"t": "18:00", "detail": "Evening activity"}}
-                ],
-                "spots": [
-                    {{"name": "Location name", "time": "09:30 – 11:45", "notes": "Description and tips for this location"}},
-                    {{"name": "Another location", "time": "14:00 – 16:30", "notes": "More details and recommendations"}}
-                ],
-                "budget": {{
-                    "transport": estimated_transport_cost,
-                    "entrance": estimated_entrance_fees,
-                    "meals": estimated_meal_costs,
-                    "accommodation": estimated_accommodation_costs,
-                    "activities": estimated_activity_costs,
-                    "total": total_estimated_cost
-                }},
-                "permits": {{
-                    "needed": true_or_false,
-                    "notes": "Permit requirements and how to obtain them",
-                    "seasonal": "Seasonal considerations and restrictions"
-                }},
-                "safety": {{
-                    "registration": "Safety registration procedures",
-                    "checkins": "Check-in procedures and requirements",
-                    "sos": "Emergency procedures and protocols",
-                    "contacts": {{
-                        "ranger": {{"name": "Local ranger station name", "phone": "+66-XX-XXX-XXXX"}},
-                        "hospital": {{"name": "Nearest hospital name", "phone": "+66-XX-XXX-XXXX"}},
-                        "police": {{"name": "Local police station", "phone": "1155"}}
+            Trip Request:
+            - From: {plan_request.start_place}
+            - To: {destination}
+            - Travel Dates: {plan_request.travelDates or 'Flexible'}
+            - Duration: {duration} days
+            - Budget: {budget} ({plan_request.budgetTier or 'Not specified'} tier)
+            - Group Size: {plan_request.groupSize} people
+            - Interests: {', '.join(plan_request.interests) if plan_request.interests else 'Not specified'}
+            - Theme: {plan_request.theme or 'General travel'}
+            - Transport Preference: {plan_request.transportPref or 'Any'}
+            - Stay Preference: {plan_request.stayPref or 'Any'}
+            - Legacy Context: {getattr(plan_request, 'trip_context', None) or 'None'}
+
+            Relevant Travel Context:
+            {context_text}
+            
+            ***Don't Explain or add any additional text outside the JSON format***.
+            Generate a response in this EXACT JSON format (no additional text before or after):
+            {{
+                "tripOverview": "A comprehensive 2-3 paragraph overview of the entire {duration}-day trip from {plan_request.start_place} to {destination}, highlighting the {plan_request.theme or 'travel'} theme and {', '.join(plan_request.interests) if plan_request.interests else 'general sightseeing'} interests",
+                "trip_plan": {{
+                    "title": "Descriptive title for the {duration}-day {plan_request.theme or 'travel'} trip to {destination}",
+                    "date": "{plan_request.travelDates or 'Flexible dates'}",
+                    "timeline": [
+                        {{"t": "08:30", "detail": "Start of day activity"}},
+                        {{"t": "12:00", "detail": "Lunch break"}},
+                        {{"t": "14:00", "detail": "Afternoon activity"}},
+                        {{"t": "18:00", "detail": "Evening activity"}}
+                    ],
+                    "spots": [
+                        {{"name": "Location name", "time": "09:30 – 11:45", "notes": "Description and tips for this location"}},
+                        {{"name": "Another location", "time": "14:00 – 16:30", "notes": "More details and recommendations"}}
+                    ],
+                    "budget": {{
+                        "transport": estimated_transport_cost,
+                        "entrance": estimated_entrance_fees,
+                        "meals": estimated_meal_costs,
+                        "accommodation": estimated_accommodation_costs,
+                        "activities": estimated_activity_costs,
+                        "total": total_estimated_cost
+                    }},
+                    "permits": {{
+                        "needed": true_or_false,
+                        "notes": "Permit requirements and how to obtain them",
+                        "seasonal": "Seasonal considerations and restrictions"
+                    }},
+                    "safety": {{
+                        "registration": "Safety registration procedures",
+                        "checkins": "Check-in procedures and requirements",
+                        "sos": "Emergency procedures and protocols",
+                        "contacts": {{
+                            "ranger": {{"name": "Local ranger station name", "phone": "+66-XX-XXX-XXXX"}},
+                            "hospital": {{"name": "Nearest hospital name", "phone": "+66-XX-XXX-XXXX"}},
+                            "police": {{"name": "Local police station", "phone": "1155"}}
+                        }}
                     }}
                 }}
             }}
-        }}
-        Rules:
-        - Use the provided context to fill in details.
-        - Ensure all fields are filled with realistic and practical information.
-        - Use local currency for prices and consider the {plan_request.budgetTier or 'moderate'} budget tier.
-        - Accommodate {plan_request.groupSize} people in all recommendations.
-        - Focus on {plan_request.theme or 'general'} themed activities.
-        - Prioritize interests: {', '.join(plan_request.interests) if plan_request.interests else 'general sightseeing'}.
-        - Consider transport preference: {plan_request.transportPref or 'any'}.
-        - Consider accommodation preference: {plan_request.stayPref or 'any'}.
-        - DONT ADD ANY INLINE NOTE IN JSON
-        
-        ***Don't Explain or add any additional text outside the JSON format***.
-        Ensure the JSON is valid and well-structured.
+            Rules:
+            - Use the provided context to fill in details.
+            - Ensure all fields are filled with realistic and practical information.
+            - Use local currency for prices and consider the {plan_request.budgetTier or 'moderate'} budget tier.
+            - Accommodate {plan_request.groupSize} people in all recommendations.
+            - Focus on {plan_request.theme or 'general'} themed activities.
+            - Prioritize interests: {', '.join(plan_request.interests) if plan_request.interests else 'general sightseeing'}.
+            - Consider transport preference: {plan_request.transportPref or 'any'}.
+            - Consider accommodation preference: {plan_request.stayPref or 'any'}.
+            - DONT ADD ANY INLINE NOTE IN JSON
+            
+            ***Don't Explain or add any additional text outside the JSON format***.
+            Ensure the JSON is valid and well-structured.
 
-        Create {duration} days of detailed activities. Include realistic prices, coordinates, and practical tips. Make it specific to the destinations, theme, interests, and budget tier provided.
-        """
-        
-        # 6. Call LLM to generate structured trip plan
-        llm_response = await self.basic_query(user_prompt=llm_prompt, max_tokens=24048)
-        print(f"LLM Response: {llm_response}")
-        
-        # 7. Parse LLM response as JSON
-        try:
-            # Clean the response and parse JSON
-            json_str = llm_response.strip()
-            if json_str.startswith("```json"):
-                json_str = json_str[7:]
-            if json_str.endswith("```"):
-                json_str = json_str[:-3]
+            Create {duration} days of detailed activities. Include realistic prices, coordinates, and practical tips. Make it specific to the destinations, theme, interests, and budget tier provided.
+            """
             
-            llm_data = json.loads(json_str)
-            print(f"LLM Data: {llm_data}")
+            # 6. Call LLM to generate structured trip plan
+            llm_response = await self.basic_query(user_prompt=llm_prompt, max_tokens=24048)
+            print(f"LLM Response: {llm_response}")
             
-            # Convert to PlanResponse structure
-            trip_plan_data = llm_data.get("trip_plan", {})
+            # 7. Parse LLM response as JSON
+            try:
+                # Clean the response and parse JSON
+                json_str = llm_response.strip()
+                if json_str.startswith("```json"):
+                    json_str = json_str[7:]
+                if json_str.endswith("```"):
+                    json_str = json_str[:-3]
+                
+                llm_data = json.loads(json_str)
+                print(f"LLM Data: {llm_data}")
+                
+                # Convert to PlanResponse structure
+                trip_plan_data = llm_data.get("trip_plan", {})
 
-            # Parse timeline
-            timeline_data = trip_plan_data.get("timeline", [])
-            timeline = [Timeline(t=item["t"], detail=item["detail"]) for item in timeline_data]
+                # Parse timeline
+                timeline_data = trip_plan_data.get("timeline", [])
+                timeline = [Timeline(t=item["t"], detail=item["detail"]) for item in timeline_data]
 
-            # Parse spots
-            spots_data = trip_plan_data.get("spots", [])
-            spots = [Spot(name=item["name"], time=item["time"], notes=item["notes"]) for item in spots_data]
+                # Parse spots
+                spots_data = trip_plan_data.get("spots", [])
+                spots = [Spot(name=item["name"], time=item["time"], notes=item["notes"]) for item in spots_data]
 
-            # Parse budget
-            budget_data = trip_plan_data.get("budget", {})
-            budget = Budget(
-                transport=budget_data.get("transport"),
-                entrance=budget_data.get("entrance"),
-                meals=budget_data.get("meals"),
-                accommodation=budget_data.get("accommodation"),
-                activities=budget_data.get("activities"),
-                total=budget_data.get("total")
-            )
+                # Parse budget
+                budget_data = trip_plan_data.get("budget", {})
+                budget = Budget(
+                    transport=budget_data.get("transport"),
+                    entrance=budget_data.get("entrance"),
+                    meals=budget_data.get("meals"),
+                    accommodation=budget_data.get("accommodation"),
+                    activities=budget_data.get("activities"),
+                    total=budget_data.get("total")
+                )
 
-            # Parse permits
-            permits_data = trip_plan_data.get("permits", {})
-            permits = Permits(
-                needed=permits_data.get("needed", False),
-                notes=permits_data.get("notes", ""),
-                seasonal=permits_data.get("seasonal", "")
-            ) if permits_data else None
+                # Parse permits
+                permits_data = trip_plan_data.get("permits", {})
+                permits = Permits(
+                    needed=permits_data.get("needed", False),
+                    notes=permits_data.get("notes", ""),
+                    seasonal=permits_data.get("seasonal", "")
+                ) if permits_data else None
 
-            # Parse safety
-            safety_data = trip_plan_data.get("safety", {})
-            safety = None
-            if safety_data:
-                contacts_data = safety_data.get("contacts", {})
-                contacts = SafetyContacts(
-                    ranger=Contact(**contacts_data["ranger"]) if contacts_data.get("ranger") else None,
-                    hospital=Contact(**contacts_data["hospital"]) if contacts_data.get("hospital") else None,
-                    police=Contact(**contacts_data["police"]) if contacts_data.get("police") else None
-                )
-                safety = Safety(
-                    registration=safety_data.get("registration", ""),
-                    checkins=safety_data.get("checkins", ""),
-                    sos=safety_data.get("sos", ""),
-                    contacts=contacts
-                )
+                # Parse safety
+                safety_data = trip_plan_data.get("safety", {})
+                safety = None
+                if safety_data:
+                    contacts_data = safety_data.get("contacts", {})
+                    contacts = SafetyContacts(
+                        ranger=Contact(**contacts_data["ranger"]) if contacts_data.get("ranger") else None,
+                        hospital=Contact(**contacts_data["hospital"]) if contacts_data.get("hospital") else None,
+                        police=Contact(**contacts_data["police"]) if contacts_data.get("police") else None
+                    )
+                    safety = Safety(
+                        registration=safety_data.get("registration", ""),
+                        checkins=safety_data.get("checkins", ""),
+                        sos=safety_data.get("sos", ""),
+                        contacts=contacts
+                    )
 
-            trip_plan = TripPlan(
-                title=trip_plan_data.get("title", ""),
-                date=trip_plan_data.get("date", ""),
-                timeline=timeline,
-                spots=spots,
-                budget=budget,
-                permits=permits,
-                safety=safety
-            )
+                trip_plan = TripPlan(
+                    title=trip_plan_data.get("title", ""),
+                    date=trip_plan_data.get("date", ""),
+                    timeline=timeline,
+                    spots=spots,
+                    budget=budget,
+                    permits=permits,
+                    safety=safety
+                )
 
-            return PlanResponse(
-                tripOverview=llm_data.get("tripOverview", ""),
-                query_params=plan_request,
-                retrieved_data=retrieved_data,
-                trip_plan=trip_plan,
-                meta={
-                    "status": "success",
-                    "query_text": query_text,
-                    "results_count": len(retrieved_data),
-                    "theme": plan_request.theme,
-                    "interests": plan_request.interests,
-                    "budget_tier": plan_request.budgetTier,
-                    "group_size": plan_request.groupSize
-                }
-            )
-            
-        except json.JSONDecodeError as e:
-            print(f"Error parsing LLM JSON response: {e}")
-            print(f"LLM Response: {llm_response}")
+                return PlanResponse(
+                    tripOverview=llm_data.get("tripOverview", ""),
+                    query_params=plan_request,
+                    retrieved_data=retrieved_data,
+                    trip_plan=trip_plan,
+                    meta={
+                        "status": "success",
+                        "query_text": query_text,
+                        "results_count": len(retrieved_data),
+                        "theme": plan_request.theme,
+                        "interests": plan_request.interests,
+                        "budget_tier": plan_request.budgetTier,
+                        "group_size": plan_request.groupSize
+                    }
+                )
+                
+            except json.JSONDecodeError as e:
+                print(f"Error parsing LLM JSON response: {e}")
+                print(f"LLM Response: {llm_response}")
+                
+                # Fallback: create basic response with LLM text
+                return PlanResponse(
+                    tripOverview=llm_response,
+                    query_params=plan_request,
+                    retrieved_data=retrieved_data,
+                    trip_plan=TripPlan(
+                        overview="Generated plan (parsing error)",
+                        total_estimated_cost=budget,
+                        steps=[]
+                    ),
+                    meta={"status": "json_parse_error", "error": str(e)}
+                )
             
-            # Fallback: create basic response with LLM text
+        except Exception as e:
+            print(f"Error in RAG query: {e}")
             return PlanResponse(
-                tripOverview=llm_response,
+                tripOverview=f"Error generating trip plan: {str(e)}",
                 query_params=plan_request,
-                retrieved_data=retrieved_data,
-                trip_plan=TripPlan(
-                    overview="Generated plan (parsing error)",
-                    total_estimated_cost=budget,
-                    steps=[]
-                ),
-                meta={"status": "json_parse_error", "error": str(e)}
+                retrieved_data=[],
+                trip_plan=TripPlan(overview="Error occurred", total_estimated_cost=0.0, steps=[]),
+                meta={"status": "error", "error": str(e)}
             )
-        
-    except Exception as e:
-        print(f"Error in RAG query: {e}")
-        return PlanResponse(
-            tripOverview=f"Error generating trip plan: {str(e)}",
-            query_params=plan_request,
-            retrieved_data=[],
-            trip_plan=TripPlan(overview="Error occurred", total_estimated_cost=0.0, steps=[]),
-            meta={"status": "error", "error": str(e)}
-        )
-        
+