Skip to content

Commit e1601ec

Browse files
Allow non-default providers to use arbitrary model names
1 parent 81e9278 commit e1601ec

4 files changed

Lines changed: 23 additions & 35 deletions

File tree

‎codex-rs/Cargo.lock‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codex-rs/github/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ serde = { workspace = true, features = ["derive"] }
1212
serde_json = { workspace = true }
1313
tempfile = { workspace = true }
1414
thiserror = { workspace = true }
15-
tokio = { workspace = true, features = ["rt", "time"] }
1615
url = { workspace = true }
1716

1817
[lints]

‎sdk/native/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"artifacts": "napi artifacts",
2525
"build": "pnpm run build:ts && pnpm run build:napi",
2626
"build:ts": "tsup",
27-
"build:napi": "node -e \"const {execFileSync}=require('node:child_process');const {readFileSync}=require('node:fs');const {platform,arch}=process;const isMusl=()=>{if(platform!=='linux')return false;try{if(readFileSync('/usr/bin/ldd','utf8').includes('musl'))return true;}catch{}if(typeof process.report?.getReport==='function'){const r=process.report.getReport();if(r?.header?.glibcVersionRuntime)return false;if(Array.isArray(r?.sharedObjects)&&r.sharedObjects.some((p)=>p.includes('libc.musl-')||p.includes('ld-musl-')))return true;}try{return require('node:child_process').execSync('ldd --version',{encoding:'utf8'}).includes('musl');}catch{}return false;};let dir=null;if(platform==='darwin'){dir=arch==='arm64'?'darwin-arm64':arch==='x64'?'darwin-x64':null;}else if(platform==='linux'){const suffix=isMusl()?'musl':'gnu';dir=arch==='arm64'?'linux-arm64-'+suffix:arch==='x64'?'linux-x64-'+suffix:null;}else if(platform==='win32'){dir=arch==='arm64'?'win32-arm64-msvc':arch==='x64'?'win32-x64-msvc':null;}if(!dir){throw new Error('Unsupported platform/arch: '+platform+' '+arch);}execFileSync('napi',['build','--platform','--release','--features','napi-bindings','--no-js','--output-dir','npm/'+dir],{stdio:'inherit'});\"",
27+
"build:napi": "node -e \"const {execFileSync}=require('node:child_process');const {readFileSync,readdirSync,rmSync}=require('node:fs');const {platform,arch}=process;for(const entry of readdirSync(process.cwd())){if(entry.endsWith('.node')&&entry.startsWith('codex_native.')){try{rmSync(entry);}catch{}}}const isMusl=()=>{if(platform!=='linux')return false;try{if(readFileSync('/usr/bin/ldd','utf8').includes('musl'))return true;}catch{}if(typeof process.report?.getReport==='function'){const r=process.report.getReport();if(r?.header?.glibcVersionRuntime)return false;if(Array.isArray(r?.sharedObjects)&&r.sharedObjects.some((p)=>p.includes('libc.musl-')||p.includes('ld-musl-')))return true;}try{return require('node:child_process').execSync('ldd --version',{encoding:'utf8'}).includes('musl');}catch{}return false;};let dir=null;if(platform==='darwin'){dir=arch==='arm64'?'darwin-arm64':arch==='x64'?'darwin-x64':null;}else if(platform==='linux'){const suffix=isMusl()?'musl':'gnu';dir=arch==='arm64'?'linux-arm64-'+suffix:arch==='x64'?'linux-x64-'+suffix:null;}else if(platform==='win32'){dir=arch==='arm64'?'win32-arm64-msvc':arch==='x64'?'win32-x64-msvc':null;}if(!dir){throw new Error('Unsupported platform/arch: '+platform+' '+arch);}execFileSync('napi',['build','--platform','--release','--features','napi-bindings','--no-js','--output-dir','npm/'+dir],{stdio:'inherit'});\"",
2828
"build:napi:debug": "node -e \"const {execFileSync}=require('node:child_process');const {readFileSync}=require('node:fs');const {platform,arch}=process;const isMusl=()=>{if(platform!=='linux')return false;try{if(readFileSync('/usr/bin/ldd','utf8').includes('musl'))return true;}catch{}if(typeof process.report?.getReport==='function'){const r=process.report.getReport();if(r?.header?.glibcVersionRuntime)return false;if(Array.isArray(r?.sharedObjects)&&r.sharedObjects.some((p)=>p.includes('libc.musl-')||p.includes('ld-musl-')))return true;}try{return require('node:child_process').execSync('ldd --version',{encoding:'utf8'}).includes('musl');}catch{}return false;};let dir=null;if(platform==='darwin'){dir=arch==='arm64'?'darwin-arm64':arch==='x64'?'darwin-x64':null;}else if(platform==='linux'){const suffix=isMusl()?'musl':'gnu';dir=arch==='arm64'?'linux-arm64-'+suffix:arch==='x64'?'linux-x64-'+suffix:null;}else if(platform==='win32'){dir=arch==='arm64'?'win32-arm64-msvc':arch==='x64'?'win32-x64-msvc':null;}if(!dir){throw new Error('Unsupported platform/arch: '+platform+' '+arch);}execFileSync('napi',['build','--platform','--features','napi-bindings','--no-js','--output-dir','npm/'+dir],{stdio:'inherit'});\"",
2929
"release": "node scripts/publish.mjs",
3030
"test": "NODE_OPTIONS='--experimental-vm-modules' jest --runInBand",
@@ -87,4 +87,4 @@
8787
"publishConfig": {
8888
"access": "public"
8989
}
90-
}
90+
}

