Fix POI storage.

Signed-off-by: Katharine Berry <[email protected]>

Author: Katharine

service/assistant/feedback/feedback.go

@@ -44,7 +44,7 @@ type ReportedThread struct {
 	ReportTime       time.Time                       `json:"report_time"`
 	ReportText       string                          `json:"report_text"`
 	ThreadContent    []persistence.SerializedMessage `json:"thread_content"`
-	ContextStorage   map[string]any                  `json:"thread_context"`
+	ContextStorage   persistence.StoredContext       `json:"thread_context"`
 }
 
 func HandleFeedback(rw http.ResponseWriter, r *http.Request) {
@@ -86,7 +86,7 @@ func HandleReport(rw http.ResponseWriter, r *http.Request) {
 		}
 	}
 	var messages []persistence.SerializedMessage
-	var contextStorage map[string]any
+	var contextStorage persistence.StoredContext
 	if threadContext != nil {
 		messages = threadContext.Messages
 		contextStorage = threadContext.ContextStorage

service/assistant/feedback/report.html

@@ -51,18 +51,14 @@ <h1>Reported thread</h1>
 {{if .ContextStorage}}
 <div class="context-storage">
     <h2>Context Storage</h2>
-    <table>
-        <tr>
-            <th>Key</th>
-            <th>Value</th>
-        </tr>
-        {{range $key, $value := .ContextStorage}}
-            <tr>
-                <td><code>{{$key}}</code></td>
-                <td><pre class="arg-context-storage-{{$key}}">{{$value}}</pre></td>
-            </tr>
+    {{if .ContextStorage.POIs}}
+    <h3>POIs</h3>
+    <ol>
+        {{range .ContextStorage.POIs}}
+            <li><code>{{.}}</code></li>
         {{end}}
-    </table>
+    </ol>
+    {{end}}
 </div>
 {{end}}
 <div class="thread">

service/assistant/functions/poi.go

@@ -36,23 +36,8 @@ type POIQuery struct {
 	Units        string
 }
 
-type POI struct {
-	Name               string
-	Address            string
-	Categories         []string
-	OpeningHours       []string
-	CurrentlyOpen      bool
-	PhoneNumber        string
-	PriceLevel         string
-	StarRating         float64
-	RatingCount        int64
-	DistanceKilometers float64     `json:"DistanceKilometers,omitempty"`
-	DistanceMiles      float64     `json:"DistanceMiles,omitempty"`
-	Coordinates        util.Coords `json:"Coordinates,omitempty"`
-}
-
 type POIResponse struct {
-	Results []POI
+	Results []util.POI
 	Warning string `json:"CriticalRequirement,omitempty"`
 }
 
@@ -161,7 +146,7 @@ func searchPoi(ctx context.Context, quotaTracker *quota.Tracker, args any) any {
 
 	log.Printf("Found %d POIs", len(results.Places))
 
-	var pois []POI
+	var pois []util.POI
 	var attributions map[string]any
 	for _, place := range results.Places {
 		var distMiles, distKm float64
@@ -171,7 +156,7 @@ func searchPoi(ctx context.Context, quotaTracker *quota.Tracker, args any) any {
 				haversine.Coord{userLocation.Lat, userLocation.Lon},
 				haversine.Coord{place.Location.Latitude, place.Location.Longitude})
 		}
-		poi := POI{
+		poi := util.POI{
 			Name:               place.DisplayName.Text,
 			Address:            place.ShortFormattedAddress,
 			Categories:         place.Types,
@@ -199,7 +184,7 @@ func searchPoi(ctx context.Context, quotaTracker *quota.Tracker, args any) any {
 	}
 
 	threadContext := query.ThreadContextFromContext(ctx)
-	threadContext.ContextStorage["poi_results"] = pois
+	threadContext.ContextStorage.POIs = pois
 
 	var attributionList []string
 	for provider := range attributions {

service/assistant/persistence/persistence.go

@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"github.com/google/uuid"
 	"github.com/honeycombio/beeline-go"
+	"github.com/pebble-dev/bobby-assistant/service/assistant/util"
 	"github.com/redis/go-redis/v9"
 	"google.golang.org/genai"
 	"time"
@@ -31,16 +32,18 @@ type SerializedMessage struct {
 	FunctionResponse *genai.FunctionResponse `json:"functionResponse,omitempty"`
 }
 
+type StoredContext struct {
+	POIs []util.POI `json:"pois"`
+}
+
 type ThreadContext struct {
 	ThreadId       uuid.UUID           `json:"threadId"`
 	Messages       []SerializedMessage `json:"messages"`
-	ContextStorage map[string]any      `json:"contextStorage"`
+	ContextStorage StoredContext       `json:"contextStorage"`
 }
 
 func NewContext() *ThreadContext {
-	return &ThreadContext{
-		ContextStorage: map[string]any{},
-	}
+	return &ThreadContext{}
 }
 
 func LoadThread(ctx context.Context, r *redis.Client, id string) (*ThreadContext, error) {

service/assistant/util/poi.go

@@ -0,0 +1,16 @@
+package util
+
+type POI struct {
+	Name               string
+	Address            string
+	Categories         []string
+	OpeningHours       []string
+	CurrentlyOpen      bool
+	PhoneNumber        string
+	PriceLevel         string
+	StarRating         float64
+	RatingCount        int64
+	DistanceKilometers float64 `json:"DistanceKilometers,omitempty"`
+	DistanceMiles      float64 `json:"DistanceMiles,omitempty"`
+	Coordinates        Coords  `json:"Coordinates,omitempty"`
+}

service/assistant/widgets/map.go

@@ -5,8 +5,6 @@ import (
 	"context"
 	_ "embed"
 	"encoding/base64"
-	"fmt"
-	"github.com/pebble-dev/bobby-assistant/service/assistant/functions"
 	"github.com/pebble-dev/bobby-assistant/service/assistant/query"
 	"github.com/pebble-dev/bobby-assistant/service/assistant/util"
 	"github.com/pebble-dev/bobby-assistant/service/assistant/util/pbi"
@@ -49,11 +47,7 @@ func mapWidget(ctx context.Context, markerString, includeLocationString string)
 	includeLocation := strings.EqualFold(includeLocationString, "true")
 	markers := make(map[string]util.Coords)
 	threadContext := query.ThreadContextFromContext(ctx)
-	poiInfoAny, ok := threadContext.ContextStorage["poi_results"]
-	if !ok {
-		return nil, fmt.Errorf("no POI results found in context storage")
-	}
-	poiInfo := poiInfoAny.([]functions.POI)
+	poiInfo := threadContext.ContextStorage.POIs
 	markerString = strings.ReplaceAll(markerString, "\"", "")
 	for _, marker := range strings.Split(markerString, ",") {
 		parts := strings.Split(marker, ":")