PDay edits

kitt.py

@@ -72,15 +72,6 @@ def use_tool(func_name, kwargs, tools):
             return tool.invoke(input=kwargs)
     return None
 
-tools = [
-    StructuredTool.from_function(get_weather),
-    StructuredTool.from_function(find_route),
-    # StructuredTool.from_function(vehicle_status),
-    StructuredTool.from_function(search_points_of_interests),
-    StructuredTool.from_function(search_along_route_w_coordinates),
-    StructuredTool.from_function(date_time_info),
-    StructuredTool.from_function(do_anything_else),
-]
 # llm = Ollama(model="nexusraven", stop=["\nReflection:", "\nThought:"], keep_alive=60*10)
 
 
@@ -88,6 +79,18 @@ tools = [
 hour_options = [f"{i:02d}:00:00" for i in range(24)]
 
 
+def search_along_route(query=""):
+    """Search for points of interest along the route/way to the destination.
+
+    Args:
+        query (str, optional): The type of point of interest to search for. Defaults to "restaurant".
+    
+    """
+    points = global_context["route_points"]
+    # maybe reshape
+    return search_along_route_w_coordinates(points, query)
+
+
 def set_time(time_picker):
     vehicle.time = time_picker
     return vehicle.model_dump_json()
@@ -97,10 +100,21 @@ def get_vehicle_status(state):
     return state.value["vehicle"].model_dump_json()
 
 
+tools = [
+    StructuredTool.from_function(get_weather),
+    StructuredTool.from_function(find_route),
+    # StructuredTool.from_function(vehicle_status),
+    StructuredTool.from_function(search_points_of_interests),
+    StructuredTool.from_function(search_along_route),
+    StructuredTool.from_function(date_time_info),
+    StructuredTool.from_function(do_anything_else),
+]
+
+
 def run_generic_model(query):
     print(f"Running the generic model with query: {query}")
     data = {
-        "prompt": query,
+        "prompt": f"Answer the question below in a short and concise manner.\n{query}",
         "model": MODEL_GENERAL,
         "options": {
             # "temperature": 0.1,
@@ -112,6 +126,7 @@ def run_generic_model(query):
 
 
 def run_model(query, voice_character):
+    query = query.strip().replace("'", "")
     print("Query: ", query)
     global_context["query"] = query
     global_context["prompt"] = get_prompt(RAVEN_PROMPT_FUNC, query, "", tools)
@@ -175,20 +190,24 @@ def save_audio_as_wav(data, sample_rate, file_path):
 
 
 def save_and_transcribe_audio(audio):
-    # capture the audio and save it to a file as wav or mp3
-    # file_name = save("audioinput.wav")
-    sr, y = audio
-    # y = y.astype(np.float32)
-    # y /= np.max(np.abs(y))
-
-    # add timestamp to file name
-    filename = f"recordings/audio{time.time()}.wav"
-    save_audio_as_wav(y, sr, filename)
-    
-    sr, y = audio
-    y = y.astype(np.float32)
-    y /= np.max(np.abs(y))
-    text = transcriber({"sampling_rate": sr, "raw":y})["text"]
+    try:
+        # capture the audio and save it to a file as wav or mp3
+        # file_name = save("audioinput.wav")
+        sr, y = audio
+        # y = y.astype(np.float32)
+        # y /= np.max(np.abs(y))
+
+        # add timestamp to file name
+        filename = f"recordings/audio{time.time()}.wav"
+        save_audio_as_wav(y, sr, filename)
+        
+        sr, y = audio
+        y = y.astype(np.float32)
+        y /= np.max(np.abs(y))
+        text = transcriber({"sampling_rate": sr, "raw":y})["text"]
+    except Exception as e:
+        print(f"Error: {e}")
+        return "Error transcribing audio"
     return text
 
 # to be able to use the microphone on chrome, you will have to go to chrome://flags/#unsafely-treat-insecure-origin-as-secure and enter http://10.186.115.21:7860/
@@ -228,10 +247,10 @@ with gr.Blocks(theme=gr.themes.Default()) as demo:
             )
             voice_character = gr.Radio(choices=voice_options, label='Choose a voice', value=voice_options[0], show_label=True)
             origin = gr.Textbox(
-                value="Rue Alphonse Weicker, Luxembourg", label="Origin", interactive=True
+                value="Mondorf-les-Bains, Luxembourg", label="Origin", interactive=True
             )
             destination = gr.Textbox(
-                value="Luxembourg Gare, Luxembourg",
+                value="Rue Alphonse Weicker, Luxembourg",
                 label="Destination",
                 interactive=True,
             )

skills/common.py

@@ -55,8 +55,8 @@ config = Settings() # type: ignore
 
 vehicle = VehicleStatus(
     location="Rue Alphonse Weicker, Luxembourg",
-    location_coordinates=(49.63324, 6.169),
+    location_coordinates=(49.505, 6.28111),
     date="2025-05-06",
     time="08:00:00",
-    destination="Luxembourg Gare, Luxembourg"
+    destination="Rue Alphonse Weicker, Luxembourg"
 )

skills/poi.py

@@ -48,7 +48,7 @@ def search_points_of_interests(search_query="french restaurant"):
 
     # Format and limit to top 5 results
     formatted_results = [
-        f"{result['poi']['name']} is {int(result['dist'])} meters away"
+        f"{result['poi']['name']}, {int(result['dist'])} meters away"
         for result in results[:3]
     ]
 
@@ -95,7 +95,7 @@ def find_points_of_interest(lat="0", lon="0", type_of_poi="restaurant"):
 
 def search_along_route_w_coordinates(points: list[tuple[float, float]], query: str):
     """
-    Return some of the closest points of interest along the route from the depart point, specified by its coordinates.
+    Return some of the closest points of interest along the route/way from the depart point, specified by its coordinates.
     :param points (list[tuple(float, float)]): Required. List of tuples of latitude and longitude of the points along the route.
     :param query (string): Required. type of point of interest depending on what the user wants to do.
     """

skills/routing.py

@@ -120,6 +120,9 @@ def find_route(destination=""):
  from the current location.
     :param destination (string): Required. The destination
     """
+    if not destination:
+        destination = vehicle.destination
+
     # lat, lon, city = check_city_coordinates(lat_depart,lon_depart,city_depart)
     lat_dest, lon_dest = find_coordinates(destination)
     print(f"lat_dest: {lat_dest}, lon_dest: {lon_dest}")