fix markdown table overflow bug and add function chatgpt adapter calling feature

adapter/chatgpt/chat.go

@@ -8,9 +8,14 @@ import (
 )
 
 type ChatProps struct {
-	Model   string
+	Model            string
-	Message []globals.Message
+	Message          []globals.Message
-	Token   int
+	Token            *int
+	PresencePenalty  *float32     `json:"presence_penalty"`
+	FrequencyPenalty *float32     `json:"frequency_penalty"`
+	Temperature      *float32     `json:"temperature"`
+	TopP             *float32     `json:"top_p"`
+	ToolChoice       *interface{} `json:"tool_choice"` // string or object
 }
 
 func (c *ChatInstance) GetChatEndpoint(props *ChatProps) string {
@@ -39,31 +44,24 @@ func (c *ChatInstance) GetLatestPrompt(props *ChatProps) string {
 func (c *ChatInstance) GetChatBody(props *ChatProps, stream bool) interface{} {
 	if props.Model == globals.GPT3TurboInstruct {
 		// for completions
-		return utils.Multi[interface{}](props.Token != -1, CompletionRequest{
+		return CompletionRequest{
 			Model:    props.Model,
 			Prompt:   c.GetCompletionPrompt(props.Message),
 			MaxToken: props.Token,
 			Stream:   stream,
-		}, CompletionWithInfinity{
-			Model:  props.Model,
-			Prompt: c.GetCompletionPrompt(props.Message),
-			Stream: stream,
-		})
-	}
-
-	if props.Token != -1 {
-		return ChatRequest{
-			Model:    props.Model,
-			Messages: formatMessages(props),
-			MaxToken: props.Token,
-			Stream:   stream,
 		}
 	}
 
-	return ChatRequestWithInfinity{
+	return ChatRequest{
-		Model:    props.Model,
+		Model:            props.Model,
-		Messages: formatMessages(props),
+		Messages:         formatMessages(props),
-		Stream:   stream,
+		MaxToken:         props.Token,
+		Stream:           stream,
+		PresencePenalty:  props.PresencePenalty,
+		FrequencyPenalty: props.FrequencyPenalty,
+		Temperature:      props.Temperature,
+		TopP:             props.TopP,
+		ToolChoice:       props.ToolChoice,
 	}
 }
 

adapter/chatgpt/test.go

@@ -12,7 +12,7 @@ func (c *ChatInstance) Test() bool {
 	result, err := c.CreateChatRequest(&ChatProps{
 		Model:   globals.GPT3Turbo,
 		Message: []globals.Message{{Role: globals.User, Content: "hi"}},
-		Token:   1,
+		Token:   utils.ToPtr(1),
 	})
 	if err != nil {
 		fmt.Println(fmt.Sprintf("%s: test failed (%s)", c.GetApiKey(), err.Error()))

adapter/chatgpt/types.go

@@ -6,30 +6,24 @@ import "chat/globals"
 type ChatRequest struct {
 	Model    string            `json:"model"`
 	Messages []globals.Message `json:"messages"`
-	MaxToken int               `json:"max_tokens"`
+	MaxToken *int              `json:"max_tokens"`
 	Stream   bool              `json:"stream"`
-}
 
-type ChatRequestWithInfinity struct {
+	PresencePenalty  *float32     `json:"presence_penalty"`
-	Model    string            `json:"model"`
+	FrequencyPenalty *float32     `json:"frequency_penalty"`
-	Messages []globals.Message `json:"messages"`
+	Temperature      *float32     `json:"temperature"`
-	Stream   bool              `json:"stream"`
+	TopP             *float32     `json:"top_p"`
+	ToolChoice       *interface{} `json:"tool_choice"` // string or object
 }
 
 // CompletionRequest ChatRequest is the request body for chatgpt completion
 type CompletionRequest struct {
 	Model    string `json:"model"`
 	Prompt   string `json:"prompt"`
-	MaxToken int    `json:"max_tokens"`
+	MaxToken *int   `json:"max_tokens"`
 	Stream   bool   `json:"stream"`
 }
 
-type CompletionWithInfinity struct {
-	Model  string `json:"model"`
-	Prompt string `json:"prompt"`
-	Stream bool   `json:"stream"`
-}
-
 // ChatResponse is the native http request body for chatgpt
 type ChatResponse struct {
 	ID      string `json:"id"`
@@ -37,9 +31,9 @@ type ChatResponse struct {
 	Created int64  `json:"created"`
 	Model   string `json:"model"`
 	Choices []struct {
-		Message struct {
+		Index        int             `json:"index"`
-			Content string `json:"content"`
+		Message      globals.Message `json:"message"`
-		}
+		FinishReason string          `json:"finish_reason"`
 	} `json:"choices"`
 	Error struct {
 		Message string `json:"message"`
@@ -54,10 +48,9 @@ type ChatStreamResponse struct {
 	Model   string `json:"model"`
 	Data    struct {
 		Choices []struct {
-			Delta struct {
+			Delta        globals.Message `json:"delta"`
-				Content string `json:"content"`
+			Index        int             `json:"index"`
-			}
+			FinishReason string          `json:"finish_reason"`
-			Index int `json:"index"`
 		} `json:"choices"`
 	} `json:"data"`
 }

adapter/request.go

@@ -28,8 +28,8 @@ func retryChatGPTPool(props *ChatProps, hook globals.Hook, retry int) error {
 		Message: props.Message,
 		Token: utils.Multi(
 			props.Token == 0,
-			utils.Multi(globals.IsGPT4Model(props.Model) || props.Plan || props.Infinity, -1, 2500),
+			utils.Multi(globals.IsGPT4Model(props.Model) || props.Plan || props.Infinity, nil, utils.ToPtr(2500)),
-			props.Token,
+			&props.Token,
 		),
 	}, hook)
 

addition/web/utils.go

@@ -14,7 +14,7 @@ func UsingWebSegment(instance *conversation.Conversation) []globals.Message {
 			return chatgpt.NewChatInstanceFromConfig("gpt3").CreateChatRequest(&chatgpt.ChatProps{
 				Model:   globals.GPT3TurboInstruct,
 				Message: message,
-				Token:   token,
+				Token:   &token,
 			})
 		}, segment, globals.IsLongContextModel(instance.GetModel()))
 	}
@@ -28,7 +28,7 @@ func UsingWebNativeSegment(enable bool, message []globals.Message) []globals.Mes
 			return chatgpt.NewChatInstanceFromConfig("gpt3").CreateChatRequest(&chatgpt.ChatProps{
 				Model:   globals.GPT3TurboInstruct,
 				Message: message,
-				Token:   token,
+				Token:   &token,
 			})
 		}, message, false)
 	} else {

app/src/assets/pages/chat.less

@@ -64,6 +64,7 @@
   .content-wrapper {
     display: flex;
     flex-direction: row;
+    max-width: 100%;
 
     .message-toolbar {
       display: flex;
@@ -124,6 +125,8 @@
 
   .message-content {
     display: flex;
+    flex: 1 1 auto;
+    min-width: 0;
     flex-direction: column;
     max-width: 100%;
     padding: 8px 16px;

app/src/assets/pages/home.less

@@ -505,7 +505,8 @@
 }
 
 .chat-container {
-  flex-grow: 1;
+  flex: 1 1 auto;
+  min-width: 0;
   height: 100%;
   background: hsl(var(--background-container));
   transition: width 0.2s ease-in-out;

app/src/conf.ts

@@ -8,7 +8,7 @@ import {
 } from "@/utils/env.ts";
 import { getMemory } from "@/utils/memory.ts";
 
-export const version = "3.6.31";
+export const version = "3.6.32";
 export const dev: boolean = getDev();
 export const deploy: boolean = true;
 export let rest_api: string = getRestApi(deploy);

globals/constant.go

@@ -4,4 +4,5 @@ const (
 	System    = "system"
 	User      = "user"
 	Assistant = "assistant"
+	Tool      = "tool"
 )

globals/tools.go

@@ -0,0 +1,40 @@
+package globals
+
+type ToolCallId string
+type FunctionTools []FunctionTool
+type FunctionTool struct {
+	Type     string       `json:"type"`
+	Function ToolFunction `json:"function"`
+}
+
+type ToolFunction struct {
+	Name        string         `json:"name"`
+	Description string         `json:"description"`
+	Parameters  ToolParameters `json:"parameters"`
+}
+
+type ToolParameters struct {
+	Type       string         `json:"type"`
+	Properties ToolProperties `json:"properties"`
+	Required   []string       `json:"required"`
+}
+
+type ToolProperties map[string]ToolProperty
+
+type ToolProperty struct {
+	Type        string   `json:"type"`
+	Description string   `json:"description"`
+	Enum        []string `json:"enum"`
+}
+
+type ToolCallFunction struct {
+	Name      string `json:"name"`
+	Arguments string `json:"arguments"`
+}
+
+type ToolCall struct {
+	Type     string           `json:"type"`
+	Id       ToolCallId       `json:"id"`
+	Function ToolCallFunction `json:"function"`
+}
+type ToolCalls []ToolCall

globals/types.go

@@ -2,8 +2,10 @@ package globals
 
 type Hook func(data string) error
 type Message struct {
-	Role    string `json:"role"`
+	Role       string     `json:"role"`
-	Content string `json:"content"`
+	Content    string     `json:"content"`
+	ToolCallId *string    `json:"tool_call_id"` // only `tool` role
+	ToolCalls  *ToolCalls `json:"tool_calls"`   // only `assistant` role
 }
 
 type ChatSegmentResponse struct {

utils/base.go

@@ -23,6 +23,10 @@ func Contains[T comparable](value T, slice []T) bool {
 	return false
 }
 
+func ToPtr[T any](value T) *T {
+	return &value
+}
+
 func TryGet[T any](arr []T, index int) T {
 	if index >= len(arr) {
 		return arr[0]