refactor: collapse 8 provider functions into one adapter table
src/lib/providers.ts holds a per-provider spec (url, headers, body, extractor, default model) and a single callProvider() covering both the action-prompt and custom-prompt families (~250 lines -> one path). getSystemPrompt, fetchWithTimeout, and listModels move along with it; background.ts drops from 553 to 130 lines. Behavior pinned by 20 parity tests written from the old functions (request shapes, headers, defaults, error strings). One deliberate change: max_tokens now scales with input length (1024-8192) instead of a hard-coded 1024, so Expand no longer truncates long selections. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
john kevin asprec
237
src/lib/providers.ts
Normal file
237
src/lib/providers.ts
Normal file
@@ -0,0 +1,237 @@
|
||||
// Provider adapter table + the single LLM call path. Replaces the eight
|
||||
// hand-rolled per-provider functions (callX / callXWithPrompt families) that
|
||||
// previously lived in the background worker. Behavior-preserving: URLs,
|
||||
// headers, request bodies, default models, and error strings match the old
|
||||
// implementations — pinned by tests/unit/providers.test.ts.
|
||||
|
||||
import type { LexAIConfig, LexAIResponse } from './types';
|
||||
|
||||
export async function fetchWithTimeout(
|
||||
url: string,
|
||||
options: RequestInit,
|
||||
timeoutMs = 30000,
|
||||
): Promise<Response> {
|
||||
const controller = new AbortController();
|
||||
const id = setTimeout(() => controller.abort(), timeoutMs);
|
||||
try {
|
||||
return await fetch(url, { ...options, signal: controller.signal });
|
||||
} finally {
|
||||
clearTimeout(id);
|
||||
}
|
||||
}
|
||||
|
||||
// ─── System prompts ───────────────────────────────────────────────────────────
|
||||
|
||||
export function getSystemPrompt(action: string, style?: string): string {
|
||||
// Normalize 'fix' (used by context menu and popup) to 'grammar'
|
||||
const normalizedAction = action === 'fix' ? 'grammar' : action;
|
||||
const prompts: Record<string, string> = {
|
||||
grammar:
|
||||
'You are a professional grammar editor. Fix all grammar, spelling, and punctuation errors in the provided text. ' +
|
||||
'Preserve the original meaning and tone as closely as possible. ' +
|
||||
'Return ONLY the corrected text — no explanations, no preamble.',
|
||||
rephrase:
|
||||
'You are a skilled writing assistant. Rephrase the provided text to make it clearer, more engaging, and more professional. ' +
|
||||
'Keep the same meaning and approximate length. ' +
|
||||
'Return ONLY the rephrased text — no explanations.',
|
||||
shorten:
|
||||
'You are a concise editor. Shorten the provided text by at least 30% while preserving the core message. ' +
|
||||
'Remove filler words, redundant phrases, and unnecessary detail. ' +
|
||||
'Return ONLY the shortened text.',
|
||||
expand:
|
||||
'You are an experienced writer. Expand the provided text with more detail, context, and supporting points. ' +
|
||||
'Make it richer and more informative while staying on topic. ' +
|
||||
'Return ONLY the expanded text.',
|
||||
explain:
|
||||
'You are a helpful teacher. Explain the following text in simple, easy-to-understand language. ' +
|
||||
'Break down complex terms, jargon, or concepts so anyone can understand. ' +
|
||||
'Be concise but clear. Return only the explanation, no extra commentary.',
|
||||
};
|
||||
const base = prompts[normalizedAction] ?? prompts.grammar;
|
||||
const styleModifier = style && style !== 'Default'
|
||||
? ` Write in a ${style.toLowerCase()} style.`
|
||||
: '';
|
||||
return base + styleModifier;
|
||||
}
|
||||
|
||||
// ─── Adapter table ────────────────────────────────────────────────────────────
|
||||
|
||||
export interface ProviderSpec {
|
||||
label: string; // human name used in error messages ('OpenAI error: …')
|
||||
chatUrl: string;
|
||||
modelsUrl: string;
|
||||
defaultModel: string;
|
||||
headers: (apiKey: string) => Record<string, string>;
|
||||
body: (model: string, systemPrompt: string, text: string, maxTokens: number) => Record<string, unknown>;
|
||||
extract: (data: any) => string | undefined;
|
||||
}
|
||||
|
||||
function bearerHeaders(apiKey: string): Record<string, string> {
|
||||
return { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` };
|
||||
}
|
||||
|
||||
// OpenAI-compatible chat body (OpenAI, Groq, OpenRouter). OpenRouter's old
|
||||
// implementation sent no temperature — preserve that.
|
||||
function openAiStyleBody(temperature?: number) {
|
||||
return (model: string, systemPrompt: string, text: string, maxTokens: number) => ({
|
||||
model,
|
||||
messages: [
|
||||
{ role: 'system', content: systemPrompt },
|
||||
{ role: 'user', content: text },
|
||||
],
|
||||
max_tokens: maxTokens,
|
||||
...(temperature !== undefined ? { temperature } : {}),
|
||||
});
|
||||
}
|
||||
|
||||
const extractOpenAiStyle = (data: any): string | undefined => data?.choices?.[0]?.message?.content;
|
||||
|
||||
export const PROVIDER_SPECS: Record<string, ProviderSpec> = {
|
||||
openai: {
|
||||
label: 'OpenAI',
|
||||
chatUrl: 'https://api.openai.com/v1/chat/completions',
|
||||
modelsUrl: 'https://api.openai.com/v1/models',
|
||||
defaultModel: 'gpt-4o-mini',
|
||||
headers: bearerHeaders,
|
||||
body: openAiStyleBody(0.7),
|
||||
extract: extractOpenAiStyle,
|
||||
},
|
||||
anthropic: {
|
||||
label: 'Anthropic',
|
||||
chatUrl: 'https://api.anthropic.com/v1/messages',
|
||||
modelsUrl: 'https://api.anthropic.com/v1/models',
|
||||
defaultModel: 'claude-3-5-haiku-20241022',
|
||||
headers: (apiKey) => ({
|
||||
'Content-Type': 'application/json',
|
||||
'x-api-key': apiKey,
|
||||
'anthropic-version': '2023-06-01',
|
||||
}),
|
||||
body: (model, systemPrompt, text, maxTokens) => ({
|
||||
model,
|
||||
max_tokens: maxTokens,
|
||||
system: systemPrompt,
|
||||
messages: [{ role: 'user', content: text }],
|
||||
}),
|
||||
extract: (data) => data?.content?.[0]?.text,
|
||||
},
|
||||
groq: {
|
||||
label: 'Groq',
|
||||
chatUrl: 'https://api.groq.com/openai/v1/chat/completions',
|
||||
modelsUrl: 'https://api.groq.com/openai/v1/models',
|
||||
defaultModel: 'llama-3.3-70b-versatile',
|
||||
headers: bearerHeaders,
|
||||
body: openAiStyleBody(0.7),
|
||||
extract: extractOpenAiStyle,
|
||||
},
|
||||
openrouter: {
|
||||
label: 'OpenRouter',
|
||||
chatUrl: 'https://openrouter.ai/api/v1/chat/completions',
|
||||
modelsUrl: 'https://openrouter.ai/api/v1/models',
|
||||
defaultModel: 'openai/gpt-4o-mini',
|
||||
headers: (apiKey) => ({
|
||||
...bearerHeaders(apiKey),
|
||||
'HTTP-Referer': 'https://lexai.dev',
|
||||
'X-Title': 'LexAI',
|
||||
}),
|
||||
body: openAiStyleBody(undefined),
|
||||
extract: extractOpenAiStyle,
|
||||
},
|
||||
};
|
||||
|
||||
// ─── Chat call ────────────────────────────────────────────────────────────────
|
||||
|
||||
// Scale the output budget with the input instead of the old hard-coded 1024
|
||||
// (which truncated "Expand" on long selections). chars ≈ tokens × 4, so this
|
||||
// allows roughly 4× the input length in output, clamped to a sane range.
|
||||
export function defaultMaxTokens(text: string): number {
|
||||
return Math.max(1024, Math.min(8192, Math.ceil(text.length)));
|
||||
}
|
||||
|
||||
export interface CallOptions {
|
||||
maxTokens?: number;
|
||||
}
|
||||
|
||||
export async function callProvider(
|
||||
config: LexAIConfig,
|
||||
text: string,
|
||||
systemPrompt: string,
|
||||
opts?: CallOptions,
|
||||
): Promise<LexAIResponse> {
|
||||
const provider = config.provider || 'openai';
|
||||
const spec = PROVIDER_SPECS[provider];
|
||||
if (!spec) {
|
||||
return { error: `Unknown provider: "${provider}". Please check LexAI settings.` };
|
||||
}
|
||||
|
||||
const model = config.model || spec.defaultModel;
|
||||
const maxTokens = opts?.maxTokens ?? defaultMaxTokens(text);
|
||||
|
||||
let res: Response;
|
||||
try {
|
||||
res = await fetchWithTimeout(spec.chatUrl, {
|
||||
method: 'POST',
|
||||
headers: spec.headers(config.apiKey ?? ''),
|
||||
body: JSON.stringify(spec.body(model, systemPrompt, text, maxTokens)),
|
||||
});
|
||||
} catch (err) {
|
||||
return { error: `Network error reaching ${spec.label}: ${String(err)}` };
|
||||
}
|
||||
|
||||
const data = await res.json();
|
||||
if (!res.ok) {
|
||||
const msg = data?.error?.message ?? `HTTP ${res.status}`;
|
||||
return { error: `${spec.label} error: ${msg}` };
|
||||
}
|
||||
|
||||
const result = spec.extract(data);
|
||||
if (!result) return { error: `${spec.label} returned an empty response.` };
|
||||
return { result: result.trim() };
|
||||
}
|
||||
|
||||
// ─── Live model listing ───────────────────────────────────────────────────────
|
||||
|
||||
// Drop non-chat models (embeddings, audio, image, etc.) so the picker stays useful.
|
||||
const NON_CHAT_MODEL_RE = /embedding|whisper|tts|dall-e|audio|realtime|moderation|image|guard|transcribe|speech|rerank/i;
|
||||
|
||||
export async function listModels(
|
||||
provider: string,
|
||||
apiKey?: string,
|
||||
): Promise<{ models?: string[]; error?: string }> {
|
||||
const spec = PROVIDER_SPECS[provider];
|
||||
if (!spec) return { error: `Unknown provider: "${provider}". Please check LexAI settings.` };
|
||||
|
||||
const headers: Record<string, string> = { 'Content-Type': 'application/json' };
|
||||
if (provider === 'anthropic') {
|
||||
if (!apiKey) return { error: 'Anthropic requires an API key to list models.' };
|
||||
headers['x-api-key'] = apiKey;
|
||||
headers['anthropic-version'] = '2023-06-01';
|
||||
// Allow the extension origin to call Anthropic directly (avoids a CORS 403).
|
||||
headers['anthropic-dangerous-direct-browser-access'] = 'true';
|
||||
} else if (apiKey) {
|
||||
// OpenRouter's list is public, so the key is optional there; OpenAI/Groq require it.
|
||||
headers['Authorization'] = `Bearer ${apiKey}`;
|
||||
}
|
||||
|
||||
let res: Response;
|
||||
try {
|
||||
res = await fetchWithTimeout(spec.modelsUrl, { method: 'GET', headers }, 15000);
|
||||
} catch (err) {
|
||||
return { error: `Network error reaching ${provider}: ${String(err)}` };
|
||||
}
|
||||
|
||||
const data = await res.json().catch(() => null);
|
||||
if (!res.ok) {
|
||||
const msg = data?.error?.message ?? data?.error ?? `HTTP ${res.status}`;
|
||||
return { error: `${provider} error: ${msg}` };
|
||||
}
|
||||
|
||||
const raw = Array.isArray(data?.data) ? data.data : [];
|
||||
const ids = raw
|
||||
.map((m: any) => (typeof m === 'string' ? m : m?.id))
|
||||
.filter((id: unknown): id is string => typeof id === 'string' && id.length > 0)
|
||||
.filter((id: string) => !NON_CHAT_MODEL_RE.test(id))
|
||||
.sort((a: string, b: string) => a.localeCompare(b));
|
||||
|
||||
if (ids.length === 0) return { error: `No models returned by ${provider}.` };
|
||||
return { models: ids };
|
||||
}
|
||||
Reference in New Issue
Block a user