Skip to content

Commit 03510c6

Browse files
authored
Merge branch 'tensorzero:main' into main
2 parents 205f3f6 + b0121b8 commit 03510c6

File tree

491 files changed

+33830
-6151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

491 files changed

+33830
-6151
lines changed

.buildkite/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ agents:
66
steps:
77
- label: "Clickhouse Cloud tests - normal release channel"
88
concurrency: 1
9-
concurrency_group: 'clickhouse-cloud-normal-${CLICKHOUSE_ID}'
9+
concurrency_group: "clickhouse-cloud-normal-${CLICKHOUSE_ID}"
1010
command: CLICKHOUSE_PREFIX="dev-tensorzero-e2e-tests-instance-" ./ci/buildkite/test-clickhouse-cloud.sh
1111
- label: "Clickhouse Cloud tests - fast release channel"
1212
concurrency: 1
13-
concurrency_group: 'clickhouse-cloud-fast-${CLICKHOUSE_ID}'
14-
command: CLICKHOUSE_PREFIX="dev-tensorzero-e2e-tests-fast-instance-" ./ci/buildkite/test-clickhouse-cloud.sh
13+
concurrency_group: "clickhouse-cloud-fast-${CLICKHOUSE_ID}"
14+
command: CLICKHOUSE_PREFIX="dev-tensorzero-e2e-tests-fast-instance-" TENSORZERO_CLICKHOUSE_FAST_CHANNEL=1 ./ci/buildkite/test-clickhouse-cloud.sh
1515

1616
notify:
1717
- github_commit_status:

.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ test-e2e-no-creds = [
4040
"clickhouse",
4141
]
4242

43+
4344
build-e2e = "build --bin gateway --features e2e_tests"
4445
run-e2e = "run --bin gateway --features e2e_tests -- --config-file tensorzero-core/tests/e2e/tensorzero.toml"
4546
watch-e2e = "watch -x run-e2e"

.config/nextest.toml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ slow-timeout = { period = "20s", terminate-after = 3 }
2727
[profile.e2e]
2828
retries = { backoff = "exponential", count = 4, delay = "5s", jitter = true, max-delay = "60s" }
2929
default-filter = "not (test(batch)) and not (test(test_dummy_only) | test(clickhouse))"
30+
junit.path = "junit.xml"
3031

3132
[profile.batch]
3233
default-filter = 'test(batch)'
3334

3435
[profile.clickhouse]
3536
default-filter = 'test(test_dummy_only) | test(clickhouse)'
37+
junit.path = "junit.xml"
3638

3739
[profile.optimization]
3840
default-filter = 'binary(optimization-live)'
@@ -62,13 +64,12 @@ e2e_aws_sagemaker_tgi = { max-threads = 1 }
6264
# Our Sagemaker instance seems to be able to handle 2 concurrent requests
6365
e2e_aws_sagemaker_openai = { max-threads = 2 }
6466
e2e_groq = { max-threads = 1 }
67+
# Run ClickHouse migration tests serially to avoid conflicts
68+
clickhouse_migration = { max-threads = 1 }
6569

66-
# Require that nothing else runs at the same time as a Jaeger test,
67-
# so that we can find our Jaeger traces (without other tests
68-
# flushing our target spans out of the Jaeger buffer).
6970
[[profile.default.overrides]]
70-
filter = 'test(test_jaeger)'
71-
threads-required = 'num-test-threads'
71+
filter = 'test(test_otel_export)'
72+
slow-timeout = { period = "60s", terminate-after = 2 }
7273

7374
[[profile.default.overrides]]
7475
filter = 'binary(e2e) and test(providers::aws_bedrock::)'
@@ -88,6 +89,10 @@ test-group = 'e2e_groq'
8889
# We have a low rate limit on Groq, so we often need to retry several times
8990
retries = { backoff = "exponential", count = 8, delay = "5s", jitter = true, max-delay = "120s" }
9091

92+
[[profile.default.overrides]]
93+
filter = 'test(test_clickhouse_migration_manager)'
94+
test-group = 'clickhouse_migration'
95+
9196
[[profile.default.overrides]]
9297
filter = 'binary(e2e) and test(providers::vllm::)'
9398
slow-timeout = { period = "60s", terminate-after = 2 }
@@ -109,10 +114,15 @@ filter = 'test(batch)'
109114
slow-timeout = { period = "15s", terminate-after = 3 }
110115

111116
[[profile.default.overrides]]
112-
# Settings for running clickhouse tests, which can be very slow on ClickHouse Clouc
117+
# Settings for running clickhouse tests, which can be very slow on ClickHouse Cloud
113118
# (when spawning lots of concurrent inserts)
114119
filter = 'test(clickhouse)'
115-
slow-timeout = { period = "500s", terminate-after = 1 }
120+
slow-timeout = { period = "900s", terminate-after = 1 }
121+
122+
[[profile.default.overrides]]
123+
filter = 'test(test_concurrent_requests)'
124+
# This test creates and uses lots of `reqwest::Client`s, which can be slow
125+
slow-timeout = { period = "30s", terminate-after = 1 }
116126

117127
[[profile.default.overrides]]
118128
# Settings for running unit tests

.dockerignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ target-rust-analyzer
1111
**/.claude
1212
/recipes
1313
/examples
14+
gcp_jwt_key.json
15+
.credentials/
16+
/docs
1417
!/examples/integrations/cursor/feedback
1518
!/examples/quickstart/package.json
1619
!/examples/integrations/helicone/package.json
1720
!/examples/guides/tool-use/package.json
21+
!/examples/haiku-hidden-preferences

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ updates:
2020
interval: "weekly"
2121
labels: []
2222
open-pull-requests-limit: 0 # only send security updates
23+
# These paths contain educational content that is not directly meant for production use.
24+
# Automatic upgrades are likely to break them over time as they're not actively tested.
25+
exclude-paths:
26+
- "examples/**"
27+
- "recipes/**"
2328

2429
- package-ecosystem: "cargo"
2530
directory: "/"

.github/workflows/batch-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ on:
3535
jobs:
3636
batch-tests:
3737
runs-on: ubuntu-latest
38+
if: github.repository == 'tensorzero/tensorzero'
3839

3940
timeout-minutes: 15
4041

.github/workflows/build-gateway-container.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
build-gateway-container:
88
runs-on: namespace-profile-tensorzero-2x8;overrides.cache-tag=build-gateway-cache
9+
if: github.repository == 'tensorzero/tensorzero'
910

1011
steps:
1112
# TODO - investigate why using the Namespace checkout action causes
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Build Mock Inference Container
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
build-mock-inference-container:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Check out the repo
12+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
13+
14+
- name: Build `mock-inference-provider` container
15+
run: |
16+
docker build -f tensorzero-core/tests/mock-inference-provider/Dockerfile . -t mock-inference-provider:latest
17+
18+
- name: Save `mock-inference-provider` container
19+
run: docker save mock-inference-provider:latest > mock-inference-container.tar
20+
21+
- name: Upload `mock-inference-provider` container as an artifact
22+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
23+
with:
24+
name: build-mock-inference-container
25+
path: mock-inference-container.tar
26+
retention-days: 1
27+
if-no-files-found: error
28+
overwrite: false

.github/workflows/build-ui-container.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
build-ui-container:
88
runs-on: namespace-profile-tensorzero-2x8;overrides.cache-tag=build-ui-cache
9+
if: github.repository == 'tensorzero/tensorzero'
910

1011
steps:
1112
- uses: namespacelabs/nscloud-checkout-action@953fed31a6113cc2347ca69c9d823743c65bc84b

0 commit comments

Comments
 (0)