Merge pull request #103 from teknologi-umum/vision

Fix command priority

BotNet.CommandHandlers/AI/OpenAI/AskCommandHandler.cs

@@ -2,6 +2,7 @@
 using BotNet.Commands.AI.OpenAI;
 using BotNet.Commands.BotUpdate.Message;
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 using BotNet.Services.MarkdownV2;
 using BotNet.Services.OpenAI;
@@ -17,11 +18,13 @@ public sealed class AskCommandHandler(
 		ITelegramBotClient telegramBotClient,
 		OpenAIClient openAIClient,
 		ITelegramMessageCache telegramMessageCache,
+		CommandPriorityCategorizer commandPriorityCategorizer,
 		ILogger<AskCommandHandler> logger
 	) : ICommandHandler<AskCommand> {
 		private readonly ITelegramBotClient _telegramBotClient = telegramBotClient;
 		private readonly OpenAIClient _openAIClient = openAIClient;
 		private readonly ITelegramMessageCache _telegramMessageCache = telegramMessageCache;
+		private readonly CommandPriorityCategorizer _commandPriorityCategorizer = commandPriorityCategorizer;
 		private readonly ILogger<AskCommandHandler> _logger = logger;
 
 		public async Task Handle(AskCommand askCommand, CancellationToken cancellationToken) {
@@ -92,7 +95,8 @@ select ChatMessage.FromText(
 					message: AIResponseMessage.FromMessage(
 						message: responseMessage,
 						replyToMessage: askCommand.Command,
-						callSign: "AI"
+						callSign: "AI",
+						commandPriorityCategorizer: _commandPriorityCategorizer
 					)
 				);
 			});

BotNet.CommandHandlers/AI/OpenAI/OpenAIImageGenerationPromptHandler.cs

@@ -1,6 +1,7 @@
 using BotNet.Commands;
 using BotNet.Commands.AI.OpenAI;
 using BotNet.Commands.BotUpdate.Message;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Services.OpenAI.Skills;
 using Microsoft.Extensions.Logging;
 using Telegram.Bot;
