@goodandready/dsh-model-sync 0.3.12 → 0.3.14

package/lib/generic-adapter.js

@@ -31,16 +31,19 @@ export function canUseGenericAdapter(profile) {
   return Boolean(profile?.baseURL) && SUPPORTED_APIS.has(profile?.api || 'openai-completions')
 }
 
-function requestHeaders(apiKey) {
+function requestHeaders(apiKey, etag, lastModified) {
   const headers = { Accept: 'application/json' }
   if (apiKey) headers.Authorization = `Bearer ${apiKey}`
+  if (etag) headers['If-None-Match'] = etag
+  if (lastModified) headers['If-Modified-Since'] = lastModified
   return headers
 }
 
-async function resolveGenericRequest(profile, { resolveCredential, fetchImpl, signal }) {
+async function resolveGenericRequest(profile, { resolveCredential, fetchImpl, signal, etag, lastModified }) {
   const keyRef = profile.apiKeyEnv || profile.credentialRef || profile.apiKeyRef
   const apiKey = keyRef ? await resolveCredential(keyRef) : ''
-  const response = await fetchImpl(endpointFor(profile.baseURL), { headers: requestHeaders(apiKey), signal })
+  const response = await fetchImpl(endpointFor(profile.baseURL), { headers: requestHeaders(apiKey, etag, lastModified), signal })
+  if (response.status === 304) return response
   if (!response.ok) throw catalogRequestError(response.status, response)
   return response
 }
@@ -49,18 +52,33 @@ export async function discoverOpenAIModels(profile, {
   resolveCredential,
   fetchImpl = fetch,
   signal,
+  etag,
+  lastModified,
 } = {}) {
   if (!canUseGenericAdapter(profile)) {
     throw new Error('generic discovery requires an OpenAI-compatible baseURL and protocol')
   }
-  const response = await resolveGenericRequest(profile, { resolveCredential, fetchImpl, signal })
+  const response = await resolveGenericRequest(profile, { resolveCredential, fetchImpl, signal, etag, lastModified })
+  if (response.status === 304) {
+    return { notModified: true, etag: response.headers?.get?.('etag') || etag, lastModified: response.headers?.get?.('last-modified') || lastModified }
+  }
+  const respEtag = response.headers?.get?.('etag') || undefined
+  const respLastMod = response.headers?.get?.('last-modified') || undefined
   let payload
   try {
     payload = JSON.parse(await readBody(response))
   } catch {
     throw new Error('model catalog response is not valid JSON')
   }
-  return normalizeModels(profile.provider ?? '', rowsFrom(payload))
+  const models = normalizeModels(profile.provider ?? '', rowsFrom(payload))
+  if (respEtag || respLastMod) {
+    Object.defineProperty(models, '__httpMeta', {
+      value: { etag: respEtag, lastModified: respLastMod },
+      enumerable: false,
+      configurable: true,
+    })
+  }
+  return models
 }