@columenlabs/lumen-ui 0.1.230 → 0.1.231

package/dist/assistant/settings.js

@@ -121,7 +121,8 @@ const mark = (label) => _jsx(ConnectionLogo, { text: label.charAt(0) });
 function OwnProviderKey({ client, p }) {
     const { apply, refresh } = useApply(client);
     const ways = [];
-    if (p.signin === 'chatgpt')
+    const may = (w) => !p.own_ways || p.own_ways.includes(w);
+    if (p.signin === 'chatgpt' && (may('plan') || p.plan?.set))
         ways.push({
             id: 'plan',
             label: 'ChatGPT plan',
@@ -138,27 +139,37 @@ function OwnProviderKey({ client, p }) {
             removeText: 'Your API key, if you set one, runs from then on.',
             removeLabel: 'Sign out',
         });
-    ways.push({
-        id: 'key',
-        label: 'API key',
-        icon: KeyRoundIcon,
-        info: `Your own ${p.label} key, billed by ${p.label}.`,
-        set: p.own.set,
-        ident: p.own.hint,
-        test: wayTest(p.own),
-        fields: [{ id: 'key', label: `${p.label} API key`, secret: true, prefix: p.prefix }],
-        getUrl: p.keys_url,
-        onSave: (v) => apply(`own:${p.id}`, () => client.ownKey(p.id, v.key ?? ''), 'Key saved'),
-        onTest: () => client.testOwnKey(p.id, 'key').finally(refresh),
-        onRemove: () => apply(`own:${p.id}`, () => client.ownKey(p.id, null), 'Key removed'),
-        removeTitle: `Remove your ${p.label} key?`,
-    });
+    if (may('key') || p.own.set)
+        ways.push({
+            id: 'key',
+            label: 'API key',
+            icon: KeyRoundIcon,
+            info: `Your own ${p.label} key, billed by ${p.label}.`,
+            set: p.own.set,
+            ident: p.own.hint,
+            test: wayTest(p.own),
+            fields: [{ id: 'key', label: `${p.label} API key`, secret: true, prefix: p.prefix }],
+            getUrl: p.keys_url,
+            onSave: (v) => apply(`own:${p.id}`, () => client.ownKey(p.id, v.key ?? ''), 'Key saved'),
+            onTest: () => client.testOwnKey(p.id, 'key').finally(refresh),
+            onRemove: () => apply(`own:${p.id}`, () => client.ownKey(p.id, null), 'Key removed'),
+            removeTitle: `Remove your ${p.label} key?`,
+        });
     return (_jsx(LumenConnection, { id: p.id, name: p.label, logo: mark(p.label), ways: ways, use: p.use, onUse: (use) => apply(`use:${p.id}`, () => client.settings({ own_use: { [p.id]: use } })) }));
 }
 /** A person's own keys, one row a provider, and what they may spend on them. */
 function Providers({ client }) {
     const { apply } = useApply(client);
-    return (_jsx(WithStatus, { client: client, children: (s) => (_jsxs("div", { className: "flex flex-col", children: [_jsx(LumenExpandList, { children: s.providers.map((p) => (_jsx(OwnProviderKey, { client: client, p: p }, p.id))) }), s.providers.some((p) => p.own.set || p.plan?.set) && (_jsx(Row, { label: "Your keys may spend", info: "On your keys, every provider together.", children: _jsx(CapInput, { label: "Your monthly cap", value: s.caps.own, onSave: (n) => void apply('own', () => client.ownCap(n)) }) }))] })) }));
+    return (_jsx(WithStatus, { client: client, children: (s) => {
+            // A provider the app gives this person no way of their own on shows no row, unless one is
+            // still set (so it can be removed).
+            const rows = s.providers.filter((p) => !p.own_ways || p.own_ways.length > 0 || p.own.set || p.plan?.set);
+            const ownSet = rows.some((p) => p.own.set || p.plan?.set);
+            return (_jsxs("div", { className: "flex flex-col", children: [_jsx(LumenExpandList, { children: rows.map((p) => (_jsx(OwnProviderKey, { client: client, p: p }, p.id))) }), ownSet && (_jsx(Row, { label: "Answers run on", info: "Your own key or plan first, with the shared credits behind it; or the shared credits first.", children: _jsx(LumenSelector, { label: "Answers run on", size: "sm", className: "w-44", value: s.pay, options: [
+                                { value: 'own', label: 'Your own first' },
+                                { value: 'app', label: 'Shared credits first' },
+                            ], onChange: (pay) => void apply('pay', () => client.settings({ pay: pay })) }) })), ownSet && (_jsx(Row, { label: "Your keys may spend", info: "On your keys, every provider together.", children: _jsx(CapInput, { label: "Your monthly cap", value: s.caps.own, onSave: (n) => void apply('own', () => client.ownCap(n)) }) }))] }));
+        } }));
 }
 /** One provider's shared key, which an admin sets for everyone. */
 function SharedProviderKey({ client, p }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@columenlabs/lumen-ui",
-  "version": "0.1.230",
+  "version": "0.1.231",
   "description": "Lumen: shared React components (frame, views, widgets, charts, drawers).",
   "license": "MIT",
   "type": "module",
@@ -49,7 +49,7 @@
     "@codemirror/lang-javascript": "6.2.5",
     "@codemirror/lang-json": "6.0.2",
     "@codemirror/lang-sql": "6.10.0",
-    "@columenlabs/lumen-ui-types": "0.1.230",
+    "@columenlabs/lumen-ui-types": "0.1.231",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "10.0.0",
     "@dnd-kit/utilities": "3.2.2",