@adelie/server 0.5.10 → 0.6.1

package/dist/index.js

@@ -8,7 +8,7 @@ import {
 } from "./chunk-GO6G445C.js";
 import {
   TICKET_SLUG_PATTERN
-} from "./chunk-ZKT7QPDY.js";
+} from "./chunk-JHADMFBF.js";
 import {
   MachinesRepo
 } from "./chunk-HMTT2PX4.js";
@@ -3687,7 +3687,7 @@ import { DEFAULT_PROJECT_ID as DEFAULT_PROJECT_ID3, DEFAULT_PROJECT_NAME as DEFA
 
 // src/ifaces.json
 var ifaces_default = {
-  hash: "9809bda47442f2926149a29a0296ba3565733013ea8bc46dab8e7d57d9b52f39",
+  hash: "9429b591770e4b849cef3ce6aad180b25daa499877cfb837bd62f0f0cc00df83",
   ifaces: {
     "@adelie/server#Access": {
       name: "Access",
@@ -20235,6 +20235,21 @@ var ifaces_default = {
               }
             }
           }
+        },
+        readEntry: {
+          params: [
+            {
+              data: "string"
+            },
+            {
+              data: "string"
+            }
+          ],
+          returns: {
+            promise: {
+              data: "undefined|string"
+            }
+          }
         }
       },
       slots: {}
@@ -20299,6 +20314,21 @@ var ifaces_default = {
             }
           }
         },
+        readEntry: {
+          params: [
+            {
+              data: "string"
+            },
+            {
+              data: "string"
+            }
+          ],
+          returns: {
+            promise: {
+              data: "undefined|string"
+            }
+          }
+        },
         assignToAgent: {
           params: [
             {
@@ -32454,6 +32484,16 @@ function scheduledRateAt(provider, modelId, rates, at) {
 function optStr(v) {
   return typeof v === "string" && v !== "" ? v : void 0;
 }
+function groupApiKey(pool, provider, baseUrl) {
+  const target = baseUrl ?? "";
+  const keys = /* @__PURE__ */ new Set();
+  for (const row of pool) {
+    if (row.provider !== provider) continue;
+    if ((row.baseUrl ?? "") !== target) continue;
+    if (row.apiKey !== void 0) keys.add(row.apiKey);
+  }
+  return keys.size === 1 ? [...keys][0] : void 0;
+}
 function toCommandPolicyRuleDtos(rules) {
   return rules.map((r) => ({
     name: r.name,
@@ -33267,6 +33307,24 @@ var ProjectConfigService = class {
     const hadModelScopeGroup = prevModels.some(
       (model) => model.provider === MODELSCOPE_PROVIDER_ID
     );
+    const baseUrlOf = (entry) => {
+      if (entry.baseUrl === null) return void 0;
+      if (entry.baseUrl !== void 0) return entry.baseUrl;
+      const ref = entry.renamedFrom ?? { provider: entry.provider, modelId: entry.modelId };
+      return optStr(prevModels.find((m) => entryMatches(m, ref.provider, ref.modelId))?.base_url);
+    };
+    const keyPool = [
+      ...prevModels.map((m) => ({
+        provider: optStr(m.provider) ?? "",
+        baseUrl: optStr(m.base_url),
+        apiKey: optStr(m.api_key)
+      })),
+      ...req.models.filter((entry) => !entry.clearApiKey && entry.apiKey !== void 0).map((entry) => ({
+        provider: entry.provider,
+        baseUrl: baseUrlOf(entry),
+        apiKey: entry.apiKey
+      }))
+    ];
     for (const entry of req.models) {
       if (!unroutableVendorModel(entry.provider, entry.modelId, entry.clientType)) continue;
       if (prevModels.some((m) => entryMatches(m, entry.provider, entry.modelId))) continue;
@@ -33356,6 +33414,13 @@ var ProjectConfigService = class {
         next2.api_key = entry.apiKey;
         next2.created_at = (/* @__PURE__ */ new Date()).toISOString();
         if (entry.provider === MODELSCOPE_PROVIDER_ID) clearModelScopeProviderAuthToken = true;
+      } else if (!entry.clearApiKey && next2.api_key === void 0 && catalogEntryFor(entry.provider, entry.modelId) !== void 0) {
+        const borrowed = groupApiKey(keyPool, entry.provider, baseUrlOf(entry));
+        if (borrowed !== void 0) {
+          next2.api_key = borrowed;
+          next2.created_at = (/* @__PURE__ */ new Date()).toISOString();
+          if (entry.provider === MODELSCOPE_PROVIDER_ID) clearModelScopeProviderAuthToken = true;
+        }
       }
       if (entry.baseUrl === null) delete next2.base_url;
       else if (entry.baseUrl !== void 0) next2.base_url = entry.baseUrl;
@@ -53948,6 +54013,14 @@ var UserVaultService = class {
     await saveUserVault(this.root, userId, next);
     return maskTable(next);
   }
+  /**
+   * One entry's plaintext, for a caller that writes it into another file on this server (the
+   * model credential; see the mechanism). A key the account does not have is `undefined` rather
+   * than an empty string, so the caller can name the failure.
+   */
+  async readEntry(userId, key2) {
+    return (await loadUserVault(this.root, userId))[key2];
+  }
   /** Copy named user-level entries into one Agent's vault (see the module doc: a copy, not a link). */
   async assignToAgent(userId, projectId, agentId, keys) {
     const wanted = [...new Set(keys)];
@@ -55454,6 +55527,25 @@ function modelsRoutes(deps) {
     modelConfigChanged(deps, projectId);
     return c.json(res);
   });
+  app.post("/assign-user-key", async (c) => {
+    const projectId = requireValidId(c, "projectId");
+    deps.access.requireProjectOwner(c.var.user.userId, projectId);
+    const body = await readJson(c);
+    const provider = requireString(body, "provider", {
+      minLen: 1,
+      maxLen: 64,
+      label: "provider"
+    });
+    const key2 = requireString(body, "key", { minLen: 1, maxLen: 128, label: "key" });
+    const value = await deps.userVault.readEntry(c.var.user.userId, key2);
+    if (value === void 0) {
+      throw badRequest(`Not in your user vault: ${key2}.`);
+    }
+    const applied = await deps.projectConfigService.setGroupApiKey(projectId, provider, value);
+    if (applied > 0) modelConfigChanged(deps, projectId);
+    const res = { applied };
+    return c.json(res);
+  });
   app.get("/balance", async (c) => {
     const projectId = requireValidId(c, "projectId");
     deps.access.requireProjectAccess(c.var.user.userId, projectId);
@@ -57919,7 +58011,8 @@ var SessionApiRoutes = class {
       channels,
       machines: this.machines,
       projectConfigService,
-      sessionsRepo
+      sessionsRepo,
+      userVault: this.userVault
     };
     const modelDeps = {
       channels,
@@ -57927,7 +58020,8 @@ var SessionApiRoutes = class {
       machines: this.machines,
       projectConfigService,
       access,
-      sessionsRepo
+      sessionsRepo,
+      userVault: this.userVault
     };
     this.modelOauthCallbackRoutes = modelOAuthCallbackRoutes(modelOAuthDeps);
     this.modelsRoutes = modelsRoutes(modelDeps);