#153: Deduplicated the ErrEmptyResponse and adjusted a few providers to work with the new params arguments

Author: roma-glushko

pkg/providers/anthropic/chat.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/providers/clients"
 	"io"
 	"net/http"
 	"time"
@@ -27,6 +28,10 @@ type ChatRequest struct {
 	StopSequences []string              `json:"stop_sequences,omitempty"`
 }
 
+func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
+	r.Messages = params.Messages
+}
+
 // NewChatRequestFromConfig fills the struct from the config. Not using reflection because of performance penalty it gives
 func NewChatRequestFromConfig(cfg *Config) *ChatRequest {
 	return &ChatRequest{
@@ -42,42 +47,24 @@ func NewChatRequestFromConfig(cfg *Config) *ChatRequest {
 	}
 }
 
-func NewChatMessagesFromUnifiedRequest(request *schemas.ChatRequest) []ChatMessage {
-	messages := make([]ChatMessage, 0, len(request.MessageHistory)+1)
-
-	// Add items from messageHistory first and the new chat message last
-	for _, message := range request.MessageHistory {
-		messages = append(messages, ChatMessage{Role: message.Role, Content: message.Content})
-	}
-
-	messages = append(messages, ChatMessage{Role: request.Message.Role, Content: request.Message.Content})
-
-	return messages
-}
-
 // Chat sends a chat request to the specified anthropic model.
 //
 //	Ref: https://docs.anthropic.com/claude/reference/messages_post
-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.createChatRequestSchema(request)
+	// TODO: consider using objectpool to optimize memory allocation
+	chatReq := *c.chatRequestTemplate
+	chatReq.ApplyParams(params)
+
+	chatResponse, err := c.doChatRequest(ctx, &chatReq)
 
-	chatResponse, err := c.doChatRequest(ctx, chatRequest)
 	if err != nil {
 		return nil, err
 	}
 
 	return chatResponse, nil
 }
 
-func (c *Client) createChatRequestSchema(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 = NewChatMessagesFromUnifiedRequest(request)
-
-	return chatRequest
-}
-
 func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*schemas.ChatResponse, error) {
 	// Build request payload
 	rawPayload, err := json.Marshal(payload)
@@ -129,10 +116,15 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
 	}
 
 	if len(anthropicResponse.Content) == 0 {
-		return nil, ErrEmptyResponse
+		return nil, clients.ErrEmptyResponse
 	}
 
 	completion := anthropicResponse.Content[0]
+
+	if len(completion.Text) == 0 {
+		return nil, clients.ErrEmptyResponse
+	}
+
 	usage := anthropicResponse.Usage
 
 	// Map response to ChatResponse schema

pkg/providers/anthropic/client.go

@@ -1,7 +1,6 @@
 package anthropic
 
 import (
-	"errors"
 	"net/http"
 	"net/url"
 	"time"
@@ -15,11 +14,6 @@ const (
 	providerName = "anthropic"
 )
 
-// ErrEmptyResponse is returned when the OpenAI API returns an empty response.
-var (
-	ErrEmptyResponse = errors.New("empty response")
-)
-
 // Client is a client for accessing OpenAI API
 type Client struct {
 	baseURL             string

pkg/providers/azureopenai/chat.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/providers/clients"
 	"io"
 	"net/http"
 
@@ -36,39 +37,21 @@ func NewChatRequestFromConfig(cfg *Config) *ChatRequest {
 }
 
 // Chat sends a chat request to the specified azure 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)
+	// TODO: consider using objectpool to optimize memory allocation
+	chatReq := *c.chatRequestTemplate // hoping to get a copy of the template
+	chatReq.ApplyParams(params)
+
+	chatResponse, err := c.doChatRequest(ctx, &chatReq)
 
-	chatResponse, err := c.doChatRequest(ctx, chatRequest)
 	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)
@@ -110,35 +93,37 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
 	}
 
 	// Parse the response JSON
-	var openAICompletion openai.ChatCompletion
+	var chatCompletion openai.ChatCompletion
 
-	err = json.Unmarshal(bodyBytes, &openAICompletion)
+	err = json.Unmarshal(bodyBytes, &chatCompletion)
 	if err != nil {
 		c.tel.Logger.Error("failed to parse openai chat response", zap.Error(err))
 		return nil, err
 	}
 
