propagate JobsCache

Signed-off-by: kernelkind <kernelkind@gmail.com>

crates/notedeck_dave/src/lib.rs

@@ -9,6 +9,7 @@ use enostr::KeypairUnowned;
 use futures::StreamExt;
 use nostrdb::Transaction;
 use notedeck::{AppAction, AppContext};
+use notedeck_ui::jobs::JobsCache;
 use std::collections::HashMap;
 use std::string::ToString;
 use std::sync::mpsc::{self, Receiver};
@@ -42,6 +43,7 @@ pub struct Dave {
     client: async_openai::Client<OpenAIConfig>,
     incoming_tokens: Option<Receiver<DaveApiResponse>>,
     model_config: ModelConfig,
+    jobs: JobsCache,
 }
 
 /// Calculate an anonymous user_id from a keypair
@@ -106,6 +108,7 @@ You are an AI agent for the nostr protocol called Dave, created by Damus. nostr
             input,
             model_config,
             chat: vec![],
+            jobs: JobsCache::default(),
         }
     }
 
@@ -177,7 +180,11 @@ You are an AI agent for the nostr protocol called Dave, created by Damus. nostr
     }
 
     fn ui(&mut self, app_ctx: &mut AppContext, ui: &mut egui::Ui) -> DaveResponse {
-        DaveUi::new(self.model_config.trial, &self.chat, &mut self.input).ui(app_ctx, ui)
+        DaveUi::new(self.model_config.trial, &self.chat, &mut self.input).ui(
+            app_ctx,
+            &mut self.jobs,
+            ui,
+        )
     }
 
     fn handle_new_chat(&mut self) {

crates/notedeck_dave/src/ui/dave.rs

@@ -5,7 +5,7 @@ use crate::{
 use egui::{Align, Key, KeyboardShortcut, Layout, Modifiers};
 use nostrdb::{Ndb, Transaction};
 use notedeck::{AppContext, NoteAction, NoteContext};
-use notedeck_ui::{icons::search_icon, NoteOptions, ProfilePic};
+use notedeck_ui::{icons::search_icon, jobs::JobsCache, NoteOptions, ProfilePic};
 
 /// DaveUi holds all of the data it needs to render itself
 pub struct DaveUi<'a> {
@@ -83,7 +83,12 @@ impl<'a> DaveUi<'a> {
     }
 
     /// The main render function. Call this to render Dave
-    pub fn ui(&mut self, app_ctx: &mut AppContext, ui: &mut egui::Ui) -> DaveResponse {
+    pub fn ui(
+        &mut self,
+        app_ctx: &mut AppContext,
+        jobs: &mut JobsCache,
+        ui: &mut egui::Ui,
+    ) -> DaveResponse {
         let mut action: Option<DaveAction> = None;
         // Scroll area for chat messages
         let new_resp = {
@@ -124,7 +129,7 @@ impl<'a> DaveUi<'a> {
                         .show(ui, |ui| {
                             Self::chat_frame(ui.ctx())
                                 .show(ui, |ui| {
-                                    ui.vertical(|ui| self.render_chat(app_ctx, ui)).inner
+                                    ui.vertical(|ui| self.render_chat(app_ctx, jobs, ui)).inner
                                 })
                                 .inner
                         })
@@ -158,7 +163,12 @@ impl<'a> DaveUi<'a> {
     }
 
     /// Render a chat message (user, assistant, tool call/response, etc)
-    fn render_chat(&self, ctx: &mut AppContext, ui: &mut egui::Ui) -> Option<NoteAction> {
+    fn render_chat(
+        &self,
+        ctx: &mut AppContext,
+        jobs: &mut JobsCache,
+        ui: &mut egui::Ui,
+    ) -> Option<NoteAction> {
         let mut action: Option<NoteAction> = None;
         for message in self.chat {
             let r = match message {
@@ -183,7 +193,7 @@ impl<'a> DaveUi<'a> {
                     // have a debug option to show this
                     None
                 }
-                Message::ToolCalls(toolcalls) => Self::tool_calls_ui(ctx, toolcalls, ui),
+                Message::ToolCalls(toolcalls) => Self::tool_calls_ui(ctx, jobs, toolcalls, ui),
             };
 
             if r.is_some() {
@@ -208,6 +218,7 @@ impl<'a> DaveUi<'a> {
     /// The ai has asked us to render some notes, so we do that here
     fn present_notes_ui(
         ctx: &mut AppContext,
+        jobs: &mut JobsCache,
         call: &PresentNotesCall,
         ui: &mut egui::Ui,
     ) -> Option<NoteAction> {
@@ -217,6 +228,7 @@ impl<'a> DaveUi<'a> {
             note_cache: ctx.note_cache,
             zaps: ctx.zaps,
             pool: ctx.pool,
+            job_pool: ctx.job_pool,
         };
 
         let txn = Transaction::new(note_context.ndb).unwrap();
@@ -244,6 +256,7 @@ impl<'a> DaveUi<'a> {
                                         &None,
                                         &note,
                                         NoteOptions::default(),
+                                        jobs,
                                     )
                                     .preview_style()
                                     .hide_media(true)
@@ -266,6 +279,7 @@ impl<'a> DaveUi<'a> {
 
     fn tool_calls_ui(
         ctx: &mut AppContext,
+        jobs: &mut JobsCache,
         toolcalls: &[ToolCall],
         ui: &mut egui::Ui,
     ) -> Option<NoteAction> {
@@ -275,7 +289,7 @@ impl<'a> DaveUi<'a> {
             for call in toolcalls {
                 match call.calls() {
                     ToolCalls::PresentNotes(call) => {
-                        let r = Self::present_notes_ui(ctx, call, ui);
+                        let r = Self::present_notes_ui(ctx, jobs, call, ui);
                         if r.is_some() {
                             note_action = r;
                         }