Merge pull request #16 from hellcp/service-update

Update the service to Gemini 2.5 and remove the stamp on larger displays

Author: hellcp

service/assistant/query/query.go

@@ -137,6 +137,10 @@ func ScreenWidthFromContext(ctx context.Context) int {
 	return ctx.Value(queryContextKey).(queryContext).screenWidth
 }
 
+func ScreenHeightFromContext(ctx context.Context) int {
+	return ctx.Value(queryContextKey).(queryContext).screenHeight
+}
+
 func ContextWithThread(ctx context.Context, threadContext *persistence.ThreadContext) context.Context {
 	qc := ctx.Value(queryContextKey).(queryContext)
 	qc.threadContext = threadContext

service/assistant/quota/quota.go

@@ -25,10 +25,10 @@ import (
 )
 
 // one credit is worth $0.000000025.
-const InputTokenCredits = 4
-const OutputTokenCredits = 16
-const LiteInputTokenCredits = 3
-const LiteOutputTokenCredits = 12
+const InputTokenCredits = 12
+const OutputTokenCredits = 100
+const LiteInputTokenCredits = 4
+const LiteOutputTokenCredits = 16
 const WeatherQueryCredits = 21_000
 const PoiSearchCredits = 1_400_000
 const RouteCalculationCredits = 400_000

service/assistant/session.go

@@ -149,7 +149,7 @@ func (ps *PromptSession) Run(ctx context.Context) {
 			streamCtx, streamSpan := beeline.StartSpan(ctx, "chat_stream")
 			temperature := float32(0.5)
 			zero := int32(0)
-			s := geminiClient.Models.GenerateContentStream(streamCtx, "models/gemini-2.0-flash", messages, &genai.GenerateContentConfig{
+			s := geminiClient.Models.GenerateContentStream(streamCtx, "models/gemini-2.5-flash", messages, &genai.GenerateContentConfig{
 				SystemInstruction: &genai.Content{Parts: []*genai.Part{{Text: systemPrompt}}},
 				Temperature:       &temperature,
 				CandidateCount:    1,

service/assistant/verifier/verifier.go

@@ -76,7 +76,7 @@ func DetermineActions(ctx context.Context, qt *quota.Tracker, message string) ([
 	// We don't want to hold up the user for too long - if the model is responding slowly, just give up.
 	// Under normal circumstances, the P99 response time is around 600ms.
 	timeoutCtx, cancelTimeout := context.WithTimeout(ctx, 1500*time.Millisecond)
-	response, err := geminiClient.Models.GenerateContent(timeoutCtx, "models/gemini-2.0-flash-lite", []*genai.Content{
+	response, err := geminiClient.Models.GenerateContent(timeoutCtx, "models/gemini-2.5-flash-lite", []*genai.Content{
 		genai.NewContentFromText(message, genai.RoleUser),
 	}, &genai.GenerateContentConfig{
 		SystemInstruction: genai.NewContentFromText(SYSTEM_PROMPT, genai.RoleUser),

service/assistant/widgets/map.go

@@ -233,11 +233,22 @@ func generateMap(ctx context.Context, markers map[string]util.Coords, userLocati
 	}
 
 	screenWidth := query.ScreenWidthFromContext(ctx)
+	screenHeight := query.ScreenHeightFromContext(ctx)
 	if screenWidth == 0 {
 		screenWidth = 144
 	}
+
+	widgetHeight := 100
+	if screenWidth >= 168 {
+		widgetHeight = 140
+	}
+	// Assuming that screen with equal width and height is round
+	if screenWidth == screenHeight {
+		widgetHeight = screenHeight
+	}
+
 	request := gmaps.StaticMapRequest{
-		Size:    fmt.Sprintf("%dx100", screenWidth),
+		Size:    fmt.Sprintf("%dx%d", screenWidth, widgetHeight),
 		Format:  "png8",
 		MapType: "roadmap",
 		MapId:   config.GetConfig().GoogleMapsStaticMapId,
@@ -291,7 +302,9 @@ func monochrome(img image.Image) image.Image {
 			}
 		}
 	}
-	stampLogo(newImg, googleLogo1Bit)
+	if img.Bounds().Max.X <= 168 {
+		stampLogo(newImg, googleLogo1Bit)
+	}
 	return newImg
 }
 
@@ -308,7 +321,9 @@ func lowColour(img image.Image) image.Image {
 			}
 		}
 	}
-	stampLogo(newImg, googleLogo2Bit)
+	if img.Bounds().Max.X <= 168 {
+		stampLogo(newImg, googleLogo2Bit)
+	}
 	return newImg
 }