add workspaceId to indirect entities (#19522)
Required for `workspace:export` command --------- Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
+2
@@ -186,6 +186,7 @@ describe('ApplicationVariableEntityService', () => {
|
||||
description: 'A secret key',
|
||||
isSecret: true,
|
||||
applicationId: mockApplicationId,
|
||||
workspaceId: mockWorkspaceId,
|
||||
},
|
||||
]);
|
||||
});
|
||||
@@ -216,6 +217,7 @@ describe('ApplicationVariableEntityService', () => {
|
||||
description: 'Public URL',
|
||||
isSecret: false,
|
||||
applicationId: mockApplicationId,
|
||||
workspaceId: mockWorkspaceId,
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
+10
@@ -5,6 +5,7 @@ import {
|
||||
Column,
|
||||
CreateDateColumn,
|
||||
Entity,
|
||||
Index,
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
PrimaryGeneratedColumn,
|
||||
@@ -14,6 +15,7 @@ import {
|
||||
|
||||
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
|
||||
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
import { EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
|
||||
|
||||
@Entity({
|
||||
@@ -30,6 +32,14 @@ export class ApplicationVariableEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: EntityRelation<WorkspaceEntity>;
|
||||
|
||||
@Column({ nullable: false, type: 'text' })
|
||||
key: string;
|
||||
|
||||
|
||||
+1
@@ -136,6 +136,7 @@ export class ApplicationVariableEntityService {
|
||||
description: description ?? '',
|
||||
isSecret: isSecretValue,
|
||||
applicationId,
|
||||
workspaceId,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -10,6 +10,7 @@ export const fromApplicationVariableEntityToFlatApplicationVariable = (
|
||||
description: entity.description,
|
||||
isSecret: entity.isSecret,
|
||||
applicationId: entity.applicationId,
|
||||
workspaceId: entity.workspaceId,
|
||||
createdAt: entity.createdAt.toISOString(),
|
||||
updatedAt: entity.updatedAt.toISOString(),
|
||||
});
|
||||
|
||||
+3
@@ -137,6 +137,7 @@ export class BillingWebhookSubscriptionService {
|
||||
await this.updateBillingSubscriptionItems(
|
||||
updatedBillingSubscription.id,
|
||||
event,
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
const shouldSuspend = this.shouldSuspendWorkspace(data);
|
||||
@@ -224,6 +225,7 @@ export class BillingWebhookSubscriptionService {
|
||||
| Stripe.CustomerSubscriptionUpdatedEvent
|
||||
| Stripe.CustomerSubscriptionCreatedEvent
|
||||
| Stripe.CustomerSubscriptionDeletedEvent,
|
||||
workspaceId: string,
|
||||
) {
|
||||
const deletedSubscriptionItemIds =
|
||||
getDeletedStripeSubscriptionItemIdsFromStripeSubscriptionEvent(event);
|
||||
@@ -239,6 +241,7 @@ export class BillingWebhookSubscriptionService {
|
||||
transformStripeSubscriptionEventToDatabaseSubscriptionItem(
|
||||
subscriptionId,
|
||||
event.data,
|
||||
workspaceId,
|
||||
),
|
||||
{
|
||||
conflictPaths: ['stripeSubscriptionItemId'],
|
||||
|
||||
+2
@@ -8,10 +8,12 @@ export const transformStripeSubscriptionEventToDatabaseSubscriptionItem = (
|
||||
| Stripe.CustomerSubscriptionUpdatedEvent.Data
|
||||
| Stripe.CustomerSubscriptionCreatedEvent.Data
|
||||
| Stripe.CustomerSubscriptionDeletedEvent.Data,
|
||||
workspaceId: string,
|
||||
) => {
|
||||
return data.object.items.data.map((item) => {
|
||||
return {
|
||||
billingSubscriptionId,
|
||||
workspaceId,
|
||||
stripeSubscriptionId: data.object.id,
|
||||
stripeProductId: String(item.price.product),
|
||||
stripePriceId: item.price.id,
|
||||
|
||||
+10
@@ -5,6 +5,7 @@ import {
|
||||
Column,
|
||||
CreateDateColumn,
|
||||
Entity,
|
||||
Index,
|
||||
JoinColumn,
|
||||
ManyToOne,
|
||||
PrimaryGeneratedColumn,
|
||||
@@ -16,6 +17,7 @@ import {
|
||||
import { BillingProductEntity } from 'src/engine/core-modules/billing/entities/billing-product.entity';
|
||||
import { BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
|
||||
import { BillingSubscriptionItemMetadata } from 'src/engine/core-modules/billing/types/billing-subscription-item-metadata.type';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
@Entity({ name: 'billingSubscriptionItem', schema: 'core' })
|
||||
@Unique(
|
||||
'IDX_BILLING_SUBSCRIPTION_ITEM_BILLING_SUBSCRIPTION_ID_STRIPE_PRODUCT_ID_UNIQUE',
|
||||
@@ -25,6 +27,14 @@ export class BillingSubscriptionItemEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column({ nullable: true, type: 'timestamptz' })
|
||||
deletedAt?: Date;
|
||||
|
||||
|
||||
+1
@@ -348,6 +348,7 @@ export class BillingSubscriptionService {
|
||||
{
|
||||
object: subscription,
|
||||
},
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
const meterBillingSubscriptionItem = findOrThrow(
|
||||
|
||||
+6
@@ -27,6 +27,7 @@ describe('buildEnvVar', () => {
|
||||
description: 'Public URL',
|
||||
isSecret: false,
|
||||
applicationId: 'app-1',
|
||||
workspaceId: '00000000-0000-0000-0000-000000000000',
|
||||
createdAt: '2024-01-01T00:00:00.000Z',
|
||||
updatedAt: '2024-01-01T00:00:00.000Z',
|
||||
},
|
||||
@@ -37,6 +38,7 @@ describe('buildEnvVar', () => {
|
||||
description: 'API secret',
|
||||
isSecret: true,
|
||||
applicationId: 'app-1',
|
||||
workspaceId: '00000000-0000-0000-0000-000000000000',
|
||||
createdAt: '2024-01-01T00:00:00.000Z',
|
||||
updatedAt: '2024-01-01T00:00:00.000Z',
|
||||
},
|
||||
@@ -47,6 +49,7 @@ describe('buildEnvVar', () => {
|
||||
description: 'Debug flag',
|
||||
isSecret: false,
|
||||
applicationId: 'app-1',
|
||||
workspaceId: '00000000-0000-0000-0000-000000000000',
|
||||
createdAt: '2024-01-01T00:00:00.000Z',
|
||||
updatedAt: '2024-01-01T00:00:00.000Z',
|
||||
},
|
||||
@@ -74,6 +77,7 @@ describe('buildEnvVar', () => {
|
||||
description: '',
|
||||
isSecret: false,
|
||||
applicationId: 'app-1',
|
||||
workspaceId: '00000000-0000-0000-0000-000000000000',
|
||||
createdAt: '2024-01-01T00:00:00.000Z',
|
||||
updatedAt: '2024-01-01T00:00:00.000Z',
|
||||
},
|
||||
@@ -84,6 +88,7 @@ describe('buildEnvVar', () => {
|
||||
description: '',
|
||||
isSecret: false,
|
||||
applicationId: 'app-1',
|
||||
workspaceId: '00000000-0000-0000-0000-000000000000',
|
||||
createdAt: '2024-01-01T00:00:00.000Z',
|
||||
updatedAt: '2024-01-01T00:00:00.000Z',
|
||||
},
|
||||
@@ -106,6 +111,7 @@ describe('buildEnvVar', () => {
|
||||
description: '',
|
||||
isSecret: false,
|
||||
applicationId: 'app-1',
|
||||
workspaceId: '00000000-0000-0000-0000-000000000000',
|
||||
createdAt: '2024-01-01T00:00:00.000Z',
|
||||
updatedAt: '2024-01-01T00:00:00.000Z',
|
||||
},
|
||||
|
||||
+9
@@ -13,6 +13,7 @@ import {
|
||||
|
||||
import { OTPStatus } from 'src/engine/core-modules/two-factor-authentication/strategies/otp/otp.constants';
|
||||
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
|
||||
@Index(['userWorkspaceId', 'strategy'], { unique: true })
|
||||
@Entity({ name: 'twoFactorAuthenticationMethod', schema: 'core' })
|
||||
@@ -20,6 +21,14 @@ export class TwoFactorAuthenticationMethodEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
userWorkspaceId: string;
|
||||
|
||||
|
||||
+1
@@ -191,6 +191,7 @@ describe('TwoFactorAuthenticationService', () => {
|
||||
);
|
||||
expect(repository.save).toHaveBeenCalledWith({
|
||||
id: undefined,
|
||||
workspaceId: workspace.id,
|
||||
userWorkspace: mockUserWorkspace,
|
||||
secret: encryptedSecret,
|
||||
status: 'PENDING',
|
||||
|
||||
+1
@@ -140,6 +140,7 @@ export class TwoFactorAuthenticationService {
|
||||
|
||||
await this.twoFactorAuthenticationMethodRepository.save({
|
||||
id: existing2FAMethod?.id,
|
||||
workspaceId,
|
||||
userWorkspace: userWorkspace,
|
||||
secret: encryptedSecret,
|
||||
status: context.status,
|
||||
|
||||
+10
-1
@@ -12,12 +12,21 @@ import {
|
||||
|
||||
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
|
||||
import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
|
||||
@Entity('agentMessagePart')
|
||||
@Entity({ name: 'agentMessagePart', schema: 'core' })
|
||||
export class AgentMessagePartEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column('uuid')
|
||||
@Index()
|
||||
messageId: string;
|
||||
|
||||
+10
-1
@@ -13,6 +13,7 @@ import {
|
||||
import { AgentMessagePartEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message-part.entity';
|
||||
import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
|
||||
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
|
||||
export enum AgentMessageRole {
|
||||
SYSTEM = 'system',
|
||||
@@ -25,11 +26,19 @@ export enum AgentMessageStatus {
|
||||
SENT = 'sent',
|
||||
}
|
||||
|
||||
@Entity('agentMessage')
|
||||
@Entity({ name: 'agentMessage', schema: 'core' })
|
||||
export class AgentMessageEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column('uuid')
|
||||
@Index()
|
||||
threadId: string;
|
||||
|
||||
+10
-1
@@ -13,12 +13,21 @@ import {
|
||||
import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
|
||||
import { AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity';
|
||||
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
|
||||
@Entity('agentTurn')
|
||||
@Entity({ name: 'agentTurn', schema: 'core' })
|
||||
export class AgentTurnEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column('uuid')
|
||||
@Index()
|
||||
threadId: string;
|
||||
|
||||
+2
@@ -13,6 +13,7 @@ const isToolPart = (part: ExtendedUIMessagePart): part is ToolUIPart => {
|
||||
export const mapUIMessagePartsToDBParts = (
|
||||
uiMessageParts: ExtendedUIMessagePart[],
|
||||
messageId: string,
|
||||
workspaceId: string,
|
||||
): Partial<AgentMessagePartEntity>[] => {
|
||||
return uiMessageParts
|
||||
.map((part, index) => {
|
||||
@@ -20,6 +21,7 @@ export const mapUIMessagePartsToDBParts = (
|
||||
messageId,
|
||||
orderIndex: index,
|
||||
type: part.type,
|
||||
workspaceId,
|
||||
};
|
||||
|
||||
switch (part.type) {
|
||||
|
||||
+10
-1
@@ -10,12 +10,21 @@ import {
|
||||
} from 'typeorm';
|
||||
|
||||
import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
|
||||
@Entity('agentTurnEvaluation')
|
||||
@Entity({ name: 'agentTurnEvaluation', schema: 'core' })
|
||||
export class AgentTurnEvaluationEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column('uuid')
|
||||
@Index()
|
||||
turnId: string;
|
||||
|
||||
+2
@@ -44,6 +44,7 @@ export class RunEvaluationInputJob {
|
||||
role: 'user',
|
||||
parts: [{ type: 'text', text: data.input }],
|
||||
},
|
||||
workspaceId: data.workspaceId,
|
||||
});
|
||||
|
||||
const agent = await this.agentRepository.findOne({
|
||||
@@ -72,6 +73,7 @@ export class RunEvaluationInputJob {
|
||||
},
|
||||
],
|
||||
},
|
||||
workspaceId: data.workspaceId,
|
||||
});
|
||||
|
||||
await this.messageQueueService.add<{
|
||||
|
||||
+2
@@ -68,6 +68,7 @@ export class AgentTurnResolver {
|
||||
): Promise<AgentTurnEntity> {
|
||||
const thread = this.threadRepository.create({
|
||||
userWorkspaceId,
|
||||
workspaceId: workspace.id,
|
||||
title: `Eval: ${input.substring(0, 50)}...`,
|
||||
});
|
||||
const savedThread = await this.threadRepository.save(thread);
|
||||
@@ -75,6 +76,7 @@ export class AgentTurnResolver {
|
||||
const turn = this.turnRepository.create({
|
||||
threadId: savedThread.id,
|
||||
agentId,
|
||||
workspaceId: workspace.id,
|
||||
});
|
||||
const savedTurn = await this.turnRepository.save(turn);
|
||||
|
||||
|
||||
+1
@@ -36,6 +36,7 @@ export class AgentTurnGraderService {
|
||||
|
||||
const evaluation = this.evaluationRepository.create({
|
||||
turnId,
|
||||
workspaceId: turn.workspaceId,
|
||||
score,
|
||||
comment,
|
||||
});
|
||||
|
||||
+10
-1
@@ -13,13 +13,22 @@ import {
|
||||
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
|
||||
import { AgentMessageEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';
|
||||
import { AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-turn.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
import { EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
|
||||
|
||||
@Entity('agentChatThread')
|
||||
@Entity({ name: 'agentChatThread', schema: 'core' })
|
||||
export class AgentChatThreadEntity {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: EntityRelation<WorkspaceEntity>;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
userWorkspaceId: string;
|
||||
|
||||
+5
@@ -144,6 +144,7 @@ export class StreamAgentChatJob {
|
||||
part.type === 'text' || part.type === 'file',
|
||||
),
|
||||
},
|
||||
workspaceId: data.workspaceId,
|
||||
});
|
||||
|
||||
userMessagePromise.catch(() => {});
|
||||
@@ -271,6 +272,7 @@ export class StreamAgentChatJob {
|
||||
await this.handleStreamFinish({
|
||||
responseMessage,
|
||||
threadId: data.threadId,
|
||||
workspaceId: data.workspaceId,
|
||||
streamUsage,
|
||||
lastStepConversationSize,
|
||||
modelConfig,
|
||||
@@ -410,6 +412,7 @@ export class StreamAgentChatJob {
|
||||
private async handleStreamFinish({
|
||||
responseMessage,
|
||||
threadId,
|
||||
workspaceId,
|
||||
streamUsage,
|
||||
lastStepConversationSize,
|
||||
modelConfig,
|
||||
@@ -417,6 +420,7 @@ export class StreamAgentChatJob {
|
||||
}: {
|
||||
responseMessage: Omit<ExtendedUIMessage, 'id'>;
|
||||
threadId: string;
|
||||
workspaceId: string;
|
||||
streamUsage: {
|
||||
inputTokens: number;
|
||||
outputTokens: number;
|
||||
@@ -437,6 +441,7 @@ export class StreamAgentChatJob {
|
||||
threadId,
|
||||
uiMessage: responseMessage,
|
||||
turnId: userMessage.turnId ?? undefined,
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
await this.threadRepository.update(threadId, {
|
||||
|
||||
+1
@@ -174,6 +174,7 @@ export class AgentChatResolver {
|
||||
threadId,
|
||||
text,
|
||||
id: messageId,
|
||||
workspaceId: workspace.id,
|
||||
});
|
||||
|
||||
await this.eventPublisherService.publish({
|
||||
|
||||
+2
@@ -77,6 +77,7 @@ export class AgentChatStreamingService {
|
||||
role: AgentMessageRole.USER,
|
||||
parts: [{ type: 'text' as const, text }],
|
||||
},
|
||||
workspaceId: workspace.id,
|
||||
});
|
||||
|
||||
const previousMessages = await this.loadMessagesFromDB(
|
||||
@@ -138,6 +139,7 @@ export class AgentChatStreamingService {
|
||||
const turnId = await this.agentChatService.promoteQueuedMessage(
|
||||
nextQueued.id,
|
||||
threadId,
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
if (turnId === null) {
|
||||
|
||||
+12
@@ -60,6 +60,7 @@ export class AgentChatService {
|
||||
}) {
|
||||
const thread = this.threadRepository.create({
|
||||
userWorkspaceId,
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
const savedThread = await this.threadRepository.save(thread);
|
||||
@@ -105,6 +106,7 @@ export class AgentChatService {
|
||||
agentId,
|
||||
turnId,
|
||||
id,
|
||||
workspaceId,
|
||||
}: {
|
||||
threadId: string;
|
||||
uiMessage: Omit<ExtendedUIMessage, 'id'>;
|
||||
@@ -112,6 +114,7 @@ export class AgentChatService {
|
||||
agentId?: string;
|
||||
turnId?: string;
|
||||
id?: string;
|
||||
workspaceId: string;
|
||||
}) {
|
||||
let actualTurnId = turnId;
|
||||
|
||||
@@ -119,6 +122,7 @@ export class AgentChatService {
|
||||
const turn = this.turnRepository.create({
|
||||
threadId,
|
||||
agentId: agentId ?? null,
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
const savedTurn = await this.turnRepository.save(turn);
|
||||
@@ -133,6 +137,7 @@ export class AgentChatService {
|
||||
role: uiMessage.role as AgentMessageRole,
|
||||
agentId: agentId ?? null,
|
||||
processedAt: new Date(),
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
const savedMessage = await this.messageRepository.save(message);
|
||||
@@ -141,6 +146,7 @@ export class AgentChatService {
|
||||
const dbParts = mapUIMessagePartsToDBParts(
|
||||
uiMessage.parts,
|
||||
savedMessage.id,
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
await this.messagePartRepository.save(dbParts);
|
||||
@@ -175,10 +181,12 @@ export class AgentChatService {
|
||||
threadId,
|
||||
text,
|
||||
id,
|
||||
workspaceId,
|
||||
}: {
|
||||
threadId: string;
|
||||
text: string;
|
||||
id?: string;
|
||||
workspaceId: string;
|
||||
}): Promise<AgentMessageEntity> {
|
||||
const message = this.messageRepository.create({
|
||||
...(id ? { id } : {}),
|
||||
@@ -187,6 +195,7 @@ export class AgentChatService {
|
||||
role: AgentMessageRole.USER,
|
||||
agentId: null,
|
||||
status: AgentMessageStatus.QUEUED,
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
const savedMessage = await this.messageRepository.save(message);
|
||||
@@ -196,6 +205,7 @@ export class AgentChatService {
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
textContent: text,
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
await this.messagePartRepository.save(part);
|
||||
@@ -234,10 +244,12 @@ export class AgentChatService {
|
||||
async promoteQueuedMessage(
|
||||
messageId: string,
|
||||
threadId: string,
|
||||
workspaceId: string,
|
||||
): Promise<string | null> {
|
||||
const turn = this.turnRepository.create({
|
||||
threadId,
|
||||
agentId: null,
|
||||
workspaceId,
|
||||
});
|
||||
|
||||
const savedTurn = await this.turnRepository.save(turn);
|
||||
|
||||
+1
@@ -59,6 +59,7 @@ export const fromIndexMetadataEntityToFlatIndexMetadata = ({
|
||||
]),
|
||||
createdAt: indexFieldMetadata.createdAt.toISOString(),
|
||||
updatedAt: indexFieldMetadata.updatedAt.toISOString(),
|
||||
workspaceId: indexFieldMetadata.workspaceId,
|
||||
}),
|
||||
),
|
||||
universalFlatIndexFieldMetadatas:
|
||||
|
||||
+10
-1
@@ -12,14 +12,23 @@ import {
|
||||
|
||||
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
|
||||
import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
|
||||
import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
|
||||
@Entity('indexFieldMetadata')
|
||||
@Entity({ name: 'indexFieldMetadata', schema: 'core' })
|
||||
export class IndexFieldMetadataEntity
|
||||
implements Required<IndexFieldMetadataEntity>
|
||||
{
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
id: string;
|
||||
|
||||
@Column({ nullable: false, type: 'uuid' })
|
||||
@Index()
|
||||
workspaceId: string;
|
||||
|
||||
@ManyToOne('WorkspaceEntity', { onDelete: 'CASCADE' })
|
||||
@JoinColumn({ name: 'workspaceId' })
|
||||
workspace: Relation<WorkspaceEntity>;
|
||||
|
||||
@Column({ nullable: false })
|
||||
indexMetadataId: string;
|
||||
|
||||
|
||||
+24
@@ -77,6 +77,7 @@ const seedChatThreads = async ({
|
||||
.insert()
|
||||
.into(`${schemaName}.${agentChatThreadTableName}`, [
|
||||
'id',
|
||||
'workspaceId',
|
||||
'userWorkspaceId',
|
||||
'createdAt',
|
||||
'updatedAt',
|
||||
@@ -85,6 +86,7 @@ const seedChatThreads = async ({
|
||||
.values([
|
||||
{
|
||||
id: threadId,
|
||||
workspaceId,
|
||||
userWorkspaceId,
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
@@ -113,6 +115,7 @@ const seedChatMessages = async ({
|
||||
let turnIds: string[];
|
||||
let messages: Array<{
|
||||
id: string;
|
||||
workspaceId: string;
|
||||
threadId: string;
|
||||
turnId: string;
|
||||
role: AgentMessageRole;
|
||||
@@ -120,6 +123,7 @@ const seedChatMessages = async ({
|
||||
}>;
|
||||
let messageParts: Array<{
|
||||
id: string;
|
||||
workspaceId: string;
|
||||
messageId: string;
|
||||
orderIndex: number;
|
||||
type: string;
|
||||
@@ -150,6 +154,7 @@ const seedChatMessages = async ({
|
||||
messages = [
|
||||
{
|
||||
id: messageIds[0],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[0],
|
||||
role: AgentMessageRole.USER,
|
||||
@@ -157,6 +162,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: messageIds[1],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[0],
|
||||
role: AgentMessageRole.ASSISTANT,
|
||||
@@ -164,6 +170,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: messageIds[2],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[1],
|
||||
role: AgentMessageRole.USER,
|
||||
@@ -171,6 +178,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: messageIds[3],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[1],
|
||||
role: AgentMessageRole.ASSISTANT,
|
||||
@@ -180,6 +188,7 @@ const seedChatMessages = async ({
|
||||
messageParts = [
|
||||
{
|
||||
id: partIds[0],
|
||||
workspaceId,
|
||||
messageId: messageIds[0],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -189,6 +198,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: partIds[1],
|
||||
workspaceId,
|
||||
messageId: messageIds[1],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -198,6 +208,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: partIds[2],
|
||||
workspaceId,
|
||||
messageId: messageIds[2],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -207,6 +218,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: partIds[3],
|
||||
workspaceId,
|
||||
messageId: messageIds[3],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -235,6 +247,7 @@ const seedChatMessages = async ({
|
||||
messages = [
|
||||
{
|
||||
id: messageIds[0],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[0],
|
||||
role: AgentMessageRole.USER,
|
||||
@@ -242,6 +255,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: messageIds[1],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[0],
|
||||
role: AgentMessageRole.ASSISTANT,
|
||||
@@ -249,6 +263,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: messageIds[2],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[1],
|
||||
role: AgentMessageRole.USER,
|
||||
@@ -256,6 +271,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: messageIds[3],
|
||||
workspaceId,
|
||||
threadId,
|
||||
turnId: turnIds[1],
|
||||
role: AgentMessageRole.ASSISTANT,
|
||||
@@ -265,6 +281,7 @@ const seedChatMessages = async ({
|
||||
messageParts = [
|
||||
{
|
||||
id: partIds[0],
|
||||
workspaceId,
|
||||
messageId: messageIds[0],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -274,6 +291,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: partIds[1],
|
||||
workspaceId,
|
||||
messageId: messageIds[1],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -283,6 +301,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: partIds[2],
|
||||
workspaceId,
|
||||
messageId: messageIds[2],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -292,6 +311,7 @@ const seedChatMessages = async ({
|
||||
},
|
||||
{
|
||||
id: partIds[3],
|
||||
workspaceId,
|
||||
messageId: messageIds[3],
|
||||
orderIndex: 0,
|
||||
type: 'text',
|
||||
@@ -309,6 +329,7 @@ const seedChatMessages = async ({
|
||||
// Create turns first
|
||||
const turns = turnIds.map((id, index) => ({
|
||||
id,
|
||||
workspaceId,
|
||||
threadId,
|
||||
createdAt: messages[index * 2].createdAt,
|
||||
}));
|
||||
@@ -318,6 +339,7 @@ const seedChatMessages = async ({
|
||||
.insert()
|
||||
.into(`${schemaName}.${agentTurnTableName}`, [
|
||||
'id',
|
||||
'workspaceId',
|
||||
'threadId',
|
||||
'createdAt',
|
||||
])
|
||||
@@ -330,6 +352,7 @@ const seedChatMessages = async ({
|
||||
.insert()
|
||||
.into(`${schemaName}.${agentMessageTableName}`, [
|
||||
'id',
|
||||
'workspaceId',
|
||||
'threadId',
|
||||
'turnId',
|
||||
'role',
|
||||
@@ -344,6 +367,7 @@ const seedChatMessages = async ({
|
||||
.insert()
|
||||
.into(`${schemaName}.${agentMessagePartTableName}`, [
|
||||
'id',
|
||||
'workspaceId',
|
||||
'messageId',
|
||||
'orderIndex',
|
||||
'type',
|
||||
|
||||
+1
@@ -131,6 +131,7 @@ export const createStandardIndexFlatMetadata = <
|
||||
indexMetadataId: indexId,
|
||||
order: index,
|
||||
updatedAt: now,
|
||||
workspaceId,
|
||||
}),
|
||||
),
|
||||
workspaceId,
|
||||
|
||||
+2
@@ -11,6 +11,8 @@ export type UniversalFlatIndexFieldMetadata = Omit<
|
||||
| 'fieldMetadataId'
|
||||
| 'fieldMetadata'
|
||||
| 'id'
|
||||
| 'workspaceId'
|
||||
| 'workspace'
|
||||
| keyof CastRecordTypeOrmDatePropertiesToString<IndexFieldMetadataEntity>
|
||||
> & {
|
||||
indexMetadataUniversalIdentifier: string;
|
||||
|
||||
+1
@@ -61,6 +61,7 @@ export const fromUniversalFlatIndexToFlatIndex = ({
|
||||
order: universalFlatIndexFieldMetadata.order,
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
workspaceId,
|
||||
};
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user