@steve31415/baselib 3.8.1 → 3.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/llm/complete.js
CHANGED
|
@@ -126,7 +126,13 @@ export async function llmComplete(request) {
|
|
|
126
126
|
request.logger?.warn('llm.failover_attempt', {
|
|
127
127
|
failedModel: modelName,
|
|
128
128
|
failedProvider: modelEntry.provider,
|
|
129
|
-
|
|
129
|
+
// Provider/network/parse errors can echo prompts, credentials or private
|
|
130
|
+
// response bodies. Keep their text in the returned API only, never logs.
|
|
131
|
+
errorClass: err instanceof LLMError ? 'LLMError' : err instanceof Error ? 'Error' : 'NonError',
|
|
132
|
+
...(err instanceof LLMError && typeof err.statusCode === 'number' && Number.isFinite(err.statusCode)
|
|
133
|
+
? { statusCode: err.statusCode } : {}),
|
|
134
|
+
isRetryable: err instanceof LLMError && err.isRetryable === true,
|
|
135
|
+
declined: err instanceof LLMError && err.declined === true,
|
|
130
136
|
attemptNumber: failedAttempts.length,
|
|
131
137
|
nextModel: modelsToTry[failedAttempts.length] ?? 'none',
|
|
132
138
|
});
|
|
@@ -54,6 +54,7 @@ export const anthropicProvider = {
|
|
|
54
54
|
const controller = new AbortController();
|
|
55
55
|
const timer = setTimeout(() => controller.abort(), request.timeoutMs);
|
|
56
56
|
let response;
|
|
57
|
+
let responseText;
|
|
57
58
|
try {
|
|
58
59
|
response = await fetch(endpoint, {
|
|
59
60
|
method: 'POST',
|
|
@@ -65,6 +66,9 @@ export const anthropicProvider = {
|
|
|
65
66
|
body: JSON.stringify(body),
|
|
66
67
|
signal: controller.signal,
|
|
67
68
|
});
|
|
69
|
+
// fetch resolves at headers; keep the attempt deadline active until the
|
|
70
|
+
// body finishes, including error responses, so failover cannot hang.
|
|
71
|
+
responseText = await response.text();
|
|
68
72
|
}
|
|
69
73
|
catch (err) {
|
|
70
74
|
const message = err instanceof Error && err.name === 'AbortError'
|
|
@@ -81,7 +85,7 @@ export const anthropicProvider = {
|
|
|
81
85
|
clearTimeout(timer);
|
|
82
86
|
}
|
|
83
87
|
if (!response.ok) {
|
|
84
|
-
const errorText =
|
|
88
|
+
const errorText = responseText;
|
|
85
89
|
throw new LLMError({
|
|
86
90
|
message: `Anthropic API error: ${response.status} - ${errorText.slice(0, 500)}`,
|
|
87
91
|
provider: 'anthropic',
|
|
@@ -90,7 +94,7 @@ export const anthropicProvider = {
|
|
|
90
94
|
isRetryable: response.status >= 500 || response.status === 429,
|
|
91
95
|
});
|
|
92
96
|
}
|
|
93
|
-
const data =
|
|
97
|
+
const data = JSON.parse(responseText);
|
|
94
98
|
const latencyMs = Date.now() - startTime;
|
|
95
99
|
const outputTokens = data.usage?.output_tokens ?? undefined;
|
|
96
100
|
const tokensUsed = (data.usage?.input_tokens || 0) + (data.usage?.output_tokens || 0);
|
|
@@ -73,6 +73,7 @@ export const geminiProvider = {
|
|
|
73
73
|
const controller = new AbortController();
|
|
74
74
|
const timer = setTimeout(() => controller.abort(), request.timeoutMs);
|
|
75
75
|
let response;
|
|
76
|
+
let responseText;
|
|
76
77
|
try {
|
|
77
78
|
response = await fetch(`${endpoint}?key=${request.apiKey}`, {
|
|
78
79
|
method: 'POST',
|
|
@@ -80,6 +81,9 @@ export const geminiProvider = {
|
|
|
80
81
|
body: JSON.stringify(body),
|
|
81
82
|
signal: controller.signal,
|
|
82
83
|
});
|
|
84
|
+
// fetch resolves at headers; keep the attempt deadline active until the
|
|
85
|
+
// body finishes, including error responses, so failover cannot hang.
|
|
86
|
+
responseText = await response.text();
|
|
83
87
|
}
|
|
84
88
|
catch (err) {
|
|
85
89
|
const message = err instanceof Error && err.name === 'AbortError'
|
|
@@ -96,7 +100,7 @@ export const geminiProvider = {
|
|
|
96
100
|
clearTimeout(timer);
|
|
97
101
|
}
|
|
98
102
|
if (!response.ok) {
|
|
99
|
-
const errorText =
|
|
103
|
+
const errorText = responseText;
|
|
100
104
|
throw new LLMError({
|
|
101
105
|
message: `Gemini API error: ${response.status} - ${errorText.slice(0, 500)}`,
|
|
102
106
|
provider: 'gemini',
|
|
@@ -105,7 +109,7 @@ export const geminiProvider = {
|
|
|
105
109
|
isRetryable: response.status >= 500 || response.status === 429,
|
|
106
110
|
});
|
|
107
111
|
}
|
|
108
|
-
const data =
|
|
112
|
+
const data = JSON.parse(responseText);
|
|
109
113
|
const latencyMs = Date.now() - startTime;
|
|
110
114
|
const text = data.candidates?.[0]?.content?.parts?.[0]?.text || '';
|
|
111
115
|
const tokensUsed = data.usageMetadata?.totalTokenCount || 0;
|
|
@@ -125,6 +125,7 @@ export const openaiProvider = {
|
|
|
125
125
|
const controller = new AbortController();
|
|
126
126
|
const timer = setTimeout(() => controller.abort(), request.timeoutMs);
|
|
127
127
|
let response;
|
|
128
|
+
let responseText;
|
|
128
129
|
try {
|
|
129
130
|
response = await fetch(endpoint, {
|
|
130
131
|
method: 'POST',
|
|
@@ -135,6 +136,9 @@ export const openaiProvider = {
|
|
|
135
136
|
body: JSON.stringify(body),
|
|
136
137
|
signal: controller.signal,
|
|
137
138
|
});
|
|
139
|
+
// fetch resolves at headers; keep the attempt deadline active until the
|
|
140
|
+
// body finishes, including error responses, so failover cannot hang.
|
|
141
|
+
responseText = await response.text();
|
|
138
142
|
}
|
|
139
143
|
catch (err) {
|
|
140
144
|
const message = err instanceof Error && err.name === 'AbortError'
|
|
@@ -151,7 +155,7 @@ export const openaiProvider = {
|
|
|
151
155
|
clearTimeout(timer);
|
|
152
156
|
}
|
|
153
157
|
if (!response.ok) {
|
|
154
|
-
const errorText =
|
|
158
|
+
const errorText = responseText;
|
|
155
159
|
throw new LLMError({
|
|
156
160
|
message: `OpenAI API error: ${response.status} - ${errorText.slice(0, 500)}`,
|
|
157
161
|
provider: 'openai',
|
|
@@ -160,7 +164,7 @@ export const openaiProvider = {
|
|
|
160
164
|
isRetryable: response.status >= 500 || response.status === 429,
|
|
161
165
|
});
|
|
162
166
|
}
|
|
163
|
-
const data =
|
|
167
|
+
const data = JSON.parse(responseText);
|
|
164
168
|
const latencyMs = Date.now() - startTime;
|
|
165
169
|
const text = data.choices?.[0]?.message?.content || '';
|
|
166
170
|
const outputTokens = data.usage?.completion_tokens ?? undefined;
|
package/dist/llm/types.d.ts
CHANGED
|
@@ -32,7 +32,7 @@ export interface LLMRequest {
|
|
|
32
32
|
apiKeys: ApiKeys;
|
|
33
33
|
/** Logger instance for structured logging. */
|
|
34
34
|
logger?: Logger;
|
|
35
|
-
/** Timeout per provider attempt in ms. Default: 60000. */
|
|
35
|
+
/** Timeout per provider attempt, including response body download, in ms. Default: 60000. */
|
|
36
36
|
timeoutMs?: number;
|
|
37
37
|
/**
|
|
38
38
|
* Cap on reasoning/thinking tokens for models that support hidden reasoning
|
|
@@ -116,18 +116,19 @@ export interface LLMResponse {
|
|
|
116
116
|
latencyMs: number;
|
|
117
117
|
/** True if the primary model failed and a fallback was used. */
|
|
118
118
|
failedOver: boolean;
|
|
119
|
-
/** Details of each failed attempt before
|
|
119
|
+
/** Details of each failed attempt before success; error text can contain private input. Do not log verbatim. */
|
|
120
120
|
failedAttempts: FailedAttempt[];
|
|
121
121
|
}
|
|
122
122
|
/** Details of a failed provider attempt. */
|
|
123
123
|
export interface FailedAttempt {
|
|
124
124
|
provider: ProviderName;
|
|
125
125
|
model: string;
|
|
126
|
+
/** Provider detail may echo private input or credentials. Do not log verbatim. */
|
|
126
127
|
error: string;
|
|
127
128
|
/** True when this attempt failed because the model declined (vs. an infra error). */
|
|
128
129
|
declined?: boolean;
|
|
129
130
|
}
|
|
130
|
-
/** Error thrown when an LLM provider call fails. */
|
|
131
|
+
/** Error thrown when an LLM provider call fails. Its message may contain private input; do not log verbatim. */
|
|
131
132
|
export declare class LLMError extends Error {
|
|
132
133
|
provider: ProviderName;
|
|
133
134
|
model: string;
|
package/dist/llm/types.js
CHANGED
package/package.json
CHANGED