Merge branch 'main' into main

Author: pycoder49

Cargo.toml

@@ -82,6 +82,7 @@ panic = "deny"
 print_stderr = "deny"
 print_stdout = "deny"
 redundant_closure_for_method_calls = "deny"
+semicolon-if-nothing-returned = "deny"
 todo = "deny"
 trivially_copy_pass_by_ref = "deny"
 unimplemented = "deny"

clients/rust/src/lib.rs

@@ -410,8 +410,7 @@ impl Client {
                         .await
                         .map_err(err_to_http)
                 })
-                .await?
-                .0)
+                .await?)
             }
         }
     }
@@ -1185,7 +1184,7 @@ impl Client {
             ClientMode::HTTPGateway(client) => {
                 // Acquire the lock on the gateway version
                 let mut gateway_version = client.gateway_version.lock().await;
-                *gateway_version = Some(version)
+                *gateway_version = Some(version);
             }
             // Should never be called
             ClientMode::EmbeddedGateway { .. } => {}

evaluations/src/evaluators/llm_judge/mod.rs

@@ -297,7 +297,7 @@ fn prepare_messages_input(input: &ClientInput) -> Result<Vec<ClientInputMessage>
                     content: vec![ClientInputMessageContent::Text(TextKind::Text {
                         text: system_message,
                     })],
-                })
+                });
             }
             _ => {
                 bail!("System message is not a string or object");

evaluations/src/main.rs

@@ -27,7 +27,7 @@ async fn main() -> Result<()> {
     match &result {
         Ok(_) => info!(evaluation_run_id = %evaluation_run_id, "Evaluation completed successfully"),
         Err(e) => {
-            tracing::error!(evaluation_run_id = %evaluation_run_id, error = %e, "Evaluation failed")
+            tracing::error!(evaluation_run_id = %evaluation_run_id, error = %e, "Evaluation failed");
         }
     }
 

evaluations/src/stats.rs

@@ -54,7 +54,7 @@ impl EvaluationStats {
         }
         match evaluation_update {
             EvaluationUpdate::Success(evaluation_info) => {
-                self.evaluation_infos.push(evaluation_info)
+                self.evaluation_infos.push(evaluation_info);
             }
             EvaluationUpdate::Error(evaluation_error) => {
                 self.evaluation_errors.push(evaluation_error);

evaluations/tests/tests.rs

@@ -1734,7 +1734,7 @@ async fn run_evaluations_best_of_3() {
                 assert!(model_inference["system"]
                     .as_str()
                     .unwrap()
-                    .starts_with("You are an assistant tasked with re-ranking"))
+                    .starts_with("You are an assistant tasked with re-ranking"));
             }
         }
         assert_eq!(happy_count, 3);
@@ -1922,7 +1922,7 @@ async fn run_evaluations_mixture_of_3() {
                 assert!(model_inference["system"]
                     .as_str()
                     .unwrap()
-                    .starts_with("You have been provided with a set of responses from various"))
+                    .starts_with("You have been provided with a set of responses from various"));
             }
         }
         assert_eq!(happy_count, 3);

internal/tensorzero-derive/tests/deserialize.rs

@@ -33,7 +33,7 @@ fn test_good_deserialize() {
             },
             field2: true,
         }
-    )
+    );
 }
 
 #[test]

internal/tensorzero-node/lib/bindings/GatewayConfig.ts

@@ -11,4 +11,5 @@ export type GatewayConfig = {
   export: ExportConfig;
   base_path: string | null;
   unstable_error_json: boolean;
+  unstable_disable_feedback_target_validation: boolean;
 };

tensorzero-core/build.rs

@@ -8,5 +8,5 @@ fn main() {
     if std::env::var("TENSORZERO_SKIP_BUILD_INFO").is_ok() {
         println!("cargo:rerun-if-env-changed=TENSORZERO_SKIP_BUILD_INFO");
     }
-    built::write_built_file().expect("Failed to acquire build-time information")
+    built::write_built_file().expect("Failed to acquire build-time information");
 }

tensorzero-core/src/config_parser/gateway.rs

@@ -25,6 +25,9 @@ pub struct UninitializedGatewayConfig {
     // If set, all of the HTTP endpoints will have this path prepended.
     // E.g. a base path of `/custom/prefix` will cause the inference endpoint to become `/custom/prefix/inference`.
     pub base_path: Option<String>,
+    // If set to `true`, disables validation on feedback queries (read from ClickHouse to check that the target is valid)
+    #[serde(default)]
+    pub unstable_disable_feedback_target_validation: bool,
     /// If enabled, adds an 'error_json' field alongside the human-readable 'error' field
     /// in HTTP error responses. This contains a JSON-serialized version of the error.
     /// While 'error_json' will always be valid JSON when present, the exact contents is unstable,
@@ -63,6 +66,8 @@ impl UninitializedGatewayConfig {
             export: self.export,
             base_path: self.base_path,
             unstable_error_json: self.unstable_error_json,
+            unstable_disable_feedback_target_validation: self
+                .unstable_disable_feedback_target_validation,
         })
     }
 }
@@ -80,6 +85,7 @@ pub struct GatewayConfig {
     // E.g. a base path of `/custom/prefix` will cause the inference endpoint to become `/custom/prefix/inference`.
     pub base_path: Option<String>,
     pub unstable_error_json: bool,
+    pub unstable_disable_feedback_target_validation: bool,
 }
 
 fn serialize_optional_socket_addr<S>(