Skip to content

Commit eb1db5f

Browse files
authored
fix(provider-muse): show readable model names in the picker (pingdotgg#19100)
1 parent cffcb76 commit eb1db5f

3 files changed

Lines changed: 62 additions & 4 deletions

File tree

‎packages/provider-muse/src/server/modelCatalog.test.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,34 @@ const row = (modelId: string, extra: Record<string, unknown> = {}) => ({
3737
});
3838

3939
describe("Muse model catalog", () => {
40+
it.effect("formats Muse model IDs as names without changing their selection slugs", () =>
41+
Effect.gen(function* () {
42+
const models = yield* discoverMuseModels(settings, {}, undefined, async () =>
43+
host({
44+
providerId: "meta",
45+
models: [
46+
row("muse-wonder-1.0", { isDefault: true }),
47+
row("muse-wonder-full-1.0"),
48+
row("muse-spark-1.3"),
49+
row("muse-spark-1.2"),
50+
row("muse-wonder-2.0", { displayLabel: " " }),
51+
row("muse-spark-1.1", { displayLabel: " muse-spark-1.1 " }),
52+
row("muse-wonder-preview", { displayLabel: " Muse Research Preview " }),
53+
],
54+
}),
55+
).pipe(Effect.scoped);
56+
expect(models.map(({ slug, name, isDefault }) => [slug, name, isDefault])).toEqual([
57+
["muse-wonder-1.0", "Muse Wonder 1.0", true],
58+
["muse-wonder-full-1.0", "Muse Wonder Full 1.0", false],
59+
["muse-spark-1.3", "Muse Spark 1.3", false],
60+
["muse-spark-1.2", "Muse Spark 1.2", false],
61+
["muse-wonder-2.0", "Muse Wonder 2.0", false],
62+
["muse-spark-1.1", "Muse Spark 1.1", false],
63+
["muse-wonder-preview", "Muse Research Preview", false],
64+
]);
65+
}),
66+
);
67+
4068
it.effect("uses the labels, efforts and defaults that model/list sends", () =>
4169
Effect.gen(function* () {
4270
const models = yield* discoverMuseModels(settings, {}, undefined, async () =>

‎packages/provider-muse/src/server/modelCatalog.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,15 @@ export const discoverMuseModels = Effect.fn("discoverMuseModels")(function* (
122122
return catalog.models.flatMap((model): ServerProviderModel[] => {
123123
if (model.providerId !== "meta" || seen.has(model.modelId)) return [];
124124
seen.add(model.modelId);
125+
const label = model.displayLabel.trim() || model.modelId;
126+
const name =
127+
label === model.modelId && label.startsWith("muse-")
128+
? label.replaceAll("-", " ").replace(/\b[a-z]/g, (letter) => letter.toUpperCase())
129+
: label;
125130
return [
126131
{
127132
slug: model.modelId,
128-
name: model.displayLabel.trim() || model.modelId,
133+
name,
129134
isCustom: false,
130135
isDefault: model.isDefault,
131136
capabilities: museModelCapabilities(model),

‎packages/provider-muse/src/server/status.test.ts‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ const metaCatalog = {
3333
providerId: "meta",
3434
models: [
3535
{
36-
modelId: "muse-discovered",
37-
displayLabel: "Muse Discovered",
36+
modelId: "muse-wonder-1.0",
37+
displayLabel: "muse-wonder-1.0",
3838
providerId: "meta",
3939
isDefault: true,
4040
},
@@ -114,7 +114,11 @@ it.layer(NodeServices.layer)("Muse status", (it) => {
114114
expect(snapshot.auth).toEqual({ status: "unknown" });
115115
expect(snapshot.version).toBe("1.0.3-R2198.1");
116116
expect(snapshot.models.map((model) => model.slug)).toEqual([
117-
"muse-discovered",
117+
"muse-wonder-1.0",
118+
"muse-custom",
119+
]);
120+
expect(snapshot.models.map((model) => model.name)).toEqual([
121+
"Muse Wonder 1.0",
118122
"muse-custom",
119123
]);
120124
const descriptor = snapshot.models[0]?.capabilities?.optionDescriptors?.[0];
@@ -128,6 +132,27 @@ it.layer(NodeServices.layer)("Muse status", (it) => {
128132
),
129133
);
130134

135+
it.effect("preserves a configured display name for a discovered Muse model", () =>
136+
Effect.scoped(
137+
Effect.gen(function* () {
138+
const binaryPath = yield* fakeCli();
139+
const snapshot = yield* checkMuseProviderStatus(
140+
settings({
141+
enabled: true,
142+
binaryPath,
143+
customModels: [{ slug: "muse-wonder-1.0", name: "Team Wonder" }],
144+
}),
145+
undefined,
146+
undefined,
147+
async () => makeHost(metaCatalog),
148+
);
149+
expect(snapshot.models.map(({ slug, name }) => [slug, name])).toEqual([
150+
["muse-wonder-1.0", "Team Wonder"],
151+
]);
152+
}),
153+
),
154+
);
155+
131156
it.effect("closes the host after malformed metadata and reports unavailable", () =>
132157
Effect.scoped(
133158
Effect.gen(function* () {

0 commit comments

Comments
 (0)