From fb703b6c81c66d9749848ea8753f7e22151c9b56 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 6 Jul 2026 19:58:23 +0200 Subject: [PATCH] feat: Jobs infrastructure, endpoints, UI and worker prioritization --- src/Predictalytics.Api/ApiConfiguration.cs | 1 + src/Predictalytics.Api/wwwroot/css/style.css | 22 +++++- src/Predictalytics.Api/wwwroot/index.html | 66 ++++++++++++++++-- src/Predictalytics.Api/wwwroot/js/app.js | 69 ++++++++++++++++++- .../Data/AppDbContext.cs | 13 ++++ .../DependencyInjection.cs | 1 + .../Migrations/AppDbContextModelSnapshot.cs | 55 +++++++++++++++ .../Services/TradeHistoryWorker.cs | 53 ++++++++++++-- .../Services/TraderAnalyticsWorker.cs | 67 ++++++++++++++---- 9 files changed, 321 insertions(+), 26 deletions(-) diff --git a/src/Predictalytics.Api/ApiConfiguration.cs b/src/Predictalytics.Api/ApiConfiguration.cs index 56ce9f9..a0e6b75 100644 --- a/src/Predictalytics.Api/ApiConfiguration.cs +++ b/src/Predictalytics.Api/ApiConfiguration.cs @@ -30,6 +30,7 @@ public static class ApiConfiguration app.MapTraderEndpoints(); app.MapAlertEndpoints(); app.MapMarketEndpoints(); + app.MapJobEndpoints(); // Health check app.MapGet("/api/health", () => Results.Ok(new { Status = "OK", Timestamp = DateTime.UtcNow })); diff --git a/src/Predictalytics.Api/wwwroot/css/style.css b/src/Predictalytics.Api/wwwroot/css/style.css index e4eeb33..c4cbad4 100644 --- a/src/Predictalytics.Api/wwwroot/css/style.css +++ b/src/Predictalytics.Api/wwwroot/css/style.css @@ -447,9 +447,25 @@ body { .btn-primary { background: var(--primary); color: #000; border: none; border-radius: 6px; cursor: pointer; font-weight: bold; transition: all 0.2s; } .btn-primary:hover { filter: brightness(1.1); } .tabs-nav { display: flex; gap: 12px; margin-bottom: 24px; border-bottom: 1px solid var(--border); padding-bottom: 8px; flex-wrap: wrap; align-items: center; } -.btn-tab { white-space: nowrap; padding: 8px 16px; border-radius: 6px; font-size: 14px; transition: background 0.2s; } -.btn-tab:hover { background: var(--bg-input); } -.btn-tab.active { background: var(--bg-input); color: var(--primary) !important; border-bottom: 2px solid var(--primary) !important; } +.btn-tab { + white-space: nowrap; + padding: 8px 16px; + border-radius: 6px; + font-size: 14px; + font-weight: 600; + transition: all 0.2s; + background: transparent; + color: var(--text-muted); + border: none; + cursor: pointer; +} +.btn-tab:hover { background: var(--bg-input); color: var(--text-primary); } +.btn-tab.active { + background: var(--bg-input); + color: var(--primary) !important; + border-bottom: 2px solid var(--primary) !important; + border-radius: 6px 6px 0 0; +} .stat-group { margin-bottom: 16px; } .stat-label { font-size: 11px; font-weight: 700; text-transform: uppercase; color: var(--text-muted); letter-spacing: 0.5px; margin-bottom: 4px; } .stat-value { font-size: 15px; font-weight: 600; color: var(--text-primary); } diff --git a/src/Predictalytics.Api/wwwroot/index.html b/src/Predictalytics.Api/wwwroot/index.html index 75e69d1..8a318be 100644 --- a/src/Predictalytics.Api/wwwroot/index.html +++ b/src/Predictalytics.Api/wwwroot/index.html @@ -35,6 +35,10 @@ Alerts + + + Jobs +
@@ -126,9 +130,30 @@
-
-
+
+

Traders

+ + + + + + + @@ -139,7 +164,7 @@ - +
@@ -158,6 +183,33 @@