-	openAICompletion.SystemFingerprint = "" // Azure OpenAI doesn't return this
+	modelChoice := chatCompletion.Choices[0]
+
+	if len(modelChoice.Message.Content) == 0 {
+		return nil, clients.ErrEmptyResponse
+	}
 
 	// Map response to UnifiedChatResponse schema
 	response := schemas.ChatResponse{
-		ID:        openAICompletion.ID,
-		Created:   openAICompletion.Created,
+		ID:        chatCompletion.ID,
+		Created:   chatCompletion.Created,
 		Provider:  providerName,
-		ModelName: openAICompletion.ModelName,
+		ModelName: chatCompletion.ModelName,
 		Cached:    false,
 		ModelResponse: schemas.ModelResponse{
-			Metadata: map[string]string{
-				"system_fingerprint": openAICompletion.SystemFingerprint,
-			},
+			Metadata: map[string]string{},
 			Message: schemas.ChatMessage{
-				Role:    openAICompletion.Choices[0].Message.Role,
-				Content: openAICompletion.Choices[0].Message.Content,
+				Role:    modelChoice.Message.Role,
+				Content: modelChoice.Message.Content,
 			},
 			TokenUsage: schemas.TokenUsage{
-				PromptTokens:   openAICompletion.Usage.PromptTokens,
-				ResponseTokens: openAICompletion.Usage.CompletionTokens,
-				TotalTokens:    openAICompletion.Usage.TotalTokens,
+				PromptTokens:   chatCompletion.Usage.PromptTokens,
+				ResponseTokens: chatCompletion.Usage.CompletionTokens,
+				TotalTokens:    chatCompletion.Usage.TotalTokens,
 			},
 		},
 	}

pkg/providers/azureopenai/client.go

@@ -1,7 +1,6 @@
 package azureopenai
 
 import (
-	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -17,11 +16,6 @@ const (
 	providerName = "azureopenai"
 )
 
-// ErrEmptyResponse is returned when the OpenAI API returns an empty response.
-var (
-	ErrEmptyResponse = errors.New("empty response")
-)
-
 // Client is a client for accessing Azure OpenAI API
 type Client struct {
 	baseURL             string // The name of your Azure OpenAI Resource (e.g https://glide-test.openai.azure.com/)

pkg/providers/azureopenai/schemas.go

@@ -21,6 +21,10 @@ type ChatRequest struct {
 	ResponseFormat   interface{}           `json:"response_format,omitempty"`
 }
 
+func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
+	r.Messages = params.Messages
+}
+
 // ChatCompletion
 // Ref: https://learn.microsoft.com/en-us/azure/ai-services/openai/reference#chat-completions
 type ChatCompletion struct {

pkg/providers/clients/errors.go

@@ -7,6 +7,7 @@ import (
 )
 
 var (
+	ErrEmptyResponse            = errors.New("empty model response")
 	ErrProviderUnavailable      = errors.New("provider is not available")
 	ErrUnauthorized             = errors.New("API key is wrong or not set")
 	ErrChatStreamNotImplemented = errors.New("streaming chat API is not implemented for provider")

pkg/providers/cohere/chat.go

@@ -40,7 +40,7 @@ func (c *Client) Chat(ctx context.Context, request *schemas.ChatRequest) (*schem
 	}
 
 	if len(chatResponse.ModelResponse.Message.Content) == 0 {
-		return nil, ErrEmptyResponse
+		return nil, clients.ErrEmptyResponse
 	}
 
 	return chatResponse, nil

pkg/providers/cohere/client.go

@@ -1,7 +1,6 @@
 package cohere
 
 import (
-	"errors"
 	"net/http"
 	"net/url"
 	"time"
@@ -15,11 +14,6 @@ const (
 	providerName = "cohere"
 )
 
-// ErrEmptyResponse is returned when the Cohere API returns an empty response.
-var (
-	ErrEmptyResponse = errors.New("empty response")
-)
-
 // Client is a client for accessing Cohere API
 type Client struct {
 	baseURL             string

pkg/providers/openai/chat.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/EinStack/glide/pkg/providers/clients"
 	"io"
 	"net/http"
 
@@ -118,7 +119,7 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
 	modelChoice := chatCompletion.Choices[0]
 
 	if len(modelChoice.Message.Content) == 0 {
-		return nil, ErrEmptyResponse
+		return nil, clients.ErrEmptyResponse
 	}
 
 	// Map response to ChatResponse schema

pkg/providers/openai/client.go

@@ -1,7 +1,6 @@
 package openai
 
 import (
-	"errors"
 	"net/http"
 	"net/url"
 	"time"
@@ -17,11 +16,6 @@ const (
 	providerName = "openai"
 )
 
-// ErrEmptyResponse is returned when the OpenAI API returns an empty response.
-var (
-	ErrEmptyResponse = errors.New("empty response")
-)
-
 // Client is a client for accessing OpenAI API
 type Client struct {
 	baseURL             string