From 9fbfc0ca820a80f7624b36f5ae2ec6bca356a3fc Mon Sep 17 00:00:00 2001
From: Yiyang Kang <kkyy@kkyy.me>
Date: Thu, 17 Apr 2025 12:23:52 +0900
Subject: [PATCH 1/2] feat: update openai models

---
 assistant.go     | 2 +-
 botcmd_reason.go | 2 +-
 openai/models.go | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/assistant.go b/assistant.go
index 7ce9ea8..b115561 100644
--- a/assistant.go
+++ b/assistant.go
@@ -234,7 +234,7 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
 	}
 
 	req := openai.ChatRequest{
-		Model:       openai.ModelGpt45,
+		Model:       openai.ModelGpt41,
 		Messages:    chatReqMsgs,
 		Temperature: lo.ToPtr(0.42),
 		User:        assistantHashUserId(lastMsg.Sender.ID),
diff --git a/botcmd_reason.go b/botcmd_reason.go
index 918291a..cfd72fb 100644
--- a/botcmd_reason.go
+++ b/botcmd_reason.go
@@ -29,7 +29,7 @@ func handleReasonCmd(c tele.Context) error {
 	}
 
 	req := openai.ChatRequest{
-		Model: openai.ModelO3Mini,
+		Model: openai.ModelO4Mini,
 		Messages: []openai.ChatMessage{
 			{
 				Role:    openai.ChatRoleUser,
diff --git a/openai/models.go b/openai/models.go
index 8657a11..bdf8da9 100644
--- a/openai/models.go
+++ b/openai/models.go
@@ -1,9 +1,8 @@
 package openai
 
 const (
-	ModelGpt4O     = "gpt-4o"          // Safe default
-	ModelO1Preview = "o1-preview"      // Expensive reasoning model
-	ModelO1Mini    = "o1-mini"         // Cheaper reasoning model
-	ModelO3Mini    = "o3-mini"         // Cheaper yet powerful reasoning model
-	ModelGpt45     = "gpt-4.5-preview" // Bleeding edge (and expensive)
+	ModelGpt4O  = "gpt-4o"  // The safe default, balanced model.
+	ModelO1     = "o1"      // Expensive reasoning model
+	ModelO4Mini = "o4-mini" // Cheaper yet powerful reasoning model
+	ModelGpt41  = "gpt-4.1" // OpenAI's Flagship model
 )

From d727d6b68e4d51581052eb1841eb086151612686 Mon Sep 17 00:00:00 2001
From: Yiyang Kang <kkyy@kkyy.me>
Date: Thu, 17 Apr 2025 12:33:13 +0900
Subject: [PATCH 2/2] fix: lint errors

---
 hostcmds/dig.go  | 8 ++++----
 msgcache.go      | 6 +-----
 openai/client.go | 4 ++--
 utils/net.go     | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/hostcmds/dig.go b/hostcmds/dig.go
index cf102a8..61a41b6 100644
--- a/hostcmds/dig.go
+++ b/hostcmds/dig.go
@@ -26,7 +26,7 @@ var (
 		"SVCB", "TA", "TKEY", "TLSA", "TSIG", "TXT", "URI", "ZONEMD",
 	})
 
-	digErrInvalidArgs = fmt.Errorf("invalid request")
+	errDigInvalidArgs = fmt.Errorf("invalid request")
 
 	digIdnaMapper = idna.New(idna.MapForLookup(), idna.StrictDomainName(false))
 )
@@ -43,13 +43,13 @@ func NewDigRequest(req string) (*DigRequest, error) {
 	args := strings.Fields(req)
 	nArgs := len(args)
 	if nArgs == 0 || nArgs > 2 {
-		return nil, digErrInvalidArgs
+		return nil, errDigInvalidArgs
 	}
 
 	if nArgs > 1 {
 		typ := strings.ToUpper(args[1])
 		if _, ok := digValidDnsTypes[typ]; !ok {
-			return nil, digErrInvalidArgs
+			return nil, errDigInvalidArgs
 		}
 		ret.Type = typ
 	}
@@ -64,7 +64,7 @@ func NewDigRequest(req string) (*DigRequest, error) {
 
 	name, err := digIdnaMapper.ToASCII(args[0])
 	if err != nil {
-		return nil, digErrInvalidArgs
+		return nil, errDigInvalidArgs
 	}
 	ret.Name = name
 	return ret, nil
diff --git a/msgcache.go b/msgcache.go
index 7a4b3c4..6e64aec 100644
--- a/msgcache.go
+++ b/msgcache.go
@@ -69,11 +69,7 @@ func getCachedThread(msg *tele.Message) ([]*tele.Message, error) {
 
 	threadR := []*tele.Message{msg}
 	currentMsg := msg
-	for {
-		if currentMsg.ReplyTo == nil {
-			break
-		}
-
+	for currentMsg.ReplyTo != nil {
 		parentMsg, err := getCachedMessage(currentMsg.ReplyTo)
 		if err != nil {
 			return nil, err
diff --git a/openai/client.go b/openai/client.go
index 2802647..68eea1d 100644
--- a/openai/client.go
+++ b/openai/client.go
@@ -67,7 +67,7 @@ func (c *Client) ChatCompletionStream(request ChatRequest) (*ChatResponseStream,
 	}
 
 	if resp.StatusCode() != 200 {
-		defer rbody.Close()
+		defer func() { _ = rbody.Close() }()
 		var respBodyStr string
 		if respBody, err := io.ReadAll(rbody); err == nil {
 			respBodyStr = string(respBody)
@@ -83,7 +83,7 @@ func (c *Client) ChatCompletionStream(request ChatRequest) (*ChatResponseStream,
 	}
 	go func() {
 		defer func() {
-			rbody.Close()
+			_ = rbody.Close()
 			close(ret.Stream)
 			close(ret.Done)
 		}()
diff --git a/utils/net.go b/utils/net.go
index 71d4f1b..61c393f 100644
--- a/utils/net.go
+++ b/utils/net.go
@@ -11,7 +11,7 @@ func getLocalIP() (net.IP, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer conn.Close()
+	defer func() { _ = conn.Close() }()
 
 	host, _, err := net.SplitHostPort(conn.LocalAddr().String())
 	if err != nil {