fi

.gitignore

@@ -16,4 +16,4 @@ venv/
 .pytest_cache/
 note.txt
 
-process _data/
+process_data/

app/dialogflow/api/v1/dialogflow.py

@@ -4,7 +4,7 @@ from fastapi.responses import JSONResponse, RedirectResponse, HTMLResponse # typ
 from datetime import datetime, timedelta
 from fastapi.templating import Jinja2Templates
 from app.dialogflow.services.dialog_service import dialog_service
-from utils.format_data_dialog import format_time, get_weekday_name
+from utils.format_data_dialog import extra_time_dialogflow, get_weekday_name, find_surrounding_times
 
 from common.external.external_api import api
 from app.dialogflow.services.origin_codes import origin_codes, get_origin_id_and_code
@@ -394,30 +394,56 @@ async def time_trip(request: Request) -> Response:
         session_info = body.get("sessionInfo", {})
         parameters = session_info.get("parameters")
         trip_list: List[Dict[str, any]] = parameters.get("trip_list", [])
-        raw_route_id = parameters.get("route_id", None)
+        raw_route_id = parameters.get("route_id")
         route_name = parameters.get("route_name", "")
-
+        raw_time = parameters.get("time-select")
+        time_list = parameters.get("time_list", [])
+        is_has_time = parameters.get("is_has_time", False)
+        
         route_id = int(raw_route_id) if raw_route_id else None
+        
+        text = []
         time_list = []
-        for trip in trip_list:
-            if (trip["route_id"]) == route_id:
-                time_list.append({"time": trip["departure_time"], "id": trip["id"]})
-        parameters = {
-            "time_list": time_list
-        }
-        text = [f"Quý khách lựa chọn thời gian chuyến {route_name}\n" + " | ".join([item["time"] for item in time_list])]
+        quick_time_reply = []
+        parameters = {}
+       
+        
+        
+        if raw_time:
+            time = extra_time_dialogflow(raw_time)
+            if isinstance(time, list):
+                quick_time_reply = time
+                parameters["time_select"] = None
+                parameters["is_time_ambiguous"] = True
+                text = [f"Quý khách dự định đi vào lúc"]
+            else:
+                text = []
+                if is_has_time:
+                    text = [f"Quý khách lựa chọn thời gian chuyến {route_name}\n" + " | ".join([item["time"] for item in time_list])]
+                    parameters["is_has_time"] = None
+                else:
+                    parameters["is_has_time"] = True
+                return DialogFlowResponseAPI(text=text,parameters=parameters)
+        else:
+            for trip in trip_list:
+                if (trip["route_id"]) == route_id:
+                    time_list.append({"time": trip["departure_time"], "trip_id": trip["id"]})
+            quick_time_reply = time_list
+            text = [f"Quý khách lựa chọn thời gian chuyến {route_name}\n" + " | ".join([item["time"] for item in time_list])]
+        
+        parameters["time_list"] =  time_list
         payload={
-                                "richContent": [
-                                    [
-                                        {
-                                            "type": "chips",
-                                            "options": [ 
-                                                {"text": time["time"]} for time in (time_list)
-                                            ]
-                                        }
+                                    "richContent": [
+                                        [
+                                            {
+                                                "type": "chips",
+                                                "options": [ 
+                                                    {"text": time["time"]} for time in (quick_time_reply)
+                                                ]
+                                            }
+                                        ]
                                     ]
-                                ]
-                            }
+                                }
         return DialogFlowResponseAPI(text=text, payload=payload ,parameters=parameters)
     except Exception as e:
         print(e)
@@ -452,15 +478,17 @@ async def is_valid_select_time(request: Request) -> Response:
         route_ids = await dialog_service.search_all_route_ids(origin_code=origin_code, from_id=origin_id, orign_ids=origin_ids, dest_code=dest_code, to_id=dest_id, dest_ids=dest_ids)
         
 
-        time_list: List[Dict[str, any]] = parameters.get("time_list", [])
-        time_select = parameters.get("time-select", None)
-        route_name = parameters.get("route_name", None)
+        time_list: list[Dict[str, any]] = parameters.get("time_list", [])
+        time_select = parameters.get("time-select")
+        route_name = parameters.get("route_name")
+        is_has_time = parameters.get("is_has_time")
+        
         
-        if time_select is not None:
-            time_select = format_time(time_select)
+        if time_select:
+            time_select = extra_time_dialogflow(time_select)
             for time in time_list:
                 if time_select == time["time"]:
