Skip to content

The open alternative to Salesforce, designed for AI.

perf(ai-history): check workspace history readiness once per process (#27215)

Félix Malfait57bc28a25bf3
diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
index a9ce5319c6b..37f1bddbfe3 100644
--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
@@ -156,13 +156,13 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
const orm = createOrm();
const threads = new AgentHistoryRepository<AgentChatThreadWorkspaceEntity>(
'agentChatThread',
- storage,
+ workspaceStorage,
orm,
);
const messages = new AgentHistoryRepository<AgentMessageWorkspaceEntity>(
'agentMessage',
- storage,
+ workspaceStorage,
orm,
);
@@ -178,13 +178,13 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
const turns = new AgentHistoryRepository<AgentTurnWorkspaceEntity>(
'agentTurn',
- storage,
+ workspaceStorage,
orm,
);
const messageParts =
new AgentHistoryRepository<AgentMessagePartWorkspaceEntity>(
'agentMessagePart',
- storage,
+ workspaceStorage,
orm,
);
@@ -554,7 +554,10 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
'being migrated',
);
await expect(
- workspaceStorage.run(WORKSPACE_ID, operation),
+ new AgentHistoryWorkspaceStorageService(dataSource).run(
+ WORKSPACE_ID,
+ operation,
+ ),
).rejects.toBeInstanceOf(ServiceUnavailableException);
expect(operation).not.toHaveBeenCalled();
expect(
@@ -620,8 +623,10 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
});
await dataSource.query('DELETE FROM core."keyValuePair"');
await expect(
- workspaceStorage.run(WORKSPACE_ID, ({ manager, table }) =>
- manager.query(`SELECT id FROM ${table('agentChatThread')}`),
+ new AgentHistoryWorkspaceStorageService(dataSource).run(
+ WORKSPACE_ID,
+ ({ manager, table }) =>
+ manager.query(`SELECT id FROM ${table('agentChatThread')}`),
),
).rejects.toBeInstanceOf(ServiceUnavailableException);
await expect(
@@ -640,6 +645,10 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
await expect(
workspaceStorage.run(WORKSPACE_ID, async () => 'ready'),
).resolves.toBe('ready');
+ const readinessQuery = jest.spyOn(dataSource, 'query');
+ await workspaceStorage.run(WORKSPACE_ID, async () => 'ready');
+ expect(readinessQuery).not.toHaveBeenCalled();
+ readinessQuery.mockRestore();
await workspaceStorage.initializeWorkspace(WORKSPACE_ID);
expect(await readRoute()).toBe('workspace');
});
@@ -647,7 +656,10 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
it('does not mark legacy history as migrated during initialization', async () => {
await workspaceStorage.initializeWorkspace(WORKSPACE_ID);
await expect(
- workspaceStorage.run(WORKSPACE_ID, jest.fn()),
+ new AgentHistoryWorkspaceStorageService(dataSource).run(
+ WORKSPACE_ID,
+ jest.fn(),
+ ),
).rejects.toBeInstanceOf(ServiceUnavailableException);
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts
index 43b7d1d8490..10423fc9989 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/__tests__/agent-history-repository.spec.ts
@@ -9,11 +9,8 @@ it('reads native workspace fields and precision behind the upgrade readiness fen
activeStreamId: '',
};
const storage = {
- run: jest
- .fn()
- .mockImplementation(
- async (_workspaceId: string, work: () => Promise<unknown>) => work(),
- ),
+ run: jest.fn(),
+ getContext: jest.fn().mockResolvedValue({}),
};
const find = jest.fn().mockResolvedValue([record]);
const count = jest.fn().mockResolvedValue(1);
@@ -40,5 +37,5 @@ it('reads native workspace fields and precision behind the upgrade readiness fen
order: { archivedAt: { order: 'DESC', nulls: 'NULLS LAST' } },
}),
);
- expect(storage.run).toHaveBeenCalledTimes(2);
+ expect(storage.getContext).toHaveBeenCalledTimes(2);
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
index b3e824934f5..af72d606c77 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts
@@ -28,7 +28,7 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
private readonly name: AgentHistoryObjectName,
private readonly storageService: Pick<
AgentHistoryWorkspaceStorageService,
- 'run'
+ 'run' | 'getContext'
>,
private readonly workspaceOrmManager: Pick<
WorkspaceOrmManager,
@@ -36,27 +36,27 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {
>,
) {}
- private run<TResult>(
+ private async run<TResult>(
workspaceId: string,
work: (
repository: WorkspaceRepository<TRecord>,
context: AgentHistoryStorageContext,
) => Promise<TResult>,
): Promise<TResult> {
- return this.storageService.run(workspaceId, (context) =>
- this.workspaceOrmManager.executeInWorkspaceContext(
- () =>
- work(
- this.workspaceOrmManager.getRepository<TRecord>(
- this.name,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- ),
- context,
+ const context = await this.storageService.getContext(workspaceId);
+
+ return this.workspaceOrmManager.executeInWorkspaceContext(
+ () =>
+ work(
+ this.workspaceOrmManager.getRepository<TRecord>(
+ this.name,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
),
- buildSystemAuthContext(workspaceId),
- { lite: true },
- ),
+ context,
+ ),
+ buildSystemAuthContext(workspaceId),
+ { lite: true },
);
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts
index 57010558b51..846a5b525a8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts
@@ -14,72 +14,69 @@ export class AgentHistoryTransactionService {
private readonly workspaceOrmManager: WorkspaceOrmManager,
) {}
- run<TResult>(
+ async run<TResult>(
workspaceId: string,
work: (scope: AgentHistoryTransactionScope) => Promise<TResult>,
): Promise<TResult> {
- return this.storageService.run(workspaceId, (context) =>
- this.workspaceOrmManager.executeInWorkspaceContext(
- () =>
- this.workspaceOrmManager.runInWorkspaceTransaction(
- (transactionScope) => {
- const getRepository = (name: AgentHistoryObjectName) =>
- transactionScope.getRepository(
- name,
- { shouldBypassPermissionChecks: true },
- { shouldSkipEventEmission: true },
- );
+ const context = await this.storageService.getContext(workspaceId);
+
+ return this.workspaceOrmManager.executeInWorkspaceContext(
+ () =>
+ this.workspaceOrmManager.runInWorkspaceTransaction(
+ (transactionScope) => {
+ const getRepository = (name: AgentHistoryObjectName) =>
+ transactionScope.getRepository(
+ name,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
- return work({
- insert: async (name, values) => {
- await getRepository(name).insert(
- await addAgentMessageSenderWorkspaceMember({
- name,
- values,
- workspaceId,
- context,
- }),
- );
- },
- update: async (name, where, values) => {
- const result = await getRepository(name).update(
- where,
+ return work({
+ insert: async (name, values) => {
+ await getRepository(name).insert(
+ await addAgentMessageSenderWorkspaceMember({
+ name,
values,
- );
+ workspaceId,
+ context,
+ }),
+ );
+ },
+ update: async (name, where, values) => {
+ const result = await getRepository(name).update(where, values);
- return result.generatedMaps.length;
- },
- upsert: async (name, values, conflictPaths) => {
- // workspace upsert selects before inserting, so concurrent writers of one identity take turns
- const identity = [...conflictPaths]
- .sort()
- .map((field) => [field, values[field]]);
+ return result.generatedMaps.length;
+ },
+ upsert: async (name, values, conflictPaths) => {
+ // workspace upsert selects before inserting, so concurrent writers of one identity take turns
+ const identity = [...conflictPaths]
+ .sort()
+ .map((field) => [field, values[field]]);
- await transactionScope.executeRawQuery(
- 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',
- [
- `agent-history-upsert:${workspaceId}:${name}:${JSON.stringify(identity)}`,
- ],
- );
- await getRepository(name).upsert(
- await addAgentMessageSenderWorkspaceMember({
- name,
- values,
- workspaceId,
- context,
- }),
- conflictPaths,
- );
- },
- delete: async (name, where) => {
- await getRepository(name).delete(where);
- },
- });
- },
- ),
- buildSystemAuthContext(workspaceId),
- { lite: true },
- ),
+ await transactionScope.executeRawQuery(
+ 'SELECT pg_advisory_xact_lock(hashtextextended($1, 0))',
+ [
+ `agent-history-upsert:${workspaceId}:${name}:${JSON.stringify(identity)}`,
+ ],
+ );
+ await getRepository(name).upsert(
+ await addAgentMessageSenderWorkspaceMember({
+ name,
+ values,
+ workspaceId,
+ context,
+ }),
+ conflictPaths,
+ );
+ },
+ delete: async (name, where) => {
+ await getRepository(name).delete(where);
+ },
+ });
+ },
+ ),
+ buildSystemAuthContext(workspaceId),
+ { lite: true },
);
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts
index d22940982a1..faef1edd99a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service.ts
@@ -23,6 +23,8 @@ const getWorkspaceAgentHistoryTable =
@Injectable()
export class AgentHistoryWorkspaceStorageService {
+ private readonly readyWorkspaceIds = new Set<string>();
+
constructor(@InjectDataSource() private readonly dataSource: DataSource) {}
async initializeWorkspace(workspaceId: string): Promise<void> {
@@ -58,6 +60,24 @@ export class AgentHistoryWorkspaceStorageService {
workspaceId: string,
work: (context: AgentHistoryStorageContext) => Promise<TResult>,
): Promise<TResult> {
+ await this.assertReady(workspaceId);
+
+ return this.dataSource.transaction((manager) =>
+ work({ manager, table: getWorkspaceAgentHistoryTable(workspaceId) }),
+ );
+ }
+
+ async getContext(workspaceId: string): Promise<AgentHistoryStorageContext> {
+ await this.assertReady(workspaceId);
+
+ return {
+ manager: this.dataSource.manager,
+ table: getWorkspaceAgentHistoryTable(workspaceId),
+ };
+ }
+
+ // Once moved to workspace storage, history only leaves it if the 2.42 move is rolled back
+ private async assertReady(workspaceId: string): Promise<void> {
if (!isNonEmptyString(workspaceId)) {
throw new AgentHistoryStorageException(
'INVALID_WORKSPACE',
@@ -65,28 +85,24 @@ export class AgentHistoryWorkspaceStorageService {
);
}
- return this.runInTransaction(async (runner) => {
- // A retried upgrade clears its destination; no live write may race that copy.
- await runner.query(
- 'SELECT pg_advisory_xact_lock_shared(hashtextextended($1, 0))',
- [`${HISTORY_READINESS_KEY}:${workspaceId}`],
- );
- const ready = await runner.query(
- `SELECT 1 FROM core."keyValuePair" WHERE "key" = $1 AND "workspaceId" = $2
- AND "userId" IS NULL AND "applicationId" IS NULL AND type = 'CONFIG_VARIABLE'
- AND value->>'storage' = 'workspace' AND NOT (value ? 'migration')`,
- [HISTORY_READINESS_KEY, workspaceId],
+ if (this.readyWorkspaceIds.has(workspaceId)) {
+ return;
+ }
+
+ const ready = await this.dataSource.query(
+ `SELECT 1 FROM core."keyValuePair" WHERE "key" = $1 AND "workspaceId" = $2
+ AND "userId" IS NULL AND "applicationId" IS NULL AND type = 'CONFIG_VARIABLE'
+ AND value->>'storage' = 'workspace' AND NOT (value ? 'migration')`,
+ [HISTORY_READINESS_KEY, workspaceId],
+ );
+
+ if (ready.length === 0) {
+ throw new ServiceUnavailableException(
+ 'AI history is unavailable until this workspace finishes upgrading.',
);
- if (ready.length === 0) {
- throw new ServiceUnavailableException(
- 'AI history is unavailable until this workspace finishes upgrading.',
- );
- }
- return work({
- manager: runner.manager,
- table: getWorkspaceAgentHistoryTable(workspaceId),
- });
- });
+ }
+
+ this.readyWorkspaceIds.add(workspaceId);
}
async runReadOnlyReport<TResult>(