scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-08-28 05:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge the duplicate selector catalog tests

Browse source 
catalog_from_settings_rejects_duplicate_provider_api_ids was a copy of
catalog_from_settings_rejects_duplicate_model_aliases with the alias
declaration swapped for an api_id. Fold them into one table-driven test
so the shared invariant is stated once: canonical IDs, aliases, and API
IDs occupy a single identifier namespace per provider.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-07-28 15:48:22 -04:00
parent 8a41d4665f
commit b2942519d5
No known key found for this signature in database
1 changed files with 30 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
lib/foundation/fabro-model/src/catalog.rs
View file

@ -4253,9 +4253,15 @@ codec = "anthropic_messages"
}
#[test]
fn catalog_from_settings_rejects_duplicate_model_aliases() {
let layer = minimal_settings(
r#"
/// Canonical IDs, aliases, and API IDs share one identifier namespace per
/// provider, so a collision in any of them is rejected the same way.
fn catalog_from_settings_rejects_duplicate_provider_model_selectors() {
for (declaration, expected) in [
(r#"aliases = ["shared"]"#, "shared"),
(r#"api_id = "vendor/shared""#, "vendor/shared"),
] {
let layer = minimal_settings(&format!(
r#"
[providers.test]
display_name = "Test"
adapter = "openai"
@ -4265,7 +4271,7 @@ enabled = true
[providers.test.models.one]
display_name = "One"
family = "test"
aliases = ["shared"]
{declaration}
[providers.test.models.one.limits]
context_window = 1000
@ -4278,7 +4284,7 @@ reasoning = false
[providers.test.models.two]
display_name = "Two"
family = "test"
aliases = ["shared"]
{declaration}
[providers.test.models.two.limits]
context_window = 1000
@ -4287,23 +4293,27 @@ context_window = 1000
tools = false
vision = false
reasoning = false
"#,
);
"#
));
let err = Catalog::from_settings(&layer).unwrap_err();
let err = Catalog::from_settings(&layer).unwrap_err();
assert!(matches!(
err,
CatalogBuildError::DuplicateProviderModelSelector {
provider,
selector,
first,
second,
} if provider == ProviderId::new("test")
&& selector == "shared"
&& first == "one"
&& second == "two"
));
assert!(
matches!(
&err,
CatalogBuildError::DuplicateProviderModelSelector {
provider,
selector,
first,
second,
} if provider == &ProviderId::new("test")
&& selector == expected
&& first == "one"
&& second == "two"
),
"{declaration}: {err:?}"
);
}
}
#[test]
@ -4355,60 +4365,6 @@ reasoning = false
));
}
#[test]
fn catalog_from_settings_rejects_duplicate_provider_api_ids() {
let layer = minimal_settings(
r#"
[providers.test]
display_name = "Test"
adapter = "openai"
agent_profile = "openai"
[providers.test.models.one]
api_id = "vendor/shared"
display_name = "One"
family = "test"
default = true
[providers.test.models.one.limits]
context_window = 1000
[providers.test.models.one.features]
tools = false
vision = false
reasoning = false
[providers.test.models.two]
api_id = "vendor/shared"
display_name = "Two"
family = "test"
[providers.test.models.two.limits]
context_window = 1000
[providers.test.models.two.features]
tools = false
vision = false
reasoning = false
"#,
);
let err = Catalog::from_settings(&layer).unwrap_err();
assert!(matches!(
err,
CatalogBuildError::DuplicateProviderModelSelector {
provider,
selector,
first,
second,
} if provider == ProviderId::new("test")
&& selector == "vendor/shared"
&& first == "one"
&& second == "two"
));
}
#[test]
fn provider_scoped_model_rejects_redundant_provider_field() {
let error = Catalog::from_settings(&minimal_settings(