todo: fix gemini bad request

Author: kah-seng

internal/api/chat/create_conversation_message_stream_v2.go

@@ -2,12 +2,14 @@ package chat
 
 import (
 	"context"
+	"fmt"
 	"paperdebugger/internal/api/mapper"
 	"paperdebugger/internal/libs/contextutil"
 	"paperdebugger/internal/libs/shared"
 	"paperdebugger/internal/models"
 	"paperdebugger/internal/services"
 	chatv2 "paperdebugger/pkg/gen/api/chat/v2"
+	"strings"
 
 	"github.com/google/uuid"
 	"github.com/openai/openai-go/v3"
@@ -276,13 +278,38 @@ func (s *ChatServerV2) CreateConversationMessageStream(
 		return s.sendStreamError(stream, err)
 	}
 
+	// Check if user has an API key for requested model
+	var customModel *models.CustomModel
+	customModel = nil
+	for _, m := range settings.CustomModels {
+		if m.Slug == modelSlug {
+			customModel = &m
+			break
+		}
+	}
+
 	// Usage is the same as ChatCompletion, just passing the stream parameter
-	llmProvider := &models.LLMProviderConfig{
-		APIKey: settings.OpenAIAPIKey,
+	var llmProvider *models.LLMProviderConfig
+	if customModel == nil {
+		// User did not specify API key for this model
+		llmProvider = &models.LLMProviderConfig{
+			APIKey: settings.OpenAIAPIKey,
+		}
+	} else {
+		modelSlug = modelSlug[strings.Index(modelSlug, "/")+1:]
+		llmProvider = &models.LLMProviderConfig{
+			APIKey:   customModel.APIKey,
+			Endpoint: customModel.BaseUrl,
+		}
 	}
 
+	fmt.Println(modelSlug)
+	fmt.Println(llmProvider.Endpoint)
+	fmt.Println(llmProvider.APIKey)
+	fmt.Println("************************")
 	openaiChatHistory, inappChatHistory, err := s.aiClientV2.ChatCompletionStreamV2(ctx, stream, conversation.ID.Hex(), modelSlug, conversation.OpenaiChatHistoryCompletion, llmProvider)
 	if err != nil {
+		fmt.Println(err)
 		return s.sendStreamError(stream, err)
 	}
 

internal/api/chat/list_supported_models_v2.go

@@ -2,7 +2,6 @@ package chat
 
 import (
 	"context"
-	"strings"
 
 	"paperdebugger/internal/libs/contextutil"
 	chatv2 "paperdebugger/pkg/gen/api/chat/v2"
@@ -227,19 +226,19 @@ func (s *ChatServerV2) ListSupportedModels(
 		for _, model := range settings.CustomModels {
 			if model.Slug == config.slugOpenRouter {
 				// User has API key for this model, use slugOpenAI instead of slugOpenRouter if applicable
-				slug := config.slugOpenRouter
-				if strings.TrimSpace(config.slugOpenAI) != "" {
-					slug = config.slugOpenAI
-				}
+				// slug := config.slugOpenRouter
+				// if strings.TrimSpace(config.slugOpenAI) != "" {
+				// 	slug = config.slugOpenAI
+				// }
 
 				models = append(models, &chatv2.SupportedModel{
-					Name:          model.Name,
-					Slug:          slug,
-					TotalContext:  int64(model.ContextWindow),
-					MaxOutput:     int64(model.MaxOutput),
-					InputPrice:    int64(model.InputPrice),
-					OutputPrice:   int64(model.OutputPrice),
-					CustomModelId: model.ID.Hex(),
+					Name:         model.Name,
+					Slug:         model.Slug,
+					TotalContext: int64(model.ContextWindow),
+					MaxOutput:    int64(model.MaxOutput),
+					InputPrice:   int64(model.InputPrice),
+					OutputPrice:  int64(model.OutputPrice),
+					IsCustom:     true,
 				})
 				hasOwnAPIKey = true
 				continue
@@ -266,6 +265,7 @@ func (s *ChatServerV2) ListSupportedModels(
 			MaxOutput:    config.maxOutput,
 			InputPrice:   config.inputPrice,
 			OutputPrice:  config.outputPrice,
+			IsCustom:     false,
 		}
 
 		// If model requires own key but user hasn't provided one, mark as disabled

internal/api/mapper/user.go

@@ -3,25 +3,16 @@ package mapper
 import (
 	"paperdebugger/internal/models"
 	userv1 "paperdebugger/pkg/gen/api/user/v1"
-
-	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func MapProtoSettingsToModel(settings *userv1.Settings) *models.Settings {
 	// Map the slice of custom models
 	customModels := make([]models.CustomModel, len(settings.CustomModels))
 	for i, m := range settings.CustomModels {
-		id, _ := bson.ObjectIDFromHex(m.Id)
-		if m.Id == "" {
-			// No ID provided, new custom model
-			id = bson.NewObjectID()
-		}
-
 		customModels[i] = models.CustomModel{
-			ID:            id,
+			Slug:          m.Slug,
 			Name:          m.Name,
 			BaseUrl:       m.BaseUrl,
-			Slug:          m.Slug,
 			APIKey:        m.ApiKey,
 			ContextWindow: m.ContextWindow,
 			MaxOutput:     m.MaxOutput,
@@ -46,10 +37,9 @@ func MapModelSettingsToProto(settings *models.Settings) *userv1.Settings {
 	customModels := make([]*userv1.CustomModel, len(settings.CustomModels))
 	for i, m := range settings.CustomModels {
 		customModels[i] = &userv1.CustomModel{
-			Id:            m.ID.Hex(),
+			Slug:          m.Slug,
 			Name:          m.Name,
 			BaseUrl:       m.BaseUrl,
-			Slug:          m.Slug,
 			ApiKey:        m.APIKey,
 			ContextWindow: m.ContextWindow,
 			InputPrice:    m.InputPrice,

internal/models/user.go

@@ -3,15 +3,14 @@ package models
 import "go.mongodb.org/mongo-driver/v2/bson"
 
 type CustomModel struct {
-	ID            bson.ObjectID `bson:"_id"`
-	Name          string        `bson:"name"`
-	BaseUrl       string        `bson:"base_url"`
-	Slug          string        `bson:"slug"`
-	APIKey        string        `bson:"api_key"`
-	ContextWindow int32         `bson:"context_window"`
-	MaxOutput     int32         `bson:"max_output"`
-	InputPrice    int32         `bson:"input_price"`
-	OutputPrice   int32         `bson:"output_price"`
+	Slug          string `bson:"_id"`
+	Name          string `bson:"name"`
+	BaseUrl       string `bson:"base_url"`
+	APIKey        string `bson:"api_key"`
+	ContextWindow int32  `bson:"context_window"`
+	MaxOutput     int32  `bson:"max_output"`
+	InputPrice    int32  `bson:"input_price"`
+	OutputPrice   int32  `bson:"output_price"`
 }
 
 type Settings struct {

internal/services/toolkit/client/client_v2.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"fmt"
 	"paperdebugger/internal/libs/cfg"
 	"paperdebugger/internal/libs/db"
 	"paperdebugger/internal/libs/logger"
@@ -46,6 +47,9 @@ func (a *AIClientV2) GetOpenAIClient(llmConfig *models.LLMProviderConfig) *opena
 		APIKey = a.cfg.InferenceAPIKey
 	}
 
+	fmt.Println(Endpoint)
+	fmt.Println(APIKey)
+
 	opts := []option.RequestOption{
 		option.WithAPIKey(APIKey),
 		option.WithBaseURL(Endpoint),

internal/services/toolkit/client/completion_v2.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"paperdebugger/internal/models"
 	"paperdebugger/internal/services/toolkit/handler"
 	chatv2 "paperdebugger/pkg/gen/api/chat/v2"
@@ -68,6 +69,8 @@ func (a *AIClientV2) ChatCompletionStreamV2(ctx context.Context, callbackStream
 	oaiClient := a.GetOpenAIClient(llmProvider)
 	params := getDefaultParamsV2(modelSlug, a.toolCallHandler.Registry)
 
+	fmt.Println(params)
+
 	for {
 		params.Messages = openaiChatHistory
 		// var openaiOutput OpenAIChatHistory