Compare commits
2 Commits
b1013db0b4
...
d727d6b68e
Author | SHA1 | Date |
---|---|---|
|
d727d6b68e | |
|
9fbfc0ca82 |
|
@ -234,7 +234,7 @@ func handleAssistantConversation(c tele.Context, thread []*tele.Message) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
req := openai.ChatRequest{
|
req := openai.ChatRequest{
|
||||||
Model: openai.ModelGpt45,
|
Model: openai.ModelGpt41,
|
||||||
Messages: chatReqMsgs,
|
Messages: chatReqMsgs,
|
||||||
Temperature: lo.ToPtr(0.42),
|
Temperature: lo.ToPtr(0.42),
|
||||||
User: assistantHashUserId(lastMsg.Sender.ID),
|
User: assistantHashUserId(lastMsg.Sender.ID),
|
||||||
|
|
|
@ -29,7 +29,7 @@ func handleReasonCmd(c tele.Context) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
req := openai.ChatRequest{
|
req := openai.ChatRequest{
|
||||||
Model: openai.ModelO3Mini,
|
Model: openai.ModelO4Mini,
|
||||||
Messages: []openai.ChatMessage{
|
Messages: []openai.ChatMessage{
|
||||||
{
|
{
|
||||||
Role: openai.ChatRoleUser,
|
Role: openai.ChatRoleUser,
|
||||||
|
|
|
@ -26,7 +26,7 @@ var (
|
||||||
"SVCB", "TA", "TKEY", "TLSA", "TSIG", "TXT", "URI", "ZONEMD",
|
"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))
|
digIdnaMapper = idna.New(idna.MapForLookup(), idna.StrictDomainName(false))
|
||||||
)
|
)
|
||||||
|
@ -43,13 +43,13 @@ func NewDigRequest(req string) (*DigRequest, error) {
|
||||||
args := strings.Fields(req)
|
args := strings.Fields(req)
|
||||||
nArgs := len(args)
|
nArgs := len(args)
|
||||||
if nArgs == 0 || nArgs > 2 {
|
if nArgs == 0 || nArgs > 2 {
|
||||||
return nil, digErrInvalidArgs
|
return nil, errDigInvalidArgs
|
||||||
}
|
}
|
||||||
|
|
||||||
if nArgs > 1 {
|
if nArgs > 1 {
|
||||||
typ := strings.ToUpper(args[1])
|
typ := strings.ToUpper(args[1])
|
||||||
if _, ok := digValidDnsTypes[typ]; !ok {
|
if _, ok := digValidDnsTypes[typ]; !ok {
|
||||||
return nil, digErrInvalidArgs
|
return nil, errDigInvalidArgs
|
||||||
}
|
}
|
||||||
ret.Type = typ
|
ret.Type = typ
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,7 @@ func NewDigRequest(req string) (*DigRequest, error) {
|
||||||
|
|
||||||
name, err := digIdnaMapper.ToASCII(args[0])
|
name, err := digIdnaMapper.ToASCII(args[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, digErrInvalidArgs
|
return nil, errDigInvalidArgs
|
||||||
}
|
}
|
||||||
ret.Name = name
|
ret.Name = name
|
||||||
return ret, nil
|
return ret, nil
|
||||||
|
|
|
@ -69,11 +69,7 @@ func getCachedThread(msg *tele.Message) ([]*tele.Message, error) {
|
||||||
|
|
||||||
threadR := []*tele.Message{msg}
|
threadR := []*tele.Message{msg}
|
||||||
currentMsg := msg
|
currentMsg := msg
|
||||||
for {
|
for currentMsg.ReplyTo != nil {
|
||||||
if currentMsg.ReplyTo == nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
parentMsg, err := getCachedMessage(currentMsg.ReplyTo)
|
parentMsg, err := getCachedMessage(currentMsg.ReplyTo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -67,7 +67,7 @@ func (c *Client) ChatCompletionStream(request ChatRequest) (*ChatResponseStream,
|
||||||
}
|
}
|
||||||
|
|
||||||
if resp.StatusCode() != 200 {
|
if resp.StatusCode() != 200 {
|
||||||
defer rbody.Close()
|
defer func() { _ = rbody.Close() }()
|
||||||
var respBodyStr string
|
var respBodyStr string
|
||||||
if respBody, err := io.ReadAll(rbody); err == nil {
|
if respBody, err := io.ReadAll(rbody); err == nil {
|
||||||
respBodyStr = string(respBody)
|
respBodyStr = string(respBody)
|
||||||
|
@ -83,7 +83,7 @@ func (c *Client) ChatCompletionStream(request ChatRequest) (*ChatResponseStream,
|
||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
defer func() {
|
defer func() {
|
||||||
rbody.Close()
|
_ = rbody.Close()
|
||||||
close(ret.Stream)
|
close(ret.Stream)
|
||||||
close(ret.Done)
|
close(ret.Done)
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
package openai
|
package openai
|
||||||
|
|
||||||
const (
|
const (
|
||||||
ModelGpt4O = "gpt-4o" // Safe default
|
ModelGpt4O = "gpt-4o" // The safe default, balanced model.
|
||||||
ModelO1Preview = "o1-preview" // Expensive reasoning model
|
ModelO1 = "o1" // Expensive reasoning model
|
||||||
ModelO1Mini = "o1-mini" // Cheaper reasoning model
|
ModelO4Mini = "o4-mini" // Cheaper yet powerful reasoning model
|
||||||
ModelO3Mini = "o3-mini" // Cheaper yet powerful reasoning model
|
ModelGpt41 = "gpt-4.1" // OpenAI's Flagship model
|
||||||
ModelGpt45 = "gpt-4.5-preview" // Bleeding edge (and expensive)
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -11,7 +11,7 @@ func getLocalIP() (net.IP, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer conn.Close()
|
defer func() { _ = conn.Close() }()
|
||||||
|
|
||||||
host, _, err := net.SplitHostPort(conn.LocalAddr().String())
|
host, _, err := net.SplitHostPort(conn.LocalAddr().String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue