@tonyclaw/llm-inspector 1.7.3 → 1.7.5

package/src/proxy/providers.ts

@@ -31,82 +31,70 @@ type ProvidersStore = z.infer<typeof ProvidersStoreSchema>;
 
 // Using conf for storage - works in any Node.js environment without Electron
 // Note: conf stores data in plain JSON. For production, consider additional encryption.
+const configPath = process.env["LLM_INSPECTOR_CONFIG_PATH"];
 export const store = new Conf<ProvidersStore>({
   projectName: "llm-inspector",
   defaults: {
     providers: [],
   },
+  ...(configPath !== undefined ? { path: configPath } : {}),
 });
 
 /**
- * Migrates existing provider configs to preserve both Anthropic and OpenAI URLs.
- * Old configs had anthropicBaseUrl/openaiBaseUrl, we now keep both.
+ * Migrates a single provider config to preserve both Anthropic and OpenAI URLs.
  */
-function migrateProviders(): void {
-  const providers = store.get("providers", []);
-  let migrated = false;
-
-  const updated = providers.map((p) => {
-    // Helper to safely get old URL properties using Object.getOwnPropertyDescriptor
-    function getOldUrl(obj: unknown, key: string): string {
-      if (obj !== null && typeof obj === "object") {
-        const desc = Object.getOwnPropertyDescriptor(obj, key);
-        if (desc !== undefined && typeof desc.value === "string") {
-          return desc.value;
-        }
-      }
-      return "";
-    }
-
-    const oldAnthropicBaseUrl = getOldUrl(p, "anthropicBaseUrl");
-    const oldOpenaiBaseUrl = getOldUrl(p, "openaiBaseUrl");
-    const currentAnthropicUrl = p.anthropicBaseUrl ?? "";
-    const currentOpenaiUrl = p.openaiBaseUrl ?? "";
-
-    // If already migrated (has format field and at least one URL), skip
-    if (p.format !== undefined && (currentAnthropicUrl !== "" || currentOpenaiUrl !== "")) {
-      return p;
-    }
+export function migrateProvider(p: ProviderConfig): ProviderConfig {
+  const currentAnthropicUrl = p.anthropicBaseUrl ?? "";
+  const currentOpenaiUrl = p.openaiBaseUrl ?? "";
+
+  // If already migrated (has at least one URL set), skip
+  // format may be undefined but if URL is set, it's already migrated
+  if (currentAnthropicUrl !== "" || currentOpenaiUrl !== "") {
+    return p;
+  }
 
-    // Preserve both URLs
-    const newAnthropicUrl = oldAnthropicBaseUrl !== "" ? oldAnthropicBaseUrl : currentAnthropicUrl;
-    const newOpenaiUrl = oldOpenaiBaseUrl !== "" ? oldOpenaiBaseUrl : currentOpenaiUrl;
-
-    // Determine primary format based on which URL is set
-    let format: "anthropic" | "openai" | undefined;
-    let baseUrl: string | undefined;
-
-    if (newAnthropicUrl !== "" && newOpenaiUrl !== "") {
-      // Both URLs set - prefer anthropic as default, use baseUrl for backward compat
-      format = p.format ?? "anthropic";
-      baseUrl = p.baseUrl !== undefined && p.baseUrl !== "" ? p.baseUrl : newAnthropicUrl;
-    } else if (newOpenaiUrl !== "") {
-      format = "openai";
-      baseUrl = newOpenaiUrl;
-    } else if (newAnthropicUrl !== "") {
-      format = "anthropic";
-      baseUrl = newAnthropicUrl;
-    } else if (p.format !== undefined && p.baseUrl !== undefined && p.baseUrl !== "") {
-      // Only baseUrl is set (legacy config) - migrate based on format
-      format = p.format;
-      baseUrl = p.baseUrl;
-      if (format === "openai") {
-        return { ...p, format, baseUrl, anthropicBaseUrl: "", openaiBaseUrl: p.baseUrl };
-      } else {
-        return { ...p, format, baseUrl, anthropicBaseUrl: p.baseUrl, openaiBaseUrl: "" };
-      }
+  // Determine primary format based on which URL is set
+  let format: "anthropic" | "openai" | undefined;
+  let baseUrl: string | undefined;
+
+  if (currentAnthropicUrl !== "" && currentOpenaiUrl !== "") {
+    // Both URLs set - prefer anthropic as default, use baseUrl for backward compat
+    format = p.format ?? "anthropic";
+    baseUrl = p.baseUrl !== undefined && p.baseUrl !== "" ? p.baseUrl : currentAnthropicUrl;
+  } else if (currentOpenaiUrl !== "") {
+    format = "openai";
+    baseUrl = currentOpenaiUrl;
+  } else if (currentAnthropicUrl !== "") {
+    format = "anthropic";
+    baseUrl = currentAnthropicUrl;
+  } else if (p.format !== undefined && p.baseUrl !== undefined && p.baseUrl !== "") {
+    // Only baseUrl is set (legacy config) - migrate based on format
+    format = p.format;
+    baseUrl = p.baseUrl;
+    if (format === "openai") {
+      return { ...p, format, baseUrl, anthropicBaseUrl: "", openaiBaseUrl: p.baseUrl };
+    } else {
+      return { ...p, format, baseUrl, anthropicBaseUrl: p.baseUrl, openaiBaseUrl: "" };
     }
+  }
 
-    migrated = true;
+  return {
+    ...p,
+    format,
+    baseUrl,
+    anthropicBaseUrl: currentAnthropicUrl,
+    openaiBaseUrl: currentOpenaiUrl,
+  };
+}
 
-    return {
-      ...p,
-      format,
-      baseUrl,
-      anthropicBaseUrl: newAnthropicUrl,
-      openaiBaseUrl: newOpenaiUrl,
-    };
-  });
+/**
+ * Migrates existing provider configs to preserve both Anthropic and OpenAI URLs.
+ * Old configs had anthropicBaseUrl/openaiBaseUrl, we now keep both.
+ */
+function migrateProviders(): void {
+  const providers = store.get("providers", []);
+  const updated = providers.map(migrateProvider);
+  const migrated = updated.some((p, i) => JSON.stringify(p) !== JSON.stringify(providers[i]));
 
   if (migrated) {
     store.set("providers", updated);
@@ -116,6 +104,21 @@ function migrateProviders(): void {
 // Run migration on module load
 migrateProviders();
 
+// Override with JSON env var if provided (for testing)
+const providersJson = process.env["LLM_INSPECTOR_PROVIDERS_JSON"];
+if (providersJson !== undefined) {
+  try {
+    const parsed = ProviderConfigSchema.array().safeParse(JSON.parse(providersJson));
+    if (parsed.success) {
+      // Apply migration to JSON providers (e.g., convert baseUrl to openaiBaseUrl/anthropicBaseUrl)
+      const migrated = parsed.data.map(migrateProvider);
+      store.set("providers", migrated);
+    }
+  } catch {
+    // Ignore invalid JSON
+  }
+}
+
 export function getProviders(): ProviderConfig[] {
   return store.get("providers", []);
 }
@@ -128,7 +131,7 @@ export function getProvider(id: string): ProviderConfig | undefined {
 /**
  * Normalizes an API key by stripping "Bearer " prefix if present.
  */
-function normalizeApiKey(apiKey: string): string {
+export function normalizeApiKey(apiKey: string): string {
   return apiKey.replace(/^Bearer\s+/i, "").trim();
 }
 
@@ -152,6 +155,8 @@ export function addProvider(
     authHeader: authHeader ?? "bearer",
     createdAt: now,
     updatedAt: now,
+    anthropicBaseUrl: format === "anthropic" && baseUrl !== undefined ? baseUrl : "",
+    openaiBaseUrl: format === "openai" && baseUrl !== undefined ? baseUrl : "",
   };
   providers.push(newProvider);
   store.set("providers", providers);
@@ -176,6 +181,11 @@ export function updateProvider(
     authHeader: updates.authHeader ?? existing.authHeader,
     createdAt: existing.createdAt,
     updatedAt: new Date().toISOString(),
+    // Handle format-specific URLs
+    anthropicBaseUrl:
+      updates.anthropicBaseUrl !== undefined ? updates.anthropicBaseUrl : existing.anthropicBaseUrl,
+    openaiBaseUrl:
+      updates.openaiBaseUrl !== undefined ? updates.openaiBaseUrl : existing.openaiBaseUrl,
   };
   const index = providers.findIndex((p) => p.id === id);
   providers[index] = updated;

package/src/routes/api/providers.$providerId.ts

@@ -9,6 +9,8 @@ const ProviderUpdateSchema = z.object({
   baseUrl: z.string().min(1, "Base URL is required").optional(),
   model: z.string().min(1, "Model is required").optional(),
   authHeader: z.enum(["bearer", "x-api-key"]).optional(),
+  anthropicBaseUrl: z.string().optional(),
+  openaiBaseUrl: z.string().optional(),
 });
 
 export const Route = createFileRoute("/api/providers/$providerId")({