cleaning

paxdotdev · Oct 28, 2024 · c6fe936 · c6fe936
1 parent f23eefb
commit c6fe936
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/examples/src/fireworks/pax b/examples/src/fireworks/pax
@@ -11,5 +11,5 @@ set -e
 current_dir=$(pwd)
 pushd ../../../pax-cli
 cargo build
-PUB_PAX_SERVER=http://127.0.0.1:8090 PAX_WORKSPACE_ROOT=.. ../target/debug/pax-cli "$@" --path="$current_dir" --libdev --verbose
+../target/debug/pax-cli "$@" --path="$current_dir" --libdev --verbose
 popd
diff --git a/pax-chassis-web/src/lib.rs b/pax-chassis-web/src/lib.rs
@@ -3,6 +3,7 @@
 
 use js_sys::Uint8Array;
 use pax_message::ImageLoadInterruptArgs;
+use pax_message::ScreenshotData;
 use pax_runtime::api::borrow;
 use pax_runtime::api::math::Point2;
 use pax_runtime::api::use_RefCell;
@@ -12,7 +13,6 @@ use pax_runtime::api::RenderContext;
 use pax_runtime::api::TextboxChange;
 use pax_runtime::api::OS;
 use pax_runtime::DefinitionToInstanceTraverser;
-use pax_message::ScreenshotData;
 use pax_runtime_api::borrow_mut;
 use pax_runtime_api::Event;
 use pax_runtime_api::Focus;
@@ -147,7 +147,6 @@ impl PaxChassisWeb {
         (width, height, os_info, get_time)
     }
 
-
     #[cfg(any(feature = "designtime", feature = "designer"))]
     pub fn handle_recv_designtime(&mut self) {
         borrow_mut!(self.designtime_manager)
@@ -160,7 +159,6 @@ impl PaxChassisWeb {
         self.handle_recv_designtime();
         self.update_userland_component();
     }
-
 }
 
 #[wasm_bindgen]
@@ -607,17 +605,19 @@ impl PaxChassisWeb {
                     &globals,
                     &engine.runtime_context,
                 )
-            }, 
+            }
             NativeInterrupt::Screenshot(args) => {
                 let data = Uint8Array::new(additional_payload).to_vec();
                 if let ImageLoadInterruptArgs::Data(args) = args {
-                    let screenshot_data : ScreenshotData = ScreenshotData {
+                    let screenshot_data: ScreenshotData = ScreenshotData {
                         id: args.id,
                         data,
                         width: args.width,
                         height: args.height,
                     };
-                    engine.runtime_context.load_screenshot(args.id, screenshot_data)
+                    engine
+                        .runtime_context
+                        .load_screenshot(args.id, screenshot_data)
                 } else {
                     false
                 }

diff --git a/pax-designer/src/console/mod.rs b/pax-designer/src/console/mod.rs
@@ -24,14 +24,13 @@ pub struct Console {
     pub external_message_listener: Property<bool>,
 }
 
-
 #[pax]
 #[engine_import_path("pax_engine")]
 pub enum MessageType {
     Diff,
     LLM,
     #[default]
-    Human
+    Human,
 }
 
 #[pax]

diff --git a/pax-designtime/src/lib.rs b/pax-designtime/src/lib.rs
@@ -236,7 +236,10 @@ impl DesigntimeManager {
         &mut self.orm
     }
 
-    pub fn handle_recv(&mut self, screenshot_map: Rc<RefCell<HashMap<u32, ScreenshotData>>>) -> anyhow::Result<()> {
+    pub fn handle_recv(
+        &mut self,
+        screenshot_map: Rc<RefCell<HashMap<u32, ScreenshotData>>>,
+    ) -> anyhow::Result<()> {
         if let Some(mut llm_request) = self.enqueued_llm_request.take() {
             let mut screenshot_map = screenshot_map.borrow_mut();
             if let Some(screenshot) = screenshot_map.remove(&(llm_request.request_id as u32)) {
@@ -249,7 +252,6 @@ impl DesigntimeManager {
             }
         }
 
-
         self.priv_agent_connection
             .borrow_mut()
             .handle_recv(&mut self.orm)?;

diff --git a/pax-designtime/src/messages.rs b/pax-designtime/src/messages.rs
@@ -42,7 +42,12 @@ impl Debug for LLMRequest {
 }
 
 impl LLMRequest {
-    pub fn new(manifest: PaxManifest, prompt: String, request_id: u64, screenshot: Option<ScreenshotData>) -> Self {
+    pub fn new(
+        manifest: PaxManifest,
+        prompt: String,
+        request_id: u64,
+        screenshot: Option<ScreenshotData>,
+    ) -> Self {
         Self {
             manifest,
             prompt,

diff --git a/pax-message/src/lib.rs b/pax-message/src/lib.rs
@@ -90,7 +90,7 @@ pub enum NativeInterrupt {
     FormButtonClick(FormButtonClickArgs),
     Scrollbar(ScrollbarInterruptArgs),
     DropFile(DropFileArgs),
-    Screenshot(ImageLoadInterruptArgs)
+    Screenshot(ImageLoadInterruptArgs),
 }
 
 #[derive(Deserialize)]

diff --git a/pax-runtime/src/api.rs b/pax-runtime/src/api.rs
@@ -1,8 +1,12 @@
-use std::{collections::HashMap, rc::{Rc, Weak}};
+use std::{
+    collections::HashMap,
+    rc::{Rc, Weak},
+};
 
 use_RefCell!();
 use crate::{
-    node_interface::NodeLocal, ExpandedNode, RuntimeContext, RuntimePropertiesStackFrame, TransformAndBounds
+    node_interface::NodeLocal, ExpandedNode, RuntimeContext, RuntimePropertiesStackFrame,
+    TransformAndBounds,
 };
 
 pub use pax_runtime_api::*;
@@ -131,9 +135,7 @@ impl NodeContext {
 
     pub fn screenshot(&self, id: u32) {
         self.runtime_context
-            .enqueue_native_message(NativeMessage::Screenshot(ScreenshotPatch {
-                id,
-            }));
+            .enqueue_native_message(NativeMessage::Screenshot(ScreenshotPatch { id }));
     }
 
     pub fn get_screenshot_map(&self) -> Rc<RefCell<HashMap<u32, ScreenshotData>>> {

diff --git a/pax-runtime/src/properties.rs b/pax-runtime/src/properties.rs
@@ -142,7 +142,7 @@ impl RuntimeContext {
         borrow!(self.node_cache).eid_to_node.get(&id).cloned()
     }
 
-    pub fn load_screenshot(&self, id: u32, data: ScreenshotData)  -> bool {
+    pub fn load_screenshot(&self, id: u32, data: ScreenshotData) -> bool {
         borrow_mut!(self.screenshot_map).insert(id, data);
         true
     }