@agentbridgeai/llm 0.1.1 → 0.1.2
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/openai.d.ts +3 -0
- package/dist/openai.d.ts.map +1 -1
- package/dist/openai.js +57 -22
- package/dist/openai.js.map +1 -1
- package/package.json +1 -1
package/dist/openai.d.ts
CHANGED
|
@@ -10,9 +10,12 @@ export declare class OpenAIProvider implements LLMProvider {
|
|
|
10
10
|
private client;
|
|
11
11
|
private model;
|
|
12
12
|
private maxTokens;
|
|
13
|
+
private baseURL?;
|
|
13
14
|
constructor(options?: OpenAIProviderOptions);
|
|
14
15
|
chat(messages: Message[], tools: LLMTool[]): Promise<LLMResponse>;
|
|
15
16
|
private convertMessages;
|
|
16
17
|
private parseResponse;
|
|
18
|
+
private enrichProviderError;
|
|
19
|
+
private detectProvider;
|
|
17
20
|
}
|
|
18
21
|
//# sourceMappingURL=openai.d.ts.map
|
package/dist/openai.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAY,MAAM,qBAAqB,CAAC;AAEhG,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,cAAe,YAAW,WAAW;IAChD,IAAI,SAAY;IAChB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAS;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/openai.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAY,MAAM,qBAAqB,CAAC;AAEhG,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,cAAe,YAAW,WAAW;IAChD,IAAI,SAAY;IAChB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAC,CAAS;gBAEb,OAAO,GAAE,qBAA0B;IAUzC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAwDvE,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,cAAc;CAMvB"}
|
package/dist/openai.js
CHANGED
|
@@ -4,6 +4,7 @@ export class OpenAIProvider {
|
|
|
4
4
|
client;
|
|
5
5
|
model;
|
|
6
6
|
maxTokens;
|
|
7
|
+
baseURL;
|
|
7
8
|
constructor(options = {}) {
|
|
8
9
|
this.client = new OpenAI({
|
|
9
10
|
apiKey: options.apiKey,
|
|
@@ -11,6 +12,7 @@ export class OpenAIProvider {
|
|
|
11
12
|
});
|
|
12
13
|
this.model = options.model ?? 'gpt-4o';
|
|
13
14
|
this.maxTokens = options.maxTokens ?? 4096;
|
|
15
|
+
this.baseURL = options.baseURL;
|
|
14
16
|
}
|
|
15
17
|
async chat(messages, tools) {
|
|
16
18
|
const openaiMessages = this.convertMessages(messages);
|
|
@@ -32,29 +34,36 @@ export class OpenAIProvider {
|
|
|
32
34
|
return this.parseResponse(response);
|
|
33
35
|
}
|
|
34
36
|
catch (err) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
37
|
+
const status = typeof err?.status === 'number' ? err.status : undefined;
|
|
38
|
+
const msg = String(err?.message ?? '');
|
|
39
|
+
// Retry strategy for tool-related provider failures:
|
|
40
|
+
// 1) try fewer tools, 2) then try no tools.
|
|
41
|
+
if (openaiTools.length > 0 && (status === 400 || status === 413)) {
|
|
42
|
+
try {
|
|
43
|
+
const reducedTools = openaiTools.slice(0, Math.max(1, Math.floor(openaiTools.length / 2)));
|
|
44
|
+
const reduced = await this.client.chat.completions.create({
|
|
45
|
+
model: this.model,
|
|
46
|
+
max_tokens: this.maxTokens,
|
|
47
|
+
messages: openaiMessages,
|
|
48
|
+
tools: reducedTools,
|
|
49
|
+
});
|
|
50
|
+
return this.parseResponse(reduced);
|
|
51
|
+
}
|
|
52
|
+
catch { }
|
|
53
|
+
// Groq often returns malformed function-call errors on tool mode.
|
|
54
|
+
if (status === 413 || status === 400 || msg.includes('Failed to') || msg.includes('no body')) {
|
|
55
|
+
try {
|
|
56
|
+
const fallback = await this.client.chat.completions.create({
|
|
57
|
+
model: this.model,
|
|
58
|
+
max_tokens: this.maxTokens,
|
|
59
|
+
messages: openaiMessages,
|
|
60
|
+
});
|
|
61
|
+
return this.parseResponse(fallback);
|
|
62
|
+
}
|
|
63
|
+
catch { }
|
|
64
|
+
}
|
|
56
65
|
}
|
|
57
|
-
throw err;
|
|
66
|
+
throw this.enrichProviderError(err);
|
|
58
67
|
}
|
|
59
68
|
}
|
|
60
69
|
convertMessages(messages) {
|
|
@@ -113,5 +122,31 @@ export class OpenAIProvider {
|
|
|
113
122
|
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
114
123
|
};
|
|
115
124
|
}
|
|
125
|
+
enrichProviderError(err) {
|
|
126
|
+
const status = typeof err?.status === 'number' ? err.status : 500;
|
|
127
|
+
const raw = String(err?.message ?? 'Provider request failed');
|
|
128
|
+
const provider = this.detectProvider();
|
|
129
|
+
let detail = raw;
|
|
130
|
+
if (status === 429) {
|
|
131
|
+
detail = `${provider} rate limit/quota exceeded (429). Check API key quota or billing.`;
|
|
132
|
+
}
|
|
133
|
+
else if (status === 401) {
|
|
134
|
+
detail = `${provider} authentication failed (401). Check API key.`;
|
|
135
|
+
}
|
|
136
|
+
else if (status === 400 && raw.includes('no body')) {
|
|
137
|
+
detail = `${provider} rejected the request (400). This is often model/tool compatibility or key restrictions.`;
|
|
138
|
+
}
|
|
139
|
+
const wrapped = new Error(detail);
|
|
140
|
+
wrapped.status = status;
|
|
141
|
+
return wrapped;
|
|
142
|
+
}
|
|
143
|
+
detectProvider() {
|
|
144
|
+
const b = (this.baseURL ?? '').toLowerCase();
|
|
145
|
+
if (b.includes('groq'))
|
|
146
|
+
return 'Groq';
|
|
147
|
+
if (b.includes('generativelanguage.googleapis.com'))
|
|
148
|
+
return 'Gemini';
|
|
149
|
+
return 'LLM provider';
|
|
150
|
+
}
|
|
116
151
|
}
|
|
117
152
|
//# sourceMappingURL=openai.js.map
|
package/dist/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../src/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAU5B,MAAM,OAAO,cAAc;IACzB,IAAI,GAAG,QAAQ,CAAC;IACR,MAAM,CAAS;IACf,KAAK,CAAS;IACd,SAAS,CAAS;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../src/openai.ts"],"names":[],"mappings":"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"}
|