calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-08-11 15:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aig' of github.com:fosrl/pangolin into aig

Browse Source
This commit is contained in:
Owen
2026-08-10 13:55:10 -04:00
parent f2e7f83b3d 93dea0525e
commit eec3119297
9 changed files with 209 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
messages/en-US.json
+4 -4
View File
@@ -1779,14 +1779,14 @@
"aiProviderMessageRemove": "This will permanently delete the provider and its models and targets. This cannot be undone.",
"aiProviderErrorNoUpdate": "AI provider is not available to update",
"aiProviderModels": "Models",
"aiProviderModelsDescription": "Define allow and block patterns for this provider. Requests must match an allow pattern and must not match a block pattern. Use * and ? as wildcards (for example gpt-4* or claude-?). An empty allow list denies all models.",
"aiProviderModelsPlaceholder": "Model name or pattern (e.g. gpt-4*)",
"aiProviderModelsDescription": "Define allow and block patterns for this provider. Requests must match an allow pattern and must not match a block pattern. Pick from known models for this provider, or type a custom key or wildcard (for example gpt-4* or claude-?). An empty allow list denies all models.",
"aiProviderModelsPlaceholder": "Select a model or type a pattern (e.g. gpt-4*)",
"aiProviderModelsAllow": "Allow List",
"aiProviderModelsAllowDescription": "Models that may be used through this provider. Empty means deny all.",
"aiProviderModelsAllowPlaceholder": "Allowed model or pattern (e.g. gpt-4*)",
"aiProviderModelsAllowPlaceholder": "Select a model or type a pattern (e.g. gpt-4*)",
"aiProviderModelsBlock": "Block List",
"aiProviderModelsBlockDescription": "Models to deny even if they match an allow pattern.",
"aiProviderModelsBlockPlaceholder": "Blocked model or pattern (e.g. gpt-4o-mini)",
"aiProviderModelsBlockPlaceholder": "Select a model or type a pattern (e.g. gpt-4o-mini)",
"aiProviderModelsOverlapError": "These patterns cannot be on both lists: {keys}",
"aiProviderModelsUpdated": "Models updated",
"aiProviderModelsErrorUpdate": "Failed to update models",
server/lib/aiModelCatalog.ts
+27
View File
@@ -2,6 +2,7 @@ import fs from "node:fs";
import axios from "axios";
import config from "@server/lib/config";
import logger from "@server/logger";
import type { AiProviderType } from "@server/lib/aiProviderDefaults";
export const CATALOG_PROVIDERS = [
"openai",
@@ -16,6 +17,32 @@ export type CatalogProvider = (typeof CATALOG_PROVIDERS)[number];
const CATALOG_PROVIDER_SET = new Set<string>(CATALOG_PROVIDERS);
// Each of our provider types maps to at most one catalog provider. Provider
// types that proxy arbitrary underlying models (openRouter, vercelAiGateway,
// custom) have no mapping.
const PROVIDER_CATALOG_MAP: Record<
Exclude<AiProviderType, "custom">,
CatalogProvider | null
> = {
openai: "openai",
anthropic: "anthropic",
googleGemini: "gemini",
vertexAi: "vertex",
bedrock: "bedrock",
microsoftFoundry: "azure",
openRouter: null,
vercelAiGateway: null
};
export function getCatalogProviderForType(
type: AiProviderType
): CatalogProvider | null {
if (type === "custom") {
return null;
}
return PROVIDER_CATALOG_MAP[type];
}
export type AiModelCatalogEntry = {
provider: CatalogProvider;
model: string;
server/lib/aiModelPricing.ts
+2 -19
View File
@@ -2,6 +2,7 @@ import type { AiProviderType } from "@server/lib/aiProviderDefaults";
import type { AiUsage } from "@server/lib/aiUsageExtraction";
import {
aiModelCatalog,
getCatalogProviderForType,
type AiModelCatalogEntry,
type CatalogProvider
} from "@server/lib/aiModelCatalog";
@@ -19,23 +20,6 @@ export type AiModelPricing = {
approximate: boolean;
};
// Each of our provider types maps to at most one catalog provider. Provider types that proxy
// arbitrary underlying models (openRouter, vercelAiGateway, custom) have no
// mapping and always fall back to a global search.
const PROVIDER_CATALOG_MAP: Record<
Exclude<AiProviderType, "custom">,
CatalogProvider | null
> = {
openai: "openai",
anthropic: "anthropic",
googleGemini: "gemini",
vertexAi: "vertex",
bedrock: "bedrock",
microsoftFoundry: "azure",
openRouter: null,
vercelAiGateway: null
};
function stripVendorPrefix(modelId: string): string | null {
const idx = modelId.indexOf("/");
if (idx === -1 || idx === modelId.length - 1) {
@@ -96,8 +80,7 @@ export function getModelPricing(
return null;
}
const catalogProvider =
providerType === "custom" ? null : PROVIDER_CATALOG_MAP[providerType];
const catalogProvider = getCatalogProviderForType(providerType);
if (catalogProvider) {
const scoped = findEntry(modelId, catalogProvider);
server/routers/aiProvider/index.ts
+1
View File
@@ -5,6 +5,7 @@ export * from "./updateAiProvider";
export * from "./deleteAiProvider";
export * from "./createAiModel";
export * from "./listAiModels";
export * from "./listCatalogModels";
export * from "./getAiModel";
export * from "./updateAiModel";
export * from "./deleteAiModel";
server/routers/aiProvider/listCatalogModels.ts
+131
View File
@@ -0,0 +1,131 @@
import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { aiProviders, db } from "@server/db";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";
import logger from "@server/logger";
import { fromError } from "zod-validation-error";
import { OpenAPITags, registry } from "@server/openApi";
import { eq } from "drizzle-orm";
import {
aiModelCatalog,
getCatalogProviderForType
} from "@server/lib/aiModelCatalog";
import type { AiProviderType } from "@server/lib/aiProviderDefaults";
import type { ListCatalogModelsResponse } from "@server/routers/aiProvider/types";
const paramsSchema = z.strictObject({
providerId: z.coerce.number().int().positive()
});
const listSchema = z.object({
query: z.string().optional()
});
registry.registerPath({
method: "get",
path: "/ai-provider/{providerId}/catalog-models",
description:
"List known catalog models for an AI provider's type. Used for model key suggestions.",
tags: [OpenAPITags.AiModel],
request: {
params: paramsSchema,
query: listSchema
},
responses: {
200: {
description: "Successful response"
}
}
});
export async function listCatalogModels(
req: Request,
res: Response,
next: NextFunction
): Promise<any> {
try {
const parsedQuery = listSchema.safeParse(req.query);
if (!parsedQuery.success) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
fromError(parsedQuery.error).toString()
)
);
}
const parsedParams = paramsSchema.safeParse(req.params);
if (!parsedParams.success) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
fromError(parsedParams.error).toString()
)
);
}
const { providerId } = parsedParams.data;
const [provider] =
req.aiProvider && req.aiProvider.providerId === providerId
? [req.aiProvider]
: await db
.select()
.from(aiProviders)
.where(eq(aiProviders.providerId, providerId))
.limit(1);
if (!provider) {
return next(
createHttpError(
HttpCode.NOT_FOUND,
`AI provider with ID ${providerId} not found`
)
);
}
const catalogProvider = getCatalogProviderForType(
provider.type as AiProviderType
);
let models = catalogProvider
? aiModelCatalog.list(catalogProvider).map((entry) => ({
model: entry.model
}))
: [];
const { query } = parsedQuery.data;
if (query) {
const q = query.toLowerCase();
models = models.filter((m) => m.model.toLowerCase().includes(q));
}
// Deduplicate model keys (catalog may have duplicates after provider
// normalization, e.g. bedrock + bedrock_converse).
const seen = new Set<string>();
models = models.filter((m) => {
if (seen.has(m.model)) {
return false;
}
seen.add(m.model);
return true;
});
models.sort((a, b) => a.model.localeCompare(b.model));
return response<ListCatalogModelsResponse>(res, {
data: { models },
success: true,
error: false,
message: "Catalog models retrieved successfully",
status: HttpCode.OK
});
} catch (error) {
logger.error(error);
return next(
createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
);
}
}
server/routers/aiProvider/types.ts
+4
View File
@@ -39,6 +39,10 @@ export type ListAiModelsResponse = PaginatedResponse<{
models: AiModel[];
}>;
export type ListCatalogModelsResponse = {
models: { model: string }[];
};
export type GetAiModelResponse = {
model: AiModel;
};
server/routers/external.ts
+7
View File
@@ -1565,6 +1565,13 @@ authenticated.get(
aiProvider.listAiModels
);
authenticated.get(
"/ai-provider/:providerId/catalog-models",
verifyAiProviderAccess,
verifyUserHasAction(ActionsEnum.listAiModels),
aiProvider.listCatalogModels
);
authenticated.get(
"/ai-model/:modelId",
verifyAiModelAccess,
src/app/[orgId]/settings/ai-providers/[providerId]/models/page.tsx
+21 -3
View File
@@ -20,7 +20,7 @@ import { createApiClient, formatAxiosError } from "@app/lib/api";
import { aiProviderQueries } from "@app/lib/queries";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useTranslations } from "next-intl";
import { useEffect, useState } from "react";
import { useEffect, useMemo, useState } from "react";
type ModelListType = "allow" | "block";
@@ -43,6 +43,18 @@ export default function AiProviderModelsPage() {
const modelsQuery = useQuery(
aiProviderQueries.providerModels({ providerId: provider.providerId })
);
const catalogQuery = useQuery(
aiProviderQueries.catalogModels({ providerId: provider.providerId })
);
const catalogTags = useMemo(
() =>
(catalogQuery.data ?? []).map((entry) => ({
id: entry.model,
text: entry.model
})),
[catalogQuery.data]
);
useEffect(() => {
if (!modelsQuery.data) return;
@@ -165,6 +177,8 @@ export default function AiProviderModelsPage() {
}
}
const inputsDisabled = modelsQuery.isLoading || saveLoading;
return (
<SettingsContainer>
<SettingsSection>
@@ -196,10 +210,12 @@ export default function AiProviderModelsPage() {
: newTags;
setAllowTags(next as Tag[]);
}}
enableAutocomplete={catalogTags.length > 0}
autocompleteOptions={catalogTags}
allowDuplicates={false}
sortTags
delimiterList={[",", "Enter"]}
disabled={modelsQuery.isLoading || saveLoading}
disabled={inputsDisabled}
/>
<p className="text-sm text-muted-foreground">
{t("aiProviderModelsAllowDescription")}
@@ -223,10 +239,12 @@ export default function AiProviderModelsPage() {
: newTags;
setBlockTags(next as Tag[]);
}}
enableAutocomplete={catalogTags.length > 0}
autocompleteOptions={catalogTags}
allowDuplicates={false}
sortTags
delimiterList={[",", "Enter"]}
disabled={modelsQuery.isLoading || saveLoading}
disabled={inputsDisabled}
/>
<p className="text-sm text-muted-foreground">
{t("aiProviderModelsBlockDescription")}
src/lib/queries.ts
+12 -1
View File
@@ -61,7 +61,8 @@ import type { GetSiteResourceResponse } from "@server/routers/siteResource/getSi
import type { ListTargetsResponse } from "@server/routers/target";
import type {
ListAiModelsResponse,
ListAiProvidersResponse
ListAiProvidersResponse,
ListCatalogModelsResponse
} from "@server/routers/aiProvider/types";
import type { ListAiBudgetsByScopeResponse } from "@server/routers/aiBudget/types";
import {
@@ -1199,6 +1200,16 @@ export const aiProviderQueries = {
return res.data.data.models;
}
}),
catalogModels: ({ providerId }: { providerId: number }) =>
queryOptions({
queryKey: ["AI_PROVIDERS", providerId, "CATALOG_MODELS"] as const,
queryFn: async ({ signal, meta }) => {
const res = await meta!.api.get<
AxiosResponse<ListCatalogModelsResponse>
>(`/ai-provider/${providerId}/catalog-models`, { signal });
return res.data.data.models;
}
}),
orgProviders: ({ orgId, query }: { orgId: string; query?: string }) =>
queryOptions({
queryKey: ["AI_PROVIDERS", orgId, "LIST", query ?? ""] as const,