@acarmisc/backstage-plugin-litellm-backend 0.7.0 → 0.8.1

package/dist/client.d.ts

@@ -1,4 +1,16 @@
 import { LiteLLMConfig, UserInfo, VirtualKey, ModelInfo, UsageMetrics, TeamInfo, GenerateKeyRequest, GenerateKeyResponse, UpdateKeyRequest, DeleteKeyRequest, CreateUserRequest, CreateUserResponse, AuditLogsParams, PaginatedAuditLogs } from './types';
+/**
+ * Typed error for failed upstream LiteLLM responses. Preserves the HTTP
+ * status and the structured `param` (e.g. `key_alias`) from the upstream
+ * body so the router can surface a 400 instead of collapsing everything
+ * into a 500. The message is the upstream `error.message` when present,
+ * otherwise the raw body text.
+ */
+export declare class LiteLLMUpstreamError extends Error {
+    status: number;
+    param?: string;
+    constructor(status: number, statusText: string, body: string);
+}
 export declare class LiteLLMClient {
     private baseUrl;
     private masterKey;

package/dist/client.js

@@ -1,7 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiteLLMClient = void 0;
+exports.LiteLLMClient = exports.LiteLLMUpstreamError = void 0;
 const DEFAULT_TIMEOUT = 30000;
+/**
+ * Typed error for failed upstream LiteLLM responses. Preserves the HTTP
+ * status and the structured `param` (e.g. `key_alias`) from the upstream
+ * body so the router can surface a 400 instead of collapsing everything
+ * into a 500. The message is the upstream `error.message` when present,
+ * otherwise the raw body text.
+ */
+class LiteLLMUpstreamError extends Error {
+    constructor(status, statusText, body) {
+        let message = `LiteLLM API error: ${status} ${statusText} - ${body}`;
+        let param;
+        try {
+            const parsed = JSON.parse(body);
+            const inner = parsed?.error ?? parsed;
+            if (typeof inner?.message === 'string')
+                message = inner.message;
+            if (typeof inner?.param === 'string' && inner.param !== 'None') {
+                param = inner.param;
+            }
+        }
+        catch {
+            // not JSON — keep the raw body in the message
+        }
+        super(message);
+        this.status = status;
+        this.param = param;
+    }
+}
+exports.LiteLLMUpstreamError = LiteLLMUpstreamError;
+function extractModelList(fallback) {
+    if (Array.isArray(fallback))
+        return fallback;
+    if (Array.isArray(fallback?.data))
+        return fallback.data;
+    return [];
+}
 class LiteLLMClient {
     constructor(config, timeout = DEFAULT_TIMEOUT) {
         this.baseUrl = config.baseUrl.replace(/\/$/, '');
@@ -28,9 +64,7 @@ class LiteLLMClient {
             });
             if (!response.ok) {
                 const errorBody = await response.text();
-                const err = new Error(`LiteLLM API error: ${response.status} ${response.statusText} - ${errorBody}`);
-                err.status = response.status;
-                throw err;
+                throw new LiteLLMUpstreamError(response.status, response.statusText, errorBody);
             }
             return response.json();
         }
@@ -245,11 +279,7 @@ class LiteLLMClient {
             // fall through to /models
         }
         const fallback = await this.request('/models');
-        const data = Array.isArray(fallback)
-            ? fallback
-            : Array.isArray(fallback?.data)
-                ? fallback.data
-                : [];
+        const data = extractModelList(fallback);
         return data
             .map((m) => ({
             model_name: m.model_name ?? m.id ?? '',
@@ -373,7 +403,7 @@ class LiteLLMClient {
                     };
                     if (!kb.key_alias && kmeta.key_alias)
                         kb.key_alias = kmeta.key_alias;
-                    if (kb.team_id == null && kmeta.team_id)
+                    if (kb.team_id === null && kmeta.team_id)
                         kb.team_id = kmeta.team_id;
                     if (!kb.models.includes(name))
                         kb.models.push(name);

package/dist/index.cjs.js

@@ -63,6 +63,29 @@ var import_catalog_client = require("@backstage/catalog-client");
 
 // src/client.ts
 var DEFAULT_TIMEOUT = 3e4;
+var LiteLLMUpstreamError = class extends Error {
+  constructor(status, statusText, body) {
+    let message2 = `LiteLLM API error: ${status} ${statusText} - ${body}`;
+    let param;
+    try {
+      const parsed = JSON.parse(body);
+      const inner = parsed?.error ?? parsed;
+      if (typeof inner?.message === "string") message2 = inner.message;
+      if (typeof inner?.param === "string" && inner.param !== "None") {
+        param = inner.param;
+      }
+    } catch {
+    }
+    super(message2);
+    this.status = status;
+    this.param = param;
+  }
+};
+function extractModelList(fallback) {
+  if (Array.isArray(fallback)) return fallback;
+  if (Array.isArray(fallback?.data)) return fallback.data;
+  return [];
+}
 var LiteLLMClient = class {
   constructor(config, timeout = DEFAULT_TIMEOUT) {
     this.baseUrl = config.baseUrl.replace(/\/$/, "");
@@ -84,11 +107,11 @@ var LiteLLMClient = class {
       });
       if (!response.ok) {
         const errorBody = await response.text();
-        const err = new Error(
-          `LiteLLM API error: ${response.status} ${response.statusText} - ${errorBody}`
+        throw new LiteLLMUpstreamError(
+          response.status,
+          response.statusText,
+          errorBody
         );
-        err.status = response.status;
-        throw err;
       }
       return response.json();
     } finally {
@@ -284,7 +307,7 @@ var LiteLLMClient = class {
     } catch {
     }
     const fallback = await this.request("/models");
-    const data = Array.isArray(fallback) ? fallback : Array.isArray(fallback?.data) ? fallback.data : [];
+    const data = extractModelList(fallback);
     return data.map((m) => ({
       model_name: m.model_name ?? m.id ?? "",
       mode: m.mode ?? "chat",
@@ -403,7 +426,7 @@ var LiteLLMClient = class {
             ...emptyModelBucket()
           };
           if (!kb.key_alias && kmeta.key_alias) kb.key_alias = kmeta.key_alias;
-          if (kb.team_id == null && kmeta.team_id) kb.team_id = kmeta.team_id;
+          if (kb.team_id === null && kmeta.team_id) kb.team_id = kmeta.team_id;
           if (!kb.models.includes(name)) kb.models.push(name);
           kb.total_spend += km.spend ?? 0;
           kb.total_tokens += km.total_tokens ?? 0;
@@ -836,7 +859,7 @@ async function provisionUser(client, userId, defaults, profile, backstageEntity,
     }
   };
   logger.info(
-    `Provisioning new LiteLLM user for Backstage identity: ${userId}` + (profile.email ? ` (email=${profile.email})` : "")
+    `Provisioning new LiteLLM user for Backstage identity: ${userId}${profile.email ? ` (email=${profile.email})` : ""}`
   );
   try {
     await client.createUser(payload);
@@ -2601,12 +2624,18 @@ async function createRouter(options) {
     const tokenEntityRef = await resolveUserId(req, auth);
     const userId = tokenEntityRef ? toLiteLLMUserId(tokenEntityRef, userIdDomain) : req.query.user_id;
     if (!userId) {
-      throw { status: 403, body: { error: "Cannot verify key ownership without an authenticated user" } };
+      throw Object.assign(new Error("Cannot verify key ownership without an authenticated user"), {
+        status: 403,
+        body: { error: "Cannot verify key ownership without an authenticated user" }
+      });
     }
     const ownKeys = await client.listKeys(userId);
     const owns = ownKeys.some((k) => (k.token ?? k.key) === keyId);
     if (!owns) {
-      throw { status: 403, body: { error: "Access denied: key does not belong to the caller" } };
+      throw Object.assign(new Error("Access denied: key does not belong to the caller"), {
+        status: 403,
+        body: { error: "Access denied: key does not belong to the caller" }
+      });
     }
     return { tokenEntityRef, userId };
   }
@@ -2678,6 +2707,13 @@ async function createRouter(options) {
         });
         return;
       }
+      if (error instanceof LiteLLMUpstreamError) {
+        res.status(error.status).json({
+          error: error.message,
+          ...error.param ? { param: error.param } : {}
+        });
+        return;
+      }
       logger.error("Failed to generate key", error);
       res.status(500).json({ error: error.message });
     }