fix: report actual output fields in upstream truncation diagnostics
This commit is contained in:
+17
-4
@@ -210,7 +210,7 @@ export class Provider {
|
||||
...(body?{localEstimate:localModelEstimate(body)}:{}) };
|
||||
const context = { endpoint: base, requestUrl, model: config.model, route, attempt, attemptId: receipt.attemptId };
|
||||
onProgress?.({ phase: 'running', attempt, maxAttempts: policy.attempts, endpoint: base, route, requestUrl, wireAttemptId: receipt.attemptId });
|
||||
let responseDetails = null;
|
||||
let responseDetails = null, wireBody;
|
||||
const identityObserver = body ? modelIdentityObserver(body.model, { ...config, ...options }) : null;
|
||||
const publishIdentity = complete => {
|
||||
if (!identityObserver) return;
|
||||
@@ -234,7 +234,7 @@ export class Provider {
|
||||
dispatched = true;
|
||||
const transport=this.fetcher?null:(this.transport??=new ModelTransport());
|
||||
if(transport)onProgress?.({phase:'running',transport:transport.profile,attempt,maxAttempts:policy.attempts,wireAttemptId:receipt.attemptId});
|
||||
const wireBody = body ? JSON.stringify(body) : undefined;
|
||||
wireBody = body ? JSON.stringify(body) : undefined;
|
||||
const submitted = (this.fetcher??transport.fetch.bind(transport))(requestUrl, { method: body ? 'POST' : 'GET', headers,
|
||||
body: wireBody, signal: requestSignal, redirect: 'manual' });
|
||||
if (wireBody && options.onSubmitted) {
|
||||
@@ -290,7 +290,10 @@ export class Provider {
|
||||
if (result.error || config.protocol === 'responses' && ['failed', 'incomplete', 'cancelled'].includes(result.status)) {
|
||||
const upstream = captureResponse(response, { raw: Buffer.from(text, 'utf8') });
|
||||
const failure = httpFailure(response.status, (upstream.message ?? upstream.reason ?? upstream.rawPreview).slice(0, 600), { ...context, upstream });
|
||||
if (result.status === 'incomplete') { failure.diagnostic.kind = 'incomplete'; failure.diagnostic.title = '上游模型响应未完整结束'; }
|
||||
if (result.status === 'incomplete') {
|
||||
failure.diagnostic.kind = 'incomplete'; failure.diagnostic.title = '上游模型响应未完整结束';
|
||||
if (config.protocol === 'responses' && result.incomplete_details?.reason === 'max_output_tokens') failure.diagnostic.reason = 'output_truncated';
|
||||
}
|
||||
throw failure;
|
||||
}
|
||||
identityObserver?.observe(JSON.parse(this.redact(JSON.stringify(result), key))); publishIdentity(true);
|
||||
@@ -314,7 +317,17 @@ export class Provider {
|
||||
signal?.throwIfAborted();
|
||||
let diagnostic = connectionFailure(error, { ...context, method:body?'POST':'GET',responseReceived:receipt.httpStatus!==undefined,
|
||||
transport:this.transport?.profile,timedOut: !!timeout.timeout, timeout: timeout.timeout, redact: value => this.redact(value, key) });
|
||||
if (config.capacityMode === 'passthrough' && diagnostic.reason === 'output_truncated') diagnostic = { ...diagnostic, origin: 'upstream', title: '上游响应因输出额度结束', message: '上游返回结束原因 ' + (diagnostic.upstream?.reason ?? (config.protocol === 'anthropic-messages' ? 'max_tokens' : 'length')) + '。工作台未附加输出额度,原响应及用量已保存;不完整的工具批次未执行。' };
|
||||
if (config.capacityMode === 'passthrough' && diagnostic.reason === 'output_truncated') {
|
||||
// Describe the serialized request actually sent, including native user
|
||||
// settings and Messages' mandatory field, rather than a local default.
|
||||
const sent = wireBody ? JSON.parse(wireBody) : {};
|
||||
const fields = ['max_tokens', 'max_completion_tokens', 'max_output_tokens'].filter(field => Object.hasOwn(sent, field));
|
||||
const output = fields.length ? '实际请求携带 ' + fields.map(field => field + '=' + (Number.isFinite(sent[field]) ? sent[field] : '非数值(见原请求)')).join('、')
|
||||
+ (config.protocol === 'anthropic-messages' ? '(Messages 协议要求 max_tokens)' : '') : '实际请求未携带输出 token 上限';
|
||||
const reason = diagnostic.upstream?.reason ?? responseDetails?.reason ?? (config.protocol === 'anthropic-messages' ? 'max_tokens' : config.protocol === 'responses' ? 'max_output_tokens' : 'length');
|
||||
diagnostic = { ...diagnostic, origin: 'upstream', title: '上游响应因输出额度结束',
|
||||
message: '上游返回结束原因 ' + reason + '。' + output + '。原响应及用量已保存;不完整的工具批次未执行。' };
|
||||
}
|
||||
diagnostic = { ...diagnostic, requestUrl, ...(receipt.responseUrl ? { responseUrl: receipt.responseUrl } : {}),
|
||||
...(receipt.redirectMode ? { redirected: receipt.redirected, redirectMode: receipt.redirectMode } : {}),
|
||||
origin: diagnostic.origin ?? 'local', wireAttemptId: receipt.attemptId, upstreamRequestId: diagnostic.upstreamRequestId ?? receipt.upstreamRequestId,
|
||||
|
||||
Reference in New Issue
Block a user