‎sdk/native/rust-bindings/run.rs‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,11 @@ fn is_supported_hosted_model(model: &str) -> bool {
237237
.any(|supported| supported == model)
238238
}
239239

240-
fn validate_model_name(model: Option<&str>, oss: bool) -> napi::Result<()> {
240+
fn validate_model_name(
241+
model: Option<&str>,
242+
oss: bool,
243+
model_provider: Option<&str>,
244+
) -> napi::Result<()> {
241245
let Some(model_name) = model else {
242246
return Ok(());
243247
};
@@ -249,7 +253,11 @@ fn validate_model_name(model: Option<&str>, oss: bool) -> napi::Result<()> {
249253
)));
250254
}
251255

252-
if !oss && !is_supported_hosted_model(trimmed) {
256+
// Only validate against Codex-hosted models when using the default OpenAI provider.
257+
// For third-party providers (e.g. GitHub Copilot), model names are provider-specific.
258+
let provider = model_provider.map(str::trim).filter(|v| !v.is_empty());
259+
let is_default_provider = provider.is_none() || provider == Some("openai");
260+
if !oss && is_default_provider && !is_supported_hosted_model(trimmed) {
253261
return Err(napi::Error::from_reason(format!(
254262
"Invalid model \"{trimmed}\". Supported models are {}.",
255263
supported_hosted_models_list()
@@ -330,34 +338,11 @@ impl RunRequest {
330338
None => None,
331339
};
332340

333-
validate_model_name(self.model.as_deref(), self.oss.unwrap_or(false))?;
334-
if let Some(model_name) = self.model.as_deref() {
335-
let trimmed = model_name.trim();
336-
let model_provider = self
337-
.model_provider
338-
.as_deref()
339-
.map(str::trim)
340-
.filter(|v| !v.is_empty());
341-
if self.oss.unwrap_or(false) {
342-
if !trimmed.starts_with("gpt-oss:") {
343-
return Err(napi::Error::from_reason(format!(
344-
"Invalid model \"{trimmed}\" for OSS mode. Use models prefixed with \"gpt-oss:\", e.g. \"gpt-oss:20b\"."
345-
)));
346-
}
347-
} else if model_provider != Some("github")
348-
&& trimmed != "gpt-5"
349-
&& trimmed != "gpt-5-codex"
350-
&& trimmed != "gpt-5-codex-mini"
351-
&& trimmed != "gpt-5.1"
352-
&& trimmed != "gpt-5.1-codex"
353-
&& trimmed != "gpt-5.1-codex-mini"
354-
&& trimmed != "gpt-5.1-codex-max"
355-
{
356-
return Err(napi::Error::from_reason(format!(
357-
"Invalid model \"{trimmed}\". Supported models are \"gpt-5\", \"gpt-5-codex\", \"gpt-5-codex-mini\", \"gpt-5.1\", \"gpt-5.1-codex\", \"gpt-5.1-codex-mini\", or \"gpt-5.1-codex-max\"."
358-
)));
359-
}
360-
}
341+
validate_model_name(
342+
self.model.as_deref(),
343+
self.oss.unwrap_or(false),
344+
self.model_provider.as_deref(),
345+
)?;
361346

362347
Ok(InternalRunRequest {
363348
prompt: self.prompt,
@@ -1650,6 +1635,11 @@ mod tests_run {
16501635

16511636
#[test]
16521637
fn accepts_gpt_5_2_codex_model() {
1653-
assert!(validate_model_name(Some("gpt-5.2-codex"), false).is_ok());
1638+
assert!(validate_model_name(Some("gpt-5.2-codex"), false, None).is_ok());
1639+
}
1640+
1641+
#[test]
1642+
fn accepts_gpt_4_1_when_provider_is_non_default() {
1643+
assert!(validate_model_name(Some("gpt-4.1"), false, Some("github")).is_ok());
16541644
}
16551645
}

0 commit comments

Comments
 (0)