fix(ai): remove VIP98K text-to-image models only
This commit is contained in:
parent
ab306e298b
commit
74ea0ca9fc
@ -2,10 +2,15 @@ import { and, eq } from "drizzle-orm";
|
|||||||
import { NextResponse } from "next/server";
|
import { NextResponse } from "next/server";
|
||||||
import {
|
import {
|
||||||
fetchVip98kModelPresets,
|
fetchVip98kModelPresets,
|
||||||
|
hasVip98kTextToImageMode,
|
||||||
type Vip98kModelPreset,
|
type Vip98kModelPreset,
|
||||||
} from "@/lib/ai/vip98k-models";
|
} from "@/lib/ai/vip98k-models";
|
||||||
import { db } from "@/lib/db";
|
import { db } from "@/lib/db";
|
||||||
import { getAiProviderById } from "@/lib/db/queries";
|
import {
|
||||||
|
deleteAiModel,
|
||||||
|
getAiModelsByProviderId,
|
||||||
|
getAiProviderById,
|
||||||
|
} from "@/lib/db/queries";
|
||||||
import { aiModel, type AiModel } from "@/lib/db/schema";
|
import { aiModel, type AiModel } from "@/lib/db/schema";
|
||||||
import { requireAdmin } from "@/lib/middleware/admin";
|
import { requireAdmin } from "@/lib/middleware/admin";
|
||||||
|
|
||||||
@ -97,8 +102,35 @@ export async function POST(request: Request) {
|
|||||||
|
|
||||||
const addedModels: AiModel[] = [];
|
const addedModels: AiModel[] = [];
|
||||||
const updatedModels: AiModel[] = [];
|
const updatedModels: AiModel[] = [];
|
||||||
|
const removedModels: AiModel[] = [];
|
||||||
const errors: Array<{ modelId: string; error: string }> = [];
|
const errors: Array<{ modelId: string; error: string }> = [];
|
||||||
|
|
||||||
|
const existingModels = await getAiModelsByProviderId({ providerId });
|
||||||
|
const textToImageModels = existingModels.filter(
|
||||||
|
(model) =>
|
||||||
|
model.supportsImageGen &&
|
||||||
|
hasVip98kTextToImageMode({
|
||||||
|
modelId: model.modelId,
|
||||||
|
capabilities: model.capabilities,
|
||||||
|
defaultParams: model.defaultParams,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
for (const model of textToImageModels) {
|
||||||
|
try {
|
||||||
|
const deleted = await deleteAiModel({ id: model.id });
|
||||||
|
removedModels.push(...deleted);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(
|
||||||
|
`[VIP98K Models API] Failed to remove text-to-image model ${model.modelId}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
errors.push({
|
||||||
|
modelId: model.modelId,
|
||||||
|
error: error instanceof Error ? error.message : "Removal failed",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (const preset of presets) {
|
for (const preset of presets) {
|
||||||
try {
|
try {
|
||||||
const existing = await db.query.aiModel.findFirst({
|
const existing = await db.query.aiModel.findFirst({
|
||||||
@ -161,8 +193,10 @@ export async function POST(request: Request) {
|
|||||||
success: true,
|
success: true,
|
||||||
addedCount: addedModels.length,
|
addedCount: addedModels.length,
|
||||||
updatedCount: updatedModels.length,
|
updatedCount: updatedModels.length,
|
||||||
|
removedCount: removedModels.length,
|
||||||
addedModels,
|
addedModels,
|
||||||
updatedModels,
|
updatedModels,
|
||||||
|
removedModels,
|
||||||
errors: errors.length > 0 ? errors : undefined,
|
errors: errors.length > 0 ? errors : undefined,
|
||||||
counts: {
|
counts: {
|
||||||
requested: presets.length,
|
requested: presets.length,
|
||||||
|
|||||||
@ -355,6 +355,40 @@ function getCapabilities(model: Vip98kCatalogModel) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeMode(value: unknown) {
|
||||||
|
return String(value || "").trim().toLowerCase().replace(/_/g, "-");
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStoredSupportedModes(value: unknown) {
|
||||||
|
const record = toRecord(value);
|
||||||
|
return parseStringArray(
|
||||||
|
record?.supportedModes || record?.supported_modes,
|
||||||
|
).map(normalizeMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function hasVip98kTextToImageMode(input: {
|
||||||
|
modelId?: string | null;
|
||||||
|
capabilities?: unknown;
|
||||||
|
defaultParams?: unknown;
|
||||||
|
}) {
|
||||||
|
const modes = new Set([
|
||||||
|
...getStoredSupportedModes(input.capabilities),
|
||||||
|
...getStoredSupportedModes(input.defaultParams),
|
||||||
|
]);
|
||||||
|
return (
|
||||||
|
modes.has("text-to-image") ||
|
||||||
|
normalizeMode(input.modelId).includes("text-to-image")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isVip98kTextToImageCatalogModel(
|
||||||
|
model: Vip98kCatalogModel,
|
||||||
|
) {
|
||||||
|
if (resolvePresetType(model) !== "image") return false;
|
||||||
|
const capabilities = getCapabilities(model);
|
||||||
|
return capabilities.length === 0 || capabilities.includes("text-to-image");
|
||||||
|
}
|
||||||
|
|
||||||
function getInputModes(model: Vip98kCatalogModel) {
|
function getInputModes(model: Vip98kCatalogModel) {
|
||||||
return parseStringArray(model.inputModes || model.input_modes).map((item) =>
|
return parseStringArray(model.inputModes || model.input_modes).map((item) =>
|
||||||
item.trim().toLowerCase(),
|
item.trim().toLowerCase(),
|
||||||
@ -771,6 +805,7 @@ export function buildVip98kModelPresets(
|
|||||||
.map((model, index) => {
|
.map((model, index) => {
|
||||||
const modelId = getModelId(model);
|
const modelId = getModelId(model);
|
||||||
if (!modelId) return null;
|
if (!modelId) return null;
|
||||||
|
if (isVip98kTextToImageCatalogModel(model)) return null;
|
||||||
const type = resolvePresetType(model);
|
const type = resolvePresetType(model);
|
||||||
if (type === "image") return createImagePreset(model, index);
|
if (type === "image") return createImagePreset(model, index);
|
||||||
if (type === "video") return createVideoPreset(model, index);
|
if (type === "video") return createVideoPreset(model, index);
|
||||||
|
|||||||
@ -385,35 +385,69 @@ test.describe("AI model media classification", () => {
|
|||||||
modelId: "black-forest-labs/flux-dev",
|
modelId: "black-forest-labs/flux-dev",
|
||||||
displayName: "Flux Dev",
|
displayName: "Flux Dev",
|
||||||
type: "image",
|
type: "image",
|
||||||
capabilities: ["text_to_image"],
|
capabilities: ["image_to_image"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
modelId: "google/nano-banana-2/text-to-image",
|
modelId: "google/nano-banana-2/edit",
|
||||||
displayName: "Nano Banana 2",
|
displayName: "Nano Banana 2",
|
||||||
type: "image",
|
type: "image",
|
||||||
capabilities: ["text_to_image"],
|
capabilities: ["image_to_image"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
modelId: "future-image-with-date",
|
modelId: "future-image-with-date",
|
||||||
displayName: "Future image",
|
displayName: "Future image",
|
||||||
type: "image",
|
type: "image",
|
||||||
capabilities: ["text_to_image"],
|
capabilities: ["image_to_image"],
|
||||||
releasedAt: "2027-02-01",
|
releasedAt: "2027-02-01",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
modelId: "old-image-with-date",
|
modelId: "old-image-with-date",
|
||||||
displayName: "Old image",
|
displayName: "Old image",
|
||||||
type: "image",
|
type: "image",
|
||||||
capabilities: ["text_to_image"],
|
capabilities: ["image_to_image"],
|
||||||
releasedAt: "2025-12-15",
|
releasedAt: "2025-12-15",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
expect(presets.find((item) => item.modelId === "black-forest-labs/flux-dev")?.isHidden).toBe(true);
|
expect(presets.find((item) => item.modelId === "black-forest-labs/flux-dev")?.isHidden).toBe(true);
|
||||||
expect(
|
expect(
|
||||||
presets.find((item) => item.modelId === "google/nano-banana-2/text-to-image")?.isHidden,
|
presets.find((item) => item.modelId === "google/nano-banana-2/edit")?.isHidden,
|
||||||
).toBe(false);
|
).toBe(false);
|
||||||
expect(presets.find((item) => item.modelId === "future-image-with-date")?.isHidden).toBe(false);
|
expect(presets.find((item) => item.modelId === "future-image-with-date")?.isHidden).toBe(false);
|
||||||
expect(presets.find((item) => item.modelId === "old-image-with-date")?.isHidden).toBe(true);
|
expect(presets.find((item) => item.modelId === "old-image-with-date")?.isHidden).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("excludes VIP98K text-to-image models without applying a price limit", () => {
|
||||||
|
const presets = buildVip98kModelPresets([
|
||||||
|
{
|
||||||
|
modelId: "pure-text-to-image",
|
||||||
|
type: "image",
|
||||||
|
capabilities: ["text_to_image"],
|
||||||
|
pricing: { effective_price: 0.02 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
modelId: "mixed-image-model",
|
||||||
|
type: "image",
|
||||||
|
capabilities: ["text_to_image", "image_to_image"],
|
||||||
|
pricing: { effective_price: 0.2 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
modelId: "expensive-image-edit",
|
||||||
|
type: "image",
|
||||||
|
capabilities: ["image_to_image"],
|
||||||
|
pricing: { effective_price: 2.5 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
modelId: "remove-background",
|
||||||
|
type: "image_tool",
|
||||||
|
capabilities: ["image_processing"],
|
||||||
|
pricing: { effective_price: 1.2 },
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(presets.map((item) => item.modelId)).toEqual([
|
||||||
|
"expensive-image-edit",
|
||||||
|
"remove-background",
|
||||||
|
]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user