mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-22 21:27:40 +00:00
perf(agent): optimize active task lookup using indexed sessionId column
This commit is contained in:
@@ -305,6 +305,7 @@ We use `prisma-json-types-generator` to enforce strict type-safety for Prisma `J
|
||||
|
||||
- Development: Use `bun --bun run prisma migrate dev` to create and apply migrations during development.
|
||||
- Production: Use `bun --bun run prisma migrate deploy` to apply pending migrations in production environments.
|
||||
- **No Automatic Dev DB Reset**: Do not run `prisma migrate reset --force` or commands that force-reset the database automatically. If migrations become out of sync or a reset is required, stop executing, report the situation to the user, and present suggested manual cleanup/reset steps for the user to execute.
|
||||
|
||||
### Commands
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ vi.mock('@shumai/db', () => ({
|
||||
},
|
||||
workflowTask: {
|
||||
findUnique: vi.fn(),
|
||||
findMany: vi.fn(),
|
||||
findFirst: vi.fn(),
|
||||
update: vi.fn(),
|
||||
},
|
||||
},
|
||||
@@ -207,20 +207,19 @@ describe('Chat API', () => {
|
||||
|
||||
describe('POST /teams/:teamId/chat/sessions/:sessionId/abort', () => {
|
||||
it('aborts an active chat session and updates task status', async () => {
|
||||
const mockActiveTasks = [
|
||||
{
|
||||
id: 'task1',
|
||||
status: 'processing',
|
||||
type: 'chat',
|
||||
payload: {
|
||||
agent: {
|
||||
sessionId: 'session1',
|
||||
},
|
||||
const mockActiveTask = {
|
||||
id: 'task1',
|
||||
status: 'processing',
|
||||
type: 'chat',
|
||||
sessionId: 'session1',
|
||||
payload: {
|
||||
agent: {
|
||||
sessionId: 'session1',
|
||||
},
|
||||
},
|
||||
]
|
||||
vi.mocked(prisma.workflowTask.findMany).mockResolvedValue(
|
||||
mockActiveTasks as unknown as WorkflowTask[],
|
||||
}
|
||||
vi.mocked(prisma.workflowTask.findFirst).mockResolvedValue(
|
||||
mockActiveTask as unknown as WorkflowTask,
|
||||
)
|
||||
vi.mocked(prisma.workflowTask.update).mockResolvedValue({} as unknown as WorkflowTask)
|
||||
|
||||
@@ -245,7 +244,7 @@ describe('Chat API', () => {
|
||||
})
|
||||
|
||||
it('returns 404 if no active task is found for the session', async () => {
|
||||
vi.mocked(prisma.workflowTask.findMany).mockResolvedValue([])
|
||||
vi.mocked(prisma.workflowTask.findFirst).mockResolvedValue(null)
|
||||
|
||||
const res = await app.request('/teams/team1/chat/sessions/session1/abort', {
|
||||
method: 'POST',
|
||||
|
||||
@@ -186,17 +186,14 @@ const route = new Hono<{ Variables: { user: User } }>()
|
||||
id: teamId,
|
||||
})
|
||||
|
||||
const activeTasks = await prisma.workflowTask.findMany({
|
||||
const taskToAbort = await prisma.workflowTask.findFirst({
|
||||
where: {
|
||||
status: { in: ['pending', 'processing'] },
|
||||
type: 'chat',
|
||||
sessionId,
|
||||
},
|
||||
})
|
||||
|
||||
const taskToAbort = activeTasks.find(
|
||||
(t) => (t.payload as PrismaJson.WorkflowTaskPayload)?.agent?.sessionId === sessionId,
|
||||
)
|
||||
|
||||
if (!taskToAbort) {
|
||||
return c.json({ error: 'No active execution found for this session' }, 404)
|
||||
}
|
||||
|
||||
@@ -292,6 +292,7 @@ export class ChatService {
|
||||
status: 'pending',
|
||||
teamId,
|
||||
projectId,
|
||||
sessionId: activeSessionId,
|
||||
payload: {
|
||||
projectId,
|
||||
agent: {
|
||||
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "workflow_tasks" ADD COLUMN "session_id" TEXT;
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "workflow_tasks_session_id_idx" ON "workflow_tasks"("session_id");
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
-- Backfill session_id from existing task payloads
|
||||
UPDATE "workflow_tasks"
|
||||
SET "session_id" = (payload->'agent'->>'sessionId')
|
||||
WHERE "session_id" IS NULL AND (payload->'agent'->>'sessionId') IS NOT NULL;
|
||||
@@ -629,6 +629,7 @@ model WorkflowTask {
|
||||
inputTokens Int @default(0) @map("input_tokens")
|
||||
outputTokens Int @default(0) @map("output_tokens")
|
||||
model String?
|
||||
sessionId String? @map("session_id")
|
||||
createdAt DateTime @default(now()) @map("created_at")
|
||||
updatedAt DateTime @updatedAt @map("updated_at")
|
||||
|
||||
@@ -638,6 +639,7 @@ model WorkflowTask {
|
||||
@@index([teamId])
|
||||
@@index([projectId])
|
||||
@@index([type])
|
||||
@@index([sessionId])
|
||||
}
|
||||
enum AgentType {
|
||||
chat
|
||||
|
||||
+3
-3
File diff suppressed because one or more lines are too long
@@ -3266,6 +3266,7 @@ export const WorkflowTaskScalarFieldEnum = {
|
||||
inputTokens: 'inputTokens',
|
||||
outputTokens: 'outputTokens',
|
||||
model: 'model',
|
||||
sessionId: 'sessionId',
|
||||
createdAt: 'createdAt',
|
||||
updatedAt: 'updatedAt'
|
||||
} as const
|
||||
|
||||
@@ -451,6 +451,7 @@ export const WorkflowTaskScalarFieldEnum = {
|
||||
inputTokens: 'inputTokens',
|
||||
outputTokens: 'outputTokens',
|
||||
model: 'model',
|
||||
sessionId: 'sessionId',
|
||||
createdAt: 'createdAt',
|
||||
updatedAt: 'updatedAt'
|
||||
} as const
|
||||
|
||||
+29
-1
@@ -50,6 +50,7 @@ export type WorkflowTaskMinAggregateOutputType = {
|
||||
inputTokens: number | null
|
||||
outputTokens: number | null
|
||||
model: string | null
|
||||
sessionId: string | null
|
||||
createdAt: Date | null
|
||||
updatedAt: Date | null
|
||||
}
|
||||
@@ -66,6 +67,7 @@ export type WorkflowTaskMaxAggregateOutputType = {
|
||||
inputTokens: number | null
|
||||
outputTokens: number | null
|
||||
model: string | null
|
||||
sessionId: string | null
|
||||
createdAt: Date | null
|
||||
updatedAt: Date | null
|
||||
}
|
||||
@@ -84,6 +86,7 @@ export type WorkflowTaskCountAggregateOutputType = {
|
||||
inputTokens: number
|
||||
outputTokens: number
|
||||
model: number
|
||||
sessionId: number
|
||||
createdAt: number
|
||||
updatedAt: number
|
||||
_all: number
|
||||
@@ -112,6 +115,7 @@ export type WorkflowTaskMinAggregateInputType = {
|
||||
inputTokens?: true
|
||||
outputTokens?: true
|
||||
model?: true
|
||||
sessionId?: true
|
||||
createdAt?: true
|
||||
updatedAt?: true
|
||||
}
|
||||
@@ -128,6 +132,7 @@ export type WorkflowTaskMaxAggregateInputType = {
|
||||
inputTokens?: true
|
||||
outputTokens?: true
|
||||
model?: true
|
||||
sessionId?: true
|
||||
createdAt?: true
|
||||
updatedAt?: true
|
||||
}
|
||||
@@ -146,6 +151,7 @@ export type WorkflowTaskCountAggregateInputType = {
|
||||
inputTokens?: true
|
||||
outputTokens?: true
|
||||
model?: true
|
||||
sessionId?: true
|
||||
createdAt?: true
|
||||
updatedAt?: true
|
||||
_all?: true
|
||||
@@ -251,6 +257,7 @@ export type WorkflowTaskGroupByOutputType = {
|
||||
inputTokens: number
|
||||
outputTokens: number
|
||||
model: string | null
|
||||
sessionId: string | null
|
||||
createdAt: Date
|
||||
updatedAt: Date
|
||||
_count: WorkflowTaskCountAggregateOutputType | null
|
||||
@@ -292,6 +299,7 @@ export type WorkflowTaskWhereInput = {
|
||||
inputTokens?: Prisma.IntFilter<"WorkflowTask"> | number
|
||||
outputTokens?: Prisma.IntFilter<"WorkflowTask"> | number
|
||||
model?: Prisma.StringNullableFilter<"WorkflowTask"> | string | null
|
||||
sessionId?: Prisma.StringNullableFilter<"WorkflowTask"> | string | null
|
||||
createdAt?: Prisma.DateTimeFilter<"WorkflowTask"> | Date | string
|
||||
updatedAt?: Prisma.DateTimeFilter<"WorkflowTask"> | Date | string
|
||||
}
|
||||
@@ -310,6 +318,7 @@ export type WorkflowTaskOrderByWithRelationInput = {
|
||||
inputTokens?: Prisma.SortOrder
|
||||
outputTokens?: Prisma.SortOrder
|
||||
model?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
sessionId?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
}
|
||||
@@ -331,6 +340,7 @@ export type WorkflowTaskWhereUniqueInput = Prisma.AtLeast<{
|
||||
inputTokens?: Prisma.IntFilter<"WorkflowTask"> | number
|
||||
outputTokens?: Prisma.IntFilter<"WorkflowTask"> | number
|
||||
model?: Prisma.StringNullableFilter<"WorkflowTask"> | string | null
|
||||
sessionId?: Prisma.StringNullableFilter<"WorkflowTask"> | string | null
|
||||
createdAt?: Prisma.DateTimeFilter<"WorkflowTask"> | Date | string
|
||||
updatedAt?: Prisma.DateTimeFilter<"WorkflowTask"> | Date | string
|
||||
}, "id">
|
||||
@@ -349,6 +359,7 @@ export type WorkflowTaskOrderByWithAggregationInput = {
|
||||
inputTokens?: Prisma.SortOrder
|
||||
outputTokens?: Prisma.SortOrder
|
||||
model?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
sessionId?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
_count?: Prisma.WorkflowTaskCountOrderByAggregateInput
|
||||
@@ -375,6 +386,7 @@ export type WorkflowTaskScalarWhereWithAggregatesInput = {
|
||||
inputTokens?: Prisma.IntWithAggregatesFilter<"WorkflowTask"> | number
|
||||
outputTokens?: Prisma.IntWithAggregatesFilter<"WorkflowTask"> | number
|
||||
model?: Prisma.StringNullableWithAggregatesFilter<"WorkflowTask"> | string | null
|
||||
sessionId?: Prisma.StringNullableWithAggregatesFilter<"WorkflowTask"> | string | null
|
||||
createdAt?: Prisma.DateTimeWithAggregatesFilter<"WorkflowTask"> | Date | string
|
||||
updatedAt?: Prisma.DateTimeWithAggregatesFilter<"WorkflowTask"> | Date | string
|
||||
}
|
||||
@@ -393,6 +405,7 @@ export type WorkflowTaskCreateInput = {
|
||||
inputTokens?: number
|
||||
outputTokens?: number
|
||||
model?: string | null
|
||||
sessionId?: string | null
|
||||
createdAt?: Date | string
|
||||
updatedAt?: Date | string
|
||||
}
|
||||
@@ -411,6 +424,7 @@ export type WorkflowTaskUncheckedCreateInput = {
|
||||
inputTokens?: number
|
||||
outputTokens?: number
|
||||
model?: string | null
|
||||
sessionId?: string | null
|
||||
createdAt?: Date | string
|
||||
updatedAt?: Date | string
|
||||
}
|
||||
@@ -429,6 +443,7 @@ export type WorkflowTaskUpdateInput = {
|
||||
inputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
outputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
model?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
sessionId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
}
|
||||
@@ -447,6 +462,7 @@ export type WorkflowTaskUncheckedUpdateInput = {
|
||||
inputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
outputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
model?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
sessionId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
}
|
||||
@@ -465,6 +481,7 @@ export type WorkflowTaskCreateManyInput = {
|
||||
inputTokens?: number
|
||||
outputTokens?: number
|
||||
model?: string | null
|
||||
sessionId?: string | null
|
||||
createdAt?: Date | string
|
||||
updatedAt?: Date | string
|
||||
}
|
||||
@@ -483,6 +500,7 @@ export type WorkflowTaskUpdateManyMutationInput = {
|
||||
inputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
outputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
model?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
sessionId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
}
|
||||
@@ -501,6 +519,7 @@ export type WorkflowTaskUncheckedUpdateManyInput = {
|
||||
inputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
outputTokens?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
model?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
sessionId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
}
|
||||
@@ -519,6 +538,7 @@ export type WorkflowTaskCountOrderByAggregateInput = {
|
||||
inputTokens?: Prisma.SortOrder
|
||||
outputTokens?: Prisma.SortOrder
|
||||
model?: Prisma.SortOrder
|
||||
sessionId?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
}
|
||||
@@ -540,6 +560,7 @@ export type WorkflowTaskMaxOrderByAggregateInput = {
|
||||
inputTokens?: Prisma.SortOrder
|
||||
outputTokens?: Prisma.SortOrder
|
||||
model?: Prisma.SortOrder
|
||||
sessionId?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
}
|
||||
@@ -556,6 +577,7 @@ export type WorkflowTaskMinOrderByAggregateInput = {
|
||||
inputTokens?: Prisma.SortOrder
|
||||
outputTokens?: Prisma.SortOrder
|
||||
model?: Prisma.SortOrder
|
||||
sessionId?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
}
|
||||
@@ -589,6 +611,7 @@ export type WorkflowTaskSelect<ExtArgs extends runtime.Types.Extensions.Internal
|
||||
inputTokens?: boolean
|
||||
outputTokens?: boolean
|
||||
model?: boolean
|
||||
sessionId?: boolean
|
||||
createdAt?: boolean
|
||||
updatedAt?: boolean
|
||||
}, ExtArgs["result"]["workflowTask"]>
|
||||
@@ -607,6 +630,7 @@ export type WorkflowTaskSelectCreateManyAndReturn<ExtArgs extends runtime.Types.
|
||||
inputTokens?: boolean
|
||||
outputTokens?: boolean
|
||||
model?: boolean
|
||||
sessionId?: boolean
|
||||
createdAt?: boolean
|
||||
updatedAt?: boolean
|
||||
}, ExtArgs["result"]["workflowTask"]>
|
||||
@@ -625,6 +649,7 @@ export type WorkflowTaskSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.
|
||||
inputTokens?: boolean
|
||||
outputTokens?: boolean
|
||||
model?: boolean
|
||||
sessionId?: boolean
|
||||
createdAt?: boolean
|
||||
updatedAt?: boolean
|
||||
}, ExtArgs["result"]["workflowTask"]>
|
||||
@@ -643,11 +668,12 @@ export type WorkflowTaskSelectScalar = {
|
||||
inputTokens?: boolean
|
||||
outputTokens?: boolean
|
||||
model?: boolean
|
||||
sessionId?: boolean
|
||||
createdAt?: boolean
|
||||
updatedAt?: boolean
|
||||
}
|
||||
|
||||
export type WorkflowTaskOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "uid" | "teamId" | "projectId" | "assetId" | "type" | "status" | "payload" | "output" | "heartbeat" | "inputTokens" | "outputTokens" | "model" | "createdAt" | "updatedAt", ExtArgs["result"]["workflowTask"]>
|
||||
export type WorkflowTaskOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "uid" | "teamId" | "projectId" | "assetId" | "type" | "status" | "payload" | "output" | "heartbeat" | "inputTokens" | "outputTokens" | "model" | "sessionId" | "createdAt" | "updatedAt", ExtArgs["result"]["workflowTask"]>
|
||||
|
||||
export type $WorkflowTaskPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
|
||||
name: "WorkflowTask"
|
||||
@@ -672,6 +698,7 @@ export type $WorkflowTaskPayload<ExtArgs extends runtime.Types.Extensions.Intern
|
||||
inputTokens: number
|
||||
outputTokens: number
|
||||
model: string | null
|
||||
sessionId: string | null
|
||||
createdAt: Date
|
||||
updatedAt: Date
|
||||
}, ExtArgs["result"]["workflowTask"]>
|
||||
@@ -1110,6 +1137,7 @@ export interface WorkflowTaskFieldRefs {
|
||||
readonly inputTokens: Prisma.FieldRef<"WorkflowTask", 'Int'>
|
||||
readonly outputTokens: Prisma.FieldRef<"WorkflowTask", 'Int'>
|
||||
readonly model: Prisma.FieldRef<"WorkflowTask", 'String'>
|
||||
readonly sessionId: Prisma.FieldRef<"WorkflowTask", 'String'>
|
||||
readonly createdAt: Prisma.FieldRef<"WorkflowTask", 'DateTime'>
|
||||
readonly updatedAt: Prisma.FieldRef<"WorkflowTask", 'DateTime'>
|
||||
}
|
||||
|
||||
@@ -75,6 +75,7 @@ describe('Transcode Workflow', () => {
|
||||
assetId: 'asset-1',
|
||||
type: WorkflowTaskType.transcode,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
@@ -166,6 +167,7 @@ describe('Transcode Workflow', () => {
|
||||
assetId: 'asset-image',
|
||||
type: WorkflowTaskType.transcode,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
@@ -249,6 +251,7 @@ describe('Transcode Workflow', () => {
|
||||
assetId: 'asset-1',
|
||||
type: WorkflowTaskType.transcode,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
@@ -281,6 +284,7 @@ describe('Transcode Workflow', () => {
|
||||
assetId: 'asset-video',
|
||||
type: WorkflowTaskType.transcode,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
@@ -344,6 +348,7 @@ describe('Transcode Workflow', () => {
|
||||
assetId: 'asset-image',
|
||||
type: WorkflowTaskType.transcode,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
@@ -396,6 +401,7 @@ describe('Transcode Workflow', () => {
|
||||
assetId: 'asset-audio',
|
||||
type: WorkflowTaskType.transcode,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
|
||||
@@ -630,10 +630,7 @@ export function ChatbotSidebar({ projectId, contextAssetId }: ChatbotSidebarProp
|
||||
</Select>
|
||||
) : (
|
||||
<div className="flex items-center gap-1.5 px-2 py-1 text-[11px] text-muted-foreground/60 italic select-none">
|
||||
<Bot className="h-3.5 w-3.5" />
|
||||
<span>
|
||||
{m.no_chat_agents_warning ? m.no_chat_agents_warning() : 'No agents'}
|
||||
</span>
|
||||
<span>{m.no_chat_agents_warning()}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user