From 39ffc2f0b890831215234f4a44d34c3fbf01ad2d Mon Sep 17 00:00:00 2001 From: jif-oai Date: Thu, 4 Dec 2025 14:44:24 +0000 Subject: [PATCH] Fix merge --- codex-rs/core/src/client.rs | 2 -- codex-rs/core/src/client_common.rs | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs index eca9098876..03c29fbef8 100644 --- a/codex-rs/core/src/client.rs +++ b/codex-rs/core/src/client.rs @@ -47,8 +47,6 @@ use crate::model_provider_info::ModelProviderInfo; use crate::model_provider_info::WireApi; use crate::openai_model_info::get_model_info; use crate::openai_models::model_family::ModelFamily; -use crate::tools::spec::create_tools_json_for_chat_completions_api; -use crate::tools::spec::create_tools_json_for_responses_api; #[derive(Debug, Clone)] pub struct ModelClient { diff --git a/codex-rs/core/src/client_common.rs b/codex-rs/core/src/client_common.rs index efb0a2930f..ef4d6f02ba 100644 --- a/codex-rs/core/src/client_common.rs +++ b/codex-rs/core/src/client_common.rs @@ -1,12 +1,11 @@ use crate::client_common::tools::ToolSpec; use crate::error::CodexErr; use crate::error::Result; -use crate::model_family::ModelFamily; use crate::model_provider_info::WireApi; +use crate::openai_models::model_family::ModelFamily; use crate::tools::spec::create_tools_json_for_chat_completions_api; use crate::tools::spec::create_tools_json_for_responses_api; use codex_api::Prompt; -use crate::openai_models::model_family::ModelFamily; pub use codex_api::common::ResponseEvent; use codex_apply_patch::APPLY_PATCH_TOOL_INSTRUCTIONS; use codex_protocol::models::ResponseItem;