Skip to content

update deps versions #5703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,155 changes: 810 additions & 345 deletions backend/Cargo.lock

Large diffs are not rendered by default.

15 changes: 6 additions & 9 deletions backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ serde_json = { version = "^1", features = ["preserve_order", "raw_value"] }
uuid = { version = "^1", features = ["serde", "v4"] }
thiserror = "^2"
anyhow = "^1"
chrono = { version = "=0.4.39", features = ["serde"] }
chrono = { version = "^0.4", features = ["serde"] }
chrono-tz = "^0.10.1"
tracing = "^0"
tracing-subscriber = { version = "^0", features = ["env-filter", "json"] }
Expand Down Expand Up @@ -317,9 +317,9 @@ nix = { version = "0.27.1", features = ["process", "signal"] }
tinyvector = { git = "https://github.com/windmill-labs/tinyvector", rev = "20823b94c20f2b9093f318badd24026cf54dcc85" }
hf-hub = "0.3.2"
tokenizers = "0.14.1"
candle-core = "0.3.0"
candle-transformers = "0.3.0"
candle-nn = "0.3.0"
candle-core = "0.9.1"
candle-transformers = "0.9.1"
candle-nn = "0.9.1"
tiberius = { version = "0.12.3", default-features = false, features = ["rustls", "tds73", "chrono", "sql-browser-tokio"]}
pin-project = "1"
indexmap = { version = "2.2.5", features = ["serde"]}
Expand All @@ -333,8 +333,8 @@ async-nats = "0.38.0"
nkeys = "0.4.4"
nu-parser = { version = "0.101.0", default-features = false }

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

# todo remove
half = "=2.4.1"

tikv-jemallocator = { version = "0.5" }
tikv-jemalloc-sys = { version = "^0.5" }
tikv-jemalloc-ctl = { version = "^0.5" }
Expand Down
2 changes: 1 addition & 1 deletion backend/ee-repo-ref.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d63c5908cb19c9beb670e91d6792817ea636f052
868ccad87afb804fe22818ecd3d5a091199bcdbf
11 changes: 8 additions & 3 deletions backend/src/monitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use windmill_api::{

#[cfg(feature = "enterprise")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider merging the two #[cfg(feature = "enterprise")] imports into a single statement for clarity.

use windmill_common::ee::{jobs_waiting_alerts, worker_groups_alerts};

#[cfg(feature = "enterprise")]
use windmill_common::ee::low_disk_alerts;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The imports for enterprise features use a #[cfg(feature = "enterprise")] on jobs_waiting_alerts and worker_groups_alerts, but low_disk_alerts is imported without the same cfg guard. For consistency (and to avoid accidental inclusion in non‐enterprise builds), consider wrapping low_disk_alerts in #[cfg(feature = "enterprise")].

Suggested change
use windmill_common::ee::low_disk_alerts;
#[cfg(feature = "enterprise")] use windmill_common::ee::low_disk_alerts;


#[cfg(feature = "oauth2")]
Expand Down Expand Up @@ -1356,7 +1356,7 @@ pub async fn monitor_db(
conn: &Connection,
base_internal_url: &str,
server_mode: bool,
worker_mode: bool,
_worker_mode: bool,
initial_load: bool,
_killpill_tx: KillpillSender,
) {
Expand Down Expand Up @@ -1416,15 +1416,20 @@ pub async fn monitor_db(
};

let low_disk_alerts_f = async {
#[cfg(feature = "enterprise")]
if let Some(db) = conn.as_sql() {
low_disk_alerts(
&db,
server_mode,
worker_mode,
_worker_mode,
WORKERS_NAMES.read().await.clone(),
)
.await;
}
#[cfg(not(feature = "enterprise"))]
{
()
}
};

let apply_autoscaling_f = async {
Expand Down
8 changes: 4 additions & 4 deletions backend/tests/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ use windmill_api_client::types::{EditSchedule, NewSchedule, ScriptArgs};
use windmill_api_client::types::{NewScript, ScriptLang as NewScriptLanguage};

use serde::Serialize;
use windmill_common::worker::WORKER_CONFIG;
#[cfg(feature = "deno_core")]
use windmill_common::flows::InputTransform;
use windmill_common::worker::WORKER_CONFIG;

use windmill_common::{
flow_status::{FlowStatus, FlowStatusModule, RestartedFrom},
Expand Down Expand Up @@ -145,7 +145,7 @@ impl ApiServer {
format!("http://localhost:{}", addr.port()),
));

_port_rx.await.unwrap();
_port_rx.await.expect("failed to receive port");

// clear the cache between tests
windmill_common::cache::clear();
Expand All @@ -171,7 +171,7 @@ impl ApiServer {
// Ok(())
// }

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

#[cfg(feature="python")]
#[cfg(feature = "python")]
fn find_module_in_vec(modules: Vec<FlowStatusModule>, id: &str) -> Option<FlowStatusModule> {
modules.into_iter().find(|s| s.id() == id)
}
Expand Down
3 changes: 1 addition & 2 deletions backend/windmill-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stripe = []
agent_worker_server = []
enterprise_saml = ["dep:samael", "dep:libxml"]
benchmark = []
embedding = ["dep:tinyvector", "dep:hf-hub", "dep:tokenizers", "dep:candle-core", "dep:candle-transformers", "dep:candle-nn", "dep:half"]
embedding = ["dep:tinyvector", "dep:hf-hub", "dep:tokenizers", "dep:candle-core", "dep:candle-transformers", "dep:candle-nn"]
parquet = ["dep:datafusion", "dep:object_store", "dep:url", "windmill-common/parquet", "windmill-worker/parquet"]
prometheus = ["windmill-common/prometheus", "windmill-queue/prometheus", "dep:prometheus", "windmill-worker/prometheus"]
openidconnect = ["dep:openidconnect"]
Expand Down Expand Up @@ -54,7 +54,6 @@ tokio-stream.workspace = true
anyhow.workspace = true
argon2.workspace = true
axum.workspace = true
half = { workspace = true, optional = true}
futures.workspace = true
git-version.workspace = true
tower.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion backend/windmill-api/src/embeddings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ impl ModelInstance {
let token_ids = Tensor::new(&tokens[..], &Device::Cpu)?.unsqueeze(0)?;
let token_type_ids = token_ids.zeros_like()?;

let embedding = self.model.forward(&token_ids, &token_type_ids)?;
let embedding = self.model.forward(&token_ids, &token_type_ids, None)?;
let embedding = (embedding.sum(1)? / embedding.dim(1)? as f64)?;
let embedding = normalize_l2(&embedding)?;

Expand Down
7 changes: 6 additions & 1 deletion backend/windmill-common/src/ee.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#[cfg(feature = "enterprise")]
use crate::db::DB;
use crate::ee::LicensePlan::Community;
#[cfg(feature = "enterprise")]
Expand Down Expand Up @@ -98,4 +99,8 @@ pub async fn worker_groups_alerts(_db: &DB) {}
#[cfg(feature = "enterprise")]
pub async fn jobs_waiting_alerts(_db: &DB) {}

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

Loading