Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions containers/api-proxy/proxy-request.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ function resetEffectiveTokenGuardForTests() {
function buildEffectiveTokenLimitError(etState) {
return {
error: {
type: 'effective_tokens_limit_reached',
message: `Maximum effective tokens reached (${etState.totalEffectiveTokens.toFixed(2)} / ${etState.maxEffectiveTokens}).`,
type: 'effective_tokens_limit_exceeded',
message: `Maximum effective tokens exceeded (${etState.totalEffectiveTokens.toFixed(2)} / ${etState.maxEffectiveTokens}).`,
total_effective_tokens: etState.totalEffectiveTokens,
max_effective_tokens: etState.maxEffectiveTokens,
},
Expand Down Expand Up @@ -483,7 +483,7 @@ function proxyRequest(req, res, targetHost, injectHeaders, provider, basePath =
metrics.gaugeDec('active_requests', { provider });
metrics.increment('requests_total', { provider, method: req.method, status_class: '4xx' });
metrics.observe('request_duration_ms', duration, { provider });
logRequest('warn', 'effective_tokens_limit_reached', {
logRequest('warn', 'effective_tokens_limit_exceeded', {
request_id: requestId,
provider,
total_effective_tokens: etBlock.totalEffectiveTokens,
Expand Down Expand Up @@ -628,7 +628,7 @@ function proxyWebSocket(req, socket, head, targetHost, injectHeaders, provider,

const etBlock = getEffectiveTokenBlockState();
if (etBlock && etBlock.maxExceeded) {
logRequest('warn', 'effective_tokens_limit_reached', {
logRequest('warn', 'effective_tokens_limit_exceeded', {
request_id: requestId,
provider,
total_effective_tokens: etBlock.totalEffectiveTokens,
Expand Down
2 changes: 1 addition & 1 deletion containers/api-proxy/server.proxy.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ describe('proxyRequest effective token guard', () => {
'Content-Type': 'application/json',
}));
const payload = JSON.parse(res2.end.mock.calls[0][0]);
expect(payload.error.type).toBe('effective_tokens_limit_reached');
expect(payload.error.type).toBe('effective_tokens_limit_exceeded');
expect(payload.error.max_effective_tokens).toBe(10);
expect(payload.error.total_effective_tokens).toBeGreaterThanOrEqual(10);
});
Expand Down
Loading