Skip to content

The open alternative to Salesforce, designed for AI.

fix: unblock AI chat on manually added models (#23695)

Bruno Pérez3cf714fc270e
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
index 5e377df4ddc..7353b4af216 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
@@ -66,6 +66,16 @@ type ModelSuggestion = {
supportsReasoning: boolean;
};
+const isInvalidLimit = (rawValue: string) => {
+ if (rawValue.trim() === '') {
+ return false;
+ }
+
+ const parsedValue = Number(rawValue);
+
+ return !Number.isInteger(parsedValue) || parsedValue <= 0;
+};
+
type FormValues = {
name: string;
label: string;
@@ -184,9 +194,16 @@ export const SettingsAdminNewAiModel = () => {
);
form.setValue(
'contextWindowTokens',
- String(suggestion.contextWindowTokens),
+ suggestion.contextWindowTokens > 0
+ ? String(suggestion.contextWindowTokens)
+ : '',
+ );
+ form.setValue(
+ 'maxOutputTokens',
+ suggestion.maxOutputTokens > 0
+ ? String(suggestion.maxOutputTokens)
+ : '',
);
- form.setValue('maxOutputTokens', String(suggestion.maxOutputTokens));
form.setValue('modalities', suggestion.modalities ?? []);
form.setValue('supportsReasoning', suggestion.supportsReasoning);
}
@@ -217,6 +234,27 @@ export const SettingsAdminNewAiModel = () => {
return;
}
+ const contextWindowTokens = Number(values.contextWindowTokens);
+ const maxOutputTokens = Number(values.maxOutputTokens);
+
+ if (isInvalidLimit(values.contextWindowTokens)) {
+ form.setError('contextWindowTokens', {
+ type: 'manual',
+ message: t`Context window must be a positive integer`,
+ });
+
+ return;
+ }
+
+ if (isInvalidLimit(values.maxOutputTokens)) {
+ form.setError('maxOutputTokens', {
+ type: 'manual',
+ message: t`Max output must be a positive integer`,
+ });
+
+ return;
+ }
+
const cachedInput = parseFloat(
values.cachedInputCostPerMillionTokens || '',
);
@@ -239,8 +277,8 @@ export const SettingsAdminNewAiModel = () => {
...(isFinite(cacheCreation) && {
cacheCreationCostPerMillionTokens: cacheCreation,
}),
- contextWindowTokens: parseInt(values.contextWindowTokens || '0', 10),
- maxOutputTokens: parseInt(values.maxOutputTokens || '0', 10),
+ ...(contextWindowTokens > 0 && { contextWindowTokens }),
+ ...(maxOutputTokens > 0 && { maxOutputTokens }),
...(values.modalities.length > 0 && {
modalities: values.modalities,
}),
@@ -452,26 +490,34 @@ export const SettingsAdminNewAiModel = () => {
<Controller
name="contextWindowTokens"
control={form.control}
- render={({ field: { onChange, value } }) => (
+ render={({
+ field: { onChange, value },
+ fieldState: { error },
+ }) => (
<TextInput
label={t`Context window`}
value={value}
onChange={onChange}
placeholder={t`e.g. 128000`}
fullWidth
+ error={error?.message}
/>
)}
/>
<Controller
name="maxOutputTokens"
control={form.control}
- render={({ field: { onChange, value } }) => (
+ render={({
+ field: { onChange, value },
+ fieldState: { error },
+ }) => (
<TextInput
label={t`Max output`}
value={value}
onChange={onChange}
placeholder={t`e.g. 16384`}
fullWidth
+ error={error?.message}
/>
)}
/>
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
index a70a7e81c29..d6dcdb1fe3b 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
@@ -102,6 +102,7 @@ import { DefaultAiCatalogService } from 'src/engine/metadata-modules/ai/ai-model
import { ModelsDevCatalogService } from 'src/engine/metadata-modules/ai/ai-models/services/models-dev-catalog.service';
import { AiModelRole } from 'src/engine/metadata-modules/ai/ai-models/types/ai-model-role.enum';
import { type AiProviderConfig } from 'src/engine/metadata-modules/ai/ai-models/types/ai-provider-config.type';
+import { aiProviderModelConfigSchema } from 'src/engine/metadata-modules/ai/ai-models/types/ai-provider-model-config.schema';
import { type AiProviderModelConfig } from 'src/engine/metadata-modules/ai/ai-models/types/ai-provider-model-config.type';
import { extractConfigVariableName } from 'src/engine/metadata-modules/ai/ai-models/utils/extract-config-variable-name.util';
@@ -628,6 +629,17 @@ export class AdminPanelResolver {
@Args('modelConfig', { type: () => GraphQLJSON })
modelConfig: AiProviderModelConfig,
): Promise<boolean> {
+ const validatedModelConfig =
+ aiProviderModelConfigSchema.safeParse(modelConfig);
+
+ if (!validatedModelConfig.success) {
+ throw new UserInputError(
+ `Invalid model configuration: ${validatedModelConfig.error.issues
+ .map((issue) => `${issue.path.join('.')} ${issue.message}`)
+ .join(', ')}`,
+ );
+ }
+
const customProviders = {
...this.twentyConfigService.get('AI_PROVIDERS'),
};
@@ -642,18 +654,22 @@ export class AdminPanelResolver {
const existingModels = existing.models ?? [];
const alreadyExists = existingModels.some(
- (model: AiProviderModelConfig) => model.name === modelConfig.name,
+ (model: AiProviderModelConfig) =>
+ model.name === validatedModelConfig.data.name,
);
if (alreadyExists) {
throw new UserInputError(
- `Model "${modelConfig.name}" already exists on provider "${providerName}"`,
+ `Model "${validatedModelConfig.data.name}" already exists on provider "${providerName}"`,
);
}
customProviders[providerName] = {
...existing,
- models: [...existingModels, { ...modelConfig, source: 'manual' }],
+ models: [
+ ...existingModels,
+ { ...validatedModelConfig.data, source: 'manual' },
+ ],
};
await this.twentyConfigService.set('AI_PROVIDERS', customProviders);
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts
index f556f8c59cd..1f112317e17 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service.ts
@@ -27,6 +27,7 @@ import { isAutoSelectModelId } from 'twenty-shared/utils';
import { DEFAULT_MAX_OUTPUT_TOKENS } from 'src/engine/metadata-modules/ai/ai-models/types/default-max-output-tokens.const';
import { buildCompositeModelId } from 'src/engine/metadata-modules/ai/ai-models/utils/composite-model-id.util';
+import { getPositiveTokenLimitOrDefault } from 'src/engine/metadata-modules/ai/ai-models/utils/get-positive-token-limit-or-default.util';
import { inferModelFamily } from 'src/engine/metadata-modules/ai/ai-models/utils/infer-model-family.util';
import { isProviderConfigured } from 'src/engine/metadata-modules/ai/ai-models/utils/is-provider-configured.util';
import {
@@ -155,9 +156,14 @@ export class AiModelRegistryService {
cacheCreationCostPerMillionTokens:
modelDef.cacheCreationCostPerMillionTokens,
longContextCost: modelDef.longContextCost,
- contextWindowTokens:
- modelDef.contextWindowTokens ?? DEFAULT_CONTEXT_WINDOW_TOKENS,
- maxOutputTokens: modelDef.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS,
+ contextWindowTokens: getPositiveTokenLimitOrDefault(
+ modelDef.contextWindowTokens,
+ DEFAULT_CONTEXT_WINDOW_TOKENS,
+ ),
+ maxOutputTokens: getPositiveTokenLimitOrDefault(
+ modelDef.maxOutputTokens,
+ DEFAULT_MAX_OUTPUT_TOKENS,
+ ),
modalities: modelDef.modalities,
supportsReasoning: modelDef.supportsReasoning,
isDeprecated: modelDef.isDeprecated,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/utils/get-positive-token-limit-or-default.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/utils/get-positive-token-limit-or-default.util.ts
new file mode 100644
index 00000000000..07d3f701339
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/utils/get-positive-token-limit-or-default.util.ts
@@ -0,0 +1,6 @@
+import { isDefined } from 'twenty-shared/utils';
+
+export const getPositiveTokenLimitOrDefault = (
+ limit: number | undefined,
+ fallback: number,
+): number => (isDefined(limit) && limit > 0 ? limit : fallback);