#153: Extended the stream chat request

Author: roma-glushko

pkg/api/http/server.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/gofiber/contrib/otelfiber"
 	"time"
 
+	"github.com/gofiber/contrib/otelfiber"
+
 	"github.com/gofiber/swagger"
 
 	"github.com/EinStack/glide/docs"

pkg/api/schemas/chat_stream.go

@@ -20,18 +20,19 @@ type StreamRequestID = string
 
 // ChatStreamRequest defines a message that requests a new streaming chat
 type ChatStreamRequest struct {
-	ID             StreamRequestID                 `json:"id" validate:"required"`
-	Message        ChatMessage                     `json:"message" validate:"required"`
-	MessageHistory []ChatMessage                   `json:"message_history" validate:"required"`
+	ID StreamRequestID `json:"id" validate:"required"`
+	*ChatRequest
 	OverrideParams *map[string]ModelParamsOverride `json:"override_params,omitempty"`
 	Metadata       *Metadata                       `json:"metadata,omitempty"`
 }
 
 func NewChatStreamFromStr(message string) *ChatStreamRequest {
 	return &ChatStreamRequest{
-		Message: ChatMessage{
-			"user",
-			message,
+		ChatRequest: &ChatRequest{
+			Message: ChatMessage{
+				"user",
+				message,
+			},
 		},
 	}
 }

pkg/providers/anthropic/chat.go

@@ -5,11 +5,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/EinStack/glide/pkg/providers/clients"
 	"io"
 	"net/http"
 	"time"
 
+	"github.com/EinStack/glide/pkg/providers/clients"
+
 	"github.com/EinStack/glide/pkg/api/schemas"
 	"go.uber.org/zap"
 )
@@ -35,7 +36,7 @@ func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
 // NewChatRequestFromConfig fills the struct from the config. Not using reflection because of performance penalty it gives
 func NewChatRequestFromConfig(cfg *Config) *ChatRequest {
 	return &ChatRequest{
-		Model:         cfg.Model,
+		Model:         cfg.ModelName,
 		System:        cfg.DefaultParams.System,
 		Temperature:   cfg.DefaultParams.Temperature,
 		TopP:          cfg.DefaultParams.TopP,
@@ -59,7 +60,6 @@ func (c *Client) Chat(ctx context.Context, params *schemas.ChatParams) (*schemas
 	chatReq.Stream = false
 
 	chatResponse, err := c.doChatRequest(ctx, &chatReq)
-
 	if err != nil {
 		return nil, err
 	}

pkg/providers/anthropic/client.go

@@ -56,3 +56,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 func (c *Client) Provider() string {
 	return providerName
 }
+
+func (c *Client) ModelName() string {
+	return c.config.ModelName
+}

pkg/providers/anthropic/config.go

@@ -39,7 +39,7 @@ type Config struct {
 	BaseURL       string        `yaml:"base_url" json:"base_url" validate:"required"`
 	APIVersion    string        `yaml:"api_version" json:"api_version" validate:"required"`
 	ChatEndpoint  string        `yaml:"chat_endpoint" json:"chat_endpoint" validate:"required"`
-	Model         string        `yaml:"model" json:"model" validate:"required"`
+	ModelName     string        `yaml:"model" json:"model" validate:"required"`
 	APIKey        fields.Secret `yaml:"api_key" json:"-" validate:"required"`
 	DefaultParams *Params       `yaml:"default_params,omitempty" json:"default_params"`
 }
@@ -52,7 +52,7 @@ func DefaultConfig() *Config {
 		BaseURL:       "https://api.anthropic.com/v1",
 		APIVersion:    "2023-06-01",
 		ChatEndpoint:  "/messages",
-		Model:         "claude-instant-1.2",
+		ModelName:     "claude-instant-1.2",
 		DefaultParams: &defaultParams,
 	}
 }

pkg/providers/azureopenai/chat.go

@@ -5,10 +5,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/EinStack/glide/pkg/providers/clients"
 	"io"
 	"net/http"
 
+	"github.com/EinStack/glide/pkg/providers/clients"
+
 	"github.com/EinStack/glide/pkg/providers/openai"
 
 	"github.com/EinStack/glide/pkg/api/schemas"
@@ -46,7 +47,6 @@ func (c *Client) Chat(ctx context.Context, params *schemas.ChatParams) (*schemas
 	chatReq.Stream = false
 
 	chatResponse, err := c.doChatRequest(ctx, &chatReq)
-
 	if err != nil {
 		return nil, err
 	}

pkg/providers/azureopenai/chat_stream.go

@@ -158,7 +158,6 @@ func (c *Client) SupportChatStream() bool {
 func (c *Client) ChatStream(ctx context.Context, params *schemas.ChatParams) (clients.ChatStream, error) {
 	// Create a new chat request
 	httpRequest, err := c.makeStreamReq(ctx, params)
-
 	if err != nil {
 		return nil, err
 	}

pkg/providers/azureopenai/client.go

@@ -33,7 +33,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 	chatURL := fmt.Sprintf(
 		"%s/openai/deployments/%s/chat/completions?api-version=%s",
 		providerConfig.BaseURL,
-		providerConfig.Model,
+		providerConfig.ModelName,
 		providerConfig.APIVersion,
 	)
 
@@ -60,3 +60,7 @@ func NewClient(providerConfig *Config, clientConfig *clients.ClientConfig, tel *
 func (c *Client) Provider() string {
 	return providerName
 }
+
+func (c *Client) ModelName() string {
+	return c.config.ModelName
+}

pkg/providers/azureopenai/client_test.go

@@ -81,7 +81,7 @@ func TestAzureOpenAIClient_ChatError(t *testing.T) {
 
 	// Verify the default configuration values
 	require.Equal(t, "/chat/completions", providerCfg.ChatEndpoint)
-	require.Equal(t, "", providerCfg.Model)
+	require.Equal(t, "", providerCfg.ModelName)
 	require.Equal(t, "2023-05-15", providerCfg.APIVersion)
 	require.NotNil(t, providerCfg.DefaultParams)
 

pkg/providers/azureopenai/config.go

@@ -44,7 +44,7 @@ func (p *Params) UnmarshalYAML(unmarshal func(interface{}) error) error {
 type Config struct {
 	BaseURL       string        `yaml:"base_url" json:"base_url" validate:"required"` // The name of your Azure OpenAI Resource (e.g https://glide-test.openai.azure.com/)
 	ChatEndpoint  string        `yaml:"chat_endpoint" json:"chat_endpoint"`
-	Model         string        `yaml:"model" json:"model" validate:"required"`            // This is your deployment name. You're required to first deploy a model before you can make calls (e.g. glide-gpt-35)
+	ModelName     string        `yaml:"model" json:"model" validate:"required"`            // This is your deployment name. You're required to first deploy a model before you can make calls (e.g. glide-gpt-35)
 	APIVersion    string        `yaml:"api_version" json:"apiVersion" validate:"required"` // The API version to use for this operation. This follows the YYYY-MM-DD format (e.g 2023-05-15)
 	APIKey        fields.Secret `yaml:"api_key" json:"-" validate:"required"`
 	DefaultParams *Params       `yaml:"default_params,omitempty" json:"default_params"`
@@ -57,7 +57,7 @@ func DefaultConfig() *Config {
 	return &Config{
 		BaseURL:       "", // This needs to come from config
 		ChatEndpoint:  "/chat/completions",
-		Model:         "", // This needs to come from config
+		ModelName:     "", // This needs to come from config
 		APIVersion:    "2023-05-15",
 		DefaultParams: &defaultParams,
 	}