Skip to content

Commit afc9cf5

Browse files
authored
update deps versions (#5703)
1 parent 4fd0561 commit afc9cf5

File tree

8 files changed

+837
-366
lines changed

8 files changed

+837
-366
lines changed

backend/Cargo.lock

+810-345
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/Cargo.toml

+6-9
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ serde_json = { version = "^1", features = ["preserve_order", "raw_value"] }
194194
uuid = { version = "^1", features = ["serde", "v4"] }
195195
thiserror = "^2"
196196
anyhow = "^1"
197-
chrono = { version = "=0.4.39", features = ["serde"] }
197+
chrono = { version = "^0.4", features = ["serde"] }
198198
chrono-tz = "^0.10.1"
199199
tracing = "^0"
200200
tracing-subscriber = { version = "^0", features = ["env-filter", "json"] }
@@ -317,9 +317,9 @@ nix = { version = "0.27.1", features = ["process", "signal"] }
317317
tinyvector = { git = "https://github.com/windmill-labs/tinyvector", rev = "20823b94c20f2b9093f318badd24026cf54dcc85" }
318318
hf-hub = "0.3.2"
319319
tokenizers = "0.14.1"
320-
candle-core = "0.3.0"
321-
candle-transformers = "0.3.0"
322-
candle-nn = "0.3.0"
320+
candle-core = "0.9.1"
321+
candle-transformers = "0.9.1"
322+
candle-nn = "0.9.1"
323323
tiberius = { version = "0.12.3", default-features = false, features = ["rustls", "tds73", "chrono", "sql-browser-tokio"]}
324324
pin-project = "1"
325325
indexmap = { version = "2.2.5", features = ["serde"]}
@@ -333,8 +333,8 @@ async-nats = "0.38.0"
333333
nkeys = "0.4.4"
334334
nu-parser = { version = "0.101.0", default-features = false }
335335

336-
datafusion = "39.0.0"
337-
object_store = { version = "0.10.0", features = ["aws", "azure"] }
336+
datafusion = "47.0.0"
337+
object_store = { version = "0.12.0", features = ["aws", "azure"] }
338338
openidconnect = { version = "4.0.0-rc.1" }
339339
aws-config = "^1"
340340
aws-sdk-sqs = "1.57.0"
@@ -357,9 +357,6 @@ bollard = "0.18.1"
357357
tonic = { version = "=0.12.3", features = ["tls-native-roots"] }
358358
byteorder = "1.5.0"
359359

360-
# todo remove
361-
half = "=2.4.1"
362-
363360
tikv-jemallocator = { version = "0.5" }
364361
tikv-jemalloc-sys = { version = "^0.5" }
365362
tikv-jemalloc-ctl = { version = "^0.5" }

backend/ee-repo-ref.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d63c5908cb19c9beb670e91d6792817ea636f052
1+
868ccad87afb804fe22818ecd3d5a091199bcdbf

backend/src/monitor.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use windmill_api::{
3030

3131
#[cfg(feature = "enterprise")]
3232
use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts};
33-
33+
#[cfg(feature = "enterprise")]
3434
use windmill_common::ee::low_disk_alerts;
3535

3636
#[cfg(feature = "oauth2")]
@@ -1356,7 +1356,7 @@ pub async fn monitor_db(
13561356
conn: &Connection,
13571357
base_internal_url: &str,
13581358
server_mode: bool,
1359-
worker_mode: bool,
1359+
_worker_mode: bool,
13601360
initial_load: bool,
13611361
_killpill_tx: KillpillSender,
13621362
) {
@@ -1416,15 +1416,20 @@ pub async fn monitor_db(
14161416
};
14171417

14181418
let low_disk_alerts_f = async {
1419+
#[cfg(feature = "enterprise")]
14191420
if let Some(db) = conn.as_sql() {
14201421
low_disk_alerts(
14211422
&db,
14221423
server_mode,
1423-
worker_mode,
1424+
_worker_mode,
14241425
WORKERS_NAMES.read().await.clone(),
14251426
)
14261427
.await;
14271428
}
1429+
#[cfg(not(feature = "enterprise"))]
1430+
{
1431+
()
1432+
}
14281433
};
14291434

14301435
let apply_autoscaling_f = async {

backend/tests/worker.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ use windmill_api_client::types::{EditSchedule, NewSchedule, ScriptArgs};
2323
use windmill_api_client::types::{NewScript, ScriptLang as NewScriptLanguage};
2424

2525
use serde::Serialize;
26-
use windmill_common::worker::WORKER_CONFIG;
2726
#[cfg(feature = "deno_core")]
2827
use windmill_common::flows::InputTransform;
28+
use windmill_common::worker::WORKER_CONFIG;
2929

3030
use windmill_common::{
3131
flow_status::{FlowStatus, FlowStatusModule, RestartedFrom},
@@ -145,7 +145,7 @@ impl ApiServer {
145145
format!("http://localhost:{}", addr.port()),
146146
));
147147

148-
_port_rx.await.unwrap();
148+
_port_rx.await.expect("failed to receive port");
149149

150150
// clear the cache between tests
151151
windmill_common::cache::clear();
@@ -171,7 +171,7 @@ impl ApiServer {
171171
// Ok(())
172172
// }
173173

174-
#[cfg(feature="python")]
174+
#[cfg(feature = "python")]
175175
fn get_module(cjob: &CompletedJob, id: &str) -> Option<FlowStatusModule> {
176176
cjob.flow_status.clone().and_then(|fs| {
177177
find_module_in_vec(
@@ -181,7 +181,7 @@ fn get_module(cjob: &CompletedJob, id: &str) -> Option<FlowStatusModule> {
181181
})
182182
}
183183

184-
#[cfg(feature="python")]
184+
#[cfg(feature = "python")]
185185
fn find_module_in_vec(modules: Vec<FlowStatusModule>, id: &str) -> Option<FlowStatusModule> {
186186
modules.into_iter().find(|s| s.id() == id)
187187
}

backend/windmill-api/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ stripe = []
1515
agent_worker_server = []
1616
enterprise_saml = ["dep:samael", "dep:libxml"]
1717
benchmark = []
18-
embedding = ["dep:tinyvector", "dep:hf-hub", "dep:tokenizers", "dep:candle-core", "dep:candle-transformers", "dep:candle-nn", "dep:half"]
18+
embedding = ["dep:tinyvector", "dep:hf-hub", "dep:tokenizers", "dep:candle-core", "dep:candle-transformers", "dep:candle-nn"]
1919
parquet = ["dep:datafusion", "dep:object_store", "dep:url", "windmill-common/parquet", "windmill-worker/parquet"]
2020
prometheus = ["windmill-common/prometheus", "windmill-queue/prometheus", "dep:prometheus", "windmill-worker/prometheus"]
2121
openidconnect = ["dep:openidconnect"]
@@ -54,7 +54,6 @@ tokio-stream.workspace = true
5454
anyhow.workspace = true
5555
argon2.workspace = true
5656
axum.workspace = true
57-
half = { workspace = true, optional = true}
5857
futures.workspace = true
5958
git-version.workspace = true
6059
tower.workspace = true

backend/windmill-api/src/embeddings.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ impl ModelInstance {
253253
let token_ids = Tensor::new(&tokens[..], &Device::Cpu)?.unsqueeze(0)?;
254254
let token_type_ids = token_ids.zeros_like()?;
255255

256-
let embedding = self.model.forward(&token_ids, &token_type_ids)?;
256+
let embedding = self.model.forward(&token_ids, &token_type_ids, None)?;
257257
let embedding = (embedding.sum(1)? / embedding.dim(1)? as f64)?;
258258
let embedding = normalize_l2(&embedding)?;
259259

backend/windmill-common/src/ee.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#[cfg(feature = "enterprise")]
12
use crate::db::DB;
23
use crate::ee::LicensePlan::Community;
34
#[cfg(feature = "enterprise")]
@@ -98,4 +99,8 @@ pub async fn worker_groups_alerts(_db: &DB) {}
9899
#[cfg(feature = "enterprise")]
99100
pub async fn jobs_waiting_alerts(_db: &DB) {}
100101

101-
pub async fn low_disk_alerts(_db: &DB, _: bool, _: bool, _: Vec<String>) {}
102+
#[cfg(feature = "enterprise")]
103+
pub async fn low_disk_alerts(_db: &DB, _server_mode: bool, _worker_mode: bool, _workers: Vec<String>) {
104+
// Implementation is not open source
105+
}
106+

0 commit comments

Comments
 (0)