relaxes ai_model naming

Signed-off-by: Aminu Oluwaseun Joshua <[email protected]>

Author: seun-ja

crates/manifest/src/compat.rs

@@ -42,11 +42,6 @@ pub fn v1_to_v2_app(manifest: v1::AppManifestV1) -> Result<v2::AppManifest, Erro
             .map(|(key, var)| Ok((id_from_string(key)?, var)))
             .collect::<Result<_, Error>>()?;
 
-        let ai_models = component
-            .ai_models
-            .into_iter()
-            .map(id_from_string)
-            .collect::<Result<_, Error>>()?;
         let allowed_http = convert_allowed_http_to_allowed_hosts(
             &component.allowed_http_hosts,
             component.allowed_outbound_hosts.is_none(),
@@ -71,7 +66,7 @@ pub fn v1_to_v2_app(manifest: v1::AppManifestV1) -> Result<v2::AppManifest, Erro
                 exclude_files: component.exclude_files,
                 key_value_stores: component.key_value_stores,
                 sqlite_databases: component.sqlite_databases,
-                ai_models,
+                ai_models: component.ai_models,
                 build: component.build,
                 tool: Default::default(),
                 allowed_outbound_hosts,

crates/manifest/src/schema/v2.rs

@@ -796,21 +796,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_valid_kebab_ids() {
-        for valid in [
-            "default",
-            "mixed-case-words",
-            "letters1-then2-numbers345",
-            "gpt-oss:20b",
-            "gpt-4",
-        ] {
-            if let Err(err) = KebabId::try_from(valid.to_string()) {
-                panic!("{valid:?} should be value: {err:?}");
-            }
-        }
-    }
-
     #[test]
     fn test_invalid_snake_ids() {
         for invalid in [

crates/manifest/tests/ui/invalid/bad_kebab_component_ref.err

@@ -2,5 +2,5 @@ TOML parse error at line 7, column 13
   |
 7 | component = "1-2-3"
   |             ^^^^^^^
-'-'-separated words must start with an ASCII letter or digit; got '1'
+'-'-separated words must start with an ASCII letter; got '1'
 

crates/manifest/tests/ui/invalid/bad_variable_name.err

@@ -2,4 +2,4 @@ TOML parse error at line 7, column 1
   |
 7 | "bad+name" = { required = true }
   | ^^^^^^^^^^
-'_'-separated words may only contain alphanumeric ASCII (plus ':' inside words); got '+'
+'_'-separated words may only contain alphanumeric ASCII; got '+'

crates/serde/src/id.rs

@@ -44,23 +44,23 @@ impl<const DELIM: char, const LOWER: bool> TryFrom<String> for Id<DELIM, LOWER>
                 ));
             }
         }
-        for (i, word) in id.split(DELIM).enumerate() {
+        for word in id.split(DELIM) {
             if word.is_empty() {
                 return Err(format!("{DELIM:?}-separated words must not be empty"));
             }
             let mut chars = word.chars();
             let first = chars.next().unwrap();
-            if !(first.is_ascii_alphabetic() || (i > 0 && first.is_ascii_digit())) {
+            if !first.is_ascii_alphabetic() {
                 return Err(format!(
-                    "{DELIM:?}-separated words must start with an ASCII letter or digit; got {first:?}"
+                    "{DELIM:?}-separated words must start with an ASCII letter; got {first:?}"
                 ));
             }
             let word_is_uppercase = first.is_ascii_uppercase();
             for ch in chars {
-                if ch.is_ascii_digit() || ch == ':' {
+                if ch.is_ascii_digit() {
                 } else if !ch.is_ascii_alphanumeric() {
                     return Err(format!(
-                        "{DELIM:?}-separated words may only contain alphanumeric ASCII (plus ':' inside words); got {ch:?}"
+                        "{DELIM:?}-separated words may only contain alphanumeric ASCII; got {ch:?}"
                     ));
                 } else if ch.is_ascii_uppercase() != word_is_uppercase {
                     return Err(format!("{DELIM:?}-separated words must be all lowercase or all UPPERCASE; got {word:?}"));