-                    id = int(time["id"])
+                    id = int(time["trip_id"])
                     trip = await dialog_service.search_trip_by_id(id, from_time, to_time, route_ids, ticket_count)
                     departure_date = trip["raw_departure_date"]
                     parameters = {
@@ -469,10 +497,19 @@ async def is_valid_select_time(request: Request) -> Response:
                         "departure_date": departure_date,
                         "trip": trip,
                     }
-                    text = [f' Quý khách chọn chuyến **{time_select}** | **{route_name}**']
+                    text = [f'Quý khách chọn chuyến **{time_select}** | **{route_name}**']
                     return DialogFlowResponseAPI(text=text, parameters=parameters)
+            if is_has_time:
+                time_list = find_surrounding_times(time_list, time_select)
+                parameters = {
+                    "time_list": time_list,
+                    "is_valid_time": False
+                }
+                
+                return DialogFlowResponseAPI(parameters=parameters)
                 
         parameters = {
+                "time_select": None,
                 "is_valid_time": False
             }
         text = []

app/dialogflow/services/dialog_service.py

@@ -67,7 +67,6 @@ class DialogService:
             raise Exception("Error fetching seats data")
     
     async def search_all_route_ids(self, origin_code: str = None, from_id: int = None, orign_ids: int = None, dest_code: str = None, to_id: str = None, dest_ids: str = None):
-        print(from_id)
         route_ids = await self.search_route_ids_one_way_by_metadata(origin_code, from_id, orign_ids, dest_code, to_id, dest_ids)
         if len(route_ids) == 0:
             route_ids = await self.search_route_ids_one_way_by_origin_dest_code(origin_code, dest_code)

utils/format_data_dialog.py

@@ -1,17 +1,46 @@
 from datetime import datetime
+from bisect import bisect_left
 
 
-def format_time(time: dict) -> str:
+
+
+def find_surrounding_times(time_list: list, time: str) -> list:
+    """
+    Find the surrounding times in a sorted list of times.
+    :param time_list: List of time strings in "HH:mm" format.
+    :param time: Time string to find the surrounding times for.
+    :return: List of surrounding times in "HH:mm" format.
+    """
+    index = bisect_left(time_list, time)
+    
+    start = max(0, index - 2)
+    end = min(len(time_list), index + 2)
+    
+    return time_list[start:end]
+
+def extra_time_dialogflow(time: dict) -> str | list:
     """
     Format time dictionary to string.
-    :param time: Time dictionary with keys 'hours' and 'minutes'.
-    :return: Formatted time string in HH:MM format.
+    Nếu time có ambiguous (past, future) => trả về list [past_time_str, future_time_str]
+    Nếu time rõ ràng => trả về string "HH:mm"
     """
-    if time.get("past"):
-        time = time.get("past")
-        hours = int(time["hours"])
-        minutes = int(time["minutes"])
-        return f"{hours:02d}:{minutes:02d}"
+    def is_time_ambiguous(time_obj: dict) -> bool:
+        return any(time_obj.get(key) for key in ['past', 'future', 'partial'])
+    
+    if is_time_ambiguous(time):
+        past_time = time.get("past", {})
+        future_time = time.get("future", {})
+
+        past_hours = int(past_time.get("hours", 0))
+        past_minutes = int(past_time.get("minutes", 0))
+        past_time_str = f"{past_hours:02d}:{past_minutes:02d}"
+
+        future_hours = int(future_time.get("hours", 0))
+        future_minutes = int(future_time.get("minutes", 0))
+        future_time_str = f"{future_hours:02d}:{future_minutes:02d}"
+
+        return sorted([past_time_str, future_time_str])
+        
     else:
         hours = int(time["hours"])
         minutes = int(time["minutes"])
@@ -36,4 +65,16 @@ def get_weekday_name(date: datetime) -> tuple:
     weekday_ids = date.weekday()
     weekday = vietnam_weekdays.get(weekday_ids) if vietnam_weekdays.get(weekday_ids) else ""
     
-    return date.strftime("%d-%m-%Y"), weekday
+    return date.strftime("%d-%m-%Y"), weekday
+
+def get_time_now_json() -> dict:
+    """
+    Get the current time in JSON format.
+    :return: Dictionary with keys 'hours' and 'minutes', 'second'.
+    """
+    now = datetime.now()
+    return {
+        "hours": now.strftime("%H"),
+        "minutes": now.strftime("%M"),      
+        "seconds": now.strftime("%S")
+    }