Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/backend-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
pull_request:
types: [opened, synchronize, reopened]
branches: [main, develop]
paths:
- 'apps/backend-services/**'
- 'apps/shared/**'
- 'packages/**'
- '.github/workflows/backend-qa.yml'
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -33,13 +38,18 @@ jobs:
working-directory: apps/backend-services
run: npm run db:generate
env:
DATABASE_URL: "file:dev.db"
DATABASE_URL: "postgresql://localhost:5432/dummy"
- name: Lint
working-directory: apps/backend-services
run: npm run lint
- name: Type Check
working-directory: apps/backend-services
run: npm run type-check
- name: Build
working-directory: apps/backend-services
run: npm run build
env:
DATABASE_URL: "postgresql://localhost:5432/dummy"
- name: Test
working-directory: apps/backend-services
run: npm run test:cov
4 changes: 4 additions & 0 deletions .github/workflows/frontend-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
pull_request:
types: [opened, synchronize, reopened]
branches: [main, develop]
paths:
- 'apps/frontend/**'
- 'packages/**'
- '.github/workflows/frontend-qa.yml'
workflow_dispatch:

jobs:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/temporal-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
pull_request:
types: [opened, synchronize, reopened]
branches: [main, develop]
paths:
- 'apps/temporal/**'
- 'apps/shared/**'
- 'packages/**'
- '.github/workflows/temporal-qa.yml'
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -41,6 +46,11 @@ jobs:
- name: Type Check
working-directory: apps/temporal
run: npm run type-check
- name: Build
working-directory: apps/temporal
run: npm run build
env:
DATABASE_URL: "postgresql://localhost:5432/dummy"
- name: Run tests
working-directory: apps/temporal
run: npm test
4 changes: 4 additions & 0 deletions apps/backend-services/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ RUN cd /packages/blob-storage-paths && npm install --ignore-scripts && npm run b
COPY packages/graph-workflow /packages/graph-workflow
RUN cd /packages/graph-workflow && npm install --ignore-scripts && npm run build

COPY packages/temporal-payload-codec /packages/temporal-payload-codec
RUN cd /packages/temporal-payload-codec && npm install --ignore-scripts && npm run build

COPY packages/monitoring /packages/monitoring
RUN mkdir -p /packages/monitoring/node_modules/@ai-di && \
ln -s /packages/logging /packages/monitoring/node_modules/@ai-di/shared-logging && \
Expand Down Expand Up @@ -65,6 +68,7 @@ COPY --from=builder /packages/logging /packages/logging
COPY --from=builder /packages/graph-insertion-slots /packages/graph-insertion-slots
COPY --from=builder /packages/blob-storage-paths /packages/blob-storage-paths
COPY --from=builder /packages/graph-workflow /packages/graph-workflow
COPY --from=builder /packages/temporal-payload-codec /packages/temporal-payload-codec
COPY --from=builder /packages/monitoring /packages/monitoring

