pi-requesty-discover 2.1.1 → 3.0.1

package/src/models-json.ts

@@ -2,16 +2,21 @@ import type { ProviderConfig, ProviderModelConfig } from '@earendil-works/pi-cod
 import fs from 'node:fs'
 import path from 'node:path'
 import { z } from 'zod'
-import { getEnv, type Env } from './env'
+import { type Env, getEnv } from './env'
+import type { DiscoverySettings } from './settings'
 
 const DEFAULT_BASE_URL = 'https://router.requesty.ai/v1'
 const DEFAULT_NAME = 'Requesty'
 
+/** Resolves the API key for a provider through Pi's model registry. */
+export type GetApiKey = (providerId: string) => Promise<string | undefined>
+
 const ProviderSchema = z
   .object({
     name: z.string().optional(),
     baseUrl: z.string().optional(),
     apiKey: z.string().optional(),
+    api: z.string().optional(),
     models: z.array(z.object({ id: z.string() }).catchall(z.unknown())).optional(),
   })
   .catchall(z.unknown())
@@ -22,7 +27,7 @@ const ModelsJsonSchema = z
   })
   .catchall(z.unknown())
 
-type ModelsJson = z.infer<typeof ModelsJsonSchema>
+export type ModelsJson = z.infer<typeof ModelsJsonSchema>
 type ModelsJsonProvider = z.infer<typeof ProviderSchema>
 
 export type RequestyProvider = ModelsJsonProvider & {
@@ -42,15 +47,22 @@ export type ModelsDiff = {
   removed: string[]
 }
 
-export function getRequestyConfig(envConfig: Env = getEnv()): RequestyConfig {
+export async function getRequestyConfig(
+  getApiKey: GetApiKey,
+  settings: DiscoverySettings,
+  envConfig: Env = getEnv(),
+): Promise<RequestyConfig> {
   const data = readModelsJson(envConfig)
-  const provider = data.providers[envConfig.provider_id]
+  const provider = data.providers[settings.providerId]
 
   if (!provider) {
-    throw new Error(`${envConfig.models_json_path} does not define providers.${envConfig.provider_id}`)
+    throw new Error(`${envConfig.models_json_path} does not define providers.${settings.providerId}`)
   }
 
-  const apiKey = envConfig.requesty_api_key
+  const apiKey = await getApiKey(settings.providerId)
+  if (!apiKey) {
+    throw new Error(`No API key found for provider ${settings.providerId}`)
+  }
   return {
     data,
     existingModelIds: (provider.models ?? []).map(m => m.id),
@@ -81,11 +93,20 @@ export function formatModelsDiffSummary(diff: ModelsDiff): string {
   ].join('\n')
 }
 
-export function updateModelsJson(data: ModelsJson, models: ProviderModelConfig[], envConfig: Env = getEnv()): void {
-  const provider = data.providers[envConfig.provider_id]
-  data.providers[envConfig.provider_id] = {
-    ...provider,
-    apiKey: nonEmptyString(provider.apiKey) ?? '$REQUESTY_API_KEY',
+export function updateModelsJson(
+  data: ModelsJson,
+  models: ProviderModelConfig[],
+  settings: DiscoverySettings,
+  envConfig = getEnv(),
+): void {
+  const provider = data.providers[settings.providerId]
+  const { name, baseUrl, api, apiKey, models: _existingModels, ...passthrough } = provider
+  data.providers[settings.providerId] = {
+    name,
+    baseUrl,
+    api,
+    apiKey,
+    ...passthrough,
     models: models.map(model => ({
       id: model.id,
       name: model.name,

package/src/settings.ts

@@ -0,0 +1,47 @@
+import fs from 'node:fs'
+import { parse as JSON5Parse } from 'json5'
+import { prettifyError, z } from 'zod'
+import { type Env } from './env'
+import { formatErrorMessage } from './utils'
+
+export const DEFAULT_PROVIDER_ID = 'requesty-export'
+
+const HealthCheckModeSchema = z.enum(['off', 'basic', 'full']).default('full')
+
+const DiscoverySettingsSchema = z
+  .object({
+    bannedModels: z.array(z.string().min(1)).default([]),
+    healthCheckMode: HealthCheckModeSchema,
+    providerId: z.string().default(DEFAULT_PROVIDER_ID),
+  })
+  .strip()
+
+export type DiscoverySettings = z.infer<typeof DiscoverySettingsSchema>
+
+/**
+ * Reads the discovery settings file (JSON5, so it supports comments).
+ * Returns defaults when the file does not exist; throws when it exists but is invalid.
+ */
+export function readDiscoverySettings(envConfig: Env): DiscoverySettings {
+  if (!fs.existsSync(envConfig.settings_path)) {
+    return {
+      bannedModels: [],
+      healthCheckMode: 'full',
+      providerId: DEFAULT_PROVIDER_ID,
+    }
+  }
+
+  const raw = fs.readFileSync(envConfig.settings_path, 'utf8')
+  let data: unknown
+  try {
+    data = JSON5Parse(raw)
+  } catch (error) {
+    throw new Error(`Failed to parse ${envConfig.settings_path}: ${formatErrorMessage(error)}`, { cause: error })
+  }
+
+  const result = DiscoverySettingsSchema.safeParse(data)
+  if (!result.success) {
+    throw new Error(`${envConfig.settings_path} is invalid: ${prettifyError(result.error)}`)
+  }
+  return result.data
+}

package/src/ui/requesty-status-loader.ts

@@ -1,5 +1,5 @@
 import { DynamicBorder, Theme } from '@earendil-works/pi-coding-agent'
-import { Container, Loader, Spacer, TUI } from '@earendil-works/pi-tui'
+import { Container, Loader, Spacer, type TUI } from '@earendil-works/pi-tui'
 
 /**
  * A loader that allows us to change the displayed message.

package/src/utils.ts

@@ -0,0 +1,24 @@
+export type Try<T> = { ok: true; value: T } | { ok: false; error: unknown }
+
+export function runCatching<T>(fn: () => T): Try<T> {
+  try {
+    return { ok: true, value: fn() }
+  } catch (error) {
+    return { ok: false, error }
+  }
+}
+
+export async function runCatchingAsync<T>(fn: () => Promise<T>): Promise<Try<T>> {
+  try {
+    return { ok: true, value: await fn() }
+  } catch (error) {
+    return { ok: false, error }
+  }
+}
+
+export function formatErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message
+  }
+  return String(error)
+}