Skip to content

[Repo Assist] refactor: extract ModelFormatting helper; deduplicate FormatTokenCount/FormatCount #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
github-actions wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −14
Draft

[Repo Assist] refactor: extract ModelFormatting helper; deduplicate FormatTokenCount/FormatCount #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/OpenClaw.Shared/Models.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public string ContextSummaryShort
get
{
if (TotalTokens <= 0 || ContextTokens <= 0) return "";
return $"{FormatTokenCount(TotalTokens)}/{FormatTokenCount(ContextTokens)}";
return $"{ModelFormatting.FormatLargeNumber(TotalTokens)}/{ModelFormatting.FormatLargeNumber(ContextTokens)}";
}
}

Expand Down Expand Up @@ -270,12 +270,6 @@ public string ShortKey
}
}

private static string FormatTokenCount(long n)
{
if (n >= 1_000_000) return $"{n / 1_000_000.0:F1}M";
if (n >= 1_000) return $"{n / 1_000.0:F1}K";
return n.ToString();
}
}

public class GatewayUsageInfo
Expand All @@ -294,7 +288,7 @@ public string DisplayText
{
var parts = new List<string>();
if (TotalTokens > 0)
parts.Add($"Tokens: {FormatCount(TotalTokens)}");
parts.Add($"Tokens: {ModelFormatting.FormatLargeNumber(TotalTokens)}");
if (CostUsd > 0)
parts.Add($"${CostUsd:F2}");
if (RequestCount > 0)
Expand All @@ -309,12 +303,6 @@ public string DisplayText
}
}

private static string FormatCount(long n)
{
if (n >= 1_000_000) return $"{n / 1_000_000.0:F1}M";
if (n >= 1_000) return $"{n / 1_000.0:F1}K";
return n.ToString();
}
}

public class GatewayUsageWindowInfo
Expand Down Expand Up @@ -454,3 +442,17 @@ private static string FormatAge(DateTime timestampUtc)
}
}

/// <summary>Shared display-formatting helpers used by model classes.</summary>
internal static class ModelFormatting
{
/// <summary>
/// Formats a large integer with K/M suffix for compact display (e.g. 1500 → "1.5K", 2_000_000 → "2.0M").
/// </summary>
internal static string FormatLargeNumber(long n)
{
if (n >= 1_000_000) return $"{n / 1_000_000.0:F1}M";
if (n >= 1_000) return $"{n / 1_000.0:F1}K";
return n.ToString();
}
}