Sort out vehicle status

kitt/core/model.py

@@ -331,7 +331,7 @@ def run_inference_replicate(prompt):
     )
     out = "".join(output)
 
-    logger.debug(f"Response from Ollama:\nOut:{out}")
+    logger.debug(f"Response from Replicate:\nOut:{out}")
 
     return out
 

kitt/skills/routing.py

@@ -59,7 +59,7 @@ def calculate_route(origin, destination):
     data = response.json()
     points = data["routes"][0]["legs"][0]["points"]
 
-    return vehicle.model_dump_json(), points
+    return vehicle, points
 
 
 def find_route_tomtom(

main.py

@@ -133,11 +133,7 @@ def search_along_route(query=""):
 
 def set_time(time_picker):
     vehicle.time = time_picker
-    return vehicle.model_dump_json(indent=2)
-
-
-def get_vehicle_status(state):
-    return state.value["vehicle"].model_dump_json(indent=2)
+    return vehicle
 
 
 tools = [
@@ -238,10 +234,12 @@ def run_llama3_model(query, voice_character, state):
         elif global_context["tts_backend"] == "replicate":
             voice_out = run_tts_replicate(output_text, voice_character)
         else:
-            voice_out = tts_gradio(output_text, voice_character, speaker_embedding_cache)[0]
-        # 
+            voice_out = tts_gradio(
+                output_text, voice_character, speaker_embedding_cache
+            )[0]
+        #
         # voice_out = run_tts_fast(output_text)[0]
-        # 
+        #
     return (
         output_text,
         voice_out,
@@ -269,24 +267,24 @@ def run_model(query, voice_character, state):
     return (
         text,
         voice,
-        vehicle,
+        vehicle.model_dump(),
         state,
         dict(update_proxy=global_context["update_proxy"]),
     )
 
 
 def calculate_route_gradio(origin, destination):
-    vehicle_status, points = calculate_route(origin, destination)
+    _, points = calculate_route(origin, destination)
     plot = kitt_utils.plot_route(points, vehicle=vehicle.location_coordinates)
     global_context["route_points"] = points
     # state.value["route_points"] = points
     vehicle.location_coordinates = points[0]["latitude"], points[0]["longitude"]
-    return plot, vehicle_status, 0
+    return plot, vehicle.model_dump(), 0
 
 
 def update_vehicle_status(trip_progress, origin, destination, state):
     if not global_context["route_points"]:
-        vehicle_status, points = calculate_route(origin, destination)
+        _, points = calculate_route(origin, destination)
         global_context["route_points"] = points
     global_context["destination"] = destination
     global_context["route_points"] = global_context["route_points"]
@@ -305,7 +303,6 @@ def update_vehicle_status(trip_progress, origin, destination, state):
         global_context["route_points"], vehicle=vehicle.location_coordinates
     )
     return vehicle, plot, state
-    return vehicle.model_dump_json(indent=2), plot, state
 
 
 device = "cuda" if torch.cuda.is_available() else "cpu"
@@ -415,9 +412,7 @@ def conditional_update():
         or global_context["update_proxy"] == 0
     ):
         logger.info(f"Updating the map plot... in conditional_update")
-        map_plot, vehicle_status, _ = calculate_route_gradio(
-            vehicle.location, vehicle.destination
-        )
+        map_plot, _, _ = calculate_route_gradio(vehicle.location, vehicle.destination)
         global_context["map"] = map_plot
     return global_context["map"]
 
@@ -448,13 +443,13 @@ def create_demo(tts_server: bool = False, model="llama3"):
             }
         )
 
-        plot, vehicle_status, _ = calculate_route_gradio(ORIGIN, DESTINATION)
+        plot, _, _ = calculate_route_gradio(ORIGIN, DESTINATION)
         global_context["map"] = plot
 
         with gr.Row():
             with gr.Column(scale=1, min_width=300):
                 vehicle_status = gr.JSON(
-                    value=vehicle.model_dump_json(indent=2), label="Vehicle status"
+                    value=vehicle.model_dump(), label="Vehicle status"
                 )
                 time_picker = gr.Dropdown(
                     choices=hour_options,
@@ -649,6 +644,7 @@ demo.launch(
     ssl_verify=False,
     share=False,
 )
+
 app = typer.Typer()