diff --git a/Cargo.lock b/Cargo.lock index eba401119..e117a455b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,18 +148,22 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", "futures-util", "rand 0.8.5", + "raw-window-handle", "serde", "serde_repr", "tokio", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", "zbus", ] @@ -1182,6 +1186,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.5", +] + [[package]] name = "dlopen2" version = "0.7.0" @@ -1205,6 +1218,12 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + [[package]] name = "dpi" version = "0.1.1" @@ -1804,19 +1823,6 @@ dependencies = [ "x11", ] -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2819,21 +2825,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - [[package]] name = "mac" version = "0.1.1" @@ -2967,16 +2958,17 @@ dependencies = [ [[package]] name = "muda" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591" dependencies = [ - "cocoa", "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "serde", @@ -3105,17 +3097,6 @@ dependencies = [ "objc_exception", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc-sys" version = "0.3.5" @@ -3186,6 +3167,7 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", "block2", + "dispatch", "libc", "objc2", ] @@ -3628,7 +3610,7 @@ checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", "indexmap 2.4.0", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -3836,6 +3818,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" +dependencies = [ + "memchr", +] + [[package]] name = "quinn" version = "0.11.3" @@ -4116,21 +4107,20 @@ dependencies = [ [[package]] name = "rfd" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e" dependencies = [ "ashpd", - "block", - "dispatch", + "block2", "glib-sys", "gobject-sys", "gtk-sys", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", @@ -4303,6 +4293,7 @@ dependencies = [ "serde", "serde_json", "url", + "uuid", ] [[package]] @@ -4704,15 +4695,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -4842,9 +4824,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.30.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e" +checksum = "a0dbbebe82d02044dfa481adca1550d6dd7bd16e086bc34fa0fbecceb5a63751" dependencies = [ "bitflags 2.6.0", "cocoa", @@ -4873,7 +4855,7 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-version", "x11-dl", @@ -4898,9 +4880,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.14" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa32e2741bda64c1da02d93252a466893180052fc6de61c8803b0356504b70d" +checksum = "f3fad474c02a3bcd4a304afff97159a31b9bab84e29563f7109c7b0ce8cd774e" dependencies = [ "anyhow", "bytes", @@ -4929,7 +4911,6 @@ dependencies = [ "serde_json", "serde_repr", "serialize-to-javascript", - "state", "swift-rs", "tauri-build", "tauri-macros", @@ -4944,14 +4925,14 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.58.0", + "windows", ] [[package]] name = "tauri-build" -version = "2.0.0-rc.11" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148441d64674b2885c1ba5baf3ae61662bb8753859ffcfb541962cbc6b847f39" +checksum = "935f9b3c49b22b3e2e485a57f46d61cd1ae07b1cbb2ba87387a387caf2d8c4e7" dependencies = [ "anyhow", "cargo_toml", @@ -4971,9 +4952,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.11" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a15c3f9282c82871c69ddb65d02ae552738bbac848c8adcab521bf14d8b9e6" +checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e" dependencies = [ "base64 0.22.1", "brotli", @@ -4998,9 +4979,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.10" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d1aa317bec56f78388cf6012d788876d838595a48f95cbd7835642db356a0" +checksum = "4d2c0963ccfc3f5194415f2cce7acc975942a8797fbabfb0aa1ed6f59326ae7f" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5012,9 +4993,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.11" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82a2adea16b8a71b7a5ad23f720bb13f8d2830b820cc1c266512314ba99bf67" +checksum = "b2e6660a409963e4d57b9bfab4addd141eeff41bd3a7fb14e13004a832cf7ef6" dependencies = [ "anyhow", "glob", @@ -5029,9 +5010,9 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-rc.7" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785722c81beb4a6b729ae55d06aeb68d47166c933e64b727e33254dcb5d4d82d" +checksum = "ddb2fe88b602461c118722c574e2775ab26a4e68886680583874b2f6520608b7" dependencies = [ "log", "raw-window-handle", @@ -5047,9 +5028,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-rc.5" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cb1dfbbea322afbc9dec49351bc29edf4e85e74d37d9a3fcc72d67ed55ffdbd" +checksum = "ab300488ebec3487ca5f56289692e7e45feb07eea8d5e1dba497f7dc9dd9c407" dependencies = [ "anyhow", "dunce", @@ -5068,9 +5049,9 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0-rc.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54ba1a0c0c60a6a08e711e184239f8a50354988b6fe1af8b5ce2215b2e79a2" +checksum = "5058f179f7215390fc5a68eeffcb805b7e2681d6e817a5d08094fae7ab649e68" dependencies = [ "dunce", "log", @@ -5079,6 +5060,7 @@ dependencies = [ "tauri", "tauri-plugin", "thiserror", + "tokio", ] [[package]] @@ -5098,9 +5080,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.11" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389f78c8e8e6eff3897d8d9581087943b5976ea96a0ab5036be691f28c2b0df0" +checksum = "af12ad1af974b274ef1d32a94e6eba27a312b429ef28fcb98abc710df7f9151d" dependencies = [ "dpi", "gtk", @@ -5112,14 +5094,14 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.58.0", + "windows", ] [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.12" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17625b7cf63958d53945e199391d11c9f195fb3d1cb8aeb64dc3084d0091b92" +checksum = "e45e88aa0b11b302d836e6ea3e507a6359044c4a8bc86b865ba99868c695753d" dependencies = [ "gtk", "http 1.1.0", @@ -5137,15 +5119,15 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.58.0", + "windows", "wry", ] [[package]] name = "tauri-utils" -version = "2.0.0-rc.11" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3019641087c9039b57ebfca95fa42a93c07056845b7d8d57c8966061bcee83b4" +checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045" dependencies = [ "brotli", "cargo_metadata", @@ -5173,6 +5155,7 @@ dependencies = [ "toml 0.8.19", "url", "urlpattern", + "uuid", "walkdir", ] @@ -5749,9 +5732,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" +checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" dependencies = [ "core-graphics", "crossbeam-channel", @@ -6111,6 +6094,66 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wayland-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +dependencies = [ + "proc-macro2", + "quick-xml 0.36.2", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + [[package]] name = "web-sys" version = "0.3.70" @@ -6192,7 +6235,7 @@ checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-implement", "windows-interface", @@ -6216,7 +6259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" dependencies = [ "thiserror", - "windows 0.58.0", + "windows", "windows-core 0.58.0", ] @@ -6277,15 +6320,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.58.0" @@ -6698,9 +6732,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728" +checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73" dependencies = [ "base64 0.22.1", "block", @@ -6730,7 +6764,7 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.58.0", + "windows", "windows-core 0.58.0", "windows-version", "x11-dl", diff --git a/fpx-app/Cargo.toml b/fpx-app/Cargo.toml index 8b5b8d23e..41a84abdb 100644 --- a/fpx-app/Cargo.toml +++ b/fpx-app/Cargo.toml @@ -10,7 +10,7 @@ repository = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.0-rc.11", features = [] } +tauri-build = { version = "2.0.1", features = [] } [dependencies] anyhow = { workspace = true } @@ -26,9 +26,9 @@ nix = { version = "0.29", default-features = false, features = ["signal"] } schemars = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -tauri = { version = "2.0.0-rc.14", features = ["config-toml"] } -tauri-plugin-dialog = "2.0.0-rc" -tauri-plugin-store = { version = "2.0.0-rc" } +tauri = { version = "2.0.1", features = ["config-toml"] } +tauri-plugin-dialog = "2.0.1" +tauri-plugin-store = { version = "2.0.1" } tokio = { version = "1", default-features = false, features = [ "sync", "process", diff --git a/fpx-app/src/commands/workspace.rs b/fpx-app/src/commands/workspace.rs index 46a8896d4..9bfa5d394 100644 --- a/fpx-app/src/commands/workspace.rs +++ b/fpx-app/src/commands/workspace.rs @@ -1,33 +1,30 @@ use crate::api_manager::ApiManager; use crate::models::workspace::{OpenWorkspaceError, Workspace}; use crate::state::AppState; -use crate::STORE_PATH; use fpx::config::{FpxConfig, FpxConfigError}; use std::path::PathBuf; -use tauri::{AppHandle, Runtime, State}; -use tauri_plugin_store::{with_store, StoreCollection}; +use tauri::{State, Wry}; +use tauri_plugin_store::Store; const RECENT_WORKSPACES_STORE_KEY: &str = "recent_workspaces"; #[tauri::command] -pub fn list_recent_workspaces( - app: AppHandle, - stores: State<'_, StoreCollection>, -) -> Vec { - with_store(app, stores, STORE_PATH, |store| { - let recent_projects = store - .get(RECENT_WORKSPACES_STORE_KEY) - .and_then(|val| val.as_array()) - .map(|arr| { - arr.iter() - .filter_map(|item| item.as_str().map(|s| s.to_string())) - .collect() - }) - .unwrap_or_default(); +pub fn list_recent_workspaces(store: State<'_, Store>) -> Vec { + store + .with_store(|store| { + let recent_projects = store + .get(RECENT_WORKSPACES_STORE_KEY) + .and_then(|val| val.as_array()) + .map(|arr| { + arr.iter() + .filter_map(|item| item.as_str().map(|s| s.to_string())) + .collect() + }) + .unwrap_or_default(); - Ok(recent_projects) - }) - .unwrap_or_default() + Ok(recent_projects) + }) + .unwrap_or_default() } #[tauri::command] @@ -36,12 +33,11 @@ pub fn get_current_workspace(state: State<'_, AppState>) -> Option { } #[tauri::command] -pub fn open_workspace_by_path( +pub fn open_workspace_by_path( path: String, app_state: State<'_, AppState>, api_manager: State<'_, ApiManager>, - app: AppHandle, - stores: State<'_, StoreCollection>, + store: State<'_, Store>, ) -> Result { api_manager.stop_api(); @@ -68,26 +64,27 @@ pub fn open_workspace_by_path( let workspace = Workspace::new(path.clone(), config); app_state.set_workspace(workspace.clone()); - with_store(app, stores, STORE_PATH, |store| { - let mut recents: Vec = store - .get(RECENT_WORKSPACES_STORE_KEY) - .and_then(|value| value.as_array()) - .map(|arr| { - arr.iter() - .filter_map(|item| item.as_str().filter(|s| s != &path).map(|s| s.to_string())) - .collect() - }) - .unwrap_or_default(); + store + .with_store(|store| { + let mut recents: Vec = store + .get(RECENT_WORKSPACES_STORE_KEY) + .and_then(|value| value.as_array()) + .map(|arr| { + arr.iter() + .filter_map(|item| { + item.as_str().filter(|s| s != &path).map(|s| s.to_string()) + }) + .collect() + }) + .unwrap_or_default(); - recents.insert(0, path); + recents.insert(0, path); - store - .insert(RECENT_WORKSPACES_STORE_KEY.into(), recents.into()) - .unwrap(); + store.insert(RECENT_WORKSPACES_STORE_KEY.to_string(), recents); - store.save() - }) - .unwrap(); + Ok(()) + }) + .unwrap(); Ok(workspace) } diff --git a/fpx-app/src/main.rs b/fpx-app/src/main.rs index 016eb1345..1bc67c08b 100644 --- a/fpx-app/src/main.rs +++ b/fpx-app/src/main.rs @@ -5,10 +5,11 @@ use anyhow::{Context, Result}; use api_manager::ApiManager; use state::AppState; use std::env; +use std::time::Duration; use tauri::menu::{MenuBuilder, MenuId, MenuItemBuilder, SubmenuBuilder}; use tauri::{Emitter, WebviewWindowBuilder}; use tauri::{Manager, Wry}; -use tauri_plugin_store::StoreCollection; +use tauri_plugin_store::{StoreCollection, StoreExt}; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::{EnvFilter, Registry}; @@ -34,6 +35,18 @@ fn main() { .manage(AppState::default()) .manage(ApiManager::default()) .setup(|app| { + // Init store and load it from disk + let store = app + .handle() + .store_builder(STORE_PATH) + .auto_save(Duration::from_millis(100)) + .build(); + + // If there are no saved settings yet, this will return an error so we ignore the return value. + let _ = store.load(); + + app.manage(store); + app.handle() .try_state::>() .ok_or("Store not found") diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5bee26d87..b0857b89e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -122,7 +122,7 @@ importers: version: link:../../packages/client-library-otel '@langchain/core': specifier: ^0.2.18 - version: 0.2.23(openai@4.55.4(encoding@0.1.13)(zod@3.23.8)) + version: 0.2.23(openai@4.55.4) hono: specifier: ^4.5.9 version: 4.5.9 @@ -354,8 +354,8 @@ importers: specifier: ^8.17.3 version: 8.20.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@tauri-apps/api': - specifier: 2.0.0-rc.4 - version: 2.0.0-rc.4 + specifier: 2.0.1 + version: 2.0.1 '@tauri-apps/plugin-dialog': specifier: 2.0.0-rc.1 version: 2.0.0-rc.1 @@ -3258,8 +3258,8 @@ packages: resolution: {integrity: sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==} engines: {node: '>=12'} - '@tauri-apps/api@2.0.0-rc.4': - resolution: {integrity: sha512-UNiIhhKG08j4ooss2oEEVexffmWkgkYlC2M3GcX3VPtNsqFgVNL8Mcw/4Y7rO9M9S+ffAMnLOF5ypzyuyb8tyg==} + '@tauri-apps/api@2.0.1': + resolution: {integrity: sha512-eoQWT+Tq1qSwQpHV+nw1eNYe5B/nm1PoRjQCRiEOS12I1b+X4PUcREfXVX8dPcBT6GrzWGDtaecY0+1p0Rfqlw==} '@tauri-apps/plugin-dialog@2.0.0-rc.1': resolution: {integrity: sha512-H28gh6BfZtjflHQ+HrmWwunDriBI3AQLAKnMs50GA6zeNUULqbQr7VXbAAKeJL/0CmWcecID4PKXVoSlaWRhEg==} @@ -8680,7 +8680,7 @@ snapshots: '@antfu/install-pkg': 0.4.1 '@antfu/utils': 0.7.10 '@iconify/types': 2.0.0 - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) kolorist: 1.8.0 local-pkg: 0.5.0 mlly: 1.7.1 @@ -8821,6 +8821,23 @@ snapshots: - langchain - openai + '@langchain/core@0.2.23(openai@4.55.4)': + dependencies: + ansi-styles: 5.2.0 + camelcase: 6.3.0 + decamelize: 1.2.0 + js-tiktoken: 1.0.12 + langsmith: 0.1.41(@langchain/core@0.2.23(openai@4.55.4))(openai@4.55.4) + mustache: 4.2.0 + p-queue: 6.6.2 + p-retry: 4.6.2 + uuid: 10.0.0 + zod: 3.23.8 + zod-to-json-schema: 3.23.2(zod@3.23.8) + transitivePeerDependencies: + - langchain + - openai + '@lezer/common@1.2.1': {} '@lezer/highlight@1.2.1': @@ -10135,11 +10152,11 @@ snapshots: '@tanstack/table-core@8.20.5': {} - '@tauri-apps/api@2.0.0-rc.4': {} + '@tauri-apps/api@2.0.1': {} '@tauri-apps/plugin-dialog@2.0.0-rc.1': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 '@tokenizer/token@0.3.0': {} @@ -10293,7 +10310,7 @@ snapshots: '@typescript/vfs@1.6.0(typescript@5.5.4)': dependencies: - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) typescript: 5.5.4 transitivePeerDependencies: - supports-color @@ -10821,7 +10838,7 @@ snapshots: capnp-ts@0.7.0: dependencies: - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) tslib: 2.6.3 transitivePeerDependencies: - supports-color @@ -11097,10 +11114,6 @@ snapshots: date-fns@3.6.0: {} - debug@4.3.6: - dependencies: - ms: 2.1.2 - debug@4.3.6(supports-color@5.5.0): dependencies: ms: 2.1.2 @@ -11304,7 +11317,7 @@ snapshots: esbuild-register@3.6.0(esbuild@0.19.12): dependencies: - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) esbuild: 0.19.12 transitivePeerDependencies: - supports-color @@ -11563,7 +11576,7 @@ snapshots: extract-zip@2.0.1: dependencies: - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -12299,6 +12312,18 @@ snapshots: '@langchain/core': 0.2.23(openai@4.55.4(encoding@0.1.13)(zod@3.23.8)) openai: 4.55.4(encoding@0.1.13)(zod@3.23.8) + langsmith@0.1.41(@langchain/core@0.2.23(openai@4.55.4))(openai@4.55.4): + dependencies: + '@types/uuid': 9.0.8 + commander: 10.0.1 + p-queue: 6.6.2 + p-retry: 4.6.2 + semver: 7.6.3 + uuid: 9.0.1 + optionalDependencies: + '@langchain/core': 0.2.23(openai@4.55.4) + openai: 4.55.4(encoding@0.1.13)(zod@3.23.8) + leven@4.0.0: {} libsql@0.3.19: @@ -12852,7 +12877,7 @@ snapshots: micromark@4.0.0: dependencies: '@types/debug': 4.1.12 - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) decode-named-character-reference: 1.0.2 devlop: 1.1.0 micromark-core-commonmark: 2.0.1 @@ -14481,7 +14506,7 @@ snapshots: threads@1.7.0: dependencies: callsites: 3.1.0 - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) is-observable: 2.1.0 observable-fns: 0.6.1 optionalDependencies: @@ -14786,7 +14811,7 @@ snapshots: vite-node@1.6.0(@types/node@20.14.15): dependencies: cac: 6.7.14 - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) pathe: 1.1.2 picocolors: 1.0.1 vite: 5.4.0(@types/node@20.14.15) @@ -14814,7 +14839,7 @@ snapshots: vite-tsconfig-paths@4.3.2(typescript@5.6.2)(vite@5.4.0(@types/node@20.14.15)): dependencies: - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) globrex: 0.1.2 tsconfck: 3.1.1(typescript@5.6.2) optionalDependencies: @@ -14854,7 +14879,7 @@ snapshots: '@vitest/utils': 1.6.0 acorn-walk: 8.3.3 chai: 4.5.0 - debug: 4.3.6 + debug: 4.3.6(supports-color@5.5.0) execa: 8.0.1 local-pkg: 0.5.0 magic-string: 0.30.11 diff --git a/studio/package.json b/studio/package.json index ec6074d40..a5c878b35 100644 --- a/studio/package.json +++ b/studio/package.json @@ -42,7 +42,7 @@ "@scalar/openapi-parser": "^0.7.2", "@tanstack/react-query": "^5.51.1", "@tanstack/react-table": "^8.17.3", - "@tauri-apps/api": "2.0.0-rc.4", + "@tauri-apps/api": "2.0.1", "@tauri-apps/plugin-dialog": "2.0.0-rc.1", "@types/highlight-words-core": "^1.2.3", "@uiw/codemirror-theme-duotone": "^4.22.2",