Merge pull request #1 from seemywingz/development

Development

Author: Kevin Jayne

chat.go

@@ -2,17 +2,19 @@ package goai
 
 func (goai Client) ChatCompletion(messages []Message) (ChatCompletionResponse, error) {
 	res := ChatCompletionResponse{}
+
 	req := ChatCompletionRequest{
-		N:                1,
+		N:                IntPtr(1), // Convert to pointer using helper function
 		Messages:         messages,
 		User:             goai.User,
-		TopP:             goai.TopP,
+		TopP:             Float64Ptr(goai.TopP), // Convert to pointer
 		Model:            goai.ChatModel,
-		MaxTokens:        goai.MaxTokens,
-		Temperature:      goai.Temperature,
-		PresencePenalty:  goai.PresencePenalty,
-		FrequencyPenalty: goai.FrequencyPenalty,
+		MaxTokens:        IntPtr(goai.MaxTokens),            // Convert to pointer
+		Temperature:      Float64Ptr(goai.Temperature),      // Convert to pointer
+		PresencePenalty:  Float64Ptr(goai.PresencePenalty),  // Convert to pointer
+		FrequencyPenalty: Float64Ptr(goai.FrequencyPenalty), // Convert to pointer
 	}
+
 	_, err := goai.PostJson(req, &res, goai.Endpoint+"chat/completions")
 	return res, err
 }

http.go

@@ -11,12 +11,18 @@ import (
 	"strconv"
 )
 
