Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 27 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ members = [
"internal/durable-tools",
"internal/tensorzero-types",
"internal/tensorzero-types-providers",
"internal/autopilot-worker",
"internal/autopilot-worker", "internal/reqwest-sse-stream",
]
resolver = "2"

Expand All @@ -44,7 +44,6 @@ uuid = { version = "1.20.0", features = ["serde", "v7"] }
serde_json = { version = "1.0.143", features = ["preserve_order"] }
secrecy = { version = "0.10.2", features = ["serde"] }
toml = { version = "0.9.11", features = ["preserve_order"] }
reqwest-eventsource = "0.6.0"
async-stream = "0.3.5"
async-trait = "0.1.89"
http = "1.4.0"
Expand All @@ -60,6 +59,7 @@ clap = { version = "4.5.55", features = ["derive"] }
futures = "0.3.30"
thiserror = "2.0.18"
lazy_static = { version = "1.5.0" }
sse-stream = "0.2.1"
minijinja = { version = "2.15.1", features = [
"loader",
"debug",
Expand Down
2 changes: 1 addition & 1 deletion gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ ts-bindings = ["dep:ts-rs", "tensorzero-core/ts-bindings", "tensorzero-optimizer

[dev-dependencies]
reqwest.workspace = true
reqwest-sse-stream = { path = "../internal/reqwest-sse-stream" }
tempfile = "3.21.0"
tensorzero = { path = "../clients/rust", features = ["e2e_tests"] }
serde_json = { workspace = true }
reqwest-eventsource = { workspace = true }
futures = { workspace = true }
secrecy = { workspace = true }
uuid = { workspace = true }
Expand Down
45 changes: 23 additions & 22 deletions gateway/tests/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mod common;
use common::start_gateway_on_random_port;
use futures::StreamExt;
use http::StatusCode;
use reqwest_eventsource::{Event, RequestBuilderExt};
use reqwest_sse_stream::into_sse_stream;
use std::time::Duration;
use tokio::time::error::Elapsed;

Expand Down Expand Up @@ -65,33 +65,34 @@ async fn test_log_early_drop_streaming(model_name: &str, expect_finish: bool) {

let client = reqwest::Client::new();

let mut stream = client
.post(format!("http://{}/inference", child_data.addr))
.json(&serde_json::json!({
"model_name": model_name,
"input": {
"messages": [
{
"role": "user",
"content": "Hello, world!"
}
]
},
"stream": true,
}))
.eventsource()
.unwrap();
let mut stream = into_sse_stream(
client
.post(format!("http://{}/inference", child_data.addr))
.json(&serde_json::json!({
"model_name": model_name,
"input": {
"messages": [
{
"role": "user",
"content": "Hello, world!"
}
]
},
"stream": true,
})),
)
.await
.unwrap();

println!("Started stream");

// Cancel the request early, and verify that the gateway logs a warning.
let _elapsed = tokio::time::timeout(Duration::from_millis(500), async move {
while let Some(event) = stream.next().await {
let event = event.unwrap();
println!("Event: {event:?}");
if let Event::Message(event) = event
&& event.data == "[DONE]"
{
let sse = event.unwrap();
println!("Event: {sse:?}");
let Some(data) = sse.data else { continue };
if data == "[DONE]" {
break;
}
}
Expand Down
13 changes: 6 additions & 7 deletions gateway/tests/prometheus.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#![expect(clippy::print_stdout, clippy::unwrap_used)]
use std::time::{Duration, Instant};

use futures::StreamExt;
use reqwest::Client;
use reqwest_eventsource::{Event, RequestBuilderExt};
use reqwest_sse_stream::into_sse_stream;
use tensorzero::test_helpers::get_metrics;
use tokio::task::JoinSet;
use tokio_stream::StreamExt;

use crate::common::start_gateway_on_random_port;

Expand Down Expand Up @@ -69,12 +69,11 @@ async fn test_prometheus_metrics_inference_helper(stream: bool) {
.json(&inference_payload);

if stream {
let mut event_source = builder.eventsource().unwrap();
let mut event_source = into_sse_stream(builder).await.unwrap();
while let Some(event) = event_source.next().await {
let event = event.unwrap();
if let Event::Message(event) = event
&& event.data == "[DONE]"
{
let sse = event.unwrap();
let Some(data) = sse.data else { continue };
if data == "[DONE]" {
break;
}
}
Expand Down
Loading
Loading