From ccf24f1cabee0c7c449dbd5263ccfb5e12c5d141 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 16 Jan 2025 11:51:40 +0100 Subject: [PATCH] nits --- backend/windmill-worker/src/python_executor.rs | 8 +++++--- frontend/src/lib/components/ResourcePicker.svelte | 3 ++- .../settingsPanel/inputEditor/StaticInputEditor.svelte | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs index 4d3aa2ecc1..b8265b71f7 100644 --- a/backend/windmill-worker/src/python_executor.rs +++ b/backend/windmill-worker/src/python_executor.rs @@ -1705,9 +1705,10 @@ pub async fn handle_python_reqs( tracing::info!( workspace_id = %w_id, + job_id = %job_id, // is_ok = out, "started thread to install wheel {}", - job_id + venv_p ); let start = std::time::Instant::now(); @@ -1721,7 +1722,7 @@ pub async fn handle_python_reqs( if let Err(e) = pull { tracing::info!( workspace_id = %w_id, - "No tarball was found on S3 or different problem occured {job_id}:\n{e}", + "No tarball was found for {venv_p} on S3 or different problem occured {job_id}:\n{e}", ); } else { print_success( @@ -1858,9 +1859,10 @@ pub async fn handle_python_reqs( tracing::info!( workspace_id = %w_id, + job_id = %job_id, // is_ok = out, "finished setting up python dependency {}", - job_id + venv_p ); pids.lock().await.get_mut(i).and_then(|e| e.take()); diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte index 25b47773a9..47bc388dab 100644 --- a/frontend/src/lib/components/ResourcePicker.svelte +++ b/frontend/src/lib/components/ResourcePicker.svelte @@ -24,6 +24,7 @@ export let selectFirst = false export let expressOAuthSetup = false export let defaultValues: Record | undefined = undefined + export let placeholder: string | undefined = undefined onMount(() => { setTimeout(() => { @@ -153,7 +154,7 @@ }} items={collection} class="text-clip grow min-w-0" - placeholder="{resourceType ?? 'any'} resource" + placeholder={placeholder ?? `${resourceType ?? 'any'} resource`} inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles} containerStyles={darkMode ? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/StaticInputEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/StaticInputEditor.svelte index 0f6355d1df..0d406ff9a9 100644 --- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/StaticInputEditor.svelte +++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/StaticInputEditor.svelte @@ -91,6 +91,7 @@ /> {:else if fieldType === 'resource' && subFieldType === 's3'} { let path = e.detail