Skip to content

Blacksmith optimizations created based on Blacksmith support ticket 2052 with Waleed #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ConnorMul wants to merge 16 commits into from
Closed

Blacksmith optimizations created based on Blacksmith support ticket 2052 with Waleed #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
219a065
v0.4.12: guardrails, mistral models, privacy policy updates (#1608)
waleedlatif1 Oct 12, 2025
7f82ed3
v0.4.13: bugfixes for dev containers, posthog redirect, helm updates
icecrasher321 Oct 13, 2025
fb0fa1f
v0.4.14: canvas speedup and copilot context window
Sg312 Oct 14, 2025
2bc8c7b
v0.4.15: helm chart updates, telegram tools, youtube tools, file uplo…
waleedlatif1 Oct 15, 2025
04f109c
v0.4.16: executions dashboard, UI fixes, zep tools, slack fixes
icecrasher321 Oct 16, 2025
da091df
v0.4.17: input format + files support for webhooks, docs updates, das…
waleedlatif1 Oct 16, 2025
e4ddeb0
v0.4.18: file upload tools, copilot upgrade, docs changes, model filt…
icecrasher321 Oct 19, 2025
641e353
v0.4.19: landing page fix
icecrasher321 Oct 19, 2025
9751c9f
v0.4.20: internal request, kb url fixes, docs styling
icecrasher321 Oct 21, 2025
1b7437a
v0.4.21: more internal auth changes, supabase vector search tool
icecrasher321 Oct 22, 2025
71ae27b
v0.4.22: fix execution context pass for google sheets
icecrasher321 Oct 22, 2025
9b2490c
v0.4.23: webflow tools + triggers, copilot api key fix (#1723)
waleedlatif1 Oct 23, 2025
7f1ff7f
fix(billing): should allow restoring subscription (#1728)
icecrasher321 Oct 25, 2025
a02016e
v0.4.24: sso for chat deployment, usage indicator for file storage, m…
icecrasher321 Oct 27, 2025
9a4b9e2
v0.4.25: variables block, sort ordering for kb, careers page, storage…
waleedlatif1 Oct 29, 2025
e190c85
added blacksmith optimizations to workflows and dockerfiles to enhanc…
Nov 19, 2025
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
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
provenance: false
sbom: false
cache-from: ${{ github.ref == 'refs/heads/main' && format('type=registry,ref={0}:latest-amd64', matrix.ghcr_image) || '' }}
cache-to: type=inline

# Build ARM64 images for GHCR (main branch only, runs in parallel)
build-ghcr-arm64:
Expand Down Expand Up @@ -158,6 +160,10 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
provenance: false
sbom: false
cache-from: |
type=registry,ref=${{ matrix.image }}:latest-arm64
type=registry,ref=${{ matrix.image }}:${{ github.sha }}-arm64
cache-to: type=inline

# Create GHCR multi-arch manifests (only for main, after both builds)
create-ghcr-manifests:
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/docs-embeddings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,19 @@ jobs:
with:
node-version: latest

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
run: bun install
run: bun install --frozen-lockfile

- name: Process docs embeddings
working-directory: ./apps/sim
Expand Down
24 changes: 23 additions & 1 deletion .github/workflows/i18n.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ jobs:
with:
bun-version: 1.2.22

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Run Lingo.dev translations
env:
LINGODOTDEV_API_KEY: ${{ secrets.LINGODOTDEV_API_KEY }}
Expand Down Expand Up @@ -117,10 +128,21 @@ jobs:
with:
bun-version: 1.2.22

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
run: |
cd apps/docs
bun install
bun install --frozen-lockfile

- name: Build documentation to verify translations
run: |
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
provenance: false
sbom: false
cache-from: ${{ github.ref == 'refs/heads/main' && format('type=registry,ref={0}:latest-amd64', matrix.ghcr_image) || '' }}
cache-to: type=inline

build-ghcr-arm64:
name: Build ARM64 (GHCR Only)
Expand Down Expand Up @@ -143,6 +145,10 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
provenance: false
sbom: false
cache-from: |
type=registry,ref=${{ matrix.image }}:latest-arm64
type=registry,ref=${{ matrix.image }}:${{ github.sha }}-arm64
cache-to: type=inline

create-ghcr-manifests:
name: Create GHCR Manifests
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/migrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,19 @@ jobs:
with:
bun-version: 1.2.22

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
run: bun install
run: bun install --frozen-lockfile

- name: Apply migrations
working-directory: ./packages/db
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/publish-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,20 @@ jobs:
node-version: '18'
registry-url: 'https://registry.npmjs.org/'

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
working-directory: packages/cli
run: bun install
run: bun install --frozen-lockfile

- name: Build package
working-directory: packages/cli
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/publish-ts-sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,19 @@ jobs:
node-version: '22'
registry-url: 'https://registry.npmjs.org/'

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
run: bun install
run: bun install --frozen-lockfile

- name: Run tests
working-directory: packages/ts-sdk
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/test-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ jobs:
with:
node-version: latest

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
run: bun install --frozen-lockfile

Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/trigger-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,19 @@ jobs:
with:
bun-version: 1.2.22

- name: Cache Bun dependencies
uses: actions/cache@v4
with:
path: |
~/.bun/install/cache
node_modules
**/node_modules
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-bun-

- name: Install dependencies
run: bun install
run: bun install --frozen-lockfile

- name: Deploy to Trigger.dev (Staging)
if: github.ref == 'refs/heads/staging'
Expand Down
7 changes: 5 additions & 2 deletions apps/sim/app/api/billing/portal/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { db } from '@sim/db'
import { subscription as subscriptionTable, user } from '@sim/db/schema'
import { and, eq } from 'drizzle-orm'
import { and, eq, or } from 'drizzle-orm'
import { type NextRequest, NextResponse } from 'next/server'
import { getSession } from '@/lib/auth'
import { requireStripeClient } from '@/lib/billing/stripe-client'
Expand Down Expand Up @@ -38,7 +38,10 @@ export async function POST(request: NextRequest) {
.where(
and(
eq(subscriptionTable.referenceId, organizationId),
eq(subscriptionTable.status, 'active')
or(
eq(subscriptionTable.status, 'active'),
eq(subscriptionTable.cancelAtPeriodEnd, true)
)
Comment on lines +41 to +44
Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps Bot Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: Query logic incorrectly uses or() - subscriptions with cancelAtPeriodEnd=true should still have status='active', not be an alternative condition

Suggested change
or(
eq(subscriptionTable.status, 'active'),
eq(subscriptionTable.cancelAtPeriodEnd, true)
)
and(
eq(subscriptionTable.status, 'active'),
eq(subscriptionTable.cancelAtPeriodEnd, true)
)
Prompt To Fix With AI 
This is a comment left during a code review.
Path: apps/sim/app/api/billing/portal/route.ts
Line: 41:44

Comment:
**logic:** Query logic incorrectly uses `or()` - subscriptions with `cancelAtPeriodEnd=true` should still have `status='active'`, not be an alternative condition

```suggestion
            and(
              eq(subscriptionTable.status, 'active'),
              eq(subscriptionTable.cancelAtPeriodEnd, true)
            )
```

How can I resolve this? If you propose a fix, please make it concise.

)
)
.limit(1)
Expand Down
Loading