diff --git a/packages/agent/src/database-session-storage.test.ts b/packages/agent/src/database-session-storage.test.ts index 2adb30ea..e12003cf 100644 --- a/packages/agent/src/database-session-storage.test.ts +++ b/packages/agent/src/database-session-storage.test.ts @@ -1,5 +1,5 @@ import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { s3Service } from '@shumai/core/src/s3/s3' import { type SessionTreeEntry } from '@earendil-works/pi-agent-core' import { describe, expect, it, vi } from 'vitest' diff --git a/packages/agent/src/tools/read-skill.test.ts b/packages/agent/src/tools/read-skill.test.ts index deff93a9..3bf4f6a5 100644 --- a/packages/agent/src/tools/read-skill.test.ts +++ b/packages/agent/src/tools/read-skill.test.ts @@ -5,7 +5,7 @@ vi.mock('fs') import { describe, it, expect, beforeEach, afterEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { createReadSkillTool } from './read-skill' import { s3Service } from '@shumai/core/src/s3/s3' import AdmZip from 'adm-zip' diff --git a/packages/agent/src/workflows/agent-autofill.test.ts b/packages/agent/src/workflows/agent-autofill.test.ts index e4a83a3d..6016a3cf 100644 --- a/packages/agent/src/workflows/agent-autofill.test.ts +++ b/packages/agent/src/workflows/agent-autofill.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { agentAutofillMedia } from './agent-autofill' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import * as workflowUtils from '@shumai/workflow-core' vi.mock('@shumai/workflow-core', async () => { diff --git a/packages/agent/src/workflows/agent-chat.test.ts b/packages/agent/src/workflows/agent-chat.test.ts index 46854518..7e876e53 100644 --- a/packages/agent/src/workflows/agent-chat.test.ts +++ b/packages/agent/src/workflows/agent-chat.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { agentChat } from './agent-chat' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import * as workflowUtils from '@shumai/workflow-core' vi.mock('@shumai/workflow-core', async () => { diff --git a/packages/agent/src/workflows/agent-embedding.test.ts b/packages/agent/src/workflows/agent-embedding.test.ts index 2301166f..dbaba91f 100644 --- a/packages/agent/src/workflows/agent-embedding.test.ts +++ b/packages/agent/src/workflows/agent-embedding.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { agentEmbeddingMedia } from './agent-embedding' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import * as workflowUtils from '@shumai/workflow-core' vi.mock('@shumai/workflow-core', async () => { diff --git a/packages/core/src/agent/agent.test.ts b/packages/core/src/agent/agent.test.ts index 8f87796b..cbf5c2b5 100644 --- a/packages/core/src/agent/agent.test.ts +++ b/packages/core/src/agent/agent.test.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from 'vitest' import { AgentService } from './agent' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' describe('AgentService', () => { setupTestDbHooks() diff --git a/packages/core/src/asset/asset.test.ts b/packages/core/src/asset/asset.test.ts index 04903a14..25d156a1 100644 --- a/packages/core/src/asset/asset.test.ts +++ b/packages/core/src/asset/asset.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { AssetType, AssetStatus, Prisma } from '@shumai/db' import { AssetService } from './asset' diff --git a/packages/core/src/authz/authz.test.ts b/packages/core/src/authz/authz.test.ts index afcbafc2..2cdac183 100644 --- a/packages/core/src/authz/authz.test.ts +++ b/packages/core/src/authz/authz.test.ts @@ -1,4 +1,4 @@ -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { describe, expect, it } from 'vitest' import { prisma } from '@shumai/db' diff --git a/packages/core/src/collection/collection.test.ts b/packages/core/src/collection/collection.test.ts index c2a292e2..cdfcac37 100644 --- a/packages/core/src/collection/collection.test.ts +++ b/packages/core/src/collection/collection.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { collectionService } from './collection' import { projectService } from '../project/project' diff --git a/packages/core/src/invite/invite.test.ts b/packages/core/src/invite/invite.test.ts index 0b56fbfa..45badef8 100644 --- a/packages/core/src/invite/invite.test.ts +++ b/packages/core/src/invite/invite.test.ts @@ -1,5 +1,5 @@ import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { inviteService } from '@shumai/core/src/invite/invite' import { beforeEach, describe, expect, it } from 'vitest' diff --git a/packages/core/src/metadata/metadata.test.ts b/packages/core/src/metadata/metadata.test.ts index 0af30ffc..11b33bfe 100644 --- a/packages/core/src/metadata/metadata.test.ts +++ b/packages/core/src/metadata/metadata.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, beforeEach } from 'vitest' import { MetadataService } from './metadata' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' describe('MetadataService', () => { setupTestDbHooks() diff --git a/packages/core/src/notification/notification.test.ts b/packages/core/src/notification/notification.test.ts index 80f1c0ca..ffe0ba0a 100644 --- a/packages/core/src/notification/notification.test.ts +++ b/packages/core/src/notification/notification.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { NotificationType } from '@shumai/db' import { notificationService } from './notification' import { userMetadataService } from '@shumai/core/src/user-metadata/user-metadata' diff --git a/packages/core/src/project/project.test.ts b/packages/core/src/project/project.test.ts index 0e6e628e..70f0e775 100644 --- a/packages/core/src/project/project.test.ts +++ b/packages/core/src/project/project.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { ProjectService } from './project' import { s3Service } from '@shumai/core/src/s3/s3' import { assetService } from '@shumai/core/src/asset/asset' diff --git a/packages/core/src/provider/provider.test.ts b/packages/core/src/provider/provider.test.ts index 5e043e0c..5ae3b053 100644 --- a/packages/core/src/provider/provider.test.ts +++ b/packages/core/src/provider/provider.test.ts @@ -1,4 +1,4 @@ -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { teamService } from '@shumai/core/src/team/team' import { providerService } from './provider' import { describe, expect, it } from 'vitest' diff --git a/packages/core/src/search/ngram-search.test.ts b/packages/core/src/search/ngram-search.test.ts index 3bf3a81a..f83cf0f3 100644 --- a/packages/core/src/search/ngram-search.test.ts +++ b/packages/core/src/search/ngram-search.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, beforeEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { SearchService } from './search' import { AssetType } from '@shumai/db' diff --git a/packages/core/src/search/search.test.ts b/packages/core/src/search/search.test.ts index 026a3d38..6392a8d9 100644 --- a/packages/core/src/search/search.test.ts +++ b/packages/core/src/search/search.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, beforeEach, vi } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { SearchService } from './search' import { SearchConditionOperator } from '@shumai/dtos' import { metadataService } from '@shumai/core/src/metadata/metadata' diff --git a/packages/core/src/share/share.test.ts b/packages/core/src/share/share.test.ts index 9cee43ab..f150d4bd 100644 --- a/packages/core/src/share/share.test.ts +++ b/packages/core/src/share/share.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, beforeEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { shareService } from './share' import { assetService } from '@shumai/core/src/asset/asset' import { projectService } from '@shumai/core/src/project/project' diff --git a/packages/core/src/skill/skill.test.ts b/packages/core/src/skill/skill.test.ts index ec5fba7d..2bc0b776 100644 --- a/packages/core/src/skill/skill.test.ts +++ b/packages/core/src/skill/skill.test.ts @@ -1,5 +1,5 @@ import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { s3Service } from '@shumai/core/src/s3/s3' import { skillService } from '@shumai/core/src/skill/skill' import AdmZip from 'adm-zip' diff --git a/packages/core/src/team/team.test.ts b/packages/core/src/team/team.test.ts index ce728037..b31b3616 100644 --- a/packages/core/src/team/team.test.ts +++ b/packages/core/src/team/team.test.ts @@ -1,5 +1,5 @@ import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { teamService } from '@shumai/core/src/team/team' import { describe, expect, it } from 'vitest' diff --git a/packages/core/src/upload/upload.test.ts b/packages/core/src/upload/upload.test.ts index c26fad31..7730e4ca 100644 --- a/packages/core/src/upload/upload.test.ts +++ b/packages/core/src/upload/upload.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi, beforeEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { uploadService } from './upload' import { s3Service } from '@shumai/core/src/s3/s3' import { AssetStatus, AssetType, WorkflowTaskType } from '@shumai/db' diff --git a/packages/core/src/user-metadata/user-metadata.test.ts b/packages/core/src/user-metadata/user-metadata.test.ts index 9cad9700..c595c13a 100644 --- a/packages/core/src/user-metadata/user-metadata.test.ts +++ b/packages/core/src/user-metadata/user-metadata.test.ts @@ -1,5 +1,5 @@ import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { userMetadataService } from './user-metadata' import { describe, expect, it } from 'vitest' diff --git a/packages/core/src/versionStack/versionStack.test.ts b/packages/core/src/versionStack/versionStack.test.ts index 64577f64..9a74b833 100644 --- a/packages/core/src/versionStack/versionStack.test.ts +++ b/packages/core/src/versionStack/versionStack.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, beforeEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { VersionStackService } from './versionStack' import { AssetType } from '@shumai/db' diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts index 775eff25..e796c96c 100644 --- a/packages/db/src/index.ts +++ b/packages/db/src/index.ts @@ -96,6 +96,4 @@ export function getPrismaTestingHelper() { } export * from './utils/ngram' -export * from './db-test-hooks' -export * from './prisma-testing-helper' export * from './generated/prisma/client' diff --git a/packages/db/src/test.ts b/packages/db/src/test.ts new file mode 100644 index 00000000..5386fffb --- /dev/null +++ b/packages/db/src/test.ts @@ -0,0 +1,2 @@ +export * from './db-test-hooks' +export * from './prisma-testing-helper' diff --git a/packages/transcode/src/activities/transcode.test.ts b/packages/transcode/src/activities/transcode.test.ts index 961fbe7f..270809f7 100644 --- a/packages/transcode/src/activities/transcode.test.ts +++ b/packages/transcode/src/activities/transcode.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { getMediaInfoActivity, transcodeVideoActivity, updateAssetMediaActivity } from './transcode' import { s3Service } from '@shumai/core/src/s3/s3' import { transcodeService } from '../transcode' diff --git a/packages/workflow-core/src/activities/task.test.ts b/packages/workflow-core/src/activities/task.test.ts index fa698bb6..46d21ae3 100644 --- a/packages/workflow-core/src/activities/task.test.ts +++ b/packages/workflow-core/src/activities/task.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { updateTaskStatusActivity, updateAssetStatusActivity, diff --git a/packages/workflow-core/src/activities/task.ts b/packages/workflow-core/src/activities/task.ts index 919754e6..94ce337c 100644 --- a/packages/workflow-core/src/activities/task.ts +++ b/packages/workflow-core/src/activities/task.ts @@ -5,6 +5,10 @@ export async function getTranscodeWorkerQueueActivity(): Promise { return 'transcode_queue' } +export async function getAgentWorkerQueueActivity(): Promise { + return 'agent_queue' +} + export async function getAssetStatusActivity(params: { assetId: string }): Promise { const asset = await prisma.asset.findUnique({ where: { id: params.assetId }, diff --git a/packages/workflow-core/src/local-executor.test.ts b/packages/workflow-core/src/local-executor.test.ts index 8892d86b..26385b44 100644 --- a/packages/workflow-core/src/local-executor.test.ts +++ b/packages/workflow-core/src/local-executor.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, beforeEach, vi } from 'vitest' import { prisma } from '@shumai/db' -import { setupTestDbHooks } from '@shumai/db' +import { setupTestDbHooks } from '@shumai/db/test' import { workflowService } from './workflow' import { LocalExecutor, ConcurrencyLimiter, registerWorkflow } from './local-executor' import { WorkflowTaskStatus, WorkflowTaskType } from '@shumai/db' diff --git a/packages/workflow-core/src/workflow.ts b/packages/workflow-core/src/workflow.ts index 01355dc2..92b6de78 100644 --- a/packages/workflow-core/src/workflow.ts +++ b/packages/workflow-core/src/workflow.ts @@ -56,15 +56,7 @@ export class WorkflowService { } // Starts Temporal workers for specific task queues - async startWorkers( - queue: string, - options?: { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - workflowBundle?: any - // eslint-disable-next-line @typescript-eslint/no-explicit-any - activities?: any - }, - ): Promise { + async startWorkers(queue: string): Promise { const type = process.env.WORKFLOW_EXECUTOR || 'local' if (type === 'temporal') { const { Worker, NativeConnection } = await import('@temporalio/worker') @@ -74,8 +66,7 @@ export class WorkflowService { }) // eslint-disable-next-line @typescript-eslint/no-explicit-any - const activities = options?.activities || (globalThis as any).__localActivities - const workflowBundle = options?.workflowBundle + const activities = (globalThis as any).__localActivities // For agent_queue and transcode_queue, use worker-specific unique queues const crypto = await import('crypto') @@ -96,7 +87,6 @@ export class WorkflowService { const sharedWorker = await Worker.create({ connection, - workflowBundle, activities: sharedActivities, taskQueue: queue, }) diff --git a/tsconfig.json b/tsconfig.json index 8d457c9d..d6e8c691 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,6 +18,7 @@ "@shumai/core": ["packages/core/src/index.ts"], "@shumai/core/src/*": ["packages/core/src/*"], "@shumai/db": ["packages/db/src/index.ts"], + "@shumai/db/test": ["packages/db/src/test.ts"], "@shumai/dtos": ["packages/dtos/src/index.ts"], "@shumai/workflow-core": ["packages/workflow-core/src/index.ts"], "@shumai/agent": ["packages/agent/src/index.ts"],