Merge branch 'main' into main

Author: GabrielBianconi

.github/workflows/general.yml

@@ -322,17 +322,6 @@ jobs:
         run: |
           uv run pyright
 
-      - name: Install wasm-pack
-        run: npm install -g wasm-pack
-
-      - name: Build minijinja WASM bindings
-        working-directory: ui/app/utils/minijinja
-        run: wasm-pack build --dev --features console_error_panic_hook
-
-      - name: Run minijinja WASM tests
-        working-directory: ui/app/utils/minijinja
-        run: wasm-pack test --node --features console_error_panic_hook
-
       - name: Build npm workspace
         run: pnpm -r build
 
@@ -461,7 +450,6 @@ jobs:
       R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
       R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
 
-
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/ui-tests.yml

@@ -36,13 +36,6 @@ jobs:
           path: |
             ./ui/fixtures/s3-fixtures
 
-      - name: Setup `wasm-pack`
-        run: npm install -g wasm-pack
-
-      - name: Build minijinja WASM bindings
-        working-directory: ui/app/utils/minijinja
-        run: wasm-pack build --features console_error_panic_hook
-
       - name: Build `tensorzero-node`
         working-directory: internal/tensorzero-node
         run: pnpm build

CONTRIBUTING.md

@@ -194,10 +194,9 @@ It also requires a one-time build of a WebAssembly module from Rust source code
 Here are the steps in order to run or test the UI assuming you have the prerequisites installed and this repository checked out:
 
 1. Install dependencies: `pnpm install`
-2. Build the WebAssembly module following instructions in `ui/app/utils/minijinja/README.md`.
-3. Build the internal N-API client for TensorZero using `pnpm -r build`. If you have changed your Rust code, you may also have to run `pnpm build-bindings` from `internal/tensorzero-node`.
-4. Create a `ui/fixtures/.env` following the `ui/fixtures/.env.example`.
-5. Create a `ui/.env` file and set the following environment variables for the server:
+2. Build the internal N-API client for TensorZero using `pnpm -r build`. If you have changed your Rust code, you may also have to run `pnpm build-bindings` from `internal/tensorzero-node`.
+3. Create a `ui/fixtures/.env` following the `ui/fixtures/.env.example`.
+4. Create a `ui/.env` file and set the following environment variables for the server:
 
 ```bash
 OPENAI_API_KEY=<your-key>
@@ -207,7 +206,7 @@ TENSORZERO_CLICKHOUSE_URL=<your-clickhouse-url> # For testing, set to http://chu
 TENSORZERO_UI_CONFIG_PATH=<path-to-config-file> # For testing, set to ./fixtures/config/tensorzero.toml
 ```
 
-6. Run the dependencies: `docker compose -f ui/fixtures/docker-compose.yml up --build --force-recreate`
+5. Run the dependencies: `docker compose -f ui/fixtures/docker-compose.yml up --build --force-recreate`
    (you can omit these last 2 flags to skip the build step, but they ensure you're using the latest gateway)
 
 With the dependencies running, you can run the tests with `pnpm ui:test` and the Playwright tests with `pnpm ui:test:e2e`.

Cargo.lock

@@ -3,7 +3,6 @@ members = [
     "tensorzero-core",
     "tensorzero-core/tests/mock-inference-provider",
     "gateway",
-    "ui/app/utils/minijinja",
     "internal/tensorzero-node",
     "clients/rust",
     "clients/python",

Cargo.toml

@@ -2,7 +2,6 @@
 **/build
 **/node_modules
 README.md
-app/utils/minijinja/pkg/
 **/.env
 **/.envrc
 **/target

ui/.dockerignore

@@ -3,5 +3,4 @@
 **/playwright-report/
 **/.react-router/
 **/test-results/
-app/utils/minijinja/pkg/
 build/

ui/.prettierignore

@@ -49,17 +49,6 @@ RUN tar -vxf /tmp/packages.tar -C .
 
 RUN pnpm install --frozen-lockfile --prod
 
-# ========== minijinja-build-env ==========
-
-FROM rust:latest AS minijinja-build-env
-
-COPY . /build
-
-WORKDIR /build/ui/app/utils/minijinja
-RUN apt-get update && apt-get install -y nodejs npm
-RUN npm install -g wasm-pack
-RUN wasm-pack build --features console_error_panic_hook
-
 # ========== tensorzero-node-build-env ==========
 
 FROM rust:latest AS tensorzero-node-build-env
@@ -103,8 +92,6 @@ COPY --from=tensorzero-node-build-env /build/internal/tensorzero-node/*linux*.no
 
 COPY . .
 
-COPY --from=minijinja-build-env /build/ui/app/utils/minijinja/pkg ./ui/app/utils/minijinja/pkg
-
 RUN pnpm --filter=tensorzero-ui run build
 
 # ========== ui ==========

ui/Dockerfile

@@ -18,12 +18,11 @@ We provide fixture data for development purposes, but you can also use the UI wi
 The instructions below assume you're using the provided setup with fixture data.
 
 1. Build the `evaluations` binary. Run: `cargo build -p evaluations`
-2. Build the MiniJinja WASM module. See `./app/utils/minijinja/README.md` for reference.
-3. Set the environment variables for the gateway. Create a `.env` file in `fixtures/` with credentials. See `fixtures/.env.example` for reference.
-4. Launch the TensorZero Gateway and ClickHouse with `docker compose -f fixtures/docker-compose.yml up`.
-5. Set the UI environment variables in the shell (not `.env`). See `./.env.example` for reference.
-6. Build the internal N-API client for TensorZero using `pnpm -r build`. If you have changed your Rust code, you may also have to run `pnpm build-bindings` from `internal/tensorzero-node`.
-7. Run `pnpm` scripts from the root of the repository to start the app:
+2. Set the environment variables for the gateway. Create a `.env` file in `fixtures/` with credentials. See `fixtures/.env.example` for reference.
+3. Launch the TensorZero Gateway and ClickHouse with `docker compose -f fixtures/docker-compose.yml up`.
+4. Set the UI environment variables in the shell (not `.env`). See `./.env.example` for reference.
+5. Build the internal N-API client for TensorZero using `pnpm -r build`. If you have changed your Rust code, you may also have to run `pnpm build-bindings` from `internal/tensorzero-node`.
+6. Run `pnpm` scripts from the root of the repository to start the app:
    - Run `pnpm install` to install the dependencies.
    - Run `pnpm ui:dev` to start the development server.
    - You can also run tests with `pnpm ui:test` and Storybook with `pnpm ui:storybook`.