Merge pull request 'Request contexts and some logging changes.' (#10) from fix_logging into main
Reviewed-on: #10
This commit is contained in:
commit
a1debf7908
62
bot/bot.go
62
bot/bot.go
|
@ -87,11 +87,19 @@ func (b *Bot) heyHandler(bot *telego.Bot, update telego.Update) {
|
||||||
|
|
||||||
b.stats.HeyRequest()
|
b.stats.HeyRequest()
|
||||||
|
|
||||||
|
parts := strings.SplitN(update.Message.Text, " ", 2)
|
||||||
|
userMessage := "Hey!"
|
||||||
|
if len(parts) == 2 {
|
||||||
|
userMessage = parts[1]
|
||||||
|
}
|
||||||
|
|
||||||
chatID := tu.ID(update.Message.Chat.ID)
|
chatID := tu.ID(update.Message.Chat.ID)
|
||||||
|
|
||||||
b.sendTyping(chatID)
|
b.sendTyping(chatID)
|
||||||
|
|
||||||
llmReply, err := b.llm.HandleSingleRequest(update.Message.Text, llm.ModelMistralUncensored)
|
requestContext := b.createLlmRequestContext(update)
|
||||||
|
|
||||||
|
llmReply, err := b.llm.HandleSingleRequest(userMessage, llm.ModelMistralUncensored, requestContext)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot get reply from LLM connector")
|
slog.Error("Cannot get reply from LLM connector")
|
||||||
|
|
||||||
|
@ -114,6 +122,8 @@ func (b *Bot) heyHandler(bot *telego.Bot, update telego.Update) {
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Can't send reply message", err)
|
slog.Error("Can't send reply message", err)
|
||||||
|
|
||||||
|
b.trySendReplyError(update.Message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,6 +189,8 @@ func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Can't send reply message", err)
|
slog.Error("Can't send reply message", err)
|
||||||
|
|
||||||
|
b.trySendReplyError(update.Message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -198,6 +210,8 @@ func (b *Bot) helpHandler(bot *telego.Bot, update telego.Update) {
|
||||||
)))
|
)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot send a message", err)
|
slog.Error("Cannot send a message", err)
|
||||||
|
|
||||||
|
b.trySendReplyError(update.Message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -215,6 +229,8 @@ func (b *Bot) startHandler(bot *telego.Bot, update telego.Update) {
|
||||||
)))
|
)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot send a message", err)
|
slog.Error("Cannot send a message", err)
|
||||||
|
|
||||||
|
b.trySendReplyError(update.Message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,9 +250,40 @@ func (b *Bot) statsHandler(bot *telego.Bot, update telego.Update) {
|
||||||
)).WithParseMode("Markdown"))
|
)).WithParseMode("Markdown"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot send a message", err)
|
slog.Error("Cannot send a message", err)
|
||||||
|
|
||||||
|
b.trySendReplyError(update.Message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *Bot) createLlmRequestContext(update telego.Update) llm.RequestContext {
|
||||||
|
message := update.Message
|
||||||
|
|
||||||
|
rc := llm.RequestContext{}
|
||||||
|
|
||||||
|
if message == nil {
|
||||||
|
return rc
|
||||||
|
}
|
||||||
|
|
||||||
|
user := message.From
|
||||||
|
if user != nil {
|
||||||
|
rc.User = llm.UserContext{
|
||||||
|
Username: user.Username,
|
||||||
|
FirstName: user.FirstName,
|
||||||
|
LastName: user.LastName,
|
||||||
|
IsPremium: user.IsPremium,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
chat := message.Chat
|
||||||
|
rc.Chat = llm.ChatContext{
|
||||||
|
Title: chat.Title,
|
||||||
|
Description: chat.Description,
|
||||||
|
Type: chat.Type,
|
||||||
|
}
|
||||||
|
|
||||||
|
return rc
|
||||||
|
}
|
||||||
|
|
||||||
func (b *Bot) reply(originalMessage *telego.Message, newMessage *telego.SendMessageParams) *telego.SendMessageParams {
|
func (b *Bot) reply(originalMessage *telego.Message, newMessage *telego.SendMessageParams) *telego.SendMessageParams {
|
||||||
return newMessage.WithReplyParameters(&telego.ReplyParameters{
|
return newMessage.WithReplyParameters(&telego.ReplyParameters{
|
||||||
MessageID: originalMessage.MessageID,
|
MessageID: originalMessage.MessageID,
|
||||||
|
@ -244,10 +291,21 @@ func (b *Bot) reply(originalMessage *telego.Message, newMessage *telego.SendMess
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) sendTyping(chatId telego.ChatID) {
|
func (b *Bot) sendTyping(chatId telego.ChatID) {
|
||||||
slog.Info("Setting 'typing' chat action")
|
slog.Debug("Setting 'typing' chat action")
|
||||||
|
|
||||||
err := b.api.SendChatAction(tu.ChatAction(chatId, "typing"))
|
err := b.api.SendChatAction(tu.ChatAction(chatId, "typing"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot set chat action", err)
|
slog.Error("Cannot set chat action", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *Bot) trySendReplyError(message *telego.Message) {
|
||||||
|
if message == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, _ = b.api.SendMessage(b.reply(message, tu.Message(
|
||||||
|
tu.ID(message.Chat.ID),
|
||||||
|
"Error occurred while trying to send reply.",
|
||||||
|
)))
|
||||||
|
}
|
||||||
|
|
|
@ -29,13 +29,16 @@ func NewConnector(baseUrl string, token string) *LlmConnector {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *LlmConnector) HandleSingleRequest(text string, model string) (string, error) {
|
func (l *LlmConnector) HandleSingleRequest(text string, model string, requestContext RequestContext) (string, error) {
|
||||||
req := openai.ChatCompletionRequest{
|
req := openai.ChatCompletionRequest{
|
||||||
Model: model,
|
Model: model,
|
||||||
Messages: []openai.ChatCompletionMessage{
|
Messages: []openai.ChatCompletionMessage{
|
||||||
{
|
{
|
||||||
Role: openai.ChatMessageRoleSystem,
|
Role: openai.ChatMessageRoleSystem,
|
||||||
Content: "You're a bot in the Telegram chat. You are replying to questions directed to you.",
|
Content: "You're a bot in the Telegram chat. " +
|
||||||
|
"You're using a free model called \"" + model + "\". " +
|
||||||
|
"You see only messages addressed to you using commands due to privacy settings. " +
|
||||||
|
requestContext.Prompt(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
38
llm/request_context.go
Normal file
38
llm/request_context.go
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
package llm
|
||||||
|
|
||||||
|
type RequestContext struct {
|
||||||
|
User UserContext
|
||||||
|
Chat ChatContext
|
||||||
|
}
|
||||||
|
|
||||||
|
type UserContext struct {
|
||||||
|
Username string
|
||||||
|
FirstName string
|
||||||
|
LastName string
|
||||||
|
IsPremium bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type ChatContext struct {
|
||||||
|
Title string
|
||||||
|
Description string
|
||||||
|
Type string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c RequestContext) Prompt() string {
|
||||||
|
prompt := "The chat you're in is called \"" + c.Chat.Title + "\". " +
|
||||||
|
"The type of chat is \"" + c.Chat.Type + "\". " +
|
||||||
|
"The chat description is \"" + c.Chat.Description + "\". "
|
||||||
|
if c.User.Username != "" {
|
||||||
|
prompt += "The user who wrote you has username \"@" + c.Chat.Description + "\". "
|
||||||
|
}
|
||||||
|
prompt += "Their first name is \"" + c.User.FirstName + "\". "
|
||||||
|
if c.User.LastName != "" {
|
||||||
|
prompt += "Their last name is \"" + c.User.LastName + "\". "
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.User.IsPremium {
|
||||||
|
prompt += "They have Telegram Premium subscription. "
|
||||||
|
}
|
||||||
|
|
||||||
|
return prompt
|
||||||
|
}
|
Loading…
Reference in a new issue