#153: Changed the interface of chat request to pass ChatParams instead of the original Glide Chat Request

Author: roma-glushko

pkg/api/schemas/chat.go

@@ -35,8 +35,8 @@ type ChatParams struct {
 	// TODO(185): set other params
 }
 
-// ChatParams returns a specific chat request params account for model-specific overrides.
-func (r *ChatRequest) ChatParams(modelID string, modelName string) *ChatParams {
+// Params returns a specific chat request params account for model-specific overrides.
+func (r *ChatRequest) Params(modelID string, modelName string) *ChatParams {
 	params := &ChatParams{
 		Messages: make([]ChatMessage, 0, len(r.MessageHistory)+1),
 	}

pkg/providers/openai/chat.go

@@ -34,41 +34,23 @@ func NewChatRequestFromConfig(cfg *Config) *ChatRequest {
 }
 
 // Chat sends a chat request to the specified OpenAI model.
-func (c *Client) Chat(ctx context.Context, request *schemas.ChatRequest) (*schemas.ChatResponse, error) {
+func (c *Client) Chat(ctx context.Context, params *schemas.ChatParams) (*schemas.ChatResponse, error) {
 	// Create a new chat request
-	chatRequest := c.createRequestSchema(request)
-	chatRequest.Stream = false
+	// TODO: consider using objectpool to optimize memory allocation
+	chatReq := *c.chatRequestTemplate // hoping to get a copy of the template
+	chatReq.ApplyParams(params)
+
+	chatReq.Stream = false
 
-	chatResponse, err := c.doChatRequest(ctx, chatRequest)
+	chatResponse, err := c.doChatRequest(ctx, &chatReq)
 
 	if err != nil {
 		return nil, err
 	}
 
-	if len(chatResponse.ModelResponse.Message.Content) == 0 {
-		return nil, ErrEmptyResponse
-	}
-
 	return chatResponse, nil
 }
 
-// createRequestSchema creates a new ChatRequest object based on the given request.
-func (c *Client) createRequestSchema(request *schemas.ChatRequest) *ChatRequest {
-	// TODO: consider using objectpool to optimize memory allocation
-	chatRequest := *c.chatRequestTemplate // hoping to get a copy of the template
-
-	chatRequest.Messages = make([]ChatMessage, 0, len(request.MessageHistory)+1)
-
-	// Add items from messageHistory first and the new chat message last
-	for _, message := range request.MessageHistory {
-		chatRequest.Messages = append(chatRequest.Messages, ChatMessage{Role: message.Role, Content: message.Content})
-	}
-
-	chatRequest.Messages = append(chatRequest.Messages, ChatMessage{Role: request.Message.Role, Content: request.Message.Content})
-
-	return &chatRequest
-}
-
 func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*schemas.ChatResponse, error) {
 	// Build request payload
 	rawPayload, err := json.Marshal(payload)
@@ -133,6 +115,12 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
 		return nil, err
 	}
 
+	modelChoice := chatCompletion.Choices[0]
+
+	if len(modelChoice.Message.Content) == 0 {
+		return nil, ErrEmptyResponse
+	}
+
 	// Map response to ChatResponse schema
 	response := schemas.ChatResponse{
 		ID:        chatCompletion.ID,
@@ -145,8 +133,8 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
 				"system_fingerprint": chatCompletion.SystemFingerprint,
 			},
 			Message: schemas.ChatMessage{
-				Role:    chatCompletion.Choices[0].Message.Role,
-				Content: chatCompletion.Choices[0].Message.Content,
+				Role:    modelChoice.Message.Role,
+				Content: modelChoice.Message.Content,
 			},
 			TokenUsage: schemas.TokenUsage{
 				PromptTokens:   chatCompletion.Usage.PromptTokens,

pkg/providers/openai/schemas.go

@@ -22,6 +22,11 @@ type ChatRequest struct {
 	ResponseFormat   interface{}           `json:"response_format,omitempty"`
 }
 
+func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
+	r.Messages = params.Messages
+	// TODO(185): set other params
+}
+
 // ChatCompletion
 // Ref: https://platform.openai.com/docs/api-reference/chat/object
 type ChatCompletion struct {

pkg/routers/router.go

@@ -82,15 +82,10 @@ func (r *LangRouter) Chat(ctx context.Context, req *schemas.ChatRequest) (*schem
 
 			langModel := model.(providers.LangModel)
 
-			// Check if there is an override in the request
-			if req.OverrideParams != nil {
-				// Override the message if the language model ID matches the override model ID
-				if langModel.ID() == req.OverrideParams.ModelID {
-					req.Message = req.OverrideParams.Message
-				}
-			}
+			chatParams := req.Params(langModel.ID())
+
+			resp, err := langModel.Chat(ctx, chatParams)
 
-			resp, err := langModel.Chat(ctx, req)
 			if err != nil {
 				r.logger.Warn(
 					"Lang model failed processing chat request",