Updated to load training image in batch

Author: csharpfritz

Fritz.Chatbot/Commands/PredictHatCommand.cs

@@ -38,9 +38,6 @@ public PredictHatCommand(IConfiguration configuration, ScreenshotTrainingService
 			_Repository = repository;
 		}
 
-		public string TwitchScreenshotUrl => $"https://static-cdn.jtvnw.net/previews-ttv/live_user_{_TwitchChannel}-1280x720.jpg?_=";
-
-
 		public async Task Execute(IChatService chatService, string userName, ReadOnlyMemory<char> rhs)
 		{
 
@@ -51,7 +48,7 @@ public async Task Execute(IChatService chatService, string userName, ReadOnlyMem
 			var client = new CustomVisionPredictionClient()
 			{
 				ApiKey = _CustomVisionKey,
-				Endpoint = _AzureEndpoint
+				Endpoint = _AzureEndpoint,
 			};
 
 			var obsImage = await _TrainHat.GetScreenshotFromObs();
@@ -75,19 +72,20 @@ public async Task Execute(IChatService chatService, string userName, ReadOnlyMem
 
 			}
 
+			if (DateTime.UtcNow.Subtract(result.Created).TotalSeconds > Cooldown.Value.TotalSeconds) {
+				await chatService.SendMessageAsync($"I previously predicted this hat about {DateTime.UtcNow.Subtract(result.Created).TotalSeconds} seconds ago");
+			}
 
 			var bestMatch = result.Predictions.OrderByDescending(p => p.Probability).FirstOrDefault();
-			if (bestMatch == null || bestMatch.Probability <= 0.3D) {
+			if (bestMatch == null || bestMatch.Probability < 0.7D) {
 				await chatService.SendMessageAsync("csharpAngry 404 Hat Not Found!  Let's ask a moderator to !addhat so we can identify it next time");
 				// do we store the image?
 				return;
 			}
 
 			await chatService.SendMessageAsync($"csharpClip I think (with {bestMatch.Probability.ToString("0.0%")} certainty) Jeff is currently wearing his {bestMatch.TagName} hat csharpClip");
-			if (bestMatch.Probability >= 0.6D) {
-				var desc = await _Repository.GetDescription(bestMatch.TagName);
-				if (!string.IsNullOrEmpty(desc)) await chatService.SendMessageAsync(desc);
-			}
+			var desc = await _Repository.GetDescription(bestMatch.TagName);
+			if (!string.IsNullOrEmpty(desc)) await chatService.SendMessageAsync(desc);
 
 		}
 

Fritz.Chatbot/Commands/TrainHatCommand.cs

@@ -26,7 +26,7 @@ public async Task Execute(IChatService chatService, string userName, bool isMode
 			if (!(isModerator || isBroadcaster)) return;
 
 			_TrainHat.StartTraining();
-			await chatService.SendMessageAsync("Started taking screenshots, 1 every ten seconds for the next 150 seconds");
+			await chatService.SendMessageAsync($"Started taking screenshots, 1 every {ScreenshotTrainingService.TrainingIntervalInSeconds} seconds for the next {ScreenshotTrainingService.TrainingIntervalInSeconds * ScreenshotTrainingService.TrainingCount} seconds");
 
 		}
 

Fritz.Chatbot/ScreenshotTrainingService.cs

@@ -12,6 +12,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -20,6 +21,8 @@ namespace Fritz.Chatbot
 {
 	public class ScreenshotTrainingService : IHostedService, ITrainHat
 	{
+		public const int TrainingCount = 15;
+		public const int TrainingIntervalInSeconds = 2;
 
 		// TODO: Track how many images are loaded -- 5k is the maximum for the FREE service
 		private string _CustomVisionKey = "";
@@ -32,8 +35,11 @@ public class ScreenshotTrainingService : IHostedService, ITrainHat
 		private bool _CurrentlyTraining = false;
 		private byte _TrainingCount = 0;
 		private Task _TrainingTask;
+		private byte _TotalPictures = 0;
 		private byte _RetryCount = 0;
 
+		private readonly Queue<MemoryStream> _ImagesToUpload = new Queue<MemoryStream>();
+
 		public ScreenshotTrainingService(IConfiguration configuration, ILoggerFactory loggerFactory, IServiceProvider services)
 		{
 
@@ -69,17 +75,25 @@ private async Task Train(CancellationToken token)
 			while (!token.IsCancellationRequested)
 			{
 
-				if (_CurrentlyTraining && _TrainingCount == 15)
+				if (_CurrentlyTraining && _TotalPictures == TrainingCount)
 				{
 					_CurrentlyTraining = false;
 					_Logger.LogTrace("Completed screenshot training");
+					await UploadCachedScreenshots();
+					if (!_CurrentlyTraining) _TotalPictures = 0;
 
 				}
 				else if (_CurrentlyTraining)
 				{
 
-					await AddScreenshot(true);
-					await Task.Delay(TimeSpan.FromSeconds(10));
+					if (_ImagesToUpload.Count == 5) {
+						await UploadCachedScreenshots();
+					}
+
+					var imageStream = await GetScreenshotFromObs();
+					_TotalPictures++;
+					_ImagesToUpload.Enqueue((MemoryStream)imageStream);
+					await Task.Delay(TimeSpan.FromSeconds(TrainingIntervalInSeconds));
 
 				}
 				else
@@ -93,6 +107,36 @@ private async Task Train(CancellationToken token)
 
 		}
 
+		private async Task UploadCachedScreenshots()
+		{
+
+			if (!_ImagesToUpload.Any()) return;
+
+			var trainingClient = new CustomVisionTrainingClient()
+			{
+				ApiKey = _CustomVisionKey,
+				Endpoint = _AzureEndpoint
+			};
+
+			var listToLoad = new List<ImageFileCreateEntry>();
+			while (_ImagesToUpload.Any())
+			{
+				var imgStream = _ImagesToUpload.Dequeue();
+				listToLoad.Add(new ImageFileCreateEntry(contents: imgStream.ToArray()));
+			}
+
+			var result = await trainingClient.CreateImagesFromFilesWithHttpMessagesAsync(_AzureProjectId, new ImageFileCreateBatch()
+			{
+				Images = listToLoad
+			});
+
+			_TotalPictures -= (byte)result.Body.Images.Where(r => r.Status != "OK").Count();
+			if (_TotalPictures >= TrainingCount) _CurrentlyTraining = true;
+
+			Console.WriteLine(result.ToString());
+
+		}
+
 		public void StartTraining()
 		{
 

Fritz.ObsProxy/appsettings.json

@@ -10,6 +10,6 @@
 	"ImageFolderOrg": "C:\\dev\\stream\\Screenshots",
 	"BotUrl": "http://localhost:62574/obshub",
 	"ObsIpAddress": "127.0.0.1:4444",
-	"CameraSource": "Webcam-ChromaKey",
+	"CameraSource": "Razer Kiyo",
 	"ObsTest": "false"
 }

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -104,8 +104,6 @@ private static void RegisterGitHubServices(IServiceCollection services, IConfigu
 			services.AddHostedService<GitHubService>();
 
 			services.AddSingleton<ScreenshotTrainingService>();
-			//var provider = services.BuildServiceProvider();
-			//var svc = provider.GetRequiredService<ScreenshotTrainingService>();
 			services.AddHostedService<ScreenshotTrainingService>(s => s.GetRequiredService<ScreenshotTrainingService>());
 			services.AddTransient<HatDescriptionRepository>();
 		}

Fritz.StreamTools/appsettings.json

@@ -162,11 +162,11 @@
 			},
 			{
 				"command": "coffee",
-				"response": "Jeff drinks Madrinas coffee - Use code: FRITZ to receive 20% off of your order at https://www.madrinascoffee.com"
+				"response": "HTTP 418 - Jeff drinks Madrinas coffee - Use code: FRITZ to receive 20% off of your order at https://www.madrinascoffee.com"
 			},
 			{
 				"command": "madrinas",
-				"response": "Madrinas coffee - Fuel for the grind, fuel for your mind. Use code: FRITZ to receive 20% off of your order at https://www.madrinascoffee.com"
+				"response": "HTTP 418 - Madrinas coffee - Fuel for the grind, fuel for your mind. Use code: FRITZ to receive 20% off of your order at https://www.madrinascoffee.com"
 			},
 			{
 				"command": "defend",