Skip to content

Commit deda31a

Browse files
committed
enhance: proxy settings
1 parent 957d475 commit deda31a

File tree

15 files changed

+351
-261
lines changed

15 files changed

+351
-261
lines changed

api/openai/openai.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@ package openai
22

33
import (
44
"context"
5-
"crypto/tls"
65
"fmt"
76
"github.com/0xJacky/Nginx-UI/api"
87
"github.com/0xJacky/Nginx-UI/internal/chatbot"
8+
"github.com/0xJacky/Nginx-UI/internal/transport"
99
"github.com/0xJacky/Nginx-UI/settings"
1010
"github.com/gin-gonic/gin"
1111
"github.com/pkg/errors"
1212
"github.com/sashabaranov/go-openai"
1313
"io"
1414
"net/http"
15-
"net/url"
1615
)
1716

1817
const ChatGPTInitPrompt = `You are a assistant who can help users write and optimise the configurations of Nginx,
@@ -53,7 +52,7 @@ func MakeChatCompletionRequest(c *gin.Context) {
5352
config := openai.DefaultConfig(settings.OpenAISettings.Token)
5453

5554
if settings.OpenAISettings.Proxy != "" {
56-
proxyUrl, err := url.Parse(settings.OpenAISettings.Proxy)
55+
t, err := transport.NewTransport(transport.WithProxy(settings.OpenAISettings.Proxy))
5756
if err != nil {
5857
c.Stream(func(w io.Writer) bool {
5958
c.SSEvent("message", gin.H{
@@ -64,12 +63,8 @@ func MakeChatCompletionRequest(c *gin.Context) {
6463
})
6564
return
6665
}
67-
transport := &http.Transport{
68-
Proxy: http.ProxyURL(proxyUrl),
69-
TLSClientConfig: &tls.Config{InsecureSkipVerify: settings.ServerSettings.InsecureSkipVerify},
70-
}
7166
config.HTTPClient = &http.Client{
72-
Transport: transport,
67+
Transport: t,
7368
}
7469
}
7570

app/pnpm-lock.yaml

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
},
99
"dependencies": {
1010
"vitepress": "^1.3.4",
11-
"vue": "^3.5.6"
11+
"vue": "^3.5.11"
1212
},
1313
"devDependencies": {
14-
"@types/node": "^20.16.5",
14+
"@types/node": "^22.7.4",
1515
"less": "^4.2.0"
1616
},
1717
"license": "AGPL-3.0",

0 commit comments

Comments
 (0)