mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-19 16:02:14 +00:00
edece035f8
* feat(EE): job debouncing Signed-off-by: pyranota <pyra@duck.com> * remove 'script' file Signed-off-by: pyranota <pyra@duck.com> * more work Signed-off-by: pyranota <pyra@duck.com> * properly gate it behind enterprise Signed-off-by: pyranota <pyra@duck.com> * update ee repo ref Signed-off-by: pyranota <pyra@duck.com> * change ee repo ref again Signed-off-by: pyranota <pyra@duck.com> * remove unused variable Signed-off-by: pyranota <pyra@duck.com> * feat(EE): implement TODOs and enhance tracing for job debouncing - Add database index on script(workspace_id, debounce_key) for efficient lookups - Update minimum version requirement to 1.564.0 throughout codebase - Add tracing warnings when debouncing is disabled due to worker version mismatch - Fix all documentation links from TODO placeholders to proper URLs - Replace Gauge icon with Timer icon for debouncing UI elements - Update placeholder text and tooltips with clear descriptions Co-authored-by: Pyra <pyranota@users.noreply.github.com> * create -> crate Signed-off-by: pyranota <pyra@duck.com> * remove index Signed-off-by: pyranota <pyra@duck.com> * some updates Signed-off-by: pyranota <pyra@duck.com> * fix once more Signed-off-by: pyranota <pyra@duck.com> * fix it once more Signed-off-by: pyranota <pyra@duck.com> * Remove flow step debouncing, keep top-level flow debouncing - Remove debounce fields from RawScript and FlowScript FlowModuleValue variants - Remove debounce fields from JobPayload::FlowScript and RawCode - Update raw_script_to_payload function signature - Remove debouncing UI from flow step runtime settings - Remove debouncing toggle handler and indicator badge - Preserve top-level flow debouncing in FlowSettings Co-authored-by: Pyra <pyranota@users.noreply.github.com> * cleanup Signed-off-by: pyranota <pyra@duck.com> * fixup claude's work Signed-off-by: pyranota <pyra@duck.com> * cleanup: remove dbg! statements, update min version to 1.566.0, add comprehensive comments - Removed all dbg! macro calls from production code - Updated MIN_VERSION_SUPPORTS_DEBOUNCING from 1.564.0 to 1.566.0 - Added comprehensive documentation comments explaining: - Debouncing feature purpose and mechanics - Database schema for debounce_key and debounce_stale_data tables - Version check logic and guard functions - Improved code clarity and maintainability Co-authored-by: Pyra <pyranota@users.noreply.github.com> * improve fallback Signed-off-by: pyranota <pyra@duck.com> * remove comments from old migration Signed-off-by: pyranota <pyra@duck.com> * fix pull Signed-off-by: pyranota <pyra@duck.com> * fix once more Signed-off-by: pyranota <pyra@duck.com> * Update frontend/src/lib/components/ScriptBuilder.svelte Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * add sqlx cache Signed-off-by: pyranota <pyra@duck.com> * fix: frontend CI - fix debounce field names and remove leftover flow step debouncing - Fix ScriptBuilder.svelte: change custom_debounce_key to debounce_key - Add debounce_key and debounce_delay_s fields to NewScript schema in openapi.yaml - Regenerate frontend types from OpenAPI spec - Remove leftover flow step debouncing code from FlowModuleComponent.svelte - Remove debounce fields from RawScript in openflow.openapi.yaml - Remove unused Timer import from FlowModuleHeader.svelte All frontend checks now passing (0 errors, 0 warnings) Co-authored-by: Pyra <pyranota@users.noreply.github.com> * fix ci Signed-off-by: pyranota <pyra@duck.com> * remove unused import Signed-off-by: pyranota <pyra@duck.com> * fix ci again Signed-off-by: pyranota <pyra@duck.com> * udpate ee repo ref Signed-off-by: pyranota <pyra@duck.com> * CI doesn't want to be fixed but I still try Signed-off-by: pyranota <pyra@duck.com> * nits Signed-off-by: pyranota <pyra@duck.com> * ci... Signed-off-by: pyranota <pyra@duck.com> * Update ee-repo-ref.txt * safer migration Signed-off-by: pyranota <pyra@duck.com> * reduce noise in logs Signed-off-by: pyranota <pyra@duck.com> * fix cli for scripts Signed-off-by: pyranota <pyra@duck.com> * nit Signed-off-by: pyranota <pyra@duck.com> --------- Signed-off-by: pyranota <pyra@duck.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Pyra <pyranota@users.noreply.github.com> Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
401 lines
9.7 KiB
Rust
401 lines
9.7 KiB
Rust
mod common;
|
|
use crate::common::*;
|
|
use sqlx::postgres::Postgres;
|
|
use sqlx::Pool;
|
|
use windmill_common::scripts::ScriptLang;
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_requirements_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: ==3.11.11
|
|
# requirements:
|
|
# tiny==0.1.3
|
|
|
|
import bar
|
|
import baz # pin: foo
|
|
import baz # repin: fee
|
|
import bug # repin: free
|
|
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec!["# py: 3.11.11", "tiny==0.1.3"],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_extra_requirements_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
{
|
|
use windmill_common::scripts::ScriptLang;
|
|
|
|
let content = r#"# py: ==3.11.11
|
|
# extra_requirements:
|
|
# tiny
|
|
|
|
import f.system.extra_requirements
|
|
import tiny # pin: tiny==0.1.0
|
|
import tiny # pin: tiny==0.1.1
|
|
import tiny # repin: tiny==0.1.2
|
|
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec!["# py: 3.11.11", "bottle==0.13.2", "tiny==0.1.2"],
|
|
)
|
|
.await?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_extra_requirements_python2(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: ==3.11.11
|
|
# extra_requirements:
|
|
# tiny==0.1.3
|
|
|
|
import simplejson # pin: simplejson==3.20.1
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec!["# py: 3.11.11", "simplejson==3.20.1", "tiny==0.1.3"],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_pins_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: ==3.11.11
|
|
# extra_requirements:
|
|
# tiny==0.1.3
|
|
# bottle==0.13.2
|
|
|
|
import f.system.requirements
|
|
import f.system.pins
|
|
import tiny # repin: tiny==0.1.3
|
|
import simplejson
|
|
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec![
|
|
"# py: 3.11.11",
|
|
"bottle==0.13.2",
|
|
"microdot==2.2.0",
|
|
"simplejson==3.19.3",
|
|
"tiny==0.1.3",
|
|
],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "multipython"))]
|
|
async fn test_multipython_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: <=3.12.2, >=3.12.0
|
|
import f.multipython.script1
|
|
import f.multipython.aliases
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(&db, content, ScriptLang::Python3, vec!["# py: 3.12.1\n"]).await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "multipython"))]
|
|
async fn test_inline_script_metadata_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py_select_latest
|
|
# /// script
|
|
# requires-python = ">3.11,<3.12.3,!=3.12.2"
|
|
# dependencies = [
|
|
# "tiny==0.1.3",
|
|
# ]
|
|
# ///
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec!["# py: 3.12.1", "tiny==0.1.3"],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
use windmill_common::jobs::JobPayload;
|
|
#[cfg(feature = "python")]
|
|
use windmill_common::jobs::RawCode;
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_job(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
def main():
|
|
return "hello world"
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
custom_concurrency_key: None,
|
|
concurrent_limit: None,
|
|
concurrency_time_window_s: None,
|
|
custom_debounce_key: None,
|
|
debounce_delay_s: None,
|
|
cache_ttl: None,
|
|
dedicated_worker: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("hello world"));
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_global_site_packages(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
use windmill_common::{cache::concatcp, worker::ROOT_CACHE_DIR};
|
|
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
// Shared for all 3.12.*
|
|
let path = concatcp!(ROOT_CACHE_DIR, "python_3_12/global-site-packages").to_owned();
|
|
std::fs::create_dir_all(&path).unwrap();
|
|
std::fs::write(path + "/my_global_site_package_3_12_any.py", "").unwrap();
|
|
|
|
// 3.12
|
|
{
|
|
let content = r#"# py: ==3.12
|
|
#requirements:
|
|
#
|
|
|
|
import my_global_site_package_3_12_any
|
|
|
|
def main():
|
|
return "hello world"
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
custom_concurrency_key: None,
|
|
concurrent_limit: None,
|
|
concurrency_time_window_s: None,
|
|
custom_debounce_key: None,
|
|
debounce_delay_s: None,
|
|
cache_ttl: None,
|
|
dedicated_worker: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("hello world"));
|
|
}
|
|
|
|
// 3.12.1
|
|
{
|
|
let content = r#"# py: ==3.12.1
|
|
#requirements:
|
|
#
|
|
|
|
import my_global_site_package_3_12_any
|
|
|
|
def main():
|
|
return "hello world"
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
custom_concurrency_key: None,
|
|
concurrent_limit: None,
|
|
concurrency_time_window_s: None,
|
|
custom_debounce_key: None,
|
|
debounce_delay_s: None,
|
|
cache_ttl: None,
|
|
dedicated_worker: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("hello world"));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_job_heavy_dep(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
import numpy as np
|
|
|
|
def main():
|
|
a = np.arange(15).reshape(3, 5)
|
|
return len(a)
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
custom_concurrency_key: None,
|
|
concurrent_limit: None,
|
|
concurrency_time_window_s: None,
|
|
custom_debounce_key: None,
|
|
debounce_delay_s: None,
|
|
cache_ttl: None,
|
|
dedicated_worker: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!(3));
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_job_with_imports(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
import wmill
|
|
|
|
def main():
|
|
return wmill.get_workspace()
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
custom_concurrency_key: None,
|
|
concurrent_limit: None,
|
|
concurrency_time_window_s: None,
|
|
custom_debounce_key: None,
|
|
debounce_delay_s: None,
|
|
cache_ttl: None,
|
|
dedicated_worker: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("test-workspace"));
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "relative_python"))]
|
|
async fn test_relative_imports_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"
|
|
from f.system.same_folder_script import main as test1
|
|
from .same_folder_script import main as test2
|
|
from f.system_relative.different_folder_script import main as test3
|
|
from ..system_relative.different_folder_script import main as test4
|
|
|
|
def main():
|
|
return [test1(), test2(), test3(), test4()]
|
|
"#
|
|
.to_string();
|
|
|
|
run_deployed_relative_imports(&db, content.clone(), ScriptLang::Python3).await?;
|
|
run_preview_relative_imports(&db, content, ScriptLang::Python3).await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "relative_python"))]
|
|
async fn test_nested_imports_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"
|
|
|
|
from f.system_relative.nested_script import main as test
|
|
|
|
def main():
|
|
return test()
|
|
"#
|
|
.to_string();
|
|
|
|
run_deployed_relative_imports(&db, content.clone(), ScriptLang::Python3).await?;
|
|
run_preview_relative_imports(&db, content, ScriptLang::Python3).await?;
|
|
Ok(())
|
|
}
|