Merge pull request #564 from Merit-Systems/master

[Release] Hotfix - OpenRouter auto negative pricing

Author: rsproule

.github/workflows/provider-smoke-tests.yml

@@ -0,0 +1,69 @@
+name: Provider Smoke Tests
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - 'packages/tests/provider-smoke/**'
+      - 'packages/sdk/ts/**'
+      - 'packages/app/server/**'
+      - 'packages/app/control/**'
+      - '.github/workflows/provider-smoke-tests.yml'
+
+jobs:
+  provider-smoke-tests:
+    name: Run Provider Smoke Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install pnpm
+        run: npm install -g pnpm
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+
+      - name: Install workspace dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Wait for Railway Deployment
+        env:
+          RAILWAY_TOKEN: ${{ secrets.RAILWAY_TOKEN }}
+        run: |
+          echo "Installing Railway CLI..."
+          npm install -g @railway/cli
+
+          echo "Waiting for Railway deployment to complete..."
+          railway status --service echo --environment staging || echo "Service status check failed, continuing..."
+
+          echo "Waiting for deployment to be ready..."
+          max_attempts=90
+          attempt=0
+          while [ $attempt -lt $max_attempts ]; do
+            if curl -f -s -o /dev/null https://echo-staging.up.railway.app/health 2>/dev/null; then
+              echo "Deployment is ready!"
+              break
+            fi
+            attempt=$((attempt + 1))
+            echo "Attempt $attempt/$max_attempts: Deployment not ready yet, waiting 10 seconds..."
+            sleep 10
+          done
+
+          if [ $attempt -eq $max_attempts ]; then
+            echo "Deployment did not become ready in time (waited 15 minutes)"
+            exit 1
+          fi
+
+      - name: Run Provider Smoke Tests
+        working-directory: ./packages/tests/provider-smoke
+        env:
+          ECHO_DATA_SERVER_URL: https://echo-staging.up.railway.app/
+          ECHO_API_KEY: ${{ secrets.ECHO_API_KEY }}
+          ECHO_APP_ID: a4e9b928-cac0-4952-9b4e-3be01aaff45b
+        run: pnpm run test

Dockerfile.railway

@@ -91,6 +91,10 @@ COPY packages/sdk/component-registry/ ./packages/sdk/component-registry/
 WORKDIR /app
 RUN pnpm install
 
+# Build SDK first to ensure latest version is used
+WORKDIR /app
+RUN pnpm exec turbo run build --filter=@merit-systems/echo-typescript-sdk
+
 # Build only what's needed for the server
 WORKDIR /app
 RUN SKIP_ENV_VALIDATION=true pnpm exec turbo run build --filter=echo-server
@@ -103,7 +107,7 @@ WORKDIR /app/packages/app/server
 RUN pnpm run copy-prisma
 
 # Step 4: Install production dependencies only
-RUN pnpm install
+RUN pnpm install --prod
 
 # Expose the port that echo-server runs on
 EXPOSE 3069

packages/app/control/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "predev": "docker-compose -f docker-local-db.yml up -d && sleep 3 && prisma generate && prisma migrate deploy",
+    "predev": "docker compose -f docker-local-db.yml up -d && sleep 3 && prisma generate && prisma migrate deploy",
     "dev": "next dev --turbopack",
     "prebuild": "prisma generate",
     "build": "next build",

packages/app/control/prisma/migrations/20251015203154_add_video_generation_x402_table/migration.sql

@@ -0,0 +1,19 @@
+-- CreateTable
+CREATE TABLE "video_generation_x402" (
+    "videoId" TEXT NOT NULL,
+    "wallet" TEXT,
+    "userId" UUID,
+    "echoAppId" UUID,
+    "cost" DECIMAL(65,30) NOT NULL,
+    "createdAt" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "expiresAt" TIMESTAMPTZ(6) NOT NULL,
+    "isFinal" BOOLEAN NOT NULL DEFAULT false,
+
+    CONSTRAINT "video_generation_x402_pkey" PRIMARY KEY ("videoId")
+);
+
+-- AddForeignKey
+ALTER TABLE "video_generation_x402" ADD CONSTRAINT "video_generation_x402_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "video_generation_x402" ADD CONSTRAINT "video_generation_x402_echoAppId_fkey" FOREIGN KEY ("echoAppId") REFERENCES "echo_apps"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/app/control/prisma/schema.prisma

@@ -40,6 +40,7 @@ model User {
   latestFreeCreditsVersion Decimal?
   OutboundEmailSent        OutboundEmailSent[]
   creditGrantCodeUsages    CreditGrantCodeUsage[]
+  VideoGenerationX402     VideoGenerationX402[]
 
   @@map("users")
 }
@@ -107,6 +108,7 @@ model EchoApp {
   appSessions             AppSession[]
   payouts                 Payout[]
   OutboundEmailSent       OutboundEmailSent[]
+  VideoGenerationX402     VideoGenerationX402[]
 
   @@map("echo_apps")
 }
@@ -489,3 +491,18 @@ model OutboundEmailSent {
   @@index([emailCampaignId])
   @@map("outbound_emails_sent")
 }
+
+model VideoGenerationX402 {
+  videoId         String     @id
+  wallet          String?
+  userId          String?   @db.Uuid
+  echoAppId       String?   @db.Uuid
+  cost            Decimal
+  createdAt       DateTime  @default(now()) @db.Timestamptz(6)
+  expiresAt       DateTime  @db.Timestamptz(6)
+  isFinal         Boolean   @default(false)
+
+  user    User?     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  echoApp EchoApp? @relation(fields: [echoAppId], references: [id], onDelete: Cascade)
+  @@map("video_generation_x402")
+}

packages/app/server/package.json

@@ -43,6 +43,7 @@
   "dependencies": {
     "@coinbase/cdp-sdk": "^1.34.0",
     "@coinbase/x402": "^0.6.5",
+    "@e2b/code-interpreter": "^2.0.1",
     "@google-cloud/storage": "^7.17.1",
     "@google/genai": "^1.20.0",
     "@merit-systems/echo-typescript-sdk": "workspace:*",