Skip to content

The open alternative to Salesforce, designed for AI.

Attribute evaluation usage to its caller (#28935)

Raphaël Bosi12e3811137eb
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/services/ai-evaluation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/services/ai-evaluation.service.ts
index 49e5004a27a..f460bfa3dad 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/services/ai-evaluation.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/services/ai-evaluation.service.ts
@@ -23,20 +23,24 @@ export class AiEvaluationService {
private readonly aiBillingService: AiBillingService,
) {}
+ isAvailable(): boolean {
+ return (
+ this.aiModelRegistryService.isModelAdminAllowed(JEV_MODEL_ID) &&
+ isDefined(this.aiModelRegistryService.getEvaluationModel(JEV_MODEL_ID))
+ );
+ }
+
async evaluate({
workspaceId,
userWorkspaceId,
+ operationType = UsageOperationType.AI_WORKFLOW_TOKEN,
state,
questions,
abortSignal,
}: AiEvaluationRequest): Promise<AiEvaluationResult> {
assertEvaluationQuestionsAreWellFormed(questions);
- const isJevAvailable =
- this.aiModelRegistryService.isModelAdminAllowed(JEV_MODEL_ID) &&
- isDefined(this.aiModelRegistryService.getEvaluationModel(JEV_MODEL_ID));
-
- if (!isJevAvailable) {
+ if (!this.isAvailable()) {
throw new AiException(
'Jev is unavailable. Configure the TypeSafe AI API key and enable Jev before running Classify.',
AiExceptionCode.EVALUATION_MODEL_NOT_FOUND,
@@ -47,7 +51,7 @@ export class AiEvaluationService {
await this.aiBillingService.assertAiExecutionAllowed({
workspaceId,
- operationType: UsageOperationType.AI_WORKFLOW_TOKEN,
+ operationType,
spenders: { userWorkspaceId },
});
@@ -62,7 +66,7 @@ export class AiEvaluationService {
modelId,
billingInput: { usage },
workspaceId,
- operationType: UsageOperationType.AI_WORKFLOW_TOKEN,
+ operationType,
spenders: { userWorkspaceId },
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/types/ai-evaluation-request.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/types/ai-evaluation-request.type.ts
index 6ddde8e57ec..57138dd7c09 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/types/ai-evaluation-request.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-evaluation/types/ai-evaluation-request.type.ts
@@ -1,3 +1,4 @@
+import { type UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';
import {
type AiEvaluationModelInput,
type AiEvaluationModelQuestion,
@@ -7,6 +8,7 @@ export type AiEvaluationRequest = {
workspaceId: string;
// spend attribution and quota check target
userWorkspaceId?: string | null;
+ operationType?: UsageOperationType;
state: AiEvaluationModelInput;
questions: Record<string, AiEvaluationModelQuestion>;
abortSignal?: AbortSignal;