Merge branch 'main' into feat/ollama-provider

Author: rrrodzilla

Cargo.toml

@@ -23,6 +23,7 @@ resolver = "2"
 version = "2025.11.6"
 rust-version = "1.88.0"
 license = "Apache-2.0"
+edition = "2024"
 
 [workspace.dependencies]
 reqwest = { version = "0.12.24", features = [

clients/python/Cargo.toml

@@ -5,7 +5,7 @@
 name = "tensorzero-python"
 version.workspace = true
 rust-version.workspace = true
-edition = "2021"
+edition.workspace = true
 license.workspace = true
 
 [lints]

clients/python/DEVELOPER_NOTES.md

@@ -133,5 +133,5 @@ The generated python is:
 ```python
 @dataclass
 class DatapointMetadataUpdate:
-    name: str | None | UnsetType = UNSET
+    name: str | None | OmitType = OMIT
 ```

clients/python/generate_schema_types.py

@@ -33,7 +33,7 @@
 2.  When merging the schema files, some references are recursive (e.g. `InferenceFilter`) that point to the root schema of these
     types, so we need to rewrite the `$ref`s to point to the schema definition itself instead of the root schema (which becomes
     `Any` after python dataclass generation).
-3.  We generate a custom header file for the generated types to include the `UNSET` sentinel value.
+3.  We generate a custom header file for the generated types to include the `OMIT` sentinel value.
 
 
 To run this script: run `pnpm generate-python-schemas` from the root of the repository.

clients/python/src/evaluation_handlers.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use evaluations::{
-    stats::{EvaluationError, EvaluationInfo, EvaluationStats, EvaluationUpdate},
     OutputFormat, RunInfo,
+    stats::{EvaluationError, EvaluationInfo, EvaluationStats, EvaluationUpdate},
 };
 use pyo3::{
     exceptions::{PyStopAsyncIteration, PyStopIteration},

clients/python/src/gil_helpers.rs

@@ -1,6 +1,6 @@
 use std::future::Future;
 
-use pyo3::{marker::Ungil, Python};
+use pyo3::{Python, marker::Ungil};
 /// Runs a function inside the Tokio runtime, with the GIL released.
 /// This is used when we need to drop a TensorZero client (or a type that holds it),
 /// so that we can block on the ClickHouse batcher shutting down, without holding the GIL.

clients/python/src/lib.rs

@@ -11,14 +11,14 @@
 /// and defines methods on them.
 use std::{collections::HashMap, path::PathBuf, sync::Arc, time::Duration};
 
-use evaluations::{run_evaluation_core_streaming, EvaluationCoreArgs, EvaluationVariant};
+use evaluations::{EvaluationCoreArgs, EvaluationVariant, run_evaluation_core_streaming};
 use futures::StreamExt;
 use pyo3::{
+    IntoPyObjectExt,
     exceptions::{PyDeprecationWarning, PyStopAsyncIteration, PyStopIteration, PyValueError},
     ffi::c_str,
     prelude::*,
     types::{PyDict, PyList, PyString, PyType},
-    IntoPyObjectExt,
 };
 use python_helpers::{
     convert_response_to_python_dataclass, parse_feedback_response, parse_inference_chunk,
@@ -32,20 +32,19 @@ use tensorzero_core::{
     db::clickhouse::query_builder::OrderBy,
     function::{FunctionConfigChatPyClass, FunctionConfigJsonPyClass, VariantsConfigPyClass},
     inference::types::{
+        ResolvedInput, ResolvedInputMessage,
         pyo3_helpers::{
-            deserialize_from_pyobj, deserialize_from_rendered_sample,
+            JSON_DUMPS, JSON_LOADS, deserialize_from_pyobj, deserialize_from_rendered_sample,
             deserialize_from_stored_sample, deserialize_optimization_config, serialize_to_dict,
-            tensorzero_core_error, tensorzero_core_error_class, tensorzero_error_class, JSON_DUMPS,
-            JSON_LOADS,
+            tensorzero_core_error, tensorzero_core_error_class, tensorzero_error_class,
         },
-        ResolvedInput, ResolvedInputMessage,
     },
     optimization::{
+        OptimizationJobInfoPyClass, OptimizationJobStatus, UninitializedOptimizerInfo,
         dicl::UninitializedDiclOptimizationConfig, fireworks_sft::UninitializedFireworksSFTConfig,
         gcp_vertex_gemini_sft::UninitializedGCPVertexGeminiSFTConfig,
         openai_rft::UninitializedOpenAIRFTConfig, openai_sft::UninitializedOpenAISFTConfig,
-        together_sft::UninitializedTogetherSFTConfig, OptimizationJobInfoPyClass,
-        OptimizationJobStatus, UninitializedOptimizerInfo,
+        together_sft::UninitializedTogetherSFTConfig,
     },
     tool::ProviderTool,
     variant::{
@@ -64,11 +63,11 @@ use tensorzero_core::{
     utils::gateway::ShutdownHandle,
 };
 use tensorzero_rust::{
-    err_to_http, observability::LogFormat, CacheParamsOptions, Client, ClientBuilder,
-    ClientBuilderMode, ClientExt, ClientInferenceParams, ClientSecretString, Datapoint,
-    DynamicToolParams, FeedbackParams, InferenceOutput, InferenceParams, InferenceStream, Input,
-    LaunchOptimizationParams, ListDatapointsRequest, ListInferencesParams, OptimizationJobHandle,
-    RenderedSample, StoredInference, TensorZeroError, Tool, WorkflowEvaluationRunParams,
+    CacheParamsOptions, Client, ClientBuilder, ClientBuilderMode, ClientExt, ClientInferenceParams,
+    ClientSecretString, Datapoint, DynamicToolParams, FeedbackParams, InferenceOutput,
+    InferenceParams, InferenceStream, Input, LaunchOptimizationParams, ListDatapointsRequest,
+    ListInferencesParams, OptimizationJobHandle, RenderedSample, StoredInference, TensorZeroError,
+    Tool, WorkflowEvaluationRunParams, err_to_http, observability::LogFormat,
 };
 use tokio::sync::Mutex;
 use url::Url;
@@ -79,7 +78,7 @@ mod gil_helpers;
 mod python_helpers;
 
 use crate::evaluation_handlers::{AsyncEvaluationJobHandler, EvaluationJobHandler};
-use crate::gil_helpers::{tokio_block_on_without_gil, DropInTokio};
+use crate::gil_helpers::{DropInTokio, tokio_block_on_without_gil};
 
 #[pymodule]
 fn tensorzero(m: &Bound<'_, PyModule>) -> PyResult<()> {
@@ -3015,7 +3014,10 @@ fn warn_no_config(py: Python<'_>, config: Option<&str>) -> PyResult<()> {
         PyErr::warn(
             py,
             &user_warning,
-            c_str!("No config file provided, so only default functions will be available. Use `config_file=\"path/to/tensorzero.toml\"` to specify a config file."), 0
+            c_str!(
+                "No config file provided, so only default functions will be available. Use `config_file=\"path/to/tensorzero.toml\"` to specify a config file."
+            ),
+            0,
         )?;
     }
     Ok(())

clients/python/templates/dataclass.jinja2

@@ -27,7 +27,7 @@ class {{ class_name }}:
     {{ field.name }}: {{ field.type_hint }} = {{ field.field }}
     {%- else %}
     {%- if field.extras and field.extras.get('x_double_option') %}
-    {{ field.name }}: {{ field.type_hint }} | UnsetType = UNSET
+    {{ field.name }}: {{ field.type_hint }} | OmitType = OMIT
     {%- else %}
     {{ field.name }}: {{ field.type_hint }}
     {%- if not (field.required or (field.represented_default == 'None' and field.strip_default_none))

clients/python/templates/generated_types_header.py.template

@@ -11,4 +11,4 @@ To regenerate, run:
 """
 
 from __future__ import annotations
-from .unset_type import UNSET, UnsetType
+from .omit_type import OMIT, OmitType

clients/python/tensorzero/generated_types.py

@@ -15,7 +15,7 @@
 from dataclasses import dataclass, field
 from typing import Any, Literal
 
-from .unset_type import UNSET, UnsetType
+from .omit_type import OMIT, OmitType
 
 Model = Any
 
@@ -77,11 +77,11 @@ class DatapointMetadataUpdate:
     A request to update the metadata of a datapoint.
     """
 
-    name: str | None | UnsetType = UNSET
+    name: str | None | OmitType = OMIT
     """
     Datapoint name.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
     be set to the provided value.
     """
 
@@ -871,11 +871,11 @@ class UpdateDatapointMetadataRequest:
     """
     The ID of the datapoint to update. Required.
     """
-    name: str | None | UnsetType = UNSET
+    name: str | None | OmitType = OMIT
     """
     Datapoint name.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
     be set to the provided value.
     """
 
@@ -1348,30 +1348,30 @@ class UpdateDynamicToolParamsRequest:
     new tools or exclude removed tools.
     If omitted, it will be left unchanged. If specified as a value, it will be set to the provided value.
     """
-    allowed_tools: list[str] | None | UnsetType = UNSET
+    allowed_tools: list[str] | None | OmitType = OMIT
     """
     A subset of static tools configured for the function that the inference is explicitly allowed to use.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (we allow function-configured tools
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (we allow function-configured tools
     plus additional tools provided at inference time). If specified as a value, it will be set to the provided value.
     """
-    parallel_tool_calls: bool | None | UnsetType = UNSET
+    parallel_tool_calls: bool | None | OmitType = OMIT
     """
     Whether to use parallel tool calls in the inference.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
     parallel tool calls). If specified as a value, it will be set to the provided value.
     """
     provider_tools: list[ProviderTool] | None = None
     """
     Provider-specific tool configurations
     If omitted, it will be left unchanged. If specified as a value, it will be set to the provided value.
     """
-    tool_choice: ToolChoice | None | UnsetType = UNSET
+    tool_choice: ToolChoice | None | OmitType = OMIT
     """
     User-specified tool choice strategy.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
     tool choice). If specified as a value, it will be set to the provided value.
     """
 
@@ -1575,11 +1575,11 @@ class UpdateChatDatapointRequestInternal:
     new tools or exclude removed tools.
     If omitted, it will be left unchanged. If specified as a value, it will be set to the provided value.
     """
-    allowed_tools: list[str] | None | UnsetType = UNSET
+    allowed_tools: list[str] | None | OmitType = OMIT
     """
     A subset of static tools configured for the function that the inference is explicitly allowed to use.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (we allow function-configured tools
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (we allow function-configured tools
     plus additional tools provided at inference time). If specified as a value, it will be set to the provided value.
     """
     input: Input | None = None
@@ -1591,25 +1591,25 @@ class UpdateChatDatapointRequestInternal:
     DEPRECATED (#4725 / 2026.2+): Metadata fields to update.
     Moving forward, don't nest these fields.
     """
-    name: str | None | UnsetType = UNSET
+    name: str | None | OmitType = OMIT
     """
     Datapoint name.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
     be set to the provided value.
     """
-    output: list[ContentBlockChatOutput] | None | UnsetType = UNSET
+    output: list[ContentBlockChatOutput] | None | OmitType = OMIT
     """
     Chat datapoint output.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared.
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared.
     Otherwise, it will overwrite the existing output (and can be an empty list).
     """
-    parallel_tool_calls: bool | None | UnsetType = UNSET
+    parallel_tool_calls: bool | None | OmitType = OMIT
     """
     Whether to use parallel tool calls in the inference.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
     parallel tool calls). If specified as a value, it will be set to the provided value.
     """
     provider_tools: list[ProviderTool] | None = None
@@ -1621,14 +1621,14 @@ class UpdateChatDatapointRequestInternal:
     """
     Datapoint tags.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared.
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared.
     Otherwise, it will overwrite the existing tags.
     """
-    tool_choice: ToolChoice | None | UnsetType = UNSET
+    tool_choice: ToolChoice | None | OmitType = OMIT
     """
     User-specified tool choice strategy.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (we will use function-configured
     tool choice). If specified as a value, it will be set to the provided value.
     """
     tool_params: UpdateDynamicToolParamsRequest | None = None
@@ -1666,17 +1666,17 @@ class UpdateJsonDatapointRequestInternal:
     DEPRECATED (#4725 / 2026.2+): Metadata fields to update.
     Moving forward, don't nest these fields.
     """
-    name: str | None | UnsetType = UNSET
+    name: str | None | OmitType = OMIT
     """
     Datapoint name.
 
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared. If specified as a value, it will
     be set to the provided value.
     """
-    output: JsonDatapointOutputUpdate | None | UnsetType = UNSET
+    output: JsonDatapointOutputUpdate | None | OmitType = OMIT
     """
     JSON datapoint output.
-    If omitted (which uses the default value `UNSET`), it will be left unchanged. If set to `None`, it will be cleared (represents edge case where
+    If omitted (which uses the default value `OMIT`), it will be left unchanged. If set to `None`, it will be cleared (represents edge case where
     inference succeeded but model didn't output relevant content blocks). Otherwise, it will overwrite the existing output.
     """
     output_schema: Any | None = None