Skip to content

Commit 3387520

Browse files
Merge branch 'main' into feat/storybook-ci-tests
2 parents a9d0755 + 6755b45 commit 3387520

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/general.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,8 @@ jobs:
734734
# the main 'validate' job)
735735
runs-on: ${{ matrix.replicated && 'namespace-profile-tensorzero-8x16;ephemeral-storage.size-multiplier=2' || 'namespace-profile-tensorzero-8x16' }}
736736
continue-on-error: ${{ matrix.clickhouse_version.allow_failure }}
737-
if: github.repository == 'tensorzero/tensorzero'
737+
# This needs to pull from Docker Hub, so skip for external PR CI
738+
if: ${{ (github.event.pull_request.head.repo.full_name == github.repository) || inputs.is_merge_group }}
738739
strategy:
739740
matrix:
740741
# Only include replicated: true when running in merge queue

tensorzero-core/tests/e2e/providers/common.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3621,7 +3621,6 @@ pub async fn check_simple_image_inference_response(
36213621
}
36223622

36233623
pub async fn test_streaming_invalid_request_with_provider(provider: E2ETestProvider) {
3624-
// A top_p of -100 and temperature of -100 should produce errors on all providers
36253624
let extra_headers = if provider.is_modal_provider() {
36263625
get_modal_extra_headers()
36273626
} else {
@@ -3630,10 +3629,13 @@ pub async fn test_streaming_invalid_request_with_provider(provider: E2ETestProvi
36303629
let payload = json!({
36313630
"function_name": "basic_test",
36323631
"variant_name": provider.variant_name,
3632+
// Set lots of invalid parameters to try to produce an error on all providers
36333633
"params": {
36343634
"chat_completion": {
36353635
"temperature": -100,
36363636
"top_p": -100,
3637+
"presence_penalty": -100,
3638+
"frequency_penalty": -100,
36373639
}
36383640
},
36393641
"input":
@@ -3673,10 +3675,13 @@ pub async fn test_streaming_invalid_request_with_provider(provider: E2ETestProvi
36733675
assert_eq!(code, StatusCode::INTERNAL_SERVER_ERROR);
36743676
let resp: Value = resp.json().await.unwrap();
36753677
let err_msg = resp.get("error").unwrap().as_str().unwrap();
3678+
println!("Error message: {err_msg}");
36763679
assert!(
36773680
err_msg.contains("top_p")
36783681
|| err_msg.contains("topP")
3679-
|| err_msg.contains("temperature"),
3682+
|| err_msg.contains("temperature")
3683+
|| err_msg.contains("presence_penalty")
3684+
|| err_msg.contains("frequency_penalty"),
36803685
"Unexpected error message: {resp}"
36813686
);
36823687
}

0 commit comments

Comments
 (0)