Repository navigation
Fix reset detection and chart readability in 0.8.5 #32
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| using System.Globalization; | ||
| using System.Xml.Linq; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
|
|
||
| namespace CodexUsageDock.Tests; | ||
|
|
||
| public sealed class WeeklyChartReadabilityTests(ITestOutputHelper output) | ||
| { | ||
| private static readonly XNamespace Svg = "http://www.w3.org/2000/svg"; | ||
| private static readonly DateTimeOffset Now = new(2026, 10, 3, 7, 0, 0, TimeSpan.Zero); | ||
|
|
||
| [Fact] | ||
| public void MovingUnusedResetEstimatesKeepOneObservedLineWithoutResetMarkers() | ||
| { | ||
| var idle = Enumerable.Range(0, 200).Select(index => | ||
| { | ||
| var at = Now.AddHours(-10).AddMinutes(index * 3); | ||
| return new UsageHistoryEntry(at, 100, at.AddDays(7), 10080); | ||
| }).ToArray(); | ||
| var reset = idle[^1].ResetsAt!.Value; | ||
| var history = idle.Append(new UsageHistoryEntry(Now, 95, reset, 10080)).ToArray(); | ||
| var chart = Create(history, reset); | ||
| var svg = Parse(chart); | ||
|
|
||
| Assert.Single(ObservedLines(svg)); | ||
| Assert.Empty(ResetMarkers(svg)); | ||
| Assert.Contains("No quota reset or reset-schedule changes", chart.AltText, StringComparison.Ordinal); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void UnusedEstimateCanSettleBetweenObservationsWhenConsumptionStarts() | ||
| { | ||
| var previousAt = Now.AddMinutes(-5); | ||
| var startedAt = Now.AddMinutes(-2); | ||
| UsageHistoryEntry previous = new(previousAt, 100, previousAt.AddDays(7), 10080); | ||
| UsageHistoryEntry current = new(Now, 99, startedAt.AddDays(7), 10080); | ||
|
|
||
| Assert.False(WeeklyAllowanceRestoration.IsCycleChange(previous, current)); | ||
| Assert.Empty(ResetMarkers(Parse(Create([previous, current], current.ResetsAt!.Value)))); | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData(100)] | ||
| [InlineData(80)] | ||
| public void FixedCycleChangesArePreservedEvenWithoutAnAllowanceIncrease(double remaining) | ||
| { | ||
| UsageHistoryEntry previous = new(Now.AddMinutes(-5), remaining, Now.AddDays(3), 10080); | ||
| UsageHistoryEntry current = new(Now, remaining, Now.AddDays(6), 10080); | ||
| Assert.True(WeeklyAllowanceRestoration.IsCycleChange(previous, current)); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void ScheduledRolloverAtFullAllowanceIsStillACycleChange() | ||
| { | ||
| UsageHistoryEntry previous = new(Now.AddMinutes(-5), 100, Now.AddMinutes(-1), 10080); | ||
| UsageHistoryEntry current = new(Now, 100, Now.AddDays(7), 10080); | ||
| Assert.True(WeeklyAllowanceRestoration.IsCycleChange(previous, current)); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void MissingWindowMetadataCannotBeAssumedToBeAnUnusedEstimate() | ||
| { | ||
| var previousAt = Now.AddMinutes(-5); | ||
| UsageHistoryEntry previous = new(previousAt, 100, previousAt.AddDays(7)); | ||
| UsageHistoryEntry current = new(Now, 100, Now.AddDays(7)); | ||
| Assert.True(WeeklyAllowanceRestoration.IsCycleChange(previous, current)); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void RetainedHistoryShowsOnlyRealResetEventsAndNoDuplicateRestorationLines() | ||
| { | ||
| var chart = CreateScenario(); | ||
| var svg = Parse(chart); | ||
| output.WriteLine("CHART_PREVIEW_SVG=" + svg.ToString(SaveOptions.DisableFormatting)); | ||
|
|
||
| Assert.Equal(2, ResetMarkers(svg).Length); | ||
| Assert.Equal(2, svg.Descendants(Svg + "g").Count(group => group.Attribute("data-axis")?.Value == "reset-detected")); | ||
| Assert.DoesNotContain(svg.Descendants(Svg + "line"), line => line.Attribute("data-marker")?.Value == "allowance-restored"); | ||
| Assert.Equal("56%", Assert.Single(svg.Descendants(Svg + "g"), group => group.Attribute("data-axis")?.Value == "current") | ||
| .Attribute("data-axis-label")?.Value); | ||
| Assert.Contains("across quota resets", chart.AltText, StringComparison.Ordinal); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void ResetAndNowLabelsFitInsideTheHeaderWithoutOverlapping() | ||
| { | ||
| var svg = Parse(CreateScenario()); | ||
| var labels = svg.Descendants(Svg + "g") | ||
| .Where(group => group.Attribute("data-axis")?.Value is "marker" or "reset-detected") | ||
| .Select(LabelBounds).ToArray(); | ||
| Assert.Contains(svg.Descendants(Svg + "g"), group => group.Attribute("data-axis-label")?.Value == "NOW"); | ||
| Assert.All(labels, bounds => Assert.InRange(bounds.Top + bounds.Height, 0, PlotTop(svg))); | ||
| AssertNonOverlapping(labels); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void DenseCalendarLabelsKeepEveryDateWithoutOverlapping() | ||
| { | ||
| var svg = Parse(CreateScenario()); | ||
| var dayLabels = svg.Descendants(Svg + "g").Where(group => group.Attribute("data-axis")?.Value == "horizontal").ToArray(); | ||
| Assert.Equal(14, dayLabels.Length); | ||
| Assert.Equal("Sat 26", dayLabels[0].Attribute("data-axis-label")?.Value); | ||
| Assert.Equal("Fri 9", dayLabels[^1].Attribute("data-axis-label")?.Value); | ||
| Assert.All(dayLabels, group => Assert.Equal(2, group.Elements(Svg + "g").Count())); | ||
| var visibleLabels = dayLabels.SelectMany(group => group.Elements(Svg + "path").Any() | ||
| ? new[] { group } : group.Elements(Svg + "g")).Select(LabelBounds).ToArray(); | ||
| AssertNonOverlapping(visibleLabels); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void BillionTokenScaleUsesACompactLabelAtTheTopGridline() | ||
| { | ||
| var svg = Parse(CreateScenario()); | ||
| var topTokenLabel = Assert.Single(svg.Descendants(Svg + "g"), group => group.Attribute("data-axis")?.Value == "tokens" | ||
| && group.Attribute("data-axis-label")?.Value == "1B"); | ||
| Assert.Equal(PlotTop(svg) - ChartLabelGlyphs.Height / 2, LabelBounds(topTokenLabel).Top); | ||
| } | ||
|
|
||
| private static WeeklyUsageTrendChart CreateScenario() | ||
| { | ||
| var firstReset = new DateTimeOffset(2026, 9, 26, 16, 0, 0, TimeSpan.Zero); | ||
| var currentStart = new DateTimeOffset(2026, 10, 2, 21, 10, 0, TimeSpan.Zero); | ||
| var idle = Enumerable.Range(0, 124).Select(index => | ||
| { | ||
| var at = firstReset.AddMinutes(index * 20); | ||
| return new UsageHistoryEntry(at, 100, at.AddDays(7), 10080); | ||
| }).ToArray(); | ||
| var oldReset = idle[^1].ResetsAt!.Value; | ||
| UsageHistoryEntry[] history = | ||
| [ | ||
| new(firstReset.AddHours(-2), 1, firstReset.AddHours(3), 10080), | ||
| .. idle, | ||
| new(idle[^1].RecordedAt.AddMinutes(10), 95, oldReset, 10080), | ||
| new(currentStart.AddDays(-2), 70, oldReset, 10080), | ||
| new(currentStart.AddDays(-1), 60, oldReset, 10080), | ||
| new(currentStart.AddMinutes(-15), 36, oldReset, 10080), | ||
| new(currentStart, 100, currentStart.AddDays(7), 10080), | ||
| new(Now, 56, currentStart.AddDays(7), 10080), | ||
| ]; | ||
| var tokens = new LocalTokenUsageSnapshot( | ||
| [ | ||
| new(new DateOnly(2026, 9, 26), 850_000_000), | ||
| new(new DateOnly(2026, 9, 27), 350_000_000), | ||
| new(new DateOnly(2026, 10, 1), 250_000_000), | ||
| new(new DateOnly(2026, 10, 2), 600_000_000), | ||
| new(new DateOnly(2026, 10, 3), 200_000_000), | ||
| ], Now, LocalTokenUsageStatus.Complete); | ||
| return Create(history, currentStart.AddDays(7), new(new DateTimeOffset(2026, 10, 5, 0, 0, 0, TimeSpan.Zero), 0, true), tokens); | ||
| } | ||
|
|
||
| private static WeeklyUsageTrendChart Create(UsageHistoryEntry[] history, DateTimeOffset reset, | ||
| UsageTrendForecast? forecast = null, LocalTokenUsageSnapshot? tokens = null) => | ||
| Assert.IsType<WeeklyUsageTrendChart>(WeeklyUsageTrendChartRenderer.Create(history, | ||
| new RateLimitWindow(44, 10080, reset), Now, TimeSpan.FromMinutes(15), forecast, tokens, | ||
| CultureInfo.InvariantCulture, TimeZoneInfo.Utc)); | ||
|
|
||
| private static XDocument Parse(WeeklyUsageTrendChart chart) => | ||
| XDocument.Parse(Uri.UnescapeDataString(chart.ImageUrl["data:image/svg+xml;utf8,".Length..])); | ||
|
|
||
| private static XElement[] ObservedLines(XDocument svg) => svg.Descendants(Svg + "polyline") | ||
| .Where(line => line.Attribute("stroke-dasharray") is null).ToArray(); | ||
|
|
||
| private static XElement[] ResetMarkers(XDocument svg) => svg.Descendants(Svg + "line") | ||
| .Where(line => line.Attribute("data-marker")?.Value == "quota-reset").ToArray(); | ||
|
|
||
| private static double PlotTop(XDocument svg) => double.Parse(svg.Descendants(Svg + "line") | ||
| .Single(line => line.Attribute("data-grid")?.Value == "remaining-percent" && line.Attribute("data-value")?.Value == "100") | ||
| .Attribute("y1")!.Value, CultureInfo.InvariantCulture); | ||
|
|
||
| private static (double Left, double Top, double Width, double Height) LabelBounds(XElement group) | ||
| { | ||
| var translate = group.Descendants(Svg + "path").First().Attribute("transform")!.Value["translate(".Length..^1].Split(' '); | ||
| var rendered = group.Attribute("data-rendered-label")!.Value; | ||
| return (double.Parse(translate[0], CultureInfo.InvariantCulture), double.Parse(translate[1], CultureInfo.InvariantCulture), | ||
| rendered.Sum(character => ChartLabelGlyphs.Values[character].Width), ChartLabelGlyphs.Height); | ||
| } | ||
|
|
||
| private static void AssertNonOverlapping((double Left, double Top, double Width, double Height)[] labels) | ||
| { | ||
| for (var first = 0; first < labels.Length; first++) | ||
| { | ||
| for (var second = first + 1; second < labels.Length; second++) | ||
| { | ||
| var a = labels[first]; | ||
| var b = labels[second]; | ||
| Assert.False(a.Left < b.Left + b.Width && a.Left + a.Width > b.Left | ||
| && a.Top < b.Top + b.Height && a.Top + a.Height > b.Top, | ||
| $"Labels overlap: {a} and {b}."); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a 100% observation is recorded near the start of a real cycle, its fixed reset is also one full window after
RecordedAt; if a genuine early rollover or schedule change later moves the reset forward, these one-sided bounds can still classify the pair as an unused moving estimate.IsCycleChangethen returns false, so the chart connects both cycles without a reset marker and downstream forecasting can treat them as continuous. Constrain this exception to evidence that the deadline is actually moving with closely spaced idle readings rather than allowing any later reset up tocurrent.RecordedAt + duration.AGENTS.md reference: AGENTS.md:L27-L27
Useful? React with 👍 / 👎.