mlow
/
lmcli
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Slight cleanup to openai 

Remove /v1 from base url, removed some slight repetition
This commit is contained in:
Matt Low 2024-06-23 04:17:53 +00:00
parent 11402c5534
commit 677cfcfebf
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/api/provider/openai/openai.go
View File

@ -185,7 +185,17 @@ func createChatCompletionRequest(
return request
}
func (c *OpenAIClient) sendRequest(req *http.Request) (*http.Response, error) {
func (c *OpenAIClient) sendRequest(ctx context.Context, r ChatCompletionRequest) (*http.Response, error) {
jsonData, err := json.Marshal(r)
if err != nil {
return nil, err
}
req, err := http.NewRequestWithContext(ctx, "POST", c.BaseURL+"/v1/chat/completions", bytes.NewBuffer(jsonData))
if err != nil {
return nil, err
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+c.APIKey)
@ -213,17 +223,8 @@ func (c *OpenAIClient) CreateChatCompletion(
}
req := createChatCompletionRequest(params, messages)
jsonData, err := json.Marshal(req)
if err != nil {
return nil, err
}
httpReq, err := http.NewRequestWithContext(ctx, "POST", c.BaseURL+"/chat/completions", bytes.NewBuffer(jsonData))
if err != nil {
return nil, err
}
resp, err := c.sendRequest(httpReq)
resp, err := c.sendRequest(ctx, req)
if err != nil {
return nil, err
}
@ -273,17 +274,7 @@ func (c *OpenAIClient) CreateChatCompletionStream(
req := createChatCompletionRequest(params, messages)
req.Stream = true
jsonData, err := json.Marshal(req)
if err != nil {
return nil, err
}
httpReq, err := http.NewRequestWithContext(ctx, "POST", c.BaseURL+"/chat/completions", bytes.NewBuffer(jsonData))
if err != nil {
return nil, err
}
resp, err := c.sendRequest(httpReq)
resp, err := c.sendRequest(ctx, req)
if err != nil {
return nil, err
}

2
pkg/lmcli/lmcli.go
View File

@ -122,7 +122,7 @@ func (c *Context) GetModelProvider(model string) (string, api.ChatCompletionProv
BaseURL: url,
}, nil
case "openai":
url := "https://api.openai.com/v1"
url := "https://api.openai.com"
if p.BaseURL != nil {
url = *p.BaseURL
}