projectmoon
/
ai-game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only compute GBNF grammar once.

This commit is contained in:
projectmoon 2024-02-05 21:19:49 +01:00
parent f7df8af068
commit de2fcdbd6c
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
game/src/ai/prompts/parsing_prompts.rs
View File

@ -1,4 +1,7 @@
use crate::{ai::convo::AiPrompt, models::commands::ParsedCommands}; use crate::{
ai::convo::AiPrompt,
models::commands::{ParsedCommands, VerbsResponse},
};
pub const INTRO_PROMPT: &'static str = r#" pub const INTRO_PROMPT: &'static str = r#"
[INST] [INST]
@ -69,18 +72,6 @@ Check the generated commands for coherence according to these instructions. Your
[/INST] [/INST]
"#; "#;
pub const FIND_VERBS_BNF: &str = r#"
root ::= Verbs
Verbs ::= "{" ws "\"verbs\":" ws stringlist "}"
Verbslist ::= "[]" | "[" ws Verbs ("," ws Verbs)* "]"
string ::= "\"" ([^"]*) "\""
boolean ::= "true" | "false"
ws ::= [ \t\n]*
number ::= [0-9]+ "."? [0-9]*
stringlist ::= "[" ws "]" | "[" ws string ("," ws string)* ws "]"
numberlist ::= "[" ws "]" | "[" ws string ("," ws number)* ws "]"
"#;
pub const FIND_VERBS_PROMPT: &'static str = " pub const FIND_VERBS_PROMPT: &'static str = "
[INST] [INST]
@ -91,7 +82,7 @@ Text: `{}`
pub fn intro_prompt(cmd: &str) -> AiPrompt { pub fn intro_prompt(cmd: &str) -> AiPrompt {
let prompt = INTRO_PROMPT.replace("{}", cmd); let prompt = INTRO_PROMPT.replace("{}", cmd);
AiPrompt::new_with_grammar(&prompt, &ParsedCommands::to_grammar()) AiPrompt::new_with_grammar(&prompt, ParsedCommands::to_grammar())
} }
pub fn continuation_prompt(cmd: &str) -> AiPrompt { pub fn continuation_prompt(cmd: &str) -> AiPrompt {
@ -102,14 +93,14 @@ pub fn continuation_prompt(cmd: &str) -> AiPrompt {
prompt.push_str("[/INST]"); prompt.push_str("[/INST]");
AiPrompt::new_with_grammar(&prompt, &ParsedCommands::to_grammar()) AiPrompt::new_with_grammar(&prompt, ParsedCommands::to_grammar())
} }
pub fn coherence_prompt() -> AiPrompt { pub fn coherence_prompt() -> AiPrompt {
AiPrompt::new_with_grammar(COHERENCE_PROMPT, &ParsedCommands::to_grammar()) AiPrompt::new_with_grammar(COHERENCE_PROMPT, ParsedCommands::to_grammar())
} }
pub fn find_verbs_prompt(cmd: &str) -> AiPrompt { pub fn find_verbs_prompt(cmd: &str) -> AiPrompt {
let prompt = FIND_VERBS_PROMPT.replace("{}", cmd); let prompt = FIND_VERBS_PROMPT.replace("{}", cmd);
AiPrompt::new_with_grammar(&prompt, FIND_VERBS_BNF) AiPrompt::new_with_grammar(&prompt, VerbsResponse::to_grammar())
} }

2
game/src/models/commands.rs
View File

@ -40,7 +40,7 @@ pub struct ParsedCommand {
pub using: String, pub using: String,
} }
#[derive(Deserialize, Debug, Clone)] #[derive(Deserialize, Debug, Clone, Gbnf)]
pub struct VerbsResponse { pub struct VerbsResponse {
pub verbs: Vec<String>, pub verbs: Vec<String>,
} }

6
gbnf_derive/src/lib.rs
View File

@ -68,8 +68,10 @@ fn generate_gbnf(input: TokenStream, create_struct: bool) -> TokenStream {
#struct_frag #struct_frag
impl #struct_name { impl #struct_name {
pub fn to_grammar() -> String { pub fn to_grammar() -> &'static str {
Self::to_gbnf().as_complex().to_grammar() use std::sync::OnceLock;
static GRAMMAR: OnceLock<String> = OnceLock::new();
GRAMMAR.get_or_init(|| Self::to_gbnf().as_complex().to_grammar())
} }
} }