Extract prompt input popup logic to makepad (#332)

* mofa fake multi servers

* always insert default mofa address

* use command text input for prompt input

* update Cargo.toml to use command text input branch

* back to rik

Author: noxware

Cargo.lock

@@ -6,15 +6,15 @@ members = [
     "moly-protocol",
     "moly-backend",
     "moly-fake-backend",
-    "moly-mofa"
+    "moly-mofa",
 ]
 exclude = ["packaging/before-packaging-command"]
 
 [package]
 name = "moly"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.79" ## required by cargo-packager
+rust-version = "1.79"                                                 ## required by cargo-packager
 description = "Desktop app for downloading and chatting with AI LLMs"
 
 ## Rename the binary to `_moly_app` to avoid naming conflicts
@@ -28,7 +28,7 @@ path = "src/main.rs"
 moly-protocol = { path = "moly-protocol" }
 moly-backend = { path = "moly-backend" }
 moly-fake-backend = { path = "moly-fake-backend" }
-moly-mofa = { path = "moly-mofa"}
+moly-mofa = { path = "moly-mofa" }
 
 makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
 makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "rik" }

Cargo.toml

@@ -651,10 +651,11 @@ impl ChatPanel {
         mode: PromptInputMode,
         button: PromptInputButton,
     ) {
-        let prompt_input = self.text_input(id!(main_prompt_input.prompt));
+        let prompt = self.command_text_input(id!(main_prompt_input.prompt));
+        let prompt_text_input = prompt.text_input_ref();
 
         let enabled = match mode {
-            PromptInputMode::Enabled => !prompt_input.text().is_empty(),
+            PromptInputMode::Enabled => !prompt_text_input.text().is_empty(),
             PromptInputMode::Disabled => false,
         };
 
@@ -665,7 +666,7 @@ impl ChatPanel {
             (vec3(0.816, 0.835, 0.867), 0.0)
         };
 
-        prompt_input.apply_over(
+        prompt_text_input.apply_over(
             cx,
             live! {
                 draw_text: { prompt_enabled: (prompt_enabled) }
@@ -736,19 +737,21 @@ impl ChatPanel {
     }
 
     fn handle_prompt_input_actions(&mut self, cx: &mut Cx, actions: &Actions, scope: &mut Scope) {
-        let prompt_input = self.text_input(id!(main_prompt_input.prompt));
-        if let Some(_text) = prompt_input.changed(actions) {
+        let prompt = self.command_text_input(id!(main_prompt_input.prompt));
+        let prompt_text_input = prompt.text_input_ref();
+
+        if let Some(_text) = prompt_text_input.changed(actions) {
             self.redraw(cx);
         }
 
         if self
             .button(id!(main_prompt_input.prompt_send_button))
             .clicked(&actions)
         {
-            self.send_message(cx, scope, prompt_input.text(), None);
+            self.send_message(cx, scope, prompt_text_input.text(), None);
         }
 
-        if let Some(prompt) = prompt_input.returned(actions) {
+        if let Some(prompt) = prompt_text_input.returned(actions) {
             self.send_message(cx, scope, prompt, None);
         }
     }

src/chat/chat_panel.rs

@@ -122,10 +122,18 @@ pub struct EntityButton {
 
     #[rust]
     entity: Option<ChatEntityId>,
+
+    /// Do not listen to events. Make this fully read-only.
+    #[live]
+    pub deaf: bool,
 }
 
 impl Widget for EntityButton {
     fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
+        if self.deaf {
+            return;
+        }
+
         self.view.handle_event(cx, event, scope);
     }
 

src/chat/entity_button.rs

@@ -35,3 +35,15 @@ impl<'a> ChatEntityRef<'a> {
         }
     }
 }
+
+impl<'a> From<&'a MofaAgent> for ChatEntityRef<'a> {
+    fn from(agent: &'a MofaAgent) -> Self {
+        ChatEntityRef::Agent(agent)
+    }
+}
+
+impl<'a> From<&'a File> for ChatEntityRef<'a> {
+    fn from(file: &'a File) -> Self {
+        ChatEntityRef::ModelFile(file)
+    }
+}