src: split out conversation and archive bits into separate modules

src/prediction.rs

@@ -1,5 +1,3 @@
-use std::process::{Command, Stdio};
-
 use async_openai::{Client, config::OpenAIConfig, types::chat::{ChatCompletionMessageToolCalls, ChatCompletionRequestAssistantMessageArgs, ChatCompletionRequestMessage, ChatCompletionRequestSystemMessageArgs, ChatCompletionRequestToolMessageArgs, ChatCompletionTool, ChatCompletionTools, CreateChatCompletionRequestArgs, FinishReason, FunctionObjectArgs, ResponseFormat, ResponseFormatJsonSchema}};
 use bandcamp::SearchResultItem;
 use schemars::{JsonSchema, schema_for};
@@ -7,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Serializer, ser::CompactFormatter};
 use tokio::sync::{mpsc, watch};
 
-use crate::{SaveData, artifacts::{Artifact, BandcampResult}, scene::{ConversationEntry, PredictionAction, Scene, Scenery, StageDirection}};
+use crate::{SaveData, archive::BeatsQueryArgs, artifacts::BandcampQueryArgs, scene::{PredictionAction, Scene, Scenery, StageDirection, conversation::ConversationEntry}};
 
 
 const SYSTEM_PROMPT: &str = include_str!("system-prompt.txt");
@@ -47,20 +45,6 @@ struct StageEventArgs {
     event: StageEvent
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone, JsonSchema)]
-struct BeatsQueryArgs {
-    artist: Option<String>,
-    album: Option<String>,
-    genre: Option<String>,
-    title: Option<String>,
-    year: Option<u32>
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
-struct BandcampQueryArgs {
-    query: String
-}
-
 #[derive(Default, Debug)]
 struct ToolResults {
     result: Option<String>,
@@ -132,26 +116,9 @@ impl Session {
 
     async fn tool_artifact_query(&mut self, args: BeatsQueryArgs) -> ToolResults {
         let mut messages = vec![];
-        let mut beets_cmd = Command::new("beet");
-        beets_cmd.args(["export", "-f", "json", "-i", "title,label,year,genres,album,artist"]);
-        if let Some(artist) = args.artist {
-            beets_cmd.arg(format!("artist:{}", artist));
-        }
-        if let Some(genre) = args.genre {
-            beets_cmd.arg(format!("genre:{}", genre));
-        }
-        if let Some(album) = args.album {
-            beets_cmd.arg(format!("album:{}", album));
-        }
-        if let Some(title) = args.title {
-            beets_cmd.arg(format!("title:{}", title));
-        }
-        if let Some(year) = args.year {
-            beets_cmd.arg(format!("year:{}", year));
-        }
-        if let Ok(output) = beets_cmd.stdout(Stdio::piped()).spawn().unwrap().wait_with_output() {
-            messages.push(ConversationEntry::ShipComputer(format!("Executing archive query {:?}", beets_cmd)));
-            self.scenery.artifacts.push(Artifact::BeetsTrack(serde_json::from_str(str::from_utf8(&output.stdout).unwrap()).unwrap()));
+        messages.push(ConversationEntry::ShipComputer(format!("Executing archive query {:?}", args)));
+        if let Ok(output) = args.execute() {
+            self.scenery.artifacts.push(output);
         } else {
             messages.push(ConversationEntry::ShipComputer("Unable to execute query!".into()));
         };