alex/g3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkpoint

Browse Source
This commit is contained in:
Michael Neale
2025-10-29 16:21:44 +11:00
parent 4bf0f71bbd
commit 9218ba2ab4
1 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/g3-core/src/lib.rs
View File

@@ -1444,6 +1444,13 @@ Template:
let available = model_limit let available = model_limit
.saturating_sub(current_usage) .saturating_sub(current_usage)
.saturating_sub(5000); .saturating_sub(5000);
// Ensure we have at least 1 token available, otherwise we can't generate a summary
if available == 0 {
return Err(anyhow::anyhow!(
"Insufficient tokens available for summary generation. Current usage: {} tokens, model limit: {} tokens. Please start a new session.",
current_usage, model_limit
));
}
Some(available.min(10_000)) Some(available.min(10_000))
} }
"embedded" => { "embedded" => {
@@ -1452,10 +1459,24 @@ Template:
let available = model_limit let available = model_limit
.saturating_sub(current_usage) .saturating_sub(current_usage)
.saturating_sub(1000); .saturating_sub(1000);
// Ensure we have at least 1 token available
if available == 0 {
return Err(anyhow::anyhow!(
"Insufficient tokens available for summary generation. Current usage: {} tokens, model limit: {} tokens. Please start a new session.",
current_usage, model_limit
));
}
Some(available.min(3000)) Some(available.min(3000))
} }
_ => { _ => {
let available = self.context_window.remaining_tokens().saturating_sub(2000); let available = self.context_window.remaining_tokens().saturating_sub(2000);
// Ensure we have at least 1 token available
if available == 0 {
return Err(anyhow::anyhow!(
"Insufficient tokens available for summary generation. Current usage: {} tokens. Please start a new session.",
self.context_window.used_tokens
));
}
Some(available.min(5000)) Some(available.min(5000))
} }
}; };
@@ -2347,6 +2368,13 @@ Template:
let available = model_limit let available = model_limit
.saturating_sub(current_usage) .saturating_sub(current_usage)
.saturating_sub(5000); .saturating_sub(5000);
// Ensure we have at least 1 token available, otherwise we can't generate a summary
if available == 0 {
return Err(anyhow::anyhow!(
"Insufficient tokens available for summary generation. Current usage: {} tokens, model limit: {} tokens. Please start a new session.",
current_usage, model_limit
));
}
// Cap at a reasonable summary size (10k tokens max) // Cap at a reasonable summary size (10k tokens max)
Some(available.min(10_000)) Some(available.min(10_000))
} }
@@ -2358,12 +2386,26 @@ Template:
let available = model_limit let available = model_limit
.saturating_sub(current_usage) .saturating_sub(current_usage)
.saturating_sub(1000); .saturating_sub(1000);
// Ensure we have at least 1 token available
if available == 0 {
return Err(anyhow::anyhow!(
"Insufficient tokens available for summary generation. Current usage: {} tokens, model limit: {} tokens. Please start a new session.",
current_usage, model_limit
));
}
// Cap at 3k for embedded models // Cap at 3k for embedded models
Some(available.min(3000)) Some(available.min(3000))
} }
_ => { _ => {
// Default: conservative approach // Default: conservative approach
let available = self.context_window.remaining_tokens().saturating_sub(2000); let available = self.context_window.remaining_tokens().saturating_sub(2000);
// Ensure we have at least 1 token available
if available == 0 {
return Err(anyhow::anyhow!(
"Insufficient tokens available for summary generation. Current usage: {} tokens. Please start a new session.",
self.context_window.used_tokens
));
}
Some(available.min(5000)) Some(available.min(5000))
} }
}; };