# Copy package files
Expand Down
8 changes: 3 additions & 5 deletions apps/backend-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"private": true,
"license": "Apache-2.0",
"scripts": {
"build": "npm run db:generate && npm run build:graph-insertion-slots && npm run build:graph-workflow-config && npm run build:graph-workflow && nest build",
"build:prod": "NODE_ENV=production npm run db:generate && npm run build:graph-insertion-slots && npm run build:graph-workflow-config && npm run build:graph-workflow && nest build",
"build": "npm run db:generate && npm run build:graph-insertion-slots && npm run build:graph-workflow && nest build",
"build:prod": "NODE_ENV=production npm run db:generate && npm run build:graph-insertion-slots && npm run build:graph-workflow && nest build",
"build:logging": "cd ../../packages/logging && npm run build",
"format": "prettier --write \"src/**/*.ts\"",
"start": "nest start",
Expand All @@ -31,15 +31,13 @@
"workflow:migrate-ocr-refs": "tsx scripts/migrate-workflow-config-ocr-refs.ts",
"workflow:migrate-ocr-refs:apply": "tsx scripts/migrate-workflow-config-ocr-refs.ts --apply --refresh-benchmark-hashes",
"build:graph-workflow": "cd ../../packages/graph-workflow && npm run build",
"build:graph-workflow-config": "cd ../../packages/graph-workflow-config && npm run build",
"build:graph-insertion-slots": "cd ../../packages/graph-insertion-slots && npm run build"
},
"dependencies": {
"@ai-di/blob-storage-paths": "file:../../packages/blob-storage-paths",
"@ai-di/graph-workflow-config": "file:../../packages/graph-workflow-config",
"@ai-di/temporal-payload-codec": "file:../../packages/temporal-payload-codec",
"@ai-di/graph-insertion-slots": "file:../../packages/graph-insertion-slots",
"@ai-di/graph-workflow": "file:../../packages/graph-workflow",
"@ai-di/temporal-payload-codec": "file:../../packages/temporal-payload-codec",
"@ai-di/monitoring": "file:../../packages/monitoring",
"@ai-di/shared-logging": "file:../../packages/logging",
"@aws-sdk/client-s3": "3.990.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow-config";
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow";
import type { GraphWorkflowConfig } from "../workflow/graph-workflow-types";

export { applyWorkflowConfigOverrides };
Expand Down
2 changes: 1 addition & 1 deletion apps/backend-services/src/workflow/config-hash.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow-config";
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow";
import {
computeConfigHash,
computeConfigHashWithOverrides,
Expand Down
2 changes: 1 addition & 1 deletion apps/backend-services/src/workflow/config-hash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export {
computeConfigHashWithOverrides,
stampConfigWithPersistedHash,
stripPersistedConfigHash,
} from "@ai-di/graph-workflow-config";
} from "@ai-di/graph-workflow";
5 changes: 4 additions & 1 deletion apps/frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ export default defineConfig({
// Bundle graph-workflow from source: dist is CommonJS and Rollup cannot
// resolve named exports (e.g. validateGraphConfig) from the compiled output.
"@ai-di/graph-workflow": fileURLToPath(
new URL("../../packages/graph-workflow/src/index.ts", import.meta.url),
new URL(
"../../packages/graph-workflow/src/index.browser.ts",
import.meta.url,
),
),
// Explicit aliases so Vite/Vitest always resolves to the same React
// instance in all environments (prevents "Invalid hook call" in CI).
Expand Down
4 changes: 4 additions & 0 deletions apps/temporal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ RUN cd /packages/blob-storage-paths && npm install --ignore-scripts && npm run b
COPY packages/graph-workflow /packages/graph-workflow
RUN cd /packages/graph-workflow && npm install --ignore-scripts && npm run build

COPY packages/temporal-payload-codec /packages/temporal-payload-codec
RUN cd /packages/temporal-payload-codec && npm install --ignore-scripts && npm run build

COPY packages/monitoring /packages/monitoring
# @ai-di/shared-logging is a peerDependency of monitoring (not needed at build time).
# Link the already-built logging package so npm doesn't fetch it from the registry.
Expand Down Expand Up @@ -78,6 +81,7 @@ COPY --from=builder /packages/logging /packages/logging
COPY --from=builder /packages/graph-insertion-slots /packages/graph-insertion-slots
COPY --from=builder /packages/blob-storage-paths /packages/blob-storage-paths
COPY --from=builder /packages/graph-workflow /packages/graph-workflow
COPY --from=builder /packages/temporal-payload-codec /packages/temporal-payload-codec
COPY --from=builder /packages/monitoring /packages/monitoring

# Package files and production deps
Expand Down
7 changes: 3 additions & 4 deletions apps/temporal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Temporal workflow for Azure OCR document processing using TypeScript",
"main": "dist/worker.js",
"scripts": {
"build": "npm run db:generate && npm run build:graph-insertion-slots && npm run build:graph-workflow-config && npm run build:graph-workflow && tsc",
"build": "npm run db:generate && npm run build:graph-insertion-slots && npm run build:graph-workflow && tsc",
"build:logging": "cd ../../packages/logging && npm run build",
"start": "node dist/worker.js",
"start:worker": "node dist/worker.js",
Expand All @@ -14,7 +14,7 @@
"db:generate": "node ../shared/scripts/generate-prisma.js",
"lint": "npx @biomejs/biome check",
"lint:fix": "npm run lint -- --write",
"pretest": "npm run build:logging && npm run build:graph-insertion-slots && npm run build:graph-workflow-config && npm run build:graph-workflow",
"pretest": "npm run build:logging && npm run build:graph-insertion-slots && npm run build:graph-workflow",
"build:graph-workflow": "cd ../../packages/graph-workflow && npm run build",
"build:graph-workflow-config": "cd ../../packages/graph-workflow-config && npm run build",
"test": "jest",
Expand All @@ -31,10 +31,9 @@
"license": "MIT",
"dependencies": {
"@ai-di/blob-storage-paths": "file:../../packages/blob-storage-paths",
"@ai-di/graph-workflow-config": "file:../../packages/graph-workflow-config",
"@ai-di/temporal-payload-codec": "file:../../packages/temporal-payload-codec",
"@ai-di/graph-insertion-slots": "file:../../packages/graph-insertion-slots",
"@ai-di/graph-workflow": "file:../../packages/graph-workflow",
"@ai-di/temporal-payload-codec": "file:../../packages/temporal-payload-codec",
"@ai-di/monitoring": "file:../../packages/monitoring",
"@ai-di/shared-logging": "file:../../packages/logging",
"@aws-sdk/client-s3": "3.1000.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow-config";
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow";
import { computeConfigHashWithOverrides } from "../config-hash";
import type { GraphWorkflowConfig } from "../graph-workflow-types";
import { getPrismaClient } from "./database-client";
Expand Down
2 changes: 1 addition & 1 deletion apps/temporal/src/config-hash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export {
computeConfigHashWithOverrides,
stampConfigWithPersistedHash,
stripPersistedConfigHash,
} from "@ai-di/graph-workflow-config";
} from "@ai-di/graph-workflow";
2 changes: 1 addition & 1 deletion apps/temporal/src/graph-workflow.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Tests for the generic DAG workflow execution engine.
*/

import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow-config";
import { applyWorkflowConfigOverrides } from "@ai-di/graph-workflow";
import { afterAll, beforeAll, describe, expect, it } from "@jest/globals";
import { TestWorkflowEnvironment } from "@temporalio/testing";
import { Worker } from "@temporalio/worker";
Expand Down
7 changes: 1 addition & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions packages/graph-workflow-config/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions packages/graph-workflow-config/package.json

This file was deleted.

28 changes: 0 additions & 28 deletions packages/graph-workflow-config/src/index.ts

This file was deleted.

Loading
Loading