Compare commits
No commits in common. "main" and "0.1.1" have entirely different histories.
|
@ -13,11 +13,4 @@ WORKDIR /app
|
||||||
|
|
||||||
COPY --from=builder /build/app .
|
COPY --from=builder /build/app .
|
||||||
|
|
||||||
# Do not forget "/v1" in the end
|
|
||||||
ENV OPENAI_API_BASE_URL="" \
|
|
||||||
OPENAI_API_TOKEN="" \
|
|
||||||
TELEGRAM_TOKEN="" \
|
|
||||||
MODEL_TEXT_REQUEST="llama3.1:8b-instruct-q6_K" \
|
|
||||||
MODEL_SUMMARIZE_REQUEST="llama3.1:8b-instruct-q6_K"
|
|
||||||
|
|
||||||
CMD ["/app/app"]
|
CMD ["/app/app"]
|
||||||
|
|
|
@ -8,10 +8,8 @@
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
docker run \
|
docker run \
|
||||||
-e OPENAI_API_TOKEN=123 \
|
-e OLLAMA_TOKEN=123 \
|
||||||
-e OPENAI_API_BASE_URL=http://ollama.localhost:11434/v1 \
|
-e OLLAMA_BASE_URL=http://ollama.tld:11434 \
|
||||||
-e TELEGRAM_TOKEN=12345 \
|
-e TELEGRAM_TOKEN=12345 \
|
||||||
-e MODEL_TEXT_REQUEST=llama3.1:8b-instruct-q6_K
|
|
||||||
-e MODEL_SUMMARIZE_REQUEST=mistral-nemo:12b-instruct-2407-q4_K_M
|
|
||||||
skobkin/telegram-llm-bot
|
skobkin/telegram-llm-bot
|
||||||
```
|
```
|
||||||
|
|
162
bot/bot.go
162
bot/bot.go
|
@ -6,6 +6,7 @@ import (
|
||||||
th "github.com/mymmrac/telego/telegohandler"
|
th "github.com/mymmrac/telego/telegohandler"
|
||||||
tu "github.com/mymmrac/telego/telegoutil"
|
tu "github.com/mymmrac/telego/telegoutil"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"telegram-ollama-reply-bot/extractor"
|
"telegram-ollama-reply-bot/extractor"
|
||||||
"telegram-ollama-reply-bot/llm"
|
"telegram-ollama-reply-bot/llm"
|
||||||
|
@ -18,75 +19,47 @@ var (
|
||||||
ErrHandlerInit = errors.New("cannot initialize handler")
|
ErrHandlerInit = errors.New("cannot initialize handler")
|
||||||
)
|
)
|
||||||
|
|
||||||
type BotInfo struct {
|
|
||||||
Id int64
|
|
||||||
Username string
|
|
||||||
Name string
|
|
||||||
}
|
|
||||||
|
|
||||||
type Bot struct {
|
type Bot struct {
|
||||||
api *telego.Bot
|
api *telego.Bot
|
||||||
llm *llm.LlmConnector
|
llm *llm.LlmConnector
|
||||||
extractor *extractor.Extractor
|
extractor *extractor.Extractor
|
||||||
stats *stats.Stats
|
stats *stats.Stats
|
||||||
models ModelSelection
|
|
||||||
history map[int64]*MessageRingBuffer
|
|
||||||
profile BotInfo
|
|
||||||
|
|
||||||
markdownV1Replacer *strings.Replacer
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewBot(
|
func NewBot(api *telego.Bot, llm *llm.LlmConnector, extractor *extractor.Extractor) *Bot {
|
||||||
api *telego.Bot,
|
|
||||||
llm *llm.LlmConnector,
|
|
||||||
extractor *extractor.Extractor,
|
|
||||||
models ModelSelection,
|
|
||||||
) *Bot {
|
|
||||||
return &Bot{
|
return &Bot{
|
||||||
api: api,
|
api: api,
|
||||||
llm: llm,
|
llm: llm,
|
||||||
extractor: extractor,
|
extractor: extractor,
|
||||||
stats: stats.NewStats(),
|
stats: stats.NewStats(),
|
||||||
models: models,
|
|
||||||
history: make(map[int64]*MessageRingBuffer),
|
|
||||||
profile: BotInfo{0, "", ""},
|
|
||||||
|
|
||||||
markdownV1Replacer: strings.NewReplacer(
|
|
||||||
// https://core.telegram.org/bots/api#markdown-style
|
|
||||||
"_", "\\_",
|
|
||||||
//"*", "\\*",
|
|
||||||
//"`", "\\`",
|
|
||||||
//"[", "\\[",
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) Run() error {
|
func (b *Bot) Run() error {
|
||||||
botUser, err := b.api.GetMe()
|
botUser, err := b.api.GetMe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot retrieve api user", "error", err)
|
slog.Error("Cannot retrieve api user", err)
|
||||||
|
|
||||||
return ErrGetMe
|
return ErrGetMe
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Info("Running api as", "id", botUser.ID, "username", botUser.Username, "name", botUser.FirstName, "is_bot", botUser.IsBot)
|
slog.Info("Running api as", map[string]any{
|
||||||
|
"id": botUser.ID,
|
||||||
b.profile = BotInfo{
|
"username": botUser.Username,
|
||||||
Id: botUser.ID,
|
"name": botUser.FirstName,
|
||||||
Username: botUser.Username,
|
"is_bot": botUser.IsBot,
|
||||||
Name: botUser.FirstName,
|
})
|
||||||
}
|
|
||||||
|
|
||||||
updates, err := b.api.UpdatesViaLongPolling(nil)
|
updates, err := b.api.UpdatesViaLongPolling(nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot get update channel", "error", err)
|
slog.Error("Cannot get update channel", err)
|
||||||
|
|
||||||
return ErrUpdatesChannel
|
return ErrUpdatesChannel
|
||||||
}
|
}
|
||||||
|
|
||||||
bh, err := th.NewBotHandler(b.api, updates)
|
bh, err := th.NewBotHandler(b.api, updates)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot initialize bot handler", "error", err)
|
slog.Error("Cannot initialize bot handler", err)
|
||||||
|
|
||||||
return ErrHandlerInit
|
return ErrHandlerInit
|
||||||
}
|
}
|
||||||
|
@ -95,60 +68,34 @@ func (b *Bot) Run() error {
|
||||||
defer b.api.StopLongPolling()
|
defer b.api.StopLongPolling()
|
||||||
|
|
||||||
// Middlewares
|
// Middlewares
|
||||||
bh.Use(b.chatHistory)
|
|
||||||
bh.Use(b.chatTypeStatsCounter)
|
bh.Use(b.chatTypeStatsCounter)
|
||||||
|
|
||||||
// Command handlers
|
// Handlers
|
||||||
bh.Handle(b.startHandler, th.CommandEqual("start"))
|
bh.Handle(b.startHandler, th.CommandEqual("start"))
|
||||||
bh.Handle(b.summarizeHandler, th.Or(th.CommandEqual("summarize"), th.CommandEqual("s")))
|
bh.Handle(b.heyHandler, th.CommandEqual("hey"))
|
||||||
|
bh.Handle(b.summarizeHandler, th.CommandEqual("summarize"))
|
||||||
bh.Handle(b.statsHandler, th.CommandEqual("stats"))
|
bh.Handle(b.statsHandler, th.CommandEqual("stats"))
|
||||||
bh.Handle(b.helpHandler, th.CommandEqual("help"))
|
bh.Handle(b.helpHandler, th.CommandEqual("help"))
|
||||||
bh.Handle(b.textMessageHandler, th.AnyMessageWithText())
|
|
||||||
|
|
||||||
bh.Start()
|
bh.Start()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) textMessageHandler(bot *telego.Bot, update telego.Update) {
|
func (b *Bot) heyHandler(bot *telego.Bot, update telego.Update) {
|
||||||
slog.Debug("/any-message")
|
slog.Info("/hey")
|
||||||
|
|
||||||
message := update.Message
|
b.stats.HeyRequest()
|
||||||
|
|
||||||
switch {
|
chatID := tu.ID(update.Message.Chat.ID)
|
||||||
// Mentions
|
|
||||||
case b.isMentionOfMe(update):
|
|
||||||
slog.Info("/any-message", "type", "mention")
|
|
||||||
b.processMention(message)
|
|
||||||
// Replies
|
|
||||||
case b.isReplyToMe(update):
|
|
||||||
slog.Info("/any-message", "type", "reply")
|
|
||||||
b.processMention(message)
|
|
||||||
// Private chat
|
|
||||||
case b.isPrivateWithMe(update):
|
|
||||||
slog.Info("/any-message", "type", "private")
|
|
||||||
b.processMention(message)
|
|
||||||
default:
|
|
||||||
slog.Debug("/any-message", "info", "Message is not mention, reply or private chat. Skipping.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) processMention(message *telego.Message) {
|
|
||||||
b.stats.Mention()
|
|
||||||
|
|
||||||
slog.Info("/mention", "chat", message.Chat.ID)
|
|
||||||
|
|
||||||
chatID := tu.ID(message.Chat.ID)
|
|
||||||
|
|
||||||
b.sendTyping(chatID)
|
b.sendTyping(chatID)
|
||||||
|
|
||||||
requestContext := b.createLlmRequestContextFromMessage(message)
|
llmReply, err := b.llm.HandleSingleRequest(update.Message.Text, llm.ModelMistralUncensored)
|
||||||
|
|
||||||
llmReply, err := b.llm.HandleChatMessage(message.Text, b.models.TextRequestModel, requestContext)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot get reply from LLM connector")
|
slog.Error("Cannot get reply from LLM connector")
|
||||||
|
|
||||||
_, _ = b.api.SendMessage(b.reply(message, tu.Message(
|
_, _ = b.api.SendMessage(b.reply(update.Message, tu.Message(
|
||||||
chatID,
|
chatID,
|
||||||
"LLM request error. Try again later.",
|
"LLM request error. Try again later.",
|
||||||
)))
|
)))
|
||||||
|
@ -156,27 +103,22 @@ func (b *Bot) processMention(message *telego.Message) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Debug("Got completion. Going to send.", "llm-completion", llmReply)
|
slog.Debug("Got completion. Going to send.", llmReply)
|
||||||
|
|
||||||
reply := tu.Message(
|
message := tu.Message(
|
||||||
chatID,
|
chatID,
|
||||||
b.escapeMarkdownV1Symbols(llmReply),
|
llmReply,
|
||||||
).WithParseMode("Markdown")
|
).WithParseMode("Markdown")
|
||||||
|
|
||||||
_, err = b.api.SendMessage(b.reply(message, reply))
|
_, err = bot.SendMessage(b.reply(update.Message, message))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Can't send reply message", "error", err)
|
slog.Error("Can't send reply message", err)
|
||||||
|
|
||||||
b.trySendReplyError(message)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
b.saveBotReplyToHistory(message, llmReply)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
||||||
slog.Info("/summarize", "message-text", update.Message.Text)
|
slog.Info("/summarize", update.Message.Text)
|
||||||
|
|
||||||
b.stats.SummarizeRequest()
|
b.stats.SummarizeRequest()
|
||||||
|
|
||||||
|
@ -184,7 +126,7 @@ func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
||||||
|
|
||||||
b.sendTyping(chatID)
|
b.sendTyping(chatID)
|
||||||
|
|
||||||
args := strings.SplitN(update.Message.Text, " ", 2)
|
args := strings.Split(update.Message.Text, " ")
|
||||||
|
|
||||||
if len(args) < 2 {
|
if len(args) < 2 {
|
||||||
_, _ = bot.SendMessage(tu.Message(
|
_, _ = bot.SendMessage(tu.Message(
|
||||||
|
@ -197,8 +139,9 @@ func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isValidAndAllowedUrl(args[1]) {
|
_, err := url.ParseRequestURI(args[1])
|
||||||
slog.Error("Provided text is not a valid URL", "text", args[1])
|
if err != nil {
|
||||||
|
slog.Error("Provided URL is not valid", args[1])
|
||||||
|
|
||||||
_, _ = b.api.SendMessage(b.reply(update.Message, tu.Message(
|
_, _ = b.api.SendMessage(b.reply(update.Message, tu.Message(
|
||||||
chatID,
|
chatID,
|
||||||
|
@ -210,10 +153,10 @@ func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
||||||
|
|
||||||
article, err := b.extractor.GetArticleFromUrl(args[1])
|
article, err := b.extractor.GetArticleFromUrl(args[1])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot retrieve an article using extractor", "error", err)
|
slog.Error("Cannot retrieve an article using extractor", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
llmReply, err := b.llm.Summarize(article.Text, b.models.SummarizeModel)
|
llmReply, err := b.llm.Summarize(article.Text, llm.ModelMistralUncensored)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot get reply from LLM connector")
|
slog.Error("Cannot get reply from LLM connector")
|
||||||
|
|
||||||
|
@ -225,19 +168,17 @@ func (b *Bot) summarizeHandler(bot *telego.Bot, update telego.Update) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Debug("Got completion. Going to send.", "llm-completion", llmReply)
|
slog.Debug("Got completion. Going to send.", llmReply)
|
||||||
|
|
||||||
message := tu.Message(
|
message := tu.Message(
|
||||||
chatID,
|
chatID,
|
||||||
b.escapeMarkdownV1Symbols(llmReply),
|
llmReply,
|
||||||
).WithParseMode("Markdown")
|
).WithParseMode("Markdown")
|
||||||
|
|
||||||
_, err = bot.SendMessage(b.reply(update.Message, message))
|
_, err = bot.SendMessage(b.reply(update.Message, message))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Can't send reply message", "error", err)
|
slog.Error("Can't send reply message", err)
|
||||||
|
|
||||||
b.trySendReplyError(update.Message)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -253,14 +194,10 @@ func (b *Bot) helpHandler(bot *telego.Bot, update telego.Update) {
|
||||||
"Instructions:\r\n"+
|
"Instructions:\r\n"+
|
||||||
"/hey <text> - Ask something from LLM\r\n"+
|
"/hey <text> - Ask something from LLM\r\n"+
|
||||||
"/summarize <link> - Summarize text from the provided link\r\n"+
|
"/summarize <link> - Summarize text from the provided link\r\n"+
|
||||||
"/s <link> - Shorter version\r\n"+
|
"/help - Show this help",
|
||||||
"/help - Show this help\r\n\r\n"+
|
|
||||||
"Mention bot or reply to it's message to communicate with it",
|
|
||||||
)))
|
)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot send a message", "error", err)
|
slog.Error("Cannot send a message", err)
|
||||||
|
|
||||||
b.trySendReplyError(update.Message)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -277,9 +214,7 @@ func (b *Bot) startHandler(bot *telego.Bot, update telego.Update) {
|
||||||
"Check out /help to learn how to use this bot.",
|
"Check out /help to learn how to use this bot.",
|
||||||
)))
|
)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Cannot send a message", "error", err)
|
slog.Error("Cannot send a message", err)
|
||||||
|
|
||||||
b.trySendReplyError(update.Message)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -298,12 +233,21 @@ 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", "error", err)
|
slog.Error("Cannot send a message", err)
|
||||||
|
|
||||||
b.trySendReplyError(update.Message)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) escapeMarkdownV1Symbols(input string) string {
|
func (b *Bot) reply(originalMessage *telego.Message, newMessage *telego.SendMessageParams) *telego.SendMessageParams {
|
||||||
return b.markdownV1Replacer.Replace(input)
|
return newMessage.WithReplyParameters(&telego.ReplyParameters{
|
||||||
|
MessageID: originalMessage.MessageID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *Bot) sendTyping(chatId telego.ChatID) {
|
||||||
|
slog.Info("Setting 'typing' chat action")
|
||||||
|
|
||||||
|
err := b.api.SendChatAction(tu.ChatAction(chatId, "typing"))
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("Cannot set chat action", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,93 +0,0 @@
|
||||||
package bot
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/mymmrac/telego"
|
|
||||||
tu "github.com/mymmrac/telego/telegoutil"
|
|
||||||
"log/slog"
|
|
||||||
"net/url"
|
|
||||||
"slices"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
allowedUrlSchemes = []string{"http", "https"}
|
|
||||||
)
|
|
||||||
|
|
||||||
func (b *Bot) reply(originalMessage *telego.Message, newMessage *telego.SendMessageParams) *telego.SendMessageParams {
|
|
||||||
return newMessage.WithReplyParameters(&telego.ReplyParameters{
|
|
||||||
MessageID: originalMessage.MessageID,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) sendTyping(chatId telego.ChatID) {
|
|
||||||
slog.Debug("Setting 'typing' chat action")
|
|
||||||
|
|
||||||
err := b.api.SendChatAction(tu.ChatAction(chatId, "typing"))
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("Cannot set chat action", "error", 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.",
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) isMentionOfMe(update telego.Update) bool {
|
|
||||||
if update.Message == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return strings.Contains(update.Message.Text, "@"+b.profile.Username)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) isReplyToMe(update telego.Update) bool {
|
|
||||||
message := update.Message
|
|
||||||
|
|
||||||
if message == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if message.ReplyToMessage == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if message.ReplyToMessage.From == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
replyToMessage := message.ReplyToMessage
|
|
||||||
|
|
||||||
return replyToMessage != nil && replyToMessage.From.ID == b.profile.Id
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) isPrivateWithMe(update telego.Update) bool {
|
|
||||||
message := update.Message
|
|
||||||
|
|
||||||
if message == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return message.Chat.Type == telego.ChatTypePrivate
|
|
||||||
}
|
|
||||||
|
|
||||||
func isValidAndAllowedUrl(text string) bool {
|
|
||||||
u, err := url.ParseRequestURI(text)
|
|
||||||
if err != nil {
|
|
||||||
slog.Debug("Provided text is not an URL", "text", text)
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
if !slices.Contains(allowedUrlSchemes, strings.ToLower(u.Scheme)) {
|
|
||||||
slog.Debug("Provided URL has disallowed scheme", "scheme", u.Scheme, "allowed-schemes", allowedUrlSchemes)
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
|
@ -1,24 +0,0 @@
|
||||||
package bot
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Logger struct {
|
|
||||||
prefix string
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLogger(prefix string) Logger {
|
|
||||||
return Logger{
|
|
||||||
prefix: prefix,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l Logger) Debugf(format string, args ...any) {
|
|
||||||
slog.Debug(l.prefix + fmt.Sprint(format, args))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l Logger) Errorf(format string, args ...any) {
|
|
||||||
slog.Error(l.prefix + fmt.Sprintf(format, args))
|
|
||||||
}
|
|
|
@ -1,93 +0,0 @@
|
||||||
package bot
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/mymmrac/telego"
|
|
||||||
"log/slog"
|
|
||||||
)
|
|
||||||
|
|
||||||
const HistoryLength = 150
|
|
||||||
|
|
||||||
type Message struct {
|
|
||||||
Name string
|
|
||||||
Text string
|
|
||||||
IsMe bool
|
|
||||||
}
|
|
||||||
|
|
||||||
type MessageRingBuffer struct {
|
|
||||||
messages []Message
|
|
||||||
capacity int
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewMessageBuffer(capacity int) *MessageRingBuffer {
|
|
||||||
return &MessageRingBuffer{
|
|
||||||
messages: make([]Message, 0, capacity),
|
|
||||||
capacity: capacity,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *MessageRingBuffer) Push(element Message) {
|
|
||||||
if len(b.messages) >= b.capacity {
|
|
||||||
b.messages = b.messages[1:]
|
|
||||||
}
|
|
||||||
|
|
||||||
b.messages = append(b.messages, element)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *MessageRingBuffer) GetAll() []Message {
|
|
||||||
return b.messages
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) saveChatMessageToHistory(message *telego.Message) {
|
|
||||||
chatId := message.Chat.ID
|
|
||||||
|
|
||||||
slog.Info(
|
|
||||||
"history-message-save",
|
|
||||||
"chat", chatId,
|
|
||||||
"from_id", message.From.ID,
|
|
||||||
"from_name", message.From.FirstName,
|
|
||||||
"text", message.Text,
|
|
||||||
)
|
|
||||||
|
|
||||||
_, ok := b.history[chatId]
|
|
||||||
if !ok {
|
|
||||||
b.history[chatId] = NewMessageBuffer(HistoryLength)
|
|
||||||
}
|
|
||||||
|
|
||||||
b.history[chatId].Push(Message{
|
|
||||||
Name: message.From.FirstName,
|
|
||||||
Text: message.Text,
|
|
||||||
IsMe: false,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) saveBotReplyToHistory(message *telego.Message, reply string) {
|
|
||||||
chatId := message.Chat.ID
|
|
||||||
|
|
||||||
slog.Info(
|
|
||||||
"history-reply-save",
|
|
||||||
"chat", chatId,
|
|
||||||
"to_id", message.From.ID,
|
|
||||||
"to_name", message.From.FirstName,
|
|
||||||
"text", reply,
|
|
||||||
)
|
|
||||||
|
|
||||||
_, ok := b.history[chatId]
|
|
||||||
if !ok {
|
|
||||||
b.history[chatId] = NewMessageBuffer(HistoryLength)
|
|
||||||
}
|
|
||||||
|
|
||||||
b.history[chatId].Push(Message{
|
|
||||||
Name: b.profile.Username,
|
|
||||||
Text: reply,
|
|
||||||
IsMe: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Bot) getChatHistory(chatId int64) []Message {
|
|
||||||
_, ok := b.history[chatId]
|
|
||||||
if !ok {
|
|
||||||
return make([]Message, 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
return b.history[chatId].GetAll()
|
|
||||||
}
|
|
|
@ -3,48 +3,21 @@ package bot
|
||||||
import (
|
import (
|
||||||
"github.com/mymmrac/telego"
|
"github.com/mymmrac/telego"
|
||||||
"github.com/mymmrac/telego/telegohandler"
|
"github.com/mymmrac/telego/telegohandler"
|
||||||
"log/slog"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func (b *Bot) chatTypeStatsCounter(bot *telego.Bot, update telego.Update, next telegohandler.Handler) {
|
func (b *Bot) chatTypeStatsCounter(bot *telego.Bot, update telego.Update, next telegohandler.Handler) {
|
||||||
message := update.Message
|
message := update.Message
|
||||||
|
|
||||||
if message == nil {
|
if message == nil {
|
||||||
slog.Info("stats-middleware: update has no message. skipping.")
|
|
||||||
|
|
||||||
next(bot, update)
|
next(bot, update)
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch message.Chat.Type {
|
switch message.Chat.Type {
|
||||||
case telego.ChatTypeGroup, telego.ChatTypeSupergroup:
|
case telego.ChatTypeGroup, telego.ChatTypeSupergroup:
|
||||||
if b.isMentionOfMe(update) || b.isReplyToMe(update) {
|
b.stats.GroupRequest()
|
||||||
slog.Info("stats-middleware: counting message chat type in stats", "type", message.Chat.Type)
|
|
||||||
b.stats.GroupRequest()
|
|
||||||
}
|
|
||||||
case telego.ChatTypePrivate:
|
case telego.ChatTypePrivate:
|
||||||
slog.Info("stats-middleware: counting message chat type in stats", "type", message.Chat.Type)
|
|
||||||
b.stats.PrivateRequest()
|
b.stats.PrivateRequest()
|
||||||
}
|
}
|
||||||
|
|
||||||
next(bot, update)
|
next(bot, update)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *Bot) chatHistory(bot *telego.Bot, update telego.Update, next telegohandler.Handler) {
|
|
||||||
message := update.Message
|
|
||||||
|
|
||||||
if message == nil {
|
|
||||||
slog.Info("chat-history-middleware: update has no message. skipping.")
|
|
||||||
|
|
||||||
next(bot, update)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Info("chat-history-middleware: saving message to history for", "chat_id", message.Chat.ID)
|
|
||||||
|
|
||||||
b.saveChatMessageToHistory(message)
|
|
||||||
|
|
||||||
next(bot, update)
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
package bot
|
|
||||||
|
|
||||||
type ModelSelection struct {
|
|
||||||
TextRequestModel string
|
|
||||||
SummarizeModel string
|
|
||||||
}
|
|
|
@ -1,68 +0,0 @@
|
||||||
package bot
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/mymmrac/telego"
|
|
||||||
"log/slog"
|
|
||||||
"telegram-ollama-reply-bot/llm"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (b *Bot) createLlmRequestContextFromMessage(message *telego.Message) llm.RequestContext {
|
|
||||||
rc := llm.RequestContext{
|
|
||||||
Empty: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
if message == nil {
|
|
||||||
slog.Debug("request context creation problem: no message provided. returning empty context.", "request-context", rc)
|
|
||||||
|
|
||||||
return rc
|
|
||||||
}
|
|
||||||
|
|
||||||
rc.Empty = false
|
|
||||||
|
|
||||||
user := message.From
|
|
||||||
|
|
||||||
if user != nil {
|
|
||||||
rc.User = llm.UserContext{
|
|
||||||
Username: user.Username,
|
|
||||||
FirstName: user.FirstName,
|
|
||||||
LastName: user.LastName,
|
|
||||||
IsPremium: user.IsPremium,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: implement retrieval of chat description
|
|
||||||
chat := message.Chat
|
|
||||||
|
|
||||||
history := b.getChatHistory(chat.ID)
|
|
||||||
|
|
||||||
rc.Chat = llm.ChatContext{
|
|
||||||
Title: chat.Title,
|
|
||||||
// TODO: fill when ChatFullInfo retrieved
|
|
||||||
//Description: chat.Description,
|
|
||||||
Type: chat.Type,
|
|
||||||
History: historyToLlmMessages(history),
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("request context created", "request-context", rc)
|
|
||||||
|
|
||||||
return rc
|
|
||||||
}
|
|
||||||
|
|
||||||
func historyToLlmMessages(history []Message) []llm.ChatMessage {
|
|
||||||
length := len(history)
|
|
||||||
|
|
||||||
if length > 0 {
|
|
||||||
result := make([]llm.ChatMessage, 0, length)
|
|
||||||
|
|
||||||
for _, msg := range history {
|
|
||||||
result = append(result, llm.ChatMessage{
|
|
||||||
Name: msg.Name,
|
|
||||||
Text: msg.Text,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
return make([]llm.ChatMessage, 0)
|
|
||||||
}
|
|
|
@ -3,7 +3,6 @@ package extractor
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/advancedlogic/GoOse"
|
"github.com/advancedlogic/GoOse"
|
||||||
"log/slog"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -29,18 +28,12 @@ type Article struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *Extractor) GetArticleFromUrl(url string) (Article, error) {
|
func (e *Extractor) GetArticleFromUrl(url string) (Article, error) {
|
||||||
slog.Info("extractor: requested extraction from URL ", "url", url)
|
|
||||||
|
|
||||||
article, err := e.goose.ExtractFromURL(url)
|
article, err := e.goose.ExtractFromURL(url)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("extractor: failed extracting from URL", "url", url)
|
|
||||||
|
|
||||||
return Article{}, ErrExtractFailed
|
return Article{}, ErrExtractFailed
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Debug("extractor: article extracted", "article", article)
|
|
||||||
|
|
||||||
return Article{
|
return Article{
|
||||||
Title: article.Title,
|
Title: article.Title,
|
||||||
Text: article.CleanedText,
|
Text: article.CleanedText,
|
||||||
|
|
96
llm/llm.go
96
llm/llm.go
|
@ -5,13 +5,13 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/sashabaranov/go-openai"
|
"github.com/sashabaranov/go-openai"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrLlmBackendRequestFailed = errors.New("llm back-end request failed")
|
ErrLlmBackendRequestFailed = errors.New("llm back-end request failed")
|
||||||
ErrNoChoices = errors.New("no choices in LLM response")
|
ErrNoChoices = errors.New("no choices in LLM response")
|
||||||
|
|
||||||
|
ModelMistralUncensored = "dolphin-mistral"
|
||||||
)
|
)
|
||||||
|
|
||||||
type LlmConnector struct {
|
type LlmConnector struct {
|
||||||
|
@ -29,47 +29,17 @@ func NewConnector(baseUrl string, token string) *LlmConnector {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *LlmConnector) HandleChatMessage(text string, model string, requestContext RequestContext) (string, error) {
|
func (l *LlmConnector) HandleSingleRequest(text string, model string) (string, error) {
|
||||||
systemPrompt := "You're a bot in the Telegram chat.\n" +
|
|
||||||
"You're using a free model called \"" + model + "\".\n\n" +
|
|
||||||
requestContext.Prompt()
|
|
||||||
|
|
||||||
historyLength := len(requestContext.Chat.History)
|
|
||||||
|
|
||||||
if historyLength > 0 {
|
|
||||||
systemPrompt += "\nYou have access to last " + strconv.Itoa(historyLength) + "messages in this chat."
|
|
||||||
}
|
|
||||||
|
|
||||||
req := openai.ChatCompletionRequest{
|
req := openai.ChatCompletionRequest{
|
||||||
Model: model,
|
Model: model,
|
||||||
Messages: []openai.ChatCompletionMessage{
|
Messages: []openai.ChatCompletionMessage{
|
||||||
{
|
{
|
||||||
Role: openai.ChatMessageRoleSystem,
|
Role: openai.ChatMessageRoleSystem,
|
||||||
Content: systemPrompt,
|
Content: "You're a bot in the Telegram chat. You are replying to questions directed to you.",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if historyLength > 0 {
|
|
||||||
for _, msg := range requestContext.Chat.History {
|
|
||||||
var msgRole string
|
|
||||||
var msgText string
|
|
||||||
|
|
||||||
if msg.IsMe {
|
|
||||||
msgRole = openai.ChatMessageRoleAssistant
|
|
||||||
msgText = msg.Text
|
|
||||||
} else {
|
|
||||||
msgRole = openai.ChatMessageRoleSystem
|
|
||||||
msgText = "User " + msg.Name + " said:\n" + msg.Text
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Messages = append(req.Messages, openai.ChatCompletionMessage{
|
|
||||||
Role: msgRole,
|
|
||||||
Content: msgText,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Messages = append(req.Messages, openai.ChatCompletionMessage{
|
req.Messages = append(req.Messages, openai.ChatCompletionMessage{
|
||||||
Role: openai.ChatMessageRoleUser,
|
Role: openai.ChatMessageRoleUser,
|
||||||
Content: text,
|
Content: text,
|
||||||
|
@ -77,15 +47,15 @@ func (l *LlmConnector) HandleChatMessage(text string, model string, requestConte
|
||||||
|
|
||||||
resp, err := l.client.CreateChatCompletion(context.Background(), req)
|
resp, err := l.client.CreateChatCompletion(context.Background(), req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("llm: LLM back-end request failed", "error", err)
|
slog.Error("LLM back-end request failed", err)
|
||||||
|
|
||||||
return "", ErrLlmBackendRequestFailed
|
return "", ErrLlmBackendRequestFailed
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Debug("llm: Received LLM back-end response", "response", resp)
|
slog.Debug("Received LLM back-end response", resp)
|
||||||
|
|
||||||
if len(resp.Choices) < 1 {
|
if len(resp.Choices) < 1 {
|
||||||
slog.Error("llm: LLM back-end reply has no choices")
|
slog.Error("LLM back-end reply has no choices")
|
||||||
|
|
||||||
return "", ErrNoChoices
|
return "", ErrNoChoices
|
||||||
}
|
}
|
||||||
|
@ -99,11 +69,9 @@ func (l *LlmConnector) Summarize(text string, model string) (string, error) {
|
||||||
Messages: []openai.ChatCompletionMessage{
|
Messages: []openai.ChatCompletionMessage{
|
||||||
{
|
{
|
||||||
Role: openai.ChatMessageRoleSystem,
|
Role: openai.ChatMessageRoleSystem,
|
||||||
Content: "You're a text shortener. Give a very brief summary of the main facts " +
|
Content: "You are a short digest editor. Summarize the text you received " +
|
||||||
"point by point. Format them as a list of bullet points each starting with \"-\". " +
|
"as a list of bullet points with most important facts from the text. " +
|
||||||
"Avoid any commentaries and value judgement on the matter. " +
|
"If possible, use the same language as the original text.",
|
||||||
"If possible, respond in the same language as the original text." +
|
|
||||||
"Do not use any non-ASCII characters.",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -115,56 +83,18 @@ func (l *LlmConnector) Summarize(text string, model string) (string, error) {
|
||||||
|
|
||||||
resp, err := l.client.CreateChatCompletion(context.Background(), req)
|
resp, err := l.client.CreateChatCompletion(context.Background(), req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("llm: LLM back-end request failed", "error", err)
|
slog.Error("LLM back-end request failed", err)
|
||||||
|
|
||||||
return "", ErrLlmBackendRequestFailed
|
return "", ErrLlmBackendRequestFailed
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Debug("llm: Received LLM back-end response", resp)
|
slog.Debug("Received LLM back-end response", resp)
|
||||||
|
|
||||||
if len(resp.Choices) < 1 {
|
if len(resp.Choices) < 1 {
|
||||||
slog.Error("llm: LLM back-end reply has no choices")
|
slog.Error("LLM back-end reply has no choices")
|
||||||
|
|
||||||
return "", ErrNoChoices
|
return "", ErrNoChoices
|
||||||
}
|
}
|
||||||
|
|
||||||
return resp.Choices[0].Message.Content, nil
|
return resp.Choices[0].Message.Content, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *LlmConnector) GetModels() []string {
|
|
||||||
var result []string
|
|
||||||
|
|
||||||
models, err := l.client.ListModels(context.Background())
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("llm: Model list request failed", "error", err)
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Info("Model list retrieved", "models", models)
|
|
||||||
|
|
||||||
for _, model := range models.Models {
|
|
||||||
result = append(result, model.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LlmConnector) HasModel(id string) bool {
|
|
||||||
model, err := l.client.GetModel(context.Background(), id)
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("llm: Model request failed", "error", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("llm: Returned model", "model", model)
|
|
||||||
|
|
||||||
if model.ID != "" {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func quoteMessage(text string) string {
|
|
||||||
return "> " + strings.ReplaceAll(text, "\n", "\n> ")
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
package llm
|
|
||||||
|
|
||||||
type RequestContext struct {
|
|
||||||
Empty bool
|
|
||||||
User UserContext
|
|
||||||
Chat ChatContext
|
|
||||||
}
|
|
||||||
|
|
||||||
type UserContext struct {
|
|
||||||
Username string
|
|
||||||
FirstName string
|
|
||||||
LastName string
|
|
||||||
IsPremium bool
|
|
||||||
}
|
|
||||||
|
|
||||||
type ChatContext struct {
|
|
||||||
Title string
|
|
||||||
Description string
|
|
||||||
Type string
|
|
||||||
History []ChatMessage
|
|
||||||
}
|
|
||||||
|
|
||||||
type ChatMessage struct {
|
|
||||||
Name string
|
|
||||||
Text string
|
|
||||||
IsMe bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c RequestContext) Prompt() string {
|
|
||||||
if c.Empty {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
prompt := ""
|
|
||||||
|
|
||||||
prompt += "The type of chat you're in is \"" + c.Chat.Type + "\". "
|
|
||||||
|
|
||||||
if c.Chat.Type == "group" || c.Chat.Type == "supergroup" {
|
|
||||||
prompt += "Please consider that there are several users in this chat type who may discuss several unrelated " +
|
|
||||||
"topics. Try to respond only about the topic you were asked about and only to the user who asked you, " +
|
|
||||||
"but keep in mind another chat history. "
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.Chat.Title != "" {
|
|
||||||
prompt += "\nChat is called \"" + c.Chat.Title + "\". "
|
|
||||||
}
|
|
||||||
if c.Chat.Description != "" {
|
|
||||||
prompt += "Chat description is \"" + c.Chat.Description + "\". "
|
|
||||||
}
|
|
||||||
|
|
||||||
prompt += "\nProfile of the user who mentioned you in the chat:" +
|
|
||||||
"First name: \"" + c.User.FirstName + "\"\n"
|
|
||||||
if c.User.Username != "" {
|
|
||||||
prompt += "Username: @" + c.User.Username + ".\n"
|
|
||||||
}
|
|
||||||
if c.User.LastName != "" {
|
|
||||||
prompt += "Last name: \"" + c.User.LastName + "\"\n"
|
|
||||||
}
|
|
||||||
//if c.User.IsPremium {
|
|
||||||
// prompt += "Telegram Premium subscription: active."
|
|
||||||
//}
|
|
||||||
|
|
||||||
return prompt
|
|
||||||
}
|
|
31
main.go
31
main.go
|
@ -12,44 +12,25 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
apiToken := os.Getenv("OPENAI_API_TOKEN")
|
ollamaToken := os.Getenv("OLLAMA_TOKEN")
|
||||||
apiBaseUrl := os.Getenv("OPENAI_API_BASE_URL")
|
ollamaBaseUrl := os.Getenv("OLLAMA_BASE_URL")
|
||||||
|
|
||||||
models := bot.ModelSelection{
|
|
||||||
TextRequestModel: os.Getenv("MODEL_TEXT_REQUEST"),
|
|
||||||
SummarizeModel: os.Getenv("MODEL_SUMMARIZE_REQUEST"),
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Info("Selected", "models", models)
|
|
||||||
|
|
||||||
telegramToken := os.Getenv("TELEGRAM_TOKEN")
|
telegramToken := os.Getenv("TELEGRAM_TOKEN")
|
||||||
|
|
||||||
llmc := llm.NewConnector(apiBaseUrl, apiToken)
|
llmc := llm.NewConnector(ollamaBaseUrl, ollamaToken)
|
||||||
|
|
||||||
slog.Info("Checking models availability")
|
|
||||||
|
|
||||||
for _, model := range []string{models.TextRequestModel, models.SummarizeModel} {
|
|
||||||
if !llmc.HasModel(model) {
|
|
||||||
slog.Error("Model not unavailable", "model", model)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Info("All needed models are available")
|
|
||||||
|
|
||||||
ext := extractor.NewExtractor()
|
ext := extractor.NewExtractor()
|
||||||
|
|
||||||
telegramApi, err := tg.NewBot(telegramToken, tg.WithLogger(bot.NewLogger("telego: ")))
|
telegramApi, err := tg.NewBot(telegramToken, tg.WithDefaultLogger(false, true))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
botService := bot.NewBot(telegramApi, llmc, ext, models)
|
botService := bot.NewBot(telegramApi, llmc, ext)
|
||||||
|
|
||||||
err = botService.Run()
|
err = botService.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Running bot finished with an error", "error", err)
|
slog.Error("Running bot finished with an error", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,8 @@ type Stats struct {
|
||||||
|
|
||||||
GroupRequests uint64
|
GroupRequests uint64
|
||||||
PrivateRequests uint64
|
PrivateRequests uint64
|
||||||
InlineQueries uint64
|
|
||||||
|
|
||||||
Mentions uint64
|
HeyRequests uint64
|
||||||
SummarizeRequests uint64
|
SummarizeRequests uint64
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,9 +24,8 @@ func NewStats() *Stats {
|
||||||
|
|
||||||
GroupRequests: 0,
|
GroupRequests: 0,
|
||||||
PrivateRequests: 0,
|
PrivateRequests: 0,
|
||||||
InlineQueries: 0,
|
|
||||||
|
|
||||||
Mentions: 0,
|
HeyRequests: 0,
|
||||||
SummarizeRequests: 0,
|
SummarizeRequests: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,18 +36,16 @@ func (s *Stats) MarshalJSON() ([]byte, error) {
|
||||||
|
|
||||||
GroupRequests uint64 `json:"group_requests"`
|
GroupRequests uint64 `json:"group_requests"`
|
||||||
PrivateRequests uint64 `json:"private_requests"`
|
PrivateRequests uint64 `json:"private_requests"`
|
||||||
InlineQueries uint64 `json:"inline_queries"`
|
|
||||||
|
|
||||||
Mentions uint64 `json:"mentions"`
|
HeyRequests uint64 `json:"hey_requests"`
|
||||||
SummarizeRequests uint64 `json:"summarize_requests"`
|
SummarizeRequests uint64 `json:"summarize_requests"`
|
||||||
}{
|
}{
|
||||||
Uptime: time.Now().Sub(s.RunningSince).String(),
|
Uptime: time.Now().Sub(s.RunningSince).String(),
|
||||||
|
|
||||||
GroupRequests: s.GroupRequests,
|
GroupRequests: s.GroupRequests,
|
||||||
PrivateRequests: s.PrivateRequests,
|
PrivateRequests: s.PrivateRequests,
|
||||||
InlineQueries: s.InlineQueries,
|
|
||||||
|
|
||||||
Mentions: s.Mentions,
|
HeyRequests: s.HeyRequests,
|
||||||
SummarizeRequests: s.SummarizeRequests,
|
SummarizeRequests: s.SummarizeRequests,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -63,12 +59,6 @@ func (s *Stats) String() string {
|
||||||
return string(data)
|
return string(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Stats) InlineQuery() {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
s.InlineQueries++
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Stats) GroupRequest() {
|
func (s *Stats) GroupRequest() {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
defer s.mu.Unlock()
|
defer s.mu.Unlock()
|
||||||
|
@ -81,10 +71,10 @@ func (s *Stats) PrivateRequest() {
|
||||||
s.PrivateRequests++
|
s.PrivateRequests++
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Stats) Mention() {
|
func (s *Stats) HeyRequest() {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
defer s.mu.Unlock()
|
defer s.mu.Unlock()
|
||||||
s.Mentions++
|
s.HeyRequests++
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Stats) SummarizeRequest() {
|
func (s *Stats) SummarizeRequest() {
|
||||||
|
|
Loading…
Reference in a new issue