refactor(providers): a provider is a vendor and a key, and the table is gone
The dropdown was listing "connections" — a row per adapter + model + key — which made choosing a model an act of configuration, put a key icon and a bin inside a menu item, and showed five accounts nobody had created. A provider is now a vendor Officer curates. Every one is listed, set up or not, because a vendor you have no key for is exactly what you need to see in order to add one. The model is chosen per generation, from that provider's entry in the catalogue, beside it. With the model off the row, all that remained of a "provider" was the key for OpenAI — and Officer already stores keys: one active value per purpose, 0600 inside a 0700 directory, outside the backup tarball, created on first use so nothing needs provisioning. So `atelier_providers` is dropped, along with `generations.provider_id` that pointed into it. `provider` and `model` stay as text on each generation, which were always the historical fact rather than a pointer to configuration. `getSecret`, never `getKey`: this is a foreign credential, and getKey mints a random value for a purpose it cannot find — which for someone else's API key means authenticating with something invented. Resolution follows: a request names a model, and the catalogue says whose it is, rather than a database being asked which stored row served it. A model nobody in the catalogue claims is still accepted — the catalogue is advisory, and a model released today should work before we ship a file that mentions it. Two routes replace five: PUT and DELETE on /providers/:name/key. Deleting a key that came from the environment is refused rather than faked — it belongs to the install, not to this screen.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import { listProviders } from '../db';
|
||||
import { keyForProvider } from '../providers/credentials';
|
||||
import { keyFor } from '../providers/credentials';
|
||||
import { projectEnv } from '../env';
|
||||
import type { Catalogue, CatalogueModel } from './types';
|
||||
import { CATALOGUE_REVISION } from './types';
|
||||
@@ -33,15 +32,8 @@ const PRICING_URL = projectEnv('ATELIER_OPENAI_PRICING_URL') ?? 'https://platfor
|
||||
*/
|
||||
const IMAGE_MODEL = /^(gpt-image|dall-e)/i;
|
||||
|
||||
/** A key from any connection, or the bootstrap environment variable. Refresh is read-only, so any will do. */
|
||||
async function anyKey(): Promise<string | undefined> {
|
||||
for (const provider of await listProviders()) {
|
||||
if (provider.adapter !== 'openai') continue;
|
||||
const key = await keyForProvider(provider);
|
||||
if (key) return key;
|
||||
}
|
||||
return projectEnv('OPENAI_API_KEY');
|
||||
}
|
||||
/** OpenAI's key: the secret store, then the environment. `keyFor` already looks in both, in that order. */
|
||||
const anyKey = (): string | undefined => keyFor('openai');
|
||||
|
||||
async function fetchModelIds(apiKey: string): Promise<string[] | null> {
|
||||
try {
|
||||
@@ -118,7 +110,7 @@ async function fetchPricing(modelIds: string[]): Promise<Map<string, number[]>>
|
||||
* can tell a complete listing from a missing one.
|
||||
*/
|
||||
export async function refreshOpenAI(): Promise<{ catalogue: Catalogue | null; listedIds: string[] | null }> {
|
||||
const apiKey = await anyKey();
|
||||
const apiKey = anyKey();
|
||||
if (!apiKey) {
|
||||
console.log('[atelier:catalogue] no OpenAI key available — nothing to refresh, shipped catalogue stands');
|
||||
return { catalogue: null, listedIds: null };
|
||||
|
||||
Reference in New Issue
Block a user