From 13fe153603f7f2deec9e4864ee40aa1b42182629 Mon Sep 17 00:00:00 2001
From: Henry <henry@yearning.io>
Date: Fri, 1 Nov 2024 16:01:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96AI=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E6=B5=81=E5=BC=8F=E6=B6=88=E6=81=AF=E5=9B=9E=E5=A4=8D=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=202.=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=97=B6=E5=88=97=E8=A1=A8=E4=B8=8D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98=203.=20=E4=BF=AE=E5=A4=8Db?=
 =?UTF-8?q?igint=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E7=B2=BE=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98=20#1104=204.=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=94=AF=E6=8C=81ssl=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=89=A7=E8=A1=8CSQL=E7=9A=84=E9=97=AE=E9=A2=98=20#11?=
 =?UTF-8?q?20=205.=20=E6=96=B0=E5=A2=9E**DMLWhereExprValueIsNull**=20?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8F=82=E6=95=B0:=20=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5dml=E8=AF=AD=E5=8F=A5where=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=80=BC=E4=B8=BAnull=206.=20=E6=96=B0=E5=A2=9E=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8C=89=E9=92=AE=20#1032?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile            | 2 +-
 src/handler/fetch/ai.go      | 3 ++-
 src/handler/fetch/chat.go    | 4 ++--
 src/handler/personal/impl.go | 8 ++++++++
 src/lib/var.go               | 2 +-
 src/service/migrate.go       | 4 ++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e15b4547..b23a44db 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,4 +41,4 @@ EXPOSE 8000
 #ENV MYSQL_DB  ""
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["bash", "-c", "/opt/Yearning install && /opt/Yearning run"]
+CMD ["bash", "-c", "/opt/Yearning run"]
diff --git a/src/handler/fetch/ai.go b/src/handler/fetch/ai.go
index 8fffda47..9735d908 100644
--- a/src/handler/fetch/ai.go
+++ b/src/handler/fetch/ai.go
@@ -36,7 +36,8 @@ func NewAIAgent() (*AIAssistant, error) {
 		FrequencyPenalty: model.GloAI.FrequencyPenalty,
 		TopP:             model.GloAI.TopP,
 	}
-	config := openai.DefaultAzureConfig(model.GloAI.APIKey, model.GloAI.BaseUrl)
+	config := openai.DefaultConfig(model.GloAI.APIKey)
+	config.BaseURL = model.GloAI.BaseUrl
 	if model.GloAI.ProxyURL != "" {
 		proxyUrl, err := url.Parse(model.GloAI.ProxyURL)
 		if err != nil {
diff --git a/src/handler/fetch/chat.go b/src/handler/fetch/chat.go
index c4292eaf..3b72f13e 100644
--- a/src/handler/fetch/chat.go
+++ b/src/handler/fetch/chat.go
@@ -35,7 +35,7 @@ func AiChat(c yee.Context) error {
 	}
 	stream, err := cc.Messages(chat).StreamChatCompletion()
 	if err != nil {
-		fmt.Printf("ChatCompletionStream error: %v\n", err)
+		c.Logger().Criticalf("ChatCompletionStream error: %v\n", err)
 		return nil
 	}
 	defer stream.Close()
@@ -52,7 +52,7 @@ func AiChat(c yee.Context) error {
 			return nil
 		}
 
-		fmt.Fprintln(c.Response(), response.Choices[0].Delta.Content)
+		fmt.Fprintf(c.Response(), "data:%s", response.Choices[0].Delta.Content)
 		c.Response().Flush()
 	}
 }
diff --git a/src/handler/personal/impl.go b/src/handler/personal/impl.go
index e7b983eb..f3426feb 100644
--- a/src/handler/personal/impl.go
+++ b/src/handler/personal/impl.go
@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/cookieY/sqlx"
+	"strconv"
 	"strings"
 )
 
@@ -109,6 +110,13 @@ func (m *MultiSQLRunner) Run(db *sqlx.DB, schema string) (*Query, error) {
 						results[key] = i18n.DefaultLang.Load(i18n.INFO_SENSITIVE_FIELD)
 					}
 				}
+			case int64:
+				if m.excludeFieldContext(key) {
+					results[key] = i18n.DefaultLang.Load(i18n.INFO_SENSITIVE_FIELD)
+				} else {
+					results[key] = strconv.FormatInt(r, 10)
+				}
+
 			}
 		}
 		query.Data = append(query.Data, results)
diff --git a/src/lib/var.go b/src/lib/var.go
index 70f7a7b2..b0d45a53 100644
--- a/src/lib/var.go
+++ b/src/lib/var.go
@@ -1,3 +1,3 @@
 package lib
 
-const Version = "3.1.8.1 Uranus"
+const Version = "3.1.9 Uranus"
diff --git a/src/service/migrate.go b/src/service/migrate.go
index e4861504..21c98c56 100644
--- a/src/service/migrate.go
+++ b/src/service/migrate.go
@@ -262,14 +262,14 @@ func Migrate() {
 			QuerySource: []string{},
 		}
 		ai := model.AI{
-			BaseUrl:          "https://api.openai.com",
+			BaseUrl:          "https://api.openai.com/v1",
 			APIKey:           "",
 			FrequencyPenalty: 0.0,
 			MaxTokens:        2500,
 			PresencePenalty:  0.0,
 			Temperature:      0.0,
 			TopP:             0.0,
-			Model:            "gpt-3-turbo",
+			Model:            "gpt-3.5-turbo",
 			AdvisorPrompt:    SQLPrompt,
 			SQLGenPrompt:     SQLGenPrompt,
 			SQLAgentPrompt:   SQLAgentPrompt,