Compare commits

..

No commits in common. "dc5ad2c580aa98ea872679510f316309c336a00f" and "5035a7388403e413e75927b7cc00c335975eb428" have entirely different histories.

3 changed files with 5 additions and 104 deletions

View file

@ -87,19 +87,11 @@ func (b *Bot) heyHandler(bot *telego.Bot, update telego.Update) {
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)
b.sendTyping(chatID)
requestContext := b.createLlmRequestContext(update)
llmReply, err := b.llm.HandleSingleRequest(userMessage, llm.ModelMistralUncensored, requestContext)
llmReply, err := b.llm.HandleSingleRequest(update.Message.Text, llm.ModelMistralUncensored)
if err != nil {
slog.Error("Cannot get reply from LLM connector")
@ -122,8 +114,6 @@ func (b *Bot) heyHandler(bot *telego.Bot, update telego.Update) {
if err != nil {
slog.Error("Can't send reply message", err)
b.trySendReplyError(update.Message)
}
}
@ -189,8 +179,6 @@ func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
if err != nil {
slog.Error("Can't send reply message", err)
b.trySendReplyError(update.Message)
}
}
@ -210,8 +198,6 @@ func (b *Bot) helpHandler(bot *telego.Bot, update telego.Update) {
)))
if err != nil {
slog.Error("Cannot send a message", err)
b.trySendReplyError(update.Message)
}
}
@ -229,8 +215,6 @@ func (b *Bot) startHandler(bot *telego.Bot, update telego.Update) {
)))
if err != nil {
slog.Error("Cannot send a message", err)
b.trySendReplyError(update.Message)
}
}
@ -250,40 +234,9 @@ func (b *Bot) statsHandler(bot *telego.Bot, update telego.Update) {
)).WithParseMode("Markdown"))
if err != nil {
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 {
return newMessage.WithReplyParameters(&telego.ReplyParameters{
MessageID: originalMessage.MessageID,
@ -291,21 +244,10 @@ func (b *Bot) reply(originalMessage *telego.Message, newMessage *telego.SendMess
}
func (b *Bot) sendTyping(chatId telego.ChatID) {
slog.Debug("Setting 'typing' chat action")
slog.Info("Setting 'typing' chat action")
err := b.api.SendChatAction(tu.ChatAction(chatId, "typing"))
if err != nil {
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.",
)))
}

View file

@ -29,16 +29,13 @@ func NewConnector(baseUrl string, token string) *LlmConnector {
}
}
func (l *LlmConnector) HandleSingleRequest(text string, model string, requestContext RequestContext) (string, error) {
func (l *LlmConnector) HandleSingleRequest(text string, model string) (string, error) {
req := openai.ChatCompletionRequest{
Model: model,
Messages: []openai.ChatCompletionMessage{
{
Role: openai.ChatMessageRoleSystem,
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(),
Role: openai.ChatMessageRoleSystem,
Content: "You're a bot in the Telegram chat. You are replying to questions directed to you.",
},
},
}

View file

@ -1,38 +0,0 @@
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
}