Alerts

+ +
+

Background Jobs

+
+
+ + + + + + + + + + + + + + + + + +
Job IDJob TypeStatusTraderCreated AtStarted AtCompleted AtError MessageAction
Loading jobs...
+
+
+
+

Search Results

@@ -309,7 +361,13 @@
Platform
—
-
+
Category
—
diff --git a/src/Predictalytics.Api/wwwroot/js/app.js b/src/Predictalytics.Api/wwwroot/js/app.js index 5583ecf..ebea9cb 100644 --- a/src/Predictalytics.Api/wwwroot/js/app.js +++ b/src/Predictalytics.Api/wwwroot/js/app.js @@ -26,6 +26,7 @@ document.querySelectorAll('.nav-item[data-page]').forEach(item => { if (page === 'traders') loadTraders(); if (page === 'alerts') loadAlerts(); if (page === 'markets') loadMarkets(); + if (page === 'jobs') loadJobs(); }); }); @@ -285,10 +286,25 @@ async function loadTraders() { const tbody = document.getElementById('allTradersBody'); if (!data || !data.length) { tbody.innerHTML = '

No traders tracked yet.

'; return; } + const sortSelect = document.getElementById('tradersSort'); + if (sortSelect) currentSort = sortSelect.value; + + const filterWinrate = document.getElementById('filterWinrate')?.value || 'all'; + const filterCopyability = document.getElementById('filterCopyability')?.value || 'all'; + + // Filtering + if (filterWinrate === 'gt50') data = data.filter(t => t.winRate > 50); + if (filterWinrate === 'gt60') data = data.filter(t => t.winRate > 60); + + if (filterCopyability === 'gt50') data = data.filter(t => t.copytradingCopyabilityScore > 50); + if (filterCopyability === 'gt80') data = data.filter(t => t.copytradingCopyabilityScore > 80); + // Sorting if (currentSort === 'score') data.sort((a, b) => b.combinedScore - a.combinedScore); else if (currentSort === 'name') data.sort((a, b) => a.displayName.localeCompare(b.displayName)); else if (currentSort === 'pnl') data.sort((a, b) => b.totalPnl - a.totalPnl); + else if (currentSort === 'winrate') data.sort((a, b) => b.winRate - a.winRate); + else if (currentSort === 'copyability') data.sort((a, b) => (b.copytradingCopyabilityScore || 0) - (a.copytradingCopyabilityScore || 0)); tbody.innerHTML = data.map((t, i) => ` @@ -302,7 +318,13 @@ async function loadTraders() { ${fmt.pnl(t.totalPnl)} ${fmt.tier(t.tier)} ${t.strategy} - + +
+ + + +
+ `).join(''); } @@ -531,3 +553,48 @@ async function triggerAiAnalysis(id, manual) { btn.disabled = false; } } + +// ─── Jobs Page ─── +async function loadJobs() { + const data = await api('/api/jobs'); + const tbody = document.getElementById('jobsBody'); + if (!data || !data.length) { + tbody.innerHTML = '

No jobs found.

'; + return; + } + + tbody.innerHTML = data.map(j => ` + + ${j.id} + ${j.jobType} + ${j.status === 'Completed' ? 'Completed' : j.status === 'Failed' ? 'Failed' : j.status} + ${j.traderName || j.traderId} + ${fmt.time(j.createdAt)} + ${j.startedAt ? fmt.time(j.startedAt) : '—'} + ${j.completedAt ? fmt.time(j.completedAt) : '—'} + ${j.errorMessage || '—'} + + + `).join(''); +} + +async function queueHistorySync(id) { + const res = await fetch(`/api/jobs/sync/${id}`, { method: 'POST' }); + if (res.ok) { + alert('History Sync job queued successfully.'); + } else { + alert('Failed to queue history sync.'); + } +} + +async function queueTraderAnalysis(id) { + const res = await fetch(`/api/jobs/analyze/${id}`, { method: 'POST' }); + if (res.ok) { + alert('Trader Analysis job queued successfully.'); + } else { + alert('Failed to queue trader analysis.'); + } +} + +// Initialize Dashboard +loadDashboard(); diff --git a/src/Predictalytics.Infrastructure/Data/AppDbContext.cs b/src/Predictalytics.Infrastructure/Data/AppDbContext.cs index ed92d05..0b2109e 100644 --- a/src/Predictalytics.Infrastructure/Data/AppDbContext.cs +++ b/src/Predictalytics.Infrastructure/Data/AppDbContext.cs @@ -20,6 +20,7 @@ public class AppDbContext : DbContext public DbSet MarketOutcomePriceSnapshots => Set(); public DbSet TraderCategoryPerformances => Set(); public DbSet TradeContexts => Set(); + public DbSet BackgroundJobs => Set(); public AppDbContext(DbContextOptions options) : base(options) { } @@ -220,5 +221,17 @@ public class AppDbContext : DbContext e.Property(ps => ps.Price).HasPrecision(10, 6); e.HasOne(ps => ps.MarketOutcome).WithMany().HasForeignKey(ps => ps.MarketOutcomeId).OnDelete(DeleteBehavior.Cascade); }); + + // BackgroundJob + mb.Entity(e => + { + e.HasKey(j => j.Id); + e.HasIndex(j => j.Status); + e.HasIndex(j => j.JobType); + e.Property(j => j.JobType).HasConversion().HasMaxLength(64); + e.Property(j => j.Status).HasConversion().HasMaxLength(64); + e.Property(j => j.ErrorMessage).HasMaxLength(4096); + e.HasOne(j => j.Trader).WithMany().HasForeignKey(j => j.TraderId).OnDelete(DeleteBehavior.SetNull); + }); } } diff --git a/src/Predictalytics.Infrastructure/DependencyInjection.cs b/src/Predictalytics.Infrastructure/DependencyInjection.cs index b66c9dc..eb9b2a6 100644 --- a/src/Predictalytics.Infrastructure/DependencyInjection.cs +++ b/src/Predictalytics.Infrastructure/DependencyInjection.cs @@ -66,6 +66,7 @@ public static class DependencyInjection services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); // Application Services services.AddScoped(); diff --git a/src/Predictalytics.Infrastructure/Migrations/AppDbContextModelSnapshot.cs b/src/Predictalytics.Infrastructure/Migrations/AppDbContextModelSnapshot.cs index 4b4f327..aa94295 100644 --- a/src/Predictalytics.Infrastructure/Migrations/AppDbContextModelSnapshot.cs +++ b/src/Predictalytics.Infrastructure/Migrations/AppDbContextModelSnapshot.cs @@ -67,6 +67,51 @@ namespace Predictalytics.Infrastructure.Migrations b.ToTable("Alerts"); }); + modelBuilder.Entity("Predictalytics.Domain.Entities.BackgroundJob", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property("Id")); + + b.Property("CompletedAt") + .HasColumnType("datetime(6)"); + + b.Property("CreatedAt") + .HasColumnType("datetime(6)"); + + b.Property("ErrorMessage") + .HasMaxLength(4096) + .HasColumnType("varchar(4096)"); + + b.Property("JobType") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("StartedAt") + .HasColumnType("datetime(6)"); + + b.Property("Status") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("varchar(64)"); + + b.Property("TraderId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("JobType"); + + b.HasIndex("Status"); + + b.HasIndex("TraderId"); + + b.ToTable("BackgroundJobs"); + }); + modelBuilder.Entity("Predictalytics.Domain.Entities.Event", b => { b.Property("Id") @@ -795,6 +840,16 @@ namespace Predictalytics.Infrastructure.Migrations b.Navigation("Trader"); }); + modelBuilder.Entity("Predictalytics.Domain.Entities.BackgroundJob", b => + { + b.HasOne("Predictalytics.Domain.Entities.Trader", "Trader") + .WithMany() + .HasForeignKey("TraderId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("Trader"); + }); + modelBuilder.Entity("Predictalytics.Domain.Entities.Market", b => { b.HasOne("Predictalytics.Domain.Entities.Event", "Event") diff --git a/src/Predictalytics.Worker/Services/TradeHistoryWorker.cs b/src/Predictalytics.Worker/Services/TradeHistoryWorker.cs index 51cb611..5771d80 100644 --- a/src/Predictalytics.Worker/Services/TradeHistoryWorker.cs +++ b/src/Predictalytics.Worker/Services/TradeHistoryWorker.cs @@ -36,20 +36,40 @@ public class TradeHistoryWorker : BackgroundService { try { - IReadOnlyList tradersToProcess; + IReadOnlyList tradersToProcess = new List(); + Domain.Entities.BackgroundJob? activeJob = null; + using (var scope = _services.CreateScope()) { + var jobRepo = scope.ServiceProvider.GetRequiredService(); + activeJob = await jobRepo.GetNextPendingJobAsync(Predictalytics.Domain.Enums.JobType.HistorySync, stoppingToken); + var repo = scope.ServiceProvider.GetRequiredService(); - tradersToProcess = await repo.GetTradersDueForTradeUpdateAsync(CooldownHours, TradersPerCycle, stoppingToken); + + if (activeJob != null && activeJob.TraderId.HasValue) + { + var t = await repo.GetByIdAsync(activeJob.TraderId.Value, stoppingToken); + if (t != null) + { + tradersToProcess = new[] { t }; + activeJob.Status = Predictalytics.Domain.Enums.JobStatus.InProgress; + activeJob.StartedAt = DateTime.UtcNow; + await jobRepo.UpdateAsync(activeJob, stoppingToken); + } + } + else + { + tradersToProcess = await repo.GetTradersDueForTradeUpdateAsync(CooldownHours, TradersPerCycle, stoppingToken); + } } if (tradersToProcess.Count == 0) { - _logger.LogDebug("📜 No traders due for sync. Sleeping."); + _logger.LogDebug("🔄 No traders due for sync. Sleeping."); } else { - _logger.LogInformation("📜 Processing {Count} traders for trade sync (Initial/Update)", tradersToProcess.Count); + _logger.LogInformation("🔄 Processing {Count} traders for trade sync (Initial/Update)", tradersToProcess.Count); } var outcomeCache = new System.Collections.Concurrent.ConcurrentDictionary(); @@ -166,9 +186,32 @@ public class TradeHistoryWorker : BackgroundService trader.LastTradesUpdatedAt = DateTime.UtcNow; trader.LastPolledAt = DateTime.UtcNow; await traderRepo.UpdateAsync(trader, ct); + + if (activeJob != null && activeJob.TraderId == trader.Id) + { + using var jobScope = _services.CreateScope(); + var updateJobRepo = jobScope.ServiceProvider.GetRequiredService(); + activeJob.Status = Predictalytics.Domain.Enums.JobStatus.Completed; + activeJob.CompletedAt = DateTime.UtcNow; + await updateJobRepo.UpdateAsync(activeJob, ct); + } } catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested) { /* App shutting down */ } - catch (Exception ex) { _logger.LogError(ex, "Error syncing trader {TraderId}", t.Id); } + catch (Exception ex) + { + _logger.LogError(ex, "Error syncing trader {TraderId}", t.Id); + if (activeJob != null && activeJob.TraderId == t.Id) + { + try { + using var jobScope = _services.CreateScope(); + var updateJobRepo = jobScope.ServiceProvider.GetRequiredService(); + activeJob.Status = Predictalytics.Domain.Enums.JobStatus.Failed; + activeJob.CompletedAt = DateTime.UtcNow; + activeJob.ErrorMessage = ex.Message; + await updateJobRepo.UpdateAsync(activeJob, CancellationToken.None); + } catch { /* Ignore secondary errors */ } + } + } }); } catch (OperationCanceledException) { break; } diff --git a/src/Predictalytics.Worker/Services/TraderAnalyticsWorker.cs b/src/Predictalytics.Worker/Services/TraderAnalyticsWorker.cs index ffb8dbb..174d11f 100644 --- a/src/Predictalytics.Worker/Services/TraderAnalyticsWorker.cs +++ b/src/Predictalytics.Worker/Services/TraderAnalyticsWorker.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.DependencyInjection; using Predictalytics.Infrastructure.Data; using Predictalytics.Application.Interfaces; +using Predictalytics.Domain.Interfaces; namespace Predictalytics.Worker.Services; @@ -40,23 +41,40 @@ public class TraderAnalyticsWorker : BackgroundService private async Task RunAnalyticsAsync(CancellationToken ct) { - List traderIds; + List traderIds = new List(); + Domain.Entities.BackgroundJob? activeJob = null; using (var scope = _services.CreateScope()) { - var db = scope.ServiceProvider.GetRequiredService(); - // Find traders who have never been analyzed, or whose last analysis was before their latest trade. - // Prioritize never-analyzed traders. - traderIds = await db.Traders - .Where(t => t.LastAnalyzedAt == null || t.Trades.Any(tr => tr.ExecutedAt > t.LastAnalyzedAt)) - .OrderBy(t => t.LastAnalyzedAt == null ? 0 : 1) - .ThenBy(t => t.LastAnalyzedAt) - .Select(t => t.Id) - .Take(500) // Limit batch size to prevent long-running loops without save - .ToListAsync(ct); + var jobRepo = scope.ServiceProvider.GetRequiredService(); + activeJob = await jobRepo.GetNextPendingJobAsync(Predictalytics.Domain.Enums.JobType.TraderAnalysis, ct); + + if (activeJob != null && activeJob.TraderId.HasValue) + { + traderIds.Add(activeJob.TraderId.Value); + activeJob.Status = Predictalytics.Domain.Enums.JobStatus.InProgress; + activeJob.StartedAt = DateTime.UtcNow; + await jobRepo.UpdateAsync(activeJob, ct); + } + else + { + var db = scope.ServiceProvider.GetRequiredService(); + // Find traders who have never been analyzed, or whose last analysis was before their latest trade. + // Prioritize never-analyzed traders. + traderIds = await db.Traders + .Where(t => t.LastAnalyzedAt == null || t.Trades.Any(tr => tr.ExecutedAt > t.LastAnalyzedAt)) + .OrderBy(t => t.LastAnalyzedAt == null ? 0 : 1) + .ThenBy(t => t.LastAnalyzedAt) + .Select(t => t.Id) + .Take(500) // Limit batch size to prevent long-running loops without save + .ToListAsync(ct); + } } - _logger.LogInformation("Found {Count} active or unanalyzed traders to update", traderIds.Count); + if (traderIds.Count > 0) + { + _logger.LogInformation("Found {Count} active or unanalyzed traders to update", traderIds.Count); + } foreach (var id in traderIds) { @@ -65,13 +83,36 @@ public class TraderAnalyticsWorker : BackgroundService using var traderScope = _services.CreateScope(); var pnlEngine = traderScope.ServiceProvider.GetRequiredService(); await pnlEngine.RecalculateTraderPositionsAsync(id, ct); + + if (activeJob != null && activeJob.TraderId == id) + { + using var jobScope = _services.CreateScope(); + var updateJobRepo = jobScope.ServiceProvider.GetRequiredService(); + activeJob.Status = Predictalytics.Domain.Enums.JobStatus.Completed; + activeJob.CompletedAt = DateTime.UtcNow; + await updateJobRepo.UpdateAsync(activeJob, ct); + } } catch (Exception ex) { _logger.LogError(ex, "Error recalculating positions/PnL for trader {TraderId}", id); + if (activeJob != null && activeJob.TraderId == id) + { + try { + using var jobScope = _services.CreateScope(); + var updateJobRepo = jobScope.ServiceProvider.GetRequiredService(); + activeJob.Status = Predictalytics.Domain.Enums.JobStatus.Failed; + activeJob.CompletedAt = DateTime.UtcNow; + activeJob.ErrorMessage = ex.Message; + await updateJobRepo.UpdateAsync(activeJob, CancellationToken.None); + } catch { /* Ignore secondary errors */ } + } } } - _logger.LogInformation("Trader analytics update complete."); + if (traderIds.Count > 0) + { + _logger.LogInformation("Trader analytics update complete."); + } } }