allow retrying seed generations that fail

This commit is contained in:
2025-05-15 18:08:09 -05:00
parent 82bfff0677
commit 06afab3a10
4 changed files with 65 additions and 30 deletions

View File

@@ -1,4 +1,5 @@
namespace ALttPRandomizer.Service {
using ALttPRandomizer.Azure;
using ALttPRandomizer.Model;
using ALttPRandomizer.Randomizers;
using ALttPRandomizer.Settings;
@@ -7,13 +8,20 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text.Json;
using System.Threading.Tasks;
public class RandomizeService {
public RandomizeService(IdGenerator idGenerator, IServiceProvider serviceProvider, BaseRandomizer baseRandomizer, ILogger<RandomizeService> logger) {
public RandomizeService(
IdGenerator idGenerator,
IServiceProvider serviceProvider,
BaseRandomizer baseRandomizer,
AzureStorage azureStorage,
ILogger<RandomizeService> logger) {
this.IdGenerator = idGenerator;
this.ServiceProvider = serviceProvider;
this.BaseRandomizer = baseRandomizer;
this.AzureStorage = azureStorage;
this.Logger = logger;
}
@@ -22,9 +30,10 @@
private IdGenerator IdGenerator { get; }
private BaseRandomizer BaseRandomizer { get; }
private IServiceProvider ServiceProvider { get; }
private AzureStorage AzureStorage { get; }
public async Task<string> RandomizeSeed(SeedSettings settings) {
var id = this.IdGenerator.GenerateId();
public async Task<string> RandomizeSeed(SeedSettings settings, string? seedId = null) {
var id = seedId ?? this.IdGenerator.GenerateId();
this.Logger.LogInformation("Generating seed {seedId} with settings {@settings}", id, settings);
var fi = typeof(RandomizerInstance).GetField(settings.Randomizer.ToString(), BindingFlags.Static | BindingFlags.Public);
@@ -42,8 +51,8 @@
return id;
}
public async Task<string> RandomizeMultiworld(IList<SeedSettings> settings) {
var id = this.IdGenerator.GenerateId();
public async Task<string> RandomizeMultiworld(IList<SeedSettings> settings, string? multiId = null) {
var id = multiId ?? this.IdGenerator.GenerateId();
this.Logger.LogInformation("Generating multiworld {seedId} with settings {@settings}", id, settings);
this.BaseRandomizer.ValidateAll(settings);
@@ -51,5 +60,40 @@
await this.BaseRandomizer.RandomizeMultiworld(id, settings);
return id;
}
public async Task<IDictionary<string, object>> RetrySeed(string seedId) {
var files = await this.AzureStorage.GetFiles(seedId);
this.Logger.LogDebug("Found files: {@files}", files.Keys);
var result = new Dictionary<string, object>();
if (!files.TryGetValue("settings.json", out var settingsData)) {
result["status"] = 404;
result["error"] = "seed not found";
return result;
}
var settingsJson = JsonDocument.Parse(settingsData.ToString());
var settings = settingsJson.Deserialize<SeedSettings>(JsonOptions.Default) ?? new SeedSettings();
if (files.TryGetValue("patch.bps", out var patchData)) {
result["status"] = 409;
result["error"] = "generation already successful";
return result;
}
if (files.ContainsKey("generating")) {
result["status"] = 409;
result["error"] = "generation still in progress";
return result;
}
await this.RandomizeSeed(settings, seedId);
result["status"] = 202;
return result;
}
}
}

View File

@@ -43,6 +43,7 @@
} else {
result["status"] = 404;
result["error"] = "generation failed";
result["retry"] = true;
return result;
}
}