@@ -12,11 +13,13 @@ public sealed class OpenAIImageGenerationPromptHandler(
 		ITelegramBotClient telegramBotClient,
 		ImageGenerationBot imageGenerationBot,
 		ITelegramMessageCache telegramMessageCache,
+		CommandPriorityCategorizer commandPriorityCategorizer,
 		ILogger<OpenAIImageGenerationPromptHandler> logger
 	) : ICommandHandler<OpenAIImageGenerationPrompt> {
 		private readonly ITelegramBotClient _telegramBotClient = telegramBotClient;
 		private readonly ImageGenerationBot _imageGenerationBot = imageGenerationBot;
 		private readonly ITelegramMessageCache _telegramMessageCache = telegramMessageCache;
+		private readonly CommandPriorityCategorizer _commandPriorityCategorizer = commandPriorityCategorizer;
 		private readonly ILogger<OpenAIImageGenerationPromptHandler> _logger = logger;
 
 		public Task Handle(OpenAIImageGenerationPrompt command, CancellationToken cancellationToken) {
@@ -62,7 +65,7 @@ await _telegramBotClient.DeleteMessageAsync(
 
 					// Track thread
 					_telegramMessageCache.Add(
-						NormalMessage.FromMessage(responseMessage)
+						NormalMessage.FromMessage(responseMessage, _commandPriorityCategorizer)
 					);
 				} catch (OperationCanceledException) {
 					// Terminate gracefully

BotNet.CommandHandlers/AI/OpenAI/OpenAIImagePromptHandler.cs

@@ -4,6 +4,7 @@
 using BotNet.Commands.AI.Stability;
 using BotNet.Commands.BotUpdate.Message;
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 using BotNet.Services.MarkdownV2;
 using BotNet.Services.OpenAI;
@@ -21,6 +22,7 @@ public sealed class OpenAIImagePromptHandler(
 		ICommandQueue commandQueue,
 		ITelegramMessageCache telegramMessageCache,
 		OpenAIClient openAIClient,
+		CommandPriorityCategorizer commandPriorityCategorizer,
 		ILogger<OpenAIImageGenerationPromptHandler> logger
 	) : ICommandHandler<OpenAIImagePrompt> {
 		internal static readonly RateLimiter VISION_RATE_LIMITER = RateLimiter.PerUserPerChat(1, TimeSpan.FromMinutes(15));
@@ -29,6 +31,7 @@ ILogger<OpenAIImageGenerationPromptHandler> logger
 		private readonly ICommandQueue _commandQueue = commandQueue;
 		private readonly ITelegramMessageCache _telegramMessageCache = telegramMessageCache;
 		private readonly OpenAIClient _openAIClient = openAIClient;
+		private readonly CommandPriorityCategorizer _commandPriorityCategorizer = commandPriorityCategorizer;
 		private readonly ILogger<OpenAIImageGenerationPromptHandler> _logger = logger;
 
 		public Task Handle(OpenAIImagePrompt imagePrompt, CancellationToken cancellationToken) {
@@ -185,7 +188,8 @@ await _telegramBotClient.EditMessageTextAsync(
 					message: AIResponseMessage.FromMessage(
 						message: responseMessage,
 						replyToMessage: imagePrompt.Command,
-						callSign: imagePrompt.CallSign
+						callSign: imagePrompt.CallSign,
+						commandPriorityCategorizer: _commandPriorityCategorizer
 					)
 				);
 			});

BotNet.CommandHandlers/AI/OpenAI/OpenAITextPromptHandler.cs

@@ -4,6 +4,7 @@
 using BotNet.Commands.AI.Stability;
 using BotNet.Commands.BotUpdate.Message;
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 using BotNet.Services.MarkdownV2;
 using BotNet.Services.OpenAI;
@@ -20,6 +21,7 @@ public sealed class OpenAITextPromptHandler(
 		ICommandQueue commandQueue,
 		ITelegramMessageCache telegramMessageCache,
 		OpenAIClient openAIClient,
+		CommandPriorityCategorizer commandPriorityCategorizer,
 		ILogger<OpenAITextPromptHandler> logger
 	) : ICommandHandler<OpenAITextPrompt> {
 		internal static readonly RateLimiter CHAT_RATE_LIMITER = RateLimiter.PerUserPerChat(5, TimeSpan.FromMinutes(15));
@@ -28,6 +30,7 @@ ILogger<OpenAITextPromptHandler> logger
 		private readonly ICommandQueue _commandQueue = commandQueue;
 		private readonly ITelegramMessageCache _telegramMessageCache = telegramMessageCache;
 		private readonly OpenAIClient _openAIClient = openAIClient;
+		private readonly CommandPriorityCategorizer _commandPriorityCategorizer = commandPriorityCategorizer;
 		private readonly ILogger<OpenAITextPromptHandler> _logger = logger;
 
 		public Task Handle(OpenAITextPrompt textPrompt, CancellationToken cancellationToken) {
@@ -156,7 +159,8 @@ await _telegramBotClient.EditMessageTextAsync(
 					message: AIResponseMessage.FromMessage(
 						message: responseMessage,
 						replyToMessage: textPrompt.Command,
-						callSign: textPrompt.CallSign
+						callSign: textPrompt.CallSign,
+						commandPriorityCategorizer: _commandPriorityCategorizer
 					)
 				);
 			});

BotNet.CommandHandlers/AI/Stability/StabilityTextToImagePromptHandler.cs

@@ -1,6 +1,7 @@
 using BotNet.Commands;
 using BotNet.Commands.AI.Stability;
 using BotNet.Commands.BotUpdate.Message;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Services.Stability.Models;
 using BotNet.Services.Stability.Skills;
 using Telegram.Bot;
@@ -11,11 +12,13 @@ namespace BotNet.CommandHandlers.AI.Stability {
 	public sealed class StabilityTextToImagePromptHandler(
 		ITelegramBotClient telegramBotClient,
 		ImageGenerationBot imageGenerationBot,
-		ITelegramMessageCache telegramMessageCache
+		ITelegramMessageCache telegramMessageCache,
+		CommandPriorityCategorizer commandPriorityCategorizer
 	) : ICommandHandler<StabilityTextToImagePrompt> {
 		private readonly ITelegramBotClient _telegramBotClient = telegramBotClient;
 		private readonly ImageGenerationBot _imageGenerationBot = imageGenerationBot;
 		private readonly ITelegramMessageCache _telegramMessageCache = telegramMessageCache;
+		private readonly CommandPriorityCategorizer _commandPriorityCategorizer = commandPriorityCategorizer;
 
 		public Task Handle(StabilityTextToImagePrompt command, CancellationToken cancellationToken) {
 			// Fire and forget
@@ -69,7 +72,7 @@ await _telegramBotClient.DeleteMessageAsync(
 
 					// Track thread
 					_telegramMessageCache.Add(
-						NormalMessage.FromMessage(responseMessage)
+						NormalMessage.FromMessage(responseMessage, _commandPriorityCategorizer)
 					);
 				} catch (OperationCanceledException) {
 					// Terminate gracefully

BotNet.CommandHandlers/BotUpdate/Message/MessageUpdateHandler.cs

@@ -1,5 +1,6 @@
 using BotNet.Commands;
 using BotNet.Commands.BotUpdate.Message;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Services.BotProfile;
 using BotNet.Services.SocialLink;
 using RG.Ninja;
@@ -11,12 +12,14 @@ public sealed class MessageUpdateHandler(
 		ITelegramBotClient telegramBotClient,
 		ICommandQueue commandQueue,
 		ITelegramMessageCache telegramMessageCache,
-		BotProfileAccessor botProfileAccessor
+		BotProfileAccessor botProfileAccessor,
+		CommandPriorityCategorizer commandPriorityCategorizer
 	) : ICommandHandler<MessageUpdate> {
 		private readonly ITelegramBotClient _telegramBotClient = telegramBotClient;
 		private readonly ICommandQueue _commandQueue = commandQueue;
 		private readonly ITelegramMessageCache _telegramMessageCache = telegramMessageCache;
 		private readonly BotProfileAccessor _botProfileAccessor = botProfileAccessor;
+		private readonly CommandPriorityCategorizer _commandPriorityCategorizer = commandPriorityCategorizer;
 
 		public async Task Handle(MessageUpdate update, CancellationToken cancellationToken) {
 			// Handle slash commands
@@ -27,6 +30,7 @@ public async Task Handle(MessageUpdate update, CancellationToken cancellationTok
 				if (SlashCommand.TryCreate(
 					message: update.Message,
 					botUsername: (await _botProfileAccessor.GetBotProfileAsync(cancellationToken)).Username!,
+					commandPriorityCategorizer: _commandPriorityCategorizer,
 					out SlashCommand? slashCommand
 				)) {
 					await _commandQueue.DispatchAsync(
@@ -108,6 +112,7 @@ await _telegramBotClient.SendTextMessageAsync(
 			// Handle AI calls
 			if (AICallCommand.TryCreate(
 				message: update.Message!,
+				commandPriorityCategorizer: _commandPriorityCategorizer,
 				out AICallCommand? aiCallCommand
 			)) {
 				// Cache both message and reply to message
@@ -140,6 +145,7 @@ await _commandQueue.DispatchAsync(
 						messageId: new(replyToMessageId),
 						chatId: new(chatId)
 					),
+					commandPriorityCategorizer: _commandPriorityCategorizer,
 					out AIFollowUpMessage? aiFollowUpMessage
 				)) {
 					return;

BotNet.Commands/BotUpdate/Message/AICallCommand.cs

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 
 namespace BotNet.Commands.BotUpdate.Message {
@@ -36,17 +37,18 @@ string callSign
 
 		public static bool TryCreate(
 			Telegram.Bot.Types.Message message,
+			CommandPriorityCategorizer commandPriorityCategorizer,
 			[NotNullWhen(true)] out AICallCommand? aiCallCommand
 		) {
 			// Chat must be private or group
-			if (!ChatBase.TryCreate(message.Chat, out ChatBase? chat)) {
+			if (!ChatBase.TryCreate(message.Chat, commandPriorityCategorizer, out ChatBase? chat)) {
 				aiCallCommand = null;
 				return false;
 			}
 
 			// Sender must be a user
 			if (message.From is not { } from
-				|| !HumanSender.TryCreate(from, out HumanSender? sender)) {
+				|| !HumanSender.TryCreate(from, commandPriorityCategorizer, out HumanSender? sender)) {
 				aiCallCommand = null;
 				return false;
 			}
@@ -72,7 +74,7 @@ public static bool TryCreate(
 					?? message.ReplyToMessage?.Sticker?.FileId,
 				replyToMessage: message.ReplyToMessage is null
 					? null
-					: NormalMessage.FromMessage(message.ReplyToMessage),
+					: NormalMessage.FromMessage(message.ReplyToMessage, commandPriorityCategorizer),
 				callSign: callSign
 			);
 			return true;

BotNet.Commands/BotUpdate/Message/AIFollowUpMessage.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 
 namespace BotNet.Commands.BotUpdate.Message {
@@ -26,17 +27,18 @@ AIResponseMessage replyToMessage
 		public static bool TryCreate(
 			Telegram.Bot.Types.Message message,
 			IEnumerable<MessageBase> thread,
+			CommandPriorityCategorizer commandPriorityCategorizer,
 			[NotNullWhen(true)] out AIFollowUpMessage? aiFollowUpMessage
 		) {
 			// Chat must be private or group
-			if (!ChatBase.TryCreate(message.Chat, out ChatBase? chat)) {
+			if (!ChatBase.TryCreate(message.Chat, commandPriorityCategorizer, out ChatBase? chat)) {
 				aiFollowUpMessage = null;
 				return false;
 			}
 
 			// Sender must be a user
 			if (message.From is not { } from
-				|| !HumanSender.TryCreate(from, out HumanSender? sender)) {
+				|| !HumanSender.TryCreate(from, commandPriorityCategorizer, out HumanSender? sender)) {
 				aiFollowUpMessage = null;
 				return false;
 			}

BotNet.Commands/BotUpdate/Message/AIResponseMessage.cs

@@ -1,4 +1,5 @@
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 
 namespace BotNet.Commands.BotUpdate.Message {
@@ -27,10 +28,11 @@ string callSign
 		public static AIResponseMessage FromMessage(
 			Telegram.Bot.Types.Message message,
 			HumanMessageBase replyToMessage,
-			string callSign
+			string callSign,
+			CommandPriorityCategorizer commandPriorityCategorizer
 		) {
 			// Chat must be private or group
-			if (!ChatBase.TryCreate(message.Chat, out ChatBase? chat)) {
+			if (!ChatBase.TryCreate(message.Chat, commandPriorityCategorizer, out ChatBase? chat)) {
 				throw new ArgumentException("Chat must be private or group.", nameof(message));
 			}
 

BotNet.Commands/BotUpdate/Message/NormalMessage.cs

@@ -1,4 +1,5 @@
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 
 namespace BotNet.Commands.BotUpdate.Message {
@@ -19,9 +20,9 @@ private NormalMessage(
 			replyToMessage: replyToMessage
 		) { }
 
-		public static NormalMessage FromMessage(Telegram.Bot.Types.Message message) {
+		public static NormalMessage FromMessage(Telegram.Bot.Types.Message message, CommandPriorityCategorizer commandPriorityCategorizer) {
 			// Chat must be private or group
-			if (!ChatBase.TryCreate(message.Chat, out ChatBase? chat)) {
+			if (!ChatBase.TryCreate(message.Chat, commandPriorityCategorizer, out ChatBase? chat)) {
 				throw new ArgumentException("Chat must be private or group.", nameof(message));
 			}
 
@@ -33,7 +34,7 @@ public static NormalMessage FromMessage(Telegram.Bot.Types.Message message) {
 			return new(
 				messageId: new(message.MessageId),
 				chat: chat,
-				sender: HumanSender.TryCreate(from, out HumanSender? humanSender)
+				sender: HumanSender.TryCreate(from, commandPriorityCategorizer, out HumanSender? humanSender)
 					? humanSender
 					: BotSender.TryCreate(from, out BotSender? botSender)
 						? botSender
@@ -42,7 +43,7 @@ public static NormalMessage FromMessage(Telegram.Bot.Types.Message message) {
 				imageFileId: message.Photo?.LastOrDefault()?.FileId ?? message.Sticker?.FileId,
 				replyToMessage: message.ReplyToMessage is null
 					? null
-					: NormalMessage.FromMessage(message.ReplyToMessage)
+					: NormalMessage.FromMessage(message.ReplyToMessage, commandPriorityCategorizer)
 			);
 		}
 	}

BotNet.Commands/BotUpdate/Message/SlashCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using BotNet.Commands.ChatAggregate;
+using BotNet.Commands.CommandPrioritization;
 using BotNet.Commands.SenderAggregate;
 using Telegram.Bot.Types.Enums;
 
@@ -33,6 +34,7 @@ string command
 		public static bool TryCreate(
 			Telegram.Bot.Types.Message message,
 			string botUsername,
+			CommandPriorityCategorizer commandPriorityCategorizer,
 			[NotNullWhen(true)] out SlashCommand? slashCommand
 		) {
 			// Message must start with a slash command
@@ -46,14 +48,14 @@ public static bool TryCreate(
 			}
 
 			// Chat must be private or group
-			if (!ChatBase.TryCreate(message.Chat, out ChatBase? chat)) {
+			if (!ChatBase.TryCreate(message.Chat, commandPriorityCategorizer, out ChatBase? chat)) {
 				slashCommand = null;
 				return false;
 			}
 
 			// Sender must be a user
 			if (message.From is not { } from
-				|| !HumanSender.TryCreate(from, out HumanSender? sender)) {
+				|| !HumanSender.TryCreate(from, commandPriorityCategorizer, out HumanSender? sender)) {
 				slashCommand = null;
 				return false;
 			}
@@ -88,7 +90,7 @@ public static bool TryCreate(
 				imageFileId: message.Photo?.LastOrDefault()?.FileId,
 				replyToMessage: message.ReplyToMessage is null
 					? null
-					: NormalMessage.FromMessage(message.ReplyToMessage),
+					: NormalMessage.FromMessage(message.ReplyToMessage, commandPriorityCategorizer),
 				command: commandText
 			);
 			return true;

BotNet.Commands/ChatAggregate/Chat.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using BotNet.Commands.CommandPrioritization;
 using Telegram.Bot.Types.Enums;
 
 namespace BotNet.Commands.ChatAggregate {
@@ -16,11 +17,14 @@ protected ChatBase(
 
 		public static bool TryCreate(
 			Telegram.Bot.Types.Chat telegramChat,
+			CommandPriorityCategorizer priorityCategorizer,
 			[NotNullWhen(true)] out ChatBase? chat
 		) {
 			chat = telegramChat switch {
 				Telegram.Bot.Types.Chat { Type: ChatType.Private } => PrivateChat.FromTelegramChat(telegramChat),
-				Telegram.Bot.Types.Chat { Type: ChatType.Group or ChatType.Supergroup } => GroupChat.FromTelegramChat(telegramChat),
+				Telegram.Bot.Types.Chat { Type: ChatType.Group or ChatType.Supergroup } => priorityCategorizer.IsHomeGroup(telegramChat.Id)
+					? HomeGroupChat.FromTelegramChat(telegramChat)
+					: GroupChat.FromTelegramChat(telegramChat),
 				_ => null
 			};
 			return chat is not null;