Skip to content

Commit 45f153f

Browse files
authored
Merge pull request #3259 from seun-ja/manifest-ai-model-parsing-too-restrictive
Allow non-kebab-case names in component `ai_models`
2 parents e930004 + 5599534 commit 45f153f

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

crates/manifest/src/compat.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ pub fn v1_to_v2_app(manifest: v1::AppManifestV1) -> Result<v2::AppManifest, Erro
4242
.map(|(key, var)| Ok((id_from_string(key)?, var)))
4343
.collect::<Result<_, Error>>()?;
4444

45-
let ai_models = component
46-
.ai_models
47-
.into_iter()
48-
.map(id_from_string)
49-
.collect::<Result<_, Error>>()?;
5045
let allowed_http = convert_allowed_http_to_allowed_hosts(
5146
&component.allowed_http_hosts,
5247
component.allowed_outbound_hosts.is_none(),
@@ -71,7 +66,7 @@ pub fn v1_to_v2_app(manifest: v1::AppManifestV1) -> Result<v2::AppManifest, Erro
7166
exclude_files: component.exclude_files,
7267
key_value_stores: component.key_value_stores,
7368
sqlite_databases: component.sqlite_databases,
74-
ai_models,
69+
ai_models: component.ai_models,
7570
build: component.build,
7671
tool: Default::default(),
7772
allowed_outbound_hosts,

crates/manifest/src/schema/v2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ pub struct Component {
373373
/// Learn more: https://spinframework.dev/serverless-ai-api-guide#using-serverless-ai-from-applications
374374
#[serde(default, skip_serializing_if = "Vec::is_empty")]
375375
#[schemars(with = "Vec<json_schema::AIModel>")]
376-
pub ai_models: Vec<KebabId>,
376+
pub ai_models: Vec<String>,
377377
/// The component build configuration.
378378
///
379379
/// Learn more: https://spinframework.dev/build

0 commit comments

Comments
 (0)