mirror of
https://github.com/openai/codex.git
synced 2026-09-05 15:18:41 +00:00
f21dc46388
## What changed - Group top-level function and custom tool definitions into a single `functions` namespace for Responses Lite providers that support namespaced tools. - Normalize missing, empty, and explicit `functions` namespaces to the same tool identity across registration, routing, lifecycle hooks, configuration, and tool search. - Keep default tool names unprefixed in code mode, display output, and dispatch traces while preserving explicit non-default namespaces. ## Testing - Add coverage for Responses Lite serialization, tool search results, namespace normalization and collision handling, routing, lifecycle events, and code-mode namespace policies. GitOrigin-RevId: d48414005b5d22d39b11a198e19c47814d3a19f2
95 lines
2.5 KiB
Rust
95 lines
2.5 KiB
Rust
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use std::cmp::Ordering;
|
|
use std::fmt;
|
|
|
|
/// Namespace used for top-level function and custom tools.
|
|
pub const DEFAULT_FUNCTION_NAMESPACE: &str = "functions";
|
|
|
|
/// Identifies a callable tool, preserving the namespace split when the model
|
|
/// provides one.
|
|
#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
|
|
pub struct ToolName {
|
|
pub name: String,
|
|
pub namespace: Option<String>,
|
|
}
|
|
|
|
impl ToolName {
|
|
pub fn new(namespace: Option<String>, name: impl Into<String>) -> Self {
|
|
Self {
|
|
name: name.into(),
|
|
namespace,
|
|
}
|
|
}
|
|
|
|
pub fn plain(name: impl Into<String>) -> Self {
|
|
Self {
|
|
name: name.into(),
|
|
namespace: None,
|
|
}
|
|
}
|
|
|
|
pub fn namespaced(namespace: impl Into<String>, name: impl Into<String>) -> Self {
|
|
Self {
|
|
name: name.into(),
|
|
namespace: Some(namespace.into()),
|
|
}
|
|
}
|
|
|
|
pub fn with_default_namespace(mut self) -> Self {
|
|
if self.namespace.as_deref().is_none_or(str::is_empty) {
|
|
self.namespace = Some(DEFAULT_FUNCTION_NAMESPACE.to_string());
|
|
}
|
|
self
|
|
}
|
|
|
|
pub fn is_default_namespace(&self) -> bool {
|
|
matches!(
|
|
self.namespace.as_deref(),
|
|
None | Some("") | Some(DEFAULT_FUNCTION_NAMESPACE)
|
|
)
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for ToolName {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
match &self.namespace {
|
|
Some(_) if self.is_default_namespace() => f.write_str(&self.name),
|
|
Some(namespace) => write!(f, "{namespace}{}", self.name),
|
|
None => f.write_str(&self.name),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Ord for ToolName {
|
|
fn cmp(&self, other: &Self) -> Ordering {
|
|
let lhs = match &self.namespace {
|
|
Some(namespace) => (namespace.as_str(), Some(self.name.as_str())),
|
|
None => (self.name.as_str(), None),
|
|
};
|
|
let rhs = match &other.namespace {
|
|
Some(namespace) => (namespace.as_str(), Some(other.name.as_str())),
|
|
None => (other.name.as_str(), None),
|
|
};
|
|
lhs.cmp(&rhs)
|
|
}
|
|
}
|
|
|
|
impl PartialOrd for ToolName {
|
|
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
|
Some(self.cmp(other))
|
|
}
|
|
}
|
|
|
|
impl From<String> for ToolName {
|
|
fn from(name: String) -> Self {
|
|
Self::plain(name)
|
|
}
|
|
}
|
|
|
|
impl From<&str> for ToolName {
|
|
fn from(name: &str) -> Self {
|
|
Self::plain(name)
|
|
}
|
|
}
|