From 2b7af1a4b05388df151f39e291ea0f7ad66babd0 Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Tue, 11 Jun 2024 15:46:35 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20NewClien?= =?UTF-8?q?t=5Fproxy()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env_empty | 2 ++ chatgpt_connect/chatgpt_connect.go | 39 ++++++------------------------ 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/.env_empty b/.env_empty index b409153c..d2166386 100644 --- a/.env_empty +++ b/.env_empty @@ -38,6 +38,8 @@ CHATGPT_API_KEY= CHATGPT_NAME= CHATGPT_START_TEXT= CHATGPT_END_TEXT= +CHATGPT_PROXY_API_URL= +CHATGPT_PROXY_API_KEY= EMAIL_SMTP_SERVER="" EMAIL_IMAP_SERVER="" diff --git a/chatgpt_connect/chatgpt_connect.go b/chatgpt_connect/chatgpt_connect.go index d2f1fa6e..279df7bb 100644 --- a/chatgpt_connect/chatgpt_connect.go +++ b/chatgpt_connect/chatgpt_connect.go @@ -52,6 +52,13 @@ func Connect() { } +// NewClient_proxy creates new OpenAI API client. +func NewClient_proxy(authToken string) *gogpt.Client { + config := gogpt.DefaultConfig(authToken) + config.BaseURL = Settings.CHATGPT_PROXY_API_URL + return gogpt.NewClientWithConfig(config) +} + // Connect_err - подключается к базе данных func Connect_err() error { var err error @@ -61,7 +68,7 @@ func Connect_err() error { } if Settings.CHATGPT_PROXY_API_KEY != "" { - Conn = gogpt.NewClient(Settings.CHATGPT_PROXY_API_KEY) + Conn = NewClient_proxy(Settings.CHATGPT_PROXY_API_KEY) } else { Conn = gogpt.NewClient(Settings.CHATGPT_API_KEY) } @@ -202,36 +209,6 @@ func SendMessage(Text string, user string) (string, error) { } else { err = errors.New("error: no response") } - //fmt.Println("Otvet: ", resp.Choices[0].Text) - - //req := gogpt.CompletionRequest{ - // Model: gogpt.GPT3Ada, - // MaxTokens: 5, - // Prompt: Text, - // Stream: true, - //} - //stream, err := Conn.CreateCompletionStream(ctx, req) - //if err != nil { - // return Otvet, err - //} - //defer stream.Close() - // - //for { - // response, err := stream.Recv() - // Otvet = response - // if errors.Is(err, io.EOF) { - // fmt.Println("Stream finished") - // err = nil - // return Otvet, err - // } - // - // if err != nil { - // fmt.Printf("Stream error: %v\n", err) - // return Otvet, err - // } - // - // fmt.Printf("Stream response: %v\n", response) - //} return Otvet, err }