The open-source agent harness - the runtime layer that turns an LLM into a working agent.
feat: add model filtering configuration for tenants (#741)
Sujai Kumar Guptac77e7df426c8
diff --git a/.changeset/tfy-tenant-provider-account-filter.md b/.changeset/tfy-tenant-provider-account-filter.mdnew file mode 100644index 000000000..258862123--- /dev/null+++ b/.changeset/tfy-tenant-provider-account-filter.md@@ -0,0 +1,5 @@+---+"@truefoundry/trueforge": patch+---++TrueFoundry mode: optional `TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS` JSON map of tenant id → provider account names to limit which virtual providers are listed per tenant.diff --git a/packages/trueforge/.env.example b/packages/trueforge/.env.exampleindex 505a33e37..2950d0de0 100644--- a/packages/trueforge/.env.example+++ b/packages/trueforge/.env.example@@ -34,6 +34,9 @@ PORT=8790# TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS=10000## Max ms for ServiceFoundry agent create/update/delete calls. Default 3000.# TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS=3000+## Optional per-tenant allowlist of model provider account names (JSON object).+## Tenants omitted are unfiltered. Example: {"internal":["openai-main","anthropic-main"]}+# TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS={"internal":["openai-main"]}## Mutual TLS for this process's HTTPS listener and controller→server. Off by default (plain HTTP).## When true, serves HTTPS with client-cert enforcement (except /healthz) and the controllerdiff --git a/packages/trueforge/src/config.ts b/packages/trueforge/src/config.tsindex 0b9af11dd..51c109608 100644--- a/packages/trueforge/src/config.ts+++ b/packages/trueforge/src/config.ts@@ -17,6 +17,7 @@ import path from 'node:path';import { fileURLToPath } from 'node:url';import envPaths from 'env-paths';+import { z } from 'zod';const DEFAULT_PORT = 8790;/** Loopback default; container images set HOST=0.0.0.0 so probes and Service traffic reach the process. */@@ -104,10 +105,9 @@ export function parseOidcScopes(raw: string): string[] {}/**- * Parses `OIDC_ALLOWED_EMAILS`: comma-separated exact addresses and/or globs- * (`*@company.com`). Empty / unset → no allowlist (any authenticated user may sign in).+ * Parses a comma-separated env list (trim, drop empties). Empty / unset → `[]`.*/-export function parseOidcAllowedEmails(raw: string | undefined): string[] {+export function parseCommaSeparatedEnvList(raw: string | undefined): string[] {if (raw === undefined || raw.trim() === '') {return [];}@@ -117,6 +117,32 @@ export function parseOidcAllowedEmails(raw: string | undefined): string[] {.filter(part => part.length > 0);}+/**+ * Parses `OIDC_ALLOWED_EMAILS`: comma-separated exact addresses and/or globs+ * (`*@company.com`). Empty / unset → no allowlist (any authenticated user may sign in).+ */+export function parseOidcAllowedEmails(raw: string | undefined): string[] {+ return parseCommaSeparatedEnvList(raw);+}++/**+ * Parses `TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS` JSON.+ * Empty / unset → `{}` (no filtering).+ */+export function parseTenantIdToAllowedModelProviderAccounts(raw: string | undefined): Record<string, string[]> {+ if (raw === undefined || raw.trim() === '') {+ return {};+ }+ try {+ return z.record(z.string(), z.array(z.string())).parse(JSON.parse(raw));+ } catch (error) {+ throw new Error(+ 'Environment variable TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS must be a JSON object of tenant_id → string[]',+ { cause: error },+ );+ }+}+/** Parses a positive-integer env var, falling back to `defaultValue` when unset/blank. */function parsePositiveInt(options: { envKey: string; raw: string | undefined; defaultValue: number }): number {const { envKey, raw, defaultValue } = options;@@ -654,6 +680,13 @@ export type DistributedServerConfiguration = SharedServerConfiguration & {* Env: `TRUEFOUNDRY_SANDBOX_SETTINGS`.*/TRUEFOUNDRY_SANDBOX_SETTINGS: string | undefined;+ /**+ * Optional per-tenant allowlist of model provider account names. JSON object+ * `Record<tenant_id, account_name[]>`. Empty / unset → no filtering. Tenants omitted from the+ * map are unaffected; tenants present are limited to the listed provider accounts.+ * Env: `TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS`.+ */+ TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS: Record<string, string[]>;};export type ServerConfiguration = StandaloneServerConfiguration | DistributedServerConfiguration;@@ -829,6 +862,9 @@ const configuration: ServerConfiguration = standaloneTRUEFOUNDRY_SANDBOX_API_KEY: getEnv('TRUEFOUNDRY_SANDBOX_API_KEY', { required: false }),TRUEFOUNDRY_SANDBOX_SERVER_URL: getEnv('TRUEFOUNDRY_SANDBOX_SERVER_URL', { required: false }),TRUEFOUNDRY_SANDBOX_SETTINGS: getEnv('TRUEFOUNDRY_SANDBOX_SETTINGS', { required: false }),+ TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS: parseTenantIdToAllowedModelProviderAccounts(+ getEnv('TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS', { required: false }),+ ),};export function isOidcConfigured(diff --git a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.tsindex b49baf7f0..03a235aa9 100644--- a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts@@ -14,7 +14,12 @@ import {import type { AvailableModel, ModelProviderManifest } from '../schemas/modelProvider';import { accessTokenForRequest, asTrueFoundryRequestContext, type ResolveAccessToken } from './accessToken';import { trueFoundryManaged } from './errors';-import { mapEnabledModels, resolveDefaultGatewayUrl, type TrueFoundryEnabledModel } from './mapEnabledModels';+import {+ filterEnvModels,+ mapEnabledModels,+ resolveDefaultGatewayUrl,+ type TrueFoundryEnabledModel,+} from './mapEnabledModels';import { TrueFoundryServiceFoundryServerClient } from './TrueFoundryServiceFoundryServerClient';export class TrueFoundryModelProviderStore<TTransaction = never> implements IModelProviderStore<TTransaction> {@@ -94,11 +99,15 @@ export class TrueFoundryModelProviderStore<TTransaction = never> implements IModthis.#client.listGatewayInstallations(agentToken),]);const gatewayUrl = resolveDefaultGatewayUrl(installations);+ const models = filterEnvModels({+ tenant_id: input.tenant_id,+ models: mapEnabledModels({ integrations }),+ });return toRecords({tenant_id: input.tenant_id,gatewayUrl,accessToken: userToken,- models: mapEnabledModels({ integrations }),+ models,});}}diff --git a/packages/trueforge/src/truefoundry/mapEnabledModels.ts b/packages/trueforge/src/truefoundry/mapEnabledModels.tsindex 50dfbf402..32e0cfa2e 100644--- a/packages/trueforge/src/truefoundry/mapEnabledModels.ts+++ b/packages/trueforge/src/truefoundry/mapEnabledModels.ts@@ -1,6 +1,7 @@import { SUPPORTED_REASONING_EFFORTS } from '@truefoundry/trueforge-core/core';import { HTTPException } from 'hono/http-exception';import { z } from 'zod';+import configuration, { isTrueFoundryModeEnabled } from '../config';import type { ModelProperties, ReasoningEffort } from '../schemas/modelProvider';const ModelParamSchema = z.object({@@ -82,6 +83,25 @@ export function mapEnabledModels(input: { integrations: readonly unknown[] }): Treturn models;}+/**+ * Applies `TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS` when TrueFoundry mode is on.+ * Tenants omitted from the map are unfiltered; listed tenants keep only matching `accountName`s.+ */+export function filterEnvModels(input: {+ tenant_id: string;+ models: readonly TrueFoundryEnabledModel[];+}): TrueFoundryEnabledModel[] {+ if (!isTrueFoundryModeEnabled(configuration)) {+ return [...input.models];+ }+ const allowedAccounts = configuration.TRUEFOUNDRY_TENANT_ID_TO_ALLOWED_MODEL_PROVIDER_ACCOUNTS[input.tenant_id];+ if (allowedAccounts === undefined) {+ return [...input.models];+ }+ const allowed = new Set(allowedAccounts);+ return input.models.filter(model => allowed.has(model.accountName));+}+const InstallationSchema = z.object({isDefault: z.boolean().optional(),manifest: z.object({ url: z.string().min(1) }),