-func httpCatchErr(resp *http.Response, jsonString []byte) error {
+func httpCatchErr(resp *http.Response) ([]byte, error) {
+	resBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
 	// Check for HTTP Response Errors
 	if resp.StatusCode != 200 {
-		return errors.New("API Error: " + strconv.Itoa(resp.StatusCode) + "\n" + string(jsonString))
+		errJson := ErrorResponse{}
+		err = json.Unmarshal(resBody, &errJson)
+		return nil, errors.New("API Error: " + strconv.Itoa(resp.StatusCode) + "\n" + errJson.Error.Message)
 	}
-	return nil
+	return resBody, nil
 }
 
 func (goai Client) MakeRequest(request *http.Request, responseJson interface{}) ([]byte, error) {
@@ -27,14 +33,12 @@ func (goai Client) MakeRequest(request *http.Request, responseJson interface{})
 		return nil, err
 	}
 
-	// Read the JSON Response Body
-	jsonString, err := io.ReadAll(resp.Body)
+	// Check for HTTP Errors
+	jsonString, err := httpCatchErr(resp)
 	if err != nil {
 		return nil, err
 	}
 
-	// Check for HTTP Errors
-	httpCatchErr(resp, jsonString)
 	if goai.Verbose {
 		b, err := io.ReadAll(resp.Body)
 		if err != nil {

images.go

@@ -138,13 +138,13 @@ func (goai Client) UploadImage(requestJson, responseJson interface{}, endpoint,
 	}
 
 	// Read the JSON Response Body
-	jsonString, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
+	// jsonString, err := io.ReadAll(resp.Body)
+	// if err != nil {
+	// 	return err
+	// }
 
 	// Check for API Errors
-	err = httpCatchErr(resp, jsonString)
+	jsonString, err := httpCatchErr(resp)
 	if err != nil {
 		return err
 	}

json.go

@@ -1,5 +1,55 @@
 package goai
 
+// ChatCompletionRequest represents the request structure for OpenAI's chat completion API.
+type ChatCompletionRequest struct {
+	Model            string    `json:"model"`
+	Messages         []Message `json:"messages"`
+	MaxTokens        *int      `json:"max_tokens,omitempty"`
+	Temperature      *float64  `json:"temperature,omitempty"`
+	TopP             *float64  `json:"top_p,omitempty"`
+	N                *int      `json:"n,omitempty"`
+	Stream           bool      `json:"stream"`
+	PresencePenalty  *float64  `json:"presence_penalty,omitempty"`
+	FrequencyPenalty *float64  `json:"frequency_penalty,omitempty"`
+	Stop             []string  `json:"stop,omitempty"`
+	User             string    `json:"user,omitempty"`
+}
+
+// ChatCompletionResponse represents the response structure from OpenAI's chat completion API.
+type ChatCompletionResponse struct {
+	ID                string `json:"id"`
+	Object            string `json:"object"`
+	Created           int    `json:"created"`
+	Model             string `json:"model"`
+	SystemFingerprint string `json:"system_fingerprint"`
+	Choices           []struct {
+		Index   int `json:"index"`
+		Message struct {
+			Role    string `json:"role"`
+			Content string `json:"content"`
+		} `json:"message"`
+		Logprobs     interface{} `json:"logprobs"`
+		FinishReason string      `json:"finish_reason"`
+	} `json:"choices"`
+	Usage struct {
+		PromptTokens            int `json:"prompt_tokens"`
+		CompletionTokens        int `json:"completion_tokens"`
+		TotalTokens             int `json:"total_tokens"`
+		CompletionTokensDetails struct {
+			ReasoningTokens          int `json:"reasoning_tokens"`
+			AcceptedPredictionTokens int `json:"accepted_prediction_tokens"`
+			RejectedPredictionTokens int `json:"rejected_prediction_tokens"`
+		} `json:"completion_tokens_details"`
+	} `json:"usage"`
+}
+
+// Message represents a single message in the conversation history.
+type Message struct {
+	Role    string `json:"role"`    // "system", "assistant", or "user"
+	Content string `json:"content"` // The text content of the message
+}
+
+// ImageRequest represents the request structure for OpenAI's image generation API.
 type ImageRequest struct {
 	Prompt         string `json:"prompt"`
 	N              int    `json:"n"`
@@ -9,23 +59,26 @@ type ImageRequest struct {
 	Model          string `json:"model"`
 }
 
+// ImageEditRequest represents the request structure for editing images using OpenAI's API.
 type ImageEditRequest struct {
-	Prompt         string `json:"prompt"`
-	N              int    `json:"n"`
-	Size           string `json:"size"`
-	ResponseFormat string `json:"response_format"`
-	User           string `json:"user"`
-	Image          string `json:"image"`
-	Mask           string `json:"mask"`
+	Prompt         string  `json:"prompt"`
+	N              int     `json:"n"`
+	Size           string  `json:"size"`
+	ResponseFormat string  `json:"response_format"`
+	User           string  `json:"user"`
+	Image          *string `json:"image,omitempty"`
+	Mask           *string `json:"mask,omitempty"`
 }
 
+// ImageResponse represents the response structure for OpenAI's image generation/editing APIs.
 type ImageResponse struct {
 	Created int64 `json:"created"`
 	Data    []struct {
 		URL string `json:"url"`
 	} `json:"data"`
 }
 
+// ErrorResponse represents the structure of an error response from OpenAI's API.
 type ErrorResponse struct {
 	Error struct {
 		Message string `json:"message"`
@@ -35,39 +88,7 @@ type ErrorResponse struct {
 	} `json:"error"`
 }
 
-type ChatCompletionResponse struct {
-	ID      string         `json:"id"`
-	Object  string         `json:"object"`
-	Created int            `json:"created"`
-	Choices []Choice       `json:"choices"`
-	Usage   map[string]int `json:"usage"`
-}
-
-type Choice struct {
-	Index        int     `json:"index"`
-	Message      Message `json:"message"`
-	FinishReason string  `json:"finish_reason"`
-}
-
-type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
-}
-
-type ChatCompletionRequest struct {
-	Model            string    `json:"model"`
-	Messages         []Message `json:"messages"`
-	MaxTokens        int       `json:"max_tokens"`
-	Temperature      float64   `json:"temperature"`
-	TopP             float64   `json:"top_p"`
-	N                int       `json:"n"`
-	Stream           bool      `json:"stream"`
-	PresencePenalty  float64   `json:"presence_penalty"`
-	FrequencyPenalty float64   `json:"frequency_penalty"`
-	Stop             []string  `json:"stop"`
-	User             string    `json:"user"`
-}
-
+// TTSRequest represents the request structure for OpenAI's text-to-speech API.
 type TTSRequest struct {
 	Model          string  `json:"model"`
 	Input          string  `json:"input"`

utils.go

@@ -0,0 +1,9 @@
+package goai
+
+func IntPtr(i int) *int {
+	return &i
+}
+
+func Float64Ptr(f float64) *float64 {
+	return &f
+}