Desktop app iced

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["paddler_integration_tests", "paddler", "paddler_client", "paddler_model_tests", "paddler_types"]
+members = ["paddler", "paddler_bootstrap", "paddler_cli", "paddler_client", "paddler_gui", "paddler_integration_tests", "paddler_model_tests", "paddler_types"]
 resolver = "2"
 
 [workspace.package]
@@ -53,13 +53,17 @@ serial_test = { version = "3", features = ["file_locks"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 shellexpand = "3"
+iced = { version = "0.14", features = ["image", "svg", "tokio"] }
+if-addrs = "0.13"
+statum = "0.6"
 tempfile = "3.20.0"
 tokio = { version = "1.48", features = ["full"] }
 tokio-stream = { version = "0.1.17", features = ["sync"] }
 tokio-tungstenite = "0.28"
 thiserror = "2"
 url = { version = "2.5", features = ["serde"] }
 paddler = { version = "3.0.1", path = "paddler" }
+paddler_bootstrap = { version = "3.0.1", path = "paddler_bootstrap" }
 paddler_client = { version = "3.0.1", path = "paddler_client" }
 paddler_types = { version = "3.0.1", path = "paddler_types" }
 

Makefile

@@ -13,8 +13,8 @@ node_modules: package-lock.json
 	npm install --from-lockfile
 	touch node_modules
 
-target/debug/paddler: $(shell find paddler/src paddler_types/src paddler_client/src -name '*.rs')
-	cargo build -p paddler
+target/debug/paddler_cli: $(shell find paddler/src paddler_bootstrap/src paddler_cli/src paddler_client/src paddler_types/src -name '*.rs')
+	cargo build -p paddler_cli
 
 # -----------------------------------------------------------------------------
 # Phony targets
@@ -41,42 +41,42 @@ jarmuz-static: node_modules
 
 .PHONY: build
 build: jarmuz-static
-	cargo build -p paddler --features web_admin_panel
+	cargo build -p paddler_cli --features web_admin_panel
 
 .PHONY: build.cuda
 build.cuda: jarmuz-static
-	cargo build -p paddler --features cuda,web_admin_panel
+	cargo build -p paddler_cli --features cuda,web_admin_panel
 
 .PHONY: release
 release: jarmuz-static
-	cargo build --release -p paddler --features web_admin_panel
+	cargo build --release -p paddler_cli --features web_admin_panel
 
 .PHONY: release.cuda
 release.cuda: jarmuz-static
-	cargo build --release -p paddler --features web_admin_panel,cuda
+	cargo build --release -p paddler_cli --features web_admin_panel,cuda
 
 .PHONY: release.vulkan
 release.vulkan: jarmuz-static
-	cargo build --release -p paddler --features web_admin_panel,vulkan
+	cargo build --release -p paddler_cli --features web_admin_panel,vulkan
 
 .PHONY: test
 test: test.unit test.models test.integration
 
 .PHONY: test.models
 test.models:
-	timeout 300 cargo test -p paddler_model_tests --features tests_that_use_llms -- --nocapture --test-threads=1
+	cargo test -p paddler_model_tests --features tests_that_use_llms -- --nocapture --test-threads=1
 
 .PHONY: test.cuda
 test.cuda:
-	timeout 1800 cargo test -p paddler_model_tests --features tests_that_use_llms,cuda -- --nocapture --test-threads=1
+	cargo test -p paddler_model_tests --features tests_that_use_llms,cuda -- --nocapture --test-threads=1
 
 .PHONY: test.unit
 test.unit: jarmuz-static
-	timeout 300 cargo test --features web_admin_panel
+	cargo test --features web_admin_panel
 
 .PHONY: test.integration
-test.integration: target/debug/paddler
-	timeout 300 cargo test -p paddler_integration_tests --features tests_that_use_compiled_paddler,tests_that_use_llms -- --nocapture --test-threads=1
+test.integration: target/debug/paddler_cli
+	cargo test -p paddler_integration_tests --features tests_that_use_compiled_paddler,tests_that_use_llms -- --nocapture --test-threads=1
 
 .PHONY: watch
 watch: node_modules

jarmuz/worker-paddler.mjs

@@ -17,7 +17,7 @@ spawner(async function ({ buildId, command }) {
 
   const results = await Promise.all([
     command(`
-      target/debug/paddler balancer
+      target/debug/paddler_cli balancer
         --compat-openai-addr 127.0.0.1:8063
         --inference-addr 127.0.0.1:8061
         --inference-item-timeout 30000
@@ -26,19 +26,19 @@ spawner(async function ({ buildId, command }) {
         --web-admin-panel-addr 127.0.0.1:8062
     `),
     command(`
-      target/debug/paddler agent
+      target/debug/paddler_cli agent
         --management-addr 127.0.0.1:8060
         --name agent-1
         --slots 4
     `),
     command(`
-      target/debug/paddler agent
+      target/debug/paddler_cli agent
         --management-addr 127.0.0.1:8060
         --name agent-2
         --slots 4
     `),
     command(`
-      target/debug/paddler agent
+      target/debug/paddler_cli agent
         --management-addr 127.0.0.1:8060
         --name agent-3
         --slots 2

paddler/Cargo.toml

@@ -39,7 +39,6 @@ minijinja-contrib = { workspace = true }
 nanoid = { workspace = true }
 paddler_types = { workspace = true }
 thiserror = { workspace = true }
-nix = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true }
 resvg = { workspace = true }

paddler/src/lib.rs

@@ -10,7 +10,6 @@ pub mod balancer_applicable_state;
 pub mod balancer_applicable_state_holder;
 pub mod balancer_desired_state;
 pub mod chat_template_renderer;
-pub mod cmd;
 pub mod continuation_decision;
 pub mod continuation_stop_parameters;
 pub mod controls_session;

paddler_bootstrap/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "paddler_bootstrap"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+description = "Shared service wiring for Paddler CLI and desktop app"
+license.workspace = true
+
+[dependencies]
+anyhow = { workspace = true }
+nanoid = { workspace = true }
+paddler = { workspace = true }
+paddler_types = { workspace = true }
+tokio = { workspace = true }
+
+[lints]
+workspace = true
+
+[features]
+default = []
+web_admin_panel = ["paddler/web_admin_panel"]

paddler_bootstrap/src/bootstrap_agent_params.rs

@@ -0,0 +1,5 @@
+pub struct BootstrapAgentParams {
+    pub agent_name: Option<String>,
+    pub management_address: String,
+    pub slots: i32,
+}

paddler_bootstrap/src/bootstrap_balancer_params.rs

@@ -0,0 +1,20 @@
+use std::time::Duration;
+
+use paddler::balancer::compatibility::openai_service::configuration::Configuration as OpenAIServiceConfiguration;
+use paddler::balancer::inference_service::configuration::Configuration as InferenceServiceConfiguration;
+use paddler::balancer::management_service::configuration::Configuration as ManagementServiceConfiguration;
+use paddler::balancer::state_database_type::StateDatabaseType;
+#[cfg(feature = "web_admin_panel")]
+use paddler::balancer::web_admin_panel_service::configuration::Configuration as WebAdminPanelServiceConfiguration;
+
+pub struct BootstrapBalancerParams {
+    pub buffered_request_timeout: Duration,
+    pub inference_service_configuration: InferenceServiceConfiguration,
+    pub management_service_configuration: ManagementServiceConfiguration,
+    pub max_buffered_requests: i32,
+    pub openai_service_configuration: Option<OpenAIServiceConfiguration>,
+    pub state_database_type: StateDatabaseType,
+    pub statsd_prefix: String,
+    #[cfg(feature = "web_admin_panel")]
+    pub web_admin_panel_service_configuration: Option<WebAdminPanelServiceConfiguration>,
+}