openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-13 11:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Differentiate spend-limit vs credit-limit copy

Browse Source
This commit is contained in:
dhruvgupta-oai
2026-03-23 10:24:15 -04:00
parent 4048ccb261
commit 2d587c17f1
2 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
codex-rs/core/src/error.rs
View File

@@ -463,8 +463,17 @@ impl std::fmt::Display for UsageLimitReachedError {
Some(PlanType::Unknown(plan))
if plan.eq_ignore_ascii_case("self_serve_business_usage_based") =>
{
"You've hit your usage limit. Contact your admin to add credits to continue."
.to_string()
match self
.rate_limits
.as_ref()
.and_then(|snapshot| snapshot.credits.as_ref())
.map(|credits| credits.has_credits)
{
Some(true) => "You've hit your usage limit. Contact your admin to increase spend limits to continue."
.to_string(),
Some(false) | None => "You've hit your usage limit. Contact your admin to add credits to continue."
.to_string(),
}
}
Some(PlanType::Unknown(_)) | None => format!(
"You've hit your usage limit.{}",

39
codex-rs/core/src/error_tests.rs
View File

@@ -4,6 +4,7 @@ use chrono::DateTime;
use chrono::Duration as ChronoDuration;
use chrono::TimeZone;
use chrono::Utc;
use codex_protocol::protocol::CreditsSnapshot;
use codex_protocol::protocol::RateLimitWindow;
use pretty_assertions::assert_eq;
use reqwest::Response;
@@ -244,7 +245,7 @@ fn usage_limit_reached_error_formats_business_plan_without_reset() {
}
#[test]
fn usage_limit_reached_error_formats_self_serve_business_usage_plan() {
fn usage_limit_reached_error_formats_self_serve_business_usage_plan_with_spend_limits() {
let base = Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap();
let resets_at = base + ChronoDuration::hours(1);
with_now_override(base, move || {
@@ -253,7 +254,41 @@ fn usage_limit_reached_error_formats_self_serve_business_usage_plan() {
"self_serve_business_usage_based".to_string(),
)),
resets_at: Some(resets_at),
rate_limits: Some(Box::new(rate_limit_snapshot())),
rate_limits: Some(Box::new(RateLimitSnapshot {
credits: Some(CreditsSnapshot {
has_credits: true,
unlimited: false,
balance: Some("38".to_string()),
}),
..rate_limit_snapshot()
})),
promo_message: None,
};
assert_eq!(
err.to_string(),
"You've hit your usage limit. Contact your admin to increase spend limits to continue."
);
});
}
#[test]
fn usage_limit_reached_error_formats_self_serve_business_usage_plan_without_credits() {
let base = Utc.with_ymd_and_hms(2024, 1, 1, 0, 0, 0).unwrap();
let resets_at = base + ChronoDuration::hours(1);
with_now_override(base, move || {
let err = UsageLimitReachedError {
plan_type: Some(PlanType::Unknown(
"self_serve_business_usage_based".to_string(),
)),
resets_at: Some(resets_at),
rate_limits: Some(Box::new(RateLimitSnapshot {
credits: Some(CreditsSnapshot {
has_credits: false,
unlimited: false,
balance: Some("0".to_string()),
}),
..rate_limit_snapshot()
})),
promo_message: None,
};
assert_eq!(