@fgv/ts-extras 5.1.0-20 → 5.1.0-22

package/dist/packlets/ai-assist/apiClient.js

@@ -33,6 +33,7 @@ import { isJsonObject } from '@fgv/ts-json-base';
 import { fail, mapResults, succeed, Validators } from '@fgv/ts-utils';
 import { resolveModel } from './model';
 import { buildAnthropicMessages, buildGeminiContents, buildMessages, buildOpenAiChatUserContent, buildOpenAiResponsesUserContent } from './chatRequestBuilders';
+import { bearerAuthHeader, resolveEffectiveBaseUrl } from './endpoint';
 import { DEFAULT_MODEL_CAPABILITY_CONFIG, resolveImageCapability, supportsImageGeneration } from './registry';
 import { toAnthropicTools, toGeminiTools, toResponsesApiTools } from './toolFormats';
 // ============================================================================
@@ -279,9 +280,7 @@ async function callOpenAiCompletion(config, prompt, additionalMessages, temperat
         tail: additionalMessages
     });
     const body = { model: config.model, messages, temperature };
-    const headers = {
-        Authorization: `Bearer ${config.apiKey}`
-    };
+    const headers = bearerAuthHeader(config.apiKey);
     /* c8 ignore next 1 - optional logger */
     logger === null || logger === void 0 ? void 0 : logger.info(`OpenAI completion: model=${config.model}`);
     const jsonResult = await fetchJson(url, headers, body, logger, signal);
@@ -334,9 +333,7 @@ async function callOpenAiResponsesCompletion(config, prompt, tools, additionalMe
         tools: toResponsesApiTools(tools),
         temperature
     };
-    const headers = {
-        Authorization: `Bearer ${config.apiKey}`
-    };
+    const headers = bearerAuthHeader(config.apiKey);
     /* c8 ignore next 1 - optional logger */
     logger === null || logger === void 0 ? void 0 : logger.info(`OpenAI Responses API: model=${config.model}, tools=${tools.map((t) => t.type).join(',')}`);
     const jsonResult = await fetchJson(url, headers, body, logger, signal);
@@ -501,19 +498,24 @@ async function callGeminiCompletion(config, prompt, additionalMessages, temperat
  * @public
  */
 export async function callProviderCompletion(params) {
-    const { descriptor, apiKey, prompt, additionalMessages, temperature = 0.7, modelOverride, logger, tools, signal } = params;
-    if (!descriptor.baseUrl) {
-        return fail(`provider "${descriptor.id}" has no API endpoint configured`);
+    const { descriptor, apiKey, prompt, additionalMessages, temperature = 0.7, modelOverride, logger, tools, signal, endpoint } = params;
+    const baseUrlResult = resolveEffectiveBaseUrl(descriptor, endpoint);
+    if (baseUrlResult.isFailure()) {
+        return fail(baseUrlResult.message);
     }
     if (prompt.attachments.length > 0 && !descriptor.acceptsImageInput) {
         return fail(`provider "${descriptor.id}" does not accept image input`);
     }
     const hasTools = tools !== undefined && tools.length > 0;
     const modelContext = hasTools ? 'tools' : undefined;
+    const model = resolveModel(modelOverride !== null && modelOverride !== void 0 ? modelOverride : descriptor.defaultModel, modelContext);
+    if (model.length === 0) {
+        return fail(`provider "${descriptor.id}": no model resolved; pass modelOverride or set descriptor.defaultModel`);
+    }
     const config = {
-        baseUrl: descriptor.baseUrl,
+        baseUrl: baseUrlResult.value,
         apiKey,
-        model: resolveModel(modelOverride !== null && modelOverride !== void 0 ? modelOverride : descriptor.defaultModel, modelContext)
+        model
     };
     /* c8 ignore next 8 - optional logger diagnostic output */
     if (logger) {
@@ -607,9 +609,7 @@ async function callOpenAiImageGeneration(config, request, defaultMimeType, logge
     var _a, _b, _c;
     const opts = (_a = request.options) !== null && _a !== void 0 ? _a : {};
     const refs = (_b = request.referenceImages) !== null && _b !== void 0 ? _b : [];
-    const headers = {
-        Authorization: `Bearer ${config.apiKey}`
-    };
+    const headers = bearerAuthHeader(config.apiKey);
     const n = (_c = opts.count) !== null && _c !== void 0 ? _c : 1;
     const fetched = refs.length > 0
         ? await callOpenAiImagesEdits(config, request, headers, n, refs, logger, signal)
@@ -795,14 +795,20 @@ async function callImagenGeneration(config, request, logger, signal) {
  */
 export async function callProviderImageGeneration(params) {
     var _a, _b;
-    const { descriptor, apiKey, params: request, modelOverride, logger, signal } = params;
+    const { descriptor, apiKey, params: request, modelOverride, logger, signal, endpoint } = params;
     if (!supportsImageGeneration(descriptor)) {
         return fail(`provider "${descriptor.id}" does not support image generation`);
     }
-    if (!descriptor.baseUrl) {
-        return fail(`provider "${descriptor.id}" has no API endpoint configured`);
+    const baseUrlResult = resolveEffectiveBaseUrl(descriptor, endpoint);
+    if (baseUrlResult.isFailure()) {
+        return fail(baseUrlResult.message);
     }
     const model = resolveModel(modelOverride !== null && modelOverride !== void 0 ? modelOverride : descriptor.defaultModel, 'image');
+    if (model.length === 0) {
+        return fail(`provider "${descriptor.id}": no image model resolved; ` +
+            `pass modelOverride or set descriptor.defaultModel ` +
+            `(a plain string, or an object with an "image" entry)`);
+    }
     const capability = resolveImageCapability(descriptor, model);
     if (capability === undefined) {
         return fail(`provider "${descriptor.id}" does not support image generation for model "${model}"`);
@@ -811,7 +817,7 @@ export async function callProviderImageGeneration(params) {
         return fail(`model "${model}" does not support reference images`);
     }
     const config = {
-        baseUrl: descriptor.baseUrl,
+        baseUrl: baseUrlResult.value,
         apiKey,
         model
     };
@@ -938,9 +944,7 @@ function buildModelInfo(providerId, id, nativeCapabilities, nativeDisplayName, c
  */
 async function callOpenAiListModels(config, providerId, capabilityConfig, logger, signal) {
     const url = `${config.baseUrl}/models`;
-    const headers = {
-        Authorization: `Bearer ${config.apiKey}`
-    };
+    const headers = bearerAuthHeader(config.apiKey);
     /* c8 ignore next 1 - optional logger */
     logger === null || logger === void 0 ? void 0 : logger.info(`List models: provider=${providerId}, format=openai`);
     const jsonResult = await fetchGetJson(url, headers, logger, signal);
@@ -1027,12 +1031,13 @@ async function callGeminiListModels(config, providerId, capabilityConfig, logger
  * @public
  */
 export async function callProviderListModels(params) {
-    const { descriptor, apiKey, capability, capabilityConfig, logger, signal } = params;
-    if (!descriptor.baseUrl) {
-        return fail(`provider "${descriptor.id}" has no API endpoint configured`);
+    const { descriptor, apiKey, capability, capabilityConfig, logger, signal, endpoint } = params;
+    const baseUrlResult = resolveEffectiveBaseUrl(descriptor, endpoint);
+    if (baseUrlResult.isFailure()) {
+        return fail(baseUrlResult.message);
     }
     const config = {
-        baseUrl: descriptor.baseUrl,
+        baseUrl: baseUrlResult.value,
         apiKey,
         model: '' // unused by listing
     };