mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-10-20 08:03:28 +00:00
* feat: add script module mode with folder model for Bun and Python Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add missing modules field to RawCode in bun_executor Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * sqlx * feat: enrich WAC templates with checkpoint and replay semantics Add prominent comments explaining that all computation must happen inside task/step/taskScript or it will be replayed on resume/retry. Clarify that waitForApproval does not hold a worker and that approve/reject URLs are available in the timeline step details. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(cli): script module sync idempotency, per-module hash tracking, and preview support - Fix pull→push idempotency: use `??` instead of `||` for module lock field so empty strings are preserved (matches API's `lock: ""`) - Add per-module hash tracking in wmill-lock.yaml following the flow inline script pattern (SCRIPT_TOP_HASH + per-module subpath hashes) - Selective module lock regeneration: only regenerate locks for modules whose content actually changed, not all modules - Use unfiltered rawWorkspaceDependencies for module hashes to match what updateModuleLocks passes to fetchScriptLock - Show changed module names in stale script output for clarity - Add module support to `script preview` command: read modules from __mod/ folder and pass them in the preview API request - Add preview tests for taskScript pattern (flat and folder layout) - Update test assertion for module stale detection output Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): WAC UI improvements — reorder templates, module tab rename, import consolidation - Reorder WAC template buttons: TypeScript before Python in ScriptBuilder, CreateActionsScript, and CreateActionsFlow - Remove dropdown items from +Script button (simplify to direct link) - Move "Import Workflow-as-Code" to +Flow dropdown with dedicated drawer - Add module tab rename: pencil icon on hover opens popover with validation, fixed-width icon container prevents layout shift Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: remaining module-mode changes from working branch - Backend parser updates for WAC detection - CLI sync/types updates for raw app path and module support - Frontend UI polish (Dev.svelte, ScriptRow, script hash page) - Test fixture updates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test(cli): add test for module modification detection in generate-metadata Verifies that modifying a single module file re-triggers stale detection and only the changed module is listed, not all modules. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): critical fixes from PR review - Fix hardcoded dev path in bun_executor.rs WAC v2 wrapper — use "windmill-client" import instead of absolute filesystem path - Fix missed no_main_func → auto_kind rename in parser TS test - Add modules column to clone_script SQL (windmill-common and windmill-api-workspaces) so cloned scripts retain their modules - Add modules: None to RawCode structs in worker tests - Restore complete sqlx cache (merge main's cache + our new queries) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix clone warning treated as error in CI Change `.clone()` on double reference to `*k` dereference in scripts.rs hash implementation. Update sqlx cache with new query hashes from modified clone_script SQL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use published parser wasm versions for CI build The local file:// paths for windmill-parser-wasm-py and windmill-parser-wasm-ts don't exist in the Cloudflare Pages build environment. Revert to published npm versions (1.655.0). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): update parser wasm packages to 1.657.2 Use newly published windmill-parser-wasm-ts and windmill-parser-wasm-py v1.657.2 which include auto_kind/WAC detection changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): regenerate package-lock.json for npm ci compatibility Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use main's lockfile as base, update only parser wasm packages Regenerating package-lock.json from scratch pulled different dependency versions causing svelte-check type errors. Instead, start from main's lockfile and only update the two changed packages. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): add modules column to fetch_script_for_update query The Script<SR> struct has a modules field (FromRow), but fetch_script_for_update didn't SELECT modules, causing a runtime error "no column found for name: modules" when the worker processed dependency jobs. This was the root cause of the relock_skip test timeout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix script module execution for Python and Bun - Fix modules not passed through job queue: inject _MODULES into PushArgs.extra when pushing Code jobs so worker can extract them - Fix Python module imports: use relative imports (from .helper) and add sys.path.insert for module directory in wrapper - Fix Python tests: use relative imports and empty lock to prevent pip from resolving module names as packages - Add local file check in Bun loader for module resolution - Ignore Bun module test (bundle mode loader integration tracked separately) - Add missing modules column to fetch_script_for_update query Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): remove unnecessary empty lock in Python module tests Relative imports (from .helper) are not parsed as pip packages, so the empty lock workaround is not needed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix module execution for Python and Bun — all tests pass Python modules: - Use relative imports (from .helper import greet) since scripts run as packages - Add sys.path.insert for module directory in wrapper to ensure local modules take precedence over pip packages with same name Bun modules: - Use bundled output (./out/main.js) as wrapper import when modules are present — the bundled output has module content inlined by Bun.build, avoiding runtime loader resolution issues - Add local file check in loader.bun.js onResolve to short-circuit API URL resolution for module files on disk Job queue: - Inject _MODULES into PushArgs.extra when pushing Code jobs so the worker can extract them at execution time Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address PR review — simplify, fix correctness, remove dead code Critical fixes: - Replace all CLI `no_main_func` references with `auto_kind` (string) to match the backend migration and API changes - Remove duplicated `compute_python_module_dir` in worker.rs, use the canonical version from python_executor.rs High priority: - Auto-create `__init__.py` in intermediate directories for nested Python modules so imports like `from .utils.math import add` work without users manually creating __init__.py files - Remove redundant `sys_path_insert` — relative imports use Python's package system, not sys.path Medium: - Fix lock file base name extraction: use regex to strip only the final extension (`.replace(/\.[^.]+$/, '')`) instead of `indexOf(".")` which breaks for files like `helper.test.ts` Simplification: - Remove dead `{#if false}` Popover block in ScriptEditor.svelte - Guard loader.bun.js local file check to only run for relative paths (matching the Windows loader pattern) - Add clarifying comment on Bun dual mechanism (build + run phases) - Add maintenance comment on manual Hash impl for NewScript Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final review fixes — stale cleanup, baseName, auto_kind export - Fix sync.ts baseName extraction using indexOf(".") → regex (same fix as script.ts/metadata.ts, missed this instance) - Add stale module file cleanup in writeModulesToDisk: removes files from __mod/ that are no longer in the modules map before writing, fixing the pull→push cycle that couldn't delete modules - Log warning when _MODULES serialization fails in job push instead of silently dropping modules - Use strict equality (===) for auto_kind comparison - Exclude auto_kind from workspace export — it is auto-detected by the parser at deploy time from script content Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(cli): remove auto_kind from push, comparison, and metadata auto_kind is auto-detected by the parser at deploy time, so the CLI should not send it, compare it, or write it to script.yaml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove erroneously added backend/backend/.sqlx directory Duplicate .sqlx cache was committed at the wrong nested path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review feedback + fix CI dead_code warning Frontend (ScriptEditor.svelte): - Fix switchToMain() missing lastSyncedCode update — prevents stale code sync on external changes while editing a module tab - Fix formatAction saving module code to main script's localStorage draft — now saves main code when on a module tab - Fix non-null assertion on inferModuleLang in renameModule — fall back to original language instead of force unwrap - Remove redundant activeModuleTab truthy check in runTest CLI (script.ts): - Clean up empty directories after removing stale module files in writeModulesToDisk Backend: - Add path traversal guard in write_module_files — reject module paths containing ".." - Fix dead_code warning on auto_kind field in workspace export struct Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): improve auto_kind UX + address review findings - Rename "Include without main function" toggle to "Include library scripts" in script list (ItemsList.svelte) - Update NoMainFuncBadge: "No main" → "Library" with clearer tooltip - Filter module file extensions by main script language — Python scripts only allow .py modules, TypeScript only .ts, etc. - Split flushModuleState into flushModuleContent (no UI side-effect) and flushModuleState (flush + reset tab), reducing duplication - Dynamic placeholder and hint text in add module popover based on main script language Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
445 lines
16 KiB
Rust
445 lines
16 KiB
Rust
//! Utility functions for MCP server
|
|
//!
|
|
//! Contains database query functions and HTTP request helpers
|
|
//! used by the MCP server implementation.
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use axum::body::{to_bytes, Body};
|
|
use axum::response::Response;
|
|
use serde_json::Value;
|
|
use sql_builder::prelude::*;
|
|
use windmill_common::auth::create_jwt_token;
|
|
use windmill_common::db::{Authed, UserDB};
|
|
use windmill_common::scripts::{get_full_hub_script_by_path, Schema};
|
|
use windmill_common::utils::{query_elems_from_hub, StripPath};
|
|
use windmill_common::worker::to_raw_value;
|
|
use windmill_common::{DB, HUB_BASE_URL};
|
|
use windmill_mcp::server::{BackendResult, ErrorData};
|
|
use windmill_mcp::{HubResponse, HubScriptInfo, ItemSchema, ResourceInfo, ResourceType};
|
|
|
|
use crate::db::ApiAuthed;
|
|
use crate::HTTP_CLIENT;
|
|
|
|
// items max limit
|
|
const ITEMS_FETCH_MAX_LIMIT: usize = 100;
|
|
|
|
// ============================================================================
|
|
// Database utilities
|
|
// ============================================================================
|
|
|
|
/// Get the schema for a specific item (script or flow)
|
|
pub async fn get_item_schema(
|
|
path: &str,
|
|
user_db: &UserDB,
|
|
authed: &ApiAuthed,
|
|
workspace_id: &str,
|
|
item_type: &str,
|
|
) -> Result<Option<Schema>, ErrorData> {
|
|
let mut sqlb = SqlBuilder::select_from(&format!("{} as o", item_type));
|
|
sqlb.fields(&["o.schema"]);
|
|
sqlb.and_where("o.path = ?".bind(&path));
|
|
sqlb.and_where("o.workspace_id = ?".bind(&workspace_id));
|
|
sqlb.and_where("o.archived = false");
|
|
sqlb.and_where("o.draft_only IS NOT TRUE");
|
|
let sql = sqlb.sql().map_err(|e| {
|
|
tracing::error!("failed to build sql: {}", e);
|
|
ErrorData::internal_error(format!("failed to build sql: {}", e), None)
|
|
})?;
|
|
let mut tx = user_db.clone().begin(authed).await.map_err(|e| {
|
|
tracing::error!("failed to begin transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to begin transaction: {}", e), None)
|
|
})?;
|
|
let item = sqlx::query_as::<_, ItemSchema>(&sql)
|
|
.fetch_one(&mut *tx)
|
|
.await
|
|
.map_err(|e| {
|
|
tracing::error!("failed to fetch item schema: {}", e);
|
|
ErrorData::internal_error(format!("failed to fetch item schema: {}", e), None)
|
|
})?;
|
|
tx.commit().await.map_err(|e| {
|
|
tracing::error!("failed to commit transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to commit transaction: {}", e), None)
|
|
})?;
|
|
Ok(item.schema)
|
|
}
|
|
|
|
/// Get all resource types from the database
|
|
pub async fn get_resources_types(
|
|
user_db: &UserDB,
|
|
authed: &ApiAuthed,
|
|
workspace_id: &str,
|
|
) -> Result<Vec<ResourceType>, ErrorData> {
|
|
let mut sqlb = SqlBuilder::select_from("resource_type as o");
|
|
sqlb.fields(&["o.name", "o.description"]);
|
|
sqlb.and_where("o.workspace_id = ?".bind(&workspace_id));
|
|
let sql = sqlb.sql().map_err(|e| {
|
|
tracing::error!("failed to build sql: {}", e);
|
|
ErrorData::internal_error(format!("failed to build sql: {}", e), None)
|
|
})?;
|
|
let mut tx = user_db.clone().begin(authed).await.map_err(|e| {
|
|
tracing::error!("failed to begin transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to begin transaction: {}", e), None)
|
|
})?;
|
|
let rows = sqlx::query_as::<_, ResourceType>(&sql)
|
|
.fetch_all(&mut *tx)
|
|
.await
|
|
.map_err(|e| {
|
|
tracing::error!("failed to fetch resource types: {}", e);
|
|
ErrorData::internal_error(format!("failed to fetch resource types: {}", e), None)
|
|
})?;
|
|
tx.commit().await.map_err(|e| {
|
|
tracing::error!("failed to commit transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to commit transaction: {}", e), None)
|
|
})?;
|
|
Ok(rows)
|
|
}
|
|
|
|
/// Get resources by type from the database
|
|
pub async fn get_resources(
|
|
user_db: &UserDB,
|
|
authed: &ApiAuthed,
|
|
workspace_id: &str,
|
|
resource_type: &str,
|
|
) -> Result<Vec<ResourceInfo>, ErrorData> {
|
|
let mut sqlb = SqlBuilder::select_from("resource as o");
|
|
sqlb.fields(&["o.path", "o.description", "o.resource_type"]);
|
|
sqlb.and_where("o.workspace_id = ?".bind(&workspace_id));
|
|
sqlb.and_where("o.resource_type = ?".bind(&resource_type));
|
|
let sql = sqlb.sql().map_err(|e| {
|
|
tracing::error!("failed to build sql: {}", e);
|
|
ErrorData::internal_error(format!("failed to build sql: {}", e), None)
|
|
})?;
|
|
let mut tx = user_db.clone().begin(authed).await.map_err(|e| {
|
|
tracing::error!("failed to begin transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to begin transaction: {}", e), None)
|
|
})?;
|
|
let rows = sqlx::query_as::<_, ResourceInfo>(&sql)
|
|
.fetch_all(&mut *tx)
|
|
.await
|
|
.map_err(|e| {
|
|
tracing::error!("failed to fetch resources: {}", e);
|
|
ErrorData::internal_error(format!("failed to fetch resources: {}", e), None)
|
|
})?;
|
|
tx.commit().await.map_err(|e| {
|
|
tracing::error!("failed to commit transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to commit transaction: {}", e), None)
|
|
})?;
|
|
|
|
Ok(rows)
|
|
}
|
|
|
|
/// Generic function to get items (scripts or flows) from the database
|
|
pub async fn get_items<T: for<'a> sqlx::FromRow<'a, sqlx::postgres::PgRow> + Send + Unpin>(
|
|
user_db: &UserDB,
|
|
authed: &ApiAuthed,
|
|
workspace_id: &str,
|
|
scope_type: &str,
|
|
item_type: &str,
|
|
path_prefix: Option<&str>,
|
|
) -> Result<Vec<T>, ErrorData> {
|
|
let mut sqlb = SqlBuilder::select_from(&format!("{} as o", item_type));
|
|
let fields = vec!["o.path", "o.summary", "o.description", "o.schema"];
|
|
sqlb.fields(&fields);
|
|
if scope_type == "favorites" {
|
|
sqlb.join("favorite")
|
|
.on("favorite.favorite_kind = ? AND favorite.workspace_id = o.workspace_id AND favorite.path = o.path AND favorite.usr = ?".bind(&item_type)
|
|
.bind(&authed.username));
|
|
}
|
|
sqlb.and_where("o.workspace_id = ?".bind(&workspace_id))
|
|
.and_where("o.archived = false")
|
|
.and_where("o.draft_only IS NOT TRUE");
|
|
|
|
if item_type == "script" {
|
|
sqlb.and_where("o.auto_kind IS NULL");
|
|
}
|
|
|
|
if let Some(prefix) = path_prefix {
|
|
let escaped = prefix
|
|
.replace('\\', "\\\\")
|
|
.replace('%', "\\%")
|
|
.replace('_', "\\_");
|
|
sqlb.and_where("o.path LIKE ? ESCAPE '\\'".bind(&format!("{}%", escaped)));
|
|
}
|
|
|
|
sqlb.order_by(
|
|
if item_type == "flow" {
|
|
"o.edited_at"
|
|
} else {
|
|
"o.created_at"
|
|
},
|
|
false,
|
|
)
|
|
.limit(ITEMS_FETCH_MAX_LIMIT);
|
|
let sql = sqlb.sql().map_err(|e| {
|
|
tracing::error!("failed to build sql: {}", e);
|
|
ErrorData::internal_error(format!("failed to build sql: {}", e), None)
|
|
})?;
|
|
let mut tx = user_db.clone().begin(authed).await.map_err(|e| {
|
|
tracing::error!("failed to begin transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to begin transaction: {}", e), None)
|
|
})?;
|
|
let rows = sqlx::query_as::<_, T>(&sql)
|
|
.fetch_all(&mut *tx)
|
|
.await
|
|
.map_err(|e| {
|
|
tracing::error!("failed to fetch {}: {}", item_type, e);
|
|
ErrorData::internal_error(format!("failed to fetch {}: {}", item_type, e), None)
|
|
})?;
|
|
tx.commit().await.map_err(|e| {
|
|
tracing::error!("failed to commit transaction: {}", e);
|
|
ErrorData::internal_error(format!("failed to commit transaction: {}", e), None)
|
|
})?;
|
|
Ok(rows)
|
|
}
|
|
|
|
/// Get scripts from the Hub
|
|
pub async fn get_scripts_from_hub(
|
|
db: &DB,
|
|
scope_integrations: Option<&str>,
|
|
) -> Result<Vec<HubScriptInfo>, ErrorData> {
|
|
let query_params = Some(vec![
|
|
("limit", ITEMS_FETCH_MAX_LIMIT.to_string()),
|
|
("with_schema", "true".to_string()),
|
|
("apps", scope_integrations.unwrap_or("").to_string()),
|
|
]);
|
|
let url = format!("{}/scripts/top", *HUB_BASE_URL.read().await);
|
|
let (_status_code, _headers, response) =
|
|
query_elems_from_hub(&HTTP_CLIENT, &url, query_params, &db)
|
|
.await
|
|
.map_err(|e| {
|
|
tracing::error!("Failed to get items from hub: {}", e);
|
|
ErrorData::internal_error(format!("Failed to get items from hub: {}", e), None)
|
|
})?;
|
|
|
|
use axum::body::to_bytes;
|
|
let body_bytes = to_bytes(response, usize::MAX).await.map_err(|e| {
|
|
tracing::error!("Failed to read response body: {}", e);
|
|
ErrorData::internal_error(format!("Failed to read response body: {}", e), None)
|
|
})?;
|
|
let body_str = String::from_utf8(body_bytes.to_vec()).map_err(|e| {
|
|
tracing::error!("Failed to decode response body: {}", e);
|
|
ErrorData::internal_error(format!("Failed to decode response body: {}", e), None)
|
|
})?;
|
|
let hub_response: HubResponse = serde_json::from_str(&body_str).map_err(|e| {
|
|
tracing::error!("Failed to parse hub response: {}", e);
|
|
ErrorData::internal_error(format!("Failed to parse hub response: {}", e), None)
|
|
})?;
|
|
|
|
Ok(hub_response.asks)
|
|
}
|
|
|
|
/// Get the schema for a Hub script
|
|
pub async fn get_hub_script_schema(path: &str, db: &DB) -> Result<Option<Schema>, ErrorData> {
|
|
let strip_path = StripPath(path.to_string());
|
|
let res = get_full_hub_script_by_path(strip_path, &HTTP_CLIENT, Some(db))
|
|
.await
|
|
.map_err(|e| {
|
|
tracing::error!("Failed to get hub script: {}", e);
|
|
ErrorData::internal_error(format!("Failed to get hub script: {}", e), None)
|
|
})?;
|
|
match serde_json::from_str::<Schema>(res.schema.get()) {
|
|
Ok(schema) => Ok(Some(schema)),
|
|
Err(e) => {
|
|
tracing::warn!("Failed to convert schema: {}", e);
|
|
Ok(None)
|
|
}
|
|
}
|
|
}
|
|
|
|
// ============================================================================
|
|
// HTTP request utilities for endpoint tools
|
|
// ============================================================================
|
|
|
|
/// Look up the original field name from a field_renames map.
|
|
/// field_renames maps renamed_key -> original_key (e.g. {"path__path": "path"}).
|
|
fn get_original_name(renamed_key: &str, field_renames: &Option<Value>) -> String {
|
|
field_renames
|
|
.as_ref()
|
|
.and_then(|v| v.as_object())
|
|
.and_then(|m| m.get(renamed_key))
|
|
.and_then(|v| v.as_str())
|
|
.map(|s| s.to_string())
|
|
.unwrap_or_else(|| renamed_key.to_string())
|
|
}
|
|
|
|
/// Substitute path parameters in the URL template
|
|
pub fn substitute_path_params(
|
|
path: &str,
|
|
workspace_id: &str,
|
|
args_map: &serde_json::Map<String, Value>,
|
|
path_schema: &Option<Value>,
|
|
path_field_renames: &Option<Value>,
|
|
) -> BackendResult<String> {
|
|
let mut path_template = path.replace("{workspace}", workspace_id);
|
|
|
|
if let Some(schema) = path_schema {
|
|
if let Some(props) = schema.get("properties").and_then(|p| p.as_object()) {
|
|
for (param_name, _) in props {
|
|
// param_name may be renamed (e.g. "path__path"), get original for URL placeholder
|
|
let original_name = get_original_name(param_name, path_field_renames);
|
|
let placeholder = format!("{{{}}}", original_name);
|
|
match args_map.get(param_name) {
|
|
Some(param_value) => {
|
|
if let Some(str_val) = param_value.as_str() {
|
|
path_template = path_template.replace(&placeholder, str_val);
|
|
}
|
|
}
|
|
None => {
|
|
tracing::warn!("Missing required path parameter: {}", param_name);
|
|
return Err(ErrorData::invalid_params(
|
|
format!("Missing required path parameter: {}", param_name),
|
|
None,
|
|
));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(path_template)
|
|
}
|
|
|
|
/// Build query string from arguments
|
|
pub fn build_query_string(
|
|
args_map: &serde_json::Map<String, Value>,
|
|
query_schema: &Option<Value>,
|
|
query_field_renames: &Option<Value>,
|
|
) -> String {
|
|
let Some(schema) = query_schema else {
|
|
return String::new();
|
|
};
|
|
let Some(props) = schema.get("properties").and_then(|p| p.as_object()) else {
|
|
return String::new();
|
|
};
|
|
|
|
let query_params: Vec<String> = props
|
|
.keys()
|
|
.filter_map(|param_name| {
|
|
args_map
|
|
.get(param_name)
|
|
.filter(|v| !v.is_null())
|
|
.map(|value| {
|
|
// Use the original name for the query parameter key
|
|
let original_name = get_original_name(param_name, query_field_renames);
|
|
let value_str = value.to_string();
|
|
let str_val = value_str.trim_matches('"');
|
|
format!(
|
|
"{}={}",
|
|
urlencoding::encode(&original_name),
|
|
urlencoding::encode(str_val)
|
|
)
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
if query_params.is_empty() {
|
|
String::new()
|
|
} else {
|
|
format!("?{}", query_params.join("&"))
|
|
}
|
|
}
|
|
|
|
/// Build request body from arguments
|
|
pub fn build_request_body(
|
|
method: &str,
|
|
args_map: &serde_json::Map<String, Value>,
|
|
body_schema: &Option<Value>,
|
|
body_field_renames: &Option<Value>,
|
|
) -> Option<Value> {
|
|
if method == "GET" {
|
|
return None;
|
|
}
|
|
|
|
let schema = body_schema.as_ref()?;
|
|
let props = schema.get("properties")?.as_object()?;
|
|
|
|
let body_map: serde_json::Map<String, Value> = props
|
|
.keys()
|
|
.filter_map(|param_name| {
|
|
args_map.get(param_name).map(|value| {
|
|
// Use the original name as the key in the request body
|
|
let original_name = get_original_name(param_name, body_field_renames);
|
|
(original_name, value.clone())
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
if body_map.is_empty() {
|
|
None
|
|
} else {
|
|
Some(Value::Object(body_map))
|
|
}
|
|
}
|
|
|
|
/// Create HTTP request with authentication
|
|
pub async fn create_http_request(
|
|
method: &str,
|
|
url: &str,
|
|
workspace_id: &str,
|
|
api_authed: &ApiAuthed,
|
|
body_json: Option<Value>,
|
|
) -> BackendResult<reqwest::Response> {
|
|
let client = &HTTP_CLIENT;
|
|
let mut request_builder = match method {
|
|
"GET" => client.get(url),
|
|
"POST" => client.post(url),
|
|
"PUT" => client.put(url),
|
|
"DELETE" => client.delete(url),
|
|
"PATCH" => client.patch(url),
|
|
_ => {
|
|
return Err(ErrorData::invalid_params(
|
|
format!("Unsupported HTTP method: {}", method),
|
|
None,
|
|
));
|
|
}
|
|
};
|
|
|
|
// Add authorization header
|
|
let authed = Authed::from(api_authed.clone());
|
|
let token = create_jwt_token(authed, workspace_id, 3600, None, None, None, None)
|
|
.await
|
|
.map_err(|e| ErrorData::internal_error(e.to_string(), None))?;
|
|
request_builder = request_builder.header("Authorization", format!("Bearer {}", token));
|
|
|
|
// Add body if present
|
|
if let Some(body) = body_json {
|
|
request_builder = request_builder
|
|
.header("Content-Type", "application/json")
|
|
.json(&body);
|
|
}
|
|
|
|
request_builder
|
|
.send()
|
|
.await
|
|
.map_err(|e| ErrorData::internal_error(format!("Failed to execute request: {}", e), None))
|
|
}
|
|
|
|
/// Convert a JSON Value into PushArgsOwned for job execution
|
|
pub fn prepare_push_args(args: Value) -> windmill_queue::PushArgsOwned {
|
|
if let Value::Object(map) = args {
|
|
let mut args_hash = HashMap::new();
|
|
for (k, v) in map {
|
|
args_hash.insert(k, to_raw_value(&v));
|
|
}
|
|
windmill_queue::PushArgsOwned { extra: None, args: args_hash }
|
|
} else {
|
|
windmill_queue::PushArgsOwned::default()
|
|
}
|
|
}
|
|
|
|
/// Parse an HTTP response body into a JSON Value
|
|
pub async fn parse_response_body(response: Response<Body>) -> BackendResult<Value> {
|
|
let body_bytes = to_bytes(response.into_body(), usize::MAX)
|
|
.await
|
|
.map_err(|e| {
|
|
ErrorData::internal_error(format!("Failed to read response body: {}", e), None)
|
|
})?;
|
|
|
|
let body_str = String::from_utf8(body_bytes.to_vec()).map_err(|e| {
|
|
ErrorData::internal_error(format!("Failed to decode response body: {}", e), None)
|
|
})?;
|
|
|
|
Ok(serde_json::from_str(&body_str).unwrap_or_else(|_| Value::String(body_str)))
|
|
}
|