mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-20 08:01:35 +00:00
a46aa641f9
* feat: add R language support Add R as a new supported scripting language in Windmill, following the same pattern used for Ruby. Includes: - Backend: ScriptLang::Rlang enum variant, DB migration, tree-sitter-r parser crate with tests, WASM parser binding, R executor with NSJail sandboxing, job dispatch and signature parsing - Frontend: language picker, R icon, syntax highlighting, editor bar insertions (Sys.getenv, get_variable, get_resource), schema inference, init code template, BETA badge - CLI: .r extension mapping, sync support, bootstrap template R scripts use `main <- function(...)` syntax, jsonlite for JSON serialization, and system curl for the Windmill client helper. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: add R package resolution and installation Parse library()/require() calls from R scripts to extract dependencies. Resolve versions from CRAN, cache lockfiles in pip_resolution_cache, and install packages to a shared R library cache. The run step sets R_LIBS_USER so installed packages are available to the script. - Parser: parse_r_requirements() extracts package names from AST - Executor: resolve() generates lockfile, install() installs from CRAN - Worker lockfiles: wire up R resolve for dependency jobs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: add nsjail sandboxing for R resolve and install phases Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: fix R get_variable/get_resource and add sandbox annotation + e2e tests Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: fix R arg inference with JS fallback parser and get_variable/get_resource Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix flake * nsjail * nits * fix: R install improvements - suppress verbose output, flat lockfile logging, Dockerfile R support, rlimits - Suppress renv verbose output during resolve and install (controlled by #verbose annotation) - Filter renv from install list (already loaded, causes noisy restart message) - Log compact "resolved N packages" instead of full renv.lock JSON - Add R (r-base, r-cran-renv) to DockerfileFull and DockerfileFullEe - Use disable_rl for nsjail install config (R compiles from source) - Reduce default concurrency from 20 to 5 - Add rlang to openflow.openapi.yaml - Fix MainArgSignature (no_main_func -> auto_kind) after main merge Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * final * fix: remove accidental R install from multiplayer Dockerfile Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: remove R from Windows build and DockerfileExtra Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: rename R migration to avoid timestamp collision with trigger_filter_logic Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * all * fix: R install improvements - suppress verbose output, flat lockfile logging, Dockerfile R support, rlimits Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: add clear error when Rscript binary is missing Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: fix type errors in R fallback parser, use format! in wrap(), add R system prompts Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: pyranota <pyra@duck.com>
244 lines
6.0 KiB
TypeScript
244 lines
6.0 KiB
TypeScript
import { get } from 'svelte/store'
|
|
import { base } from '$lib/base'
|
|
import type { Schema, SupportedLanguage } from './common'
|
|
import { FlowService, type Script, ScriptService, ScheduleService } from './gen'
|
|
import { hubBaseUrlStore, workspaceStore } from './stores'
|
|
import { getHubFlowIdFromPath } from './utils'
|
|
|
|
export function scriptLangToEditorLang(
|
|
lang:
|
|
| Script['language']
|
|
| 'bunnative'
|
|
| 'javascript'
|
|
| 'frontend'
|
|
| 'jsx'
|
|
| 'tsx'
|
|
| 'text'
|
|
| 'json'
|
|
| undefined
|
|
) {
|
|
if (lang == 'deno') {
|
|
return 'typescript'
|
|
} else if (lang == 'bun' || lang == 'bunnative' || lang == 'frontend' || lang == 'tsx') {
|
|
return 'typescript'
|
|
} else if (lang == 'nativets') {
|
|
return 'typescript'
|
|
} else if (lang == 'text') {
|
|
return 'text'
|
|
} else if (lang == 'javascript' || lang == 'jsx') {
|
|
return 'javascript'
|
|
} else if (lang == 'postgresql') {
|
|
return 'sql'
|
|
} else if (lang == 'mysql') {
|
|
return 'sql'
|
|
} else if (lang == 'bigquery') {
|
|
return 'sql'
|
|
} else if (lang == 'oracledb') {
|
|
return 'sql'
|
|
} else if (lang == 'snowflake') {
|
|
return 'sql'
|
|
} else if (lang == 'mssql') {
|
|
return 'sql'
|
|
} else if (lang == 'duckdb') {
|
|
return 'sql'
|
|
} else if (lang == 'python3') {
|
|
return 'python'
|
|
} else if (lang == 'bash') {
|
|
return 'shell'
|
|
} else if (lang == 'powershell') {
|
|
return 'powershell'
|
|
} else if (lang == 'php') {
|
|
return 'php'
|
|
} else if (lang == 'rust') {
|
|
return 'rust'
|
|
} else if (lang == 'graphql') {
|
|
return 'graphql'
|
|
} else if (lang == 'ansible') {
|
|
return 'yaml'
|
|
} else if (lang == 'csharp') {
|
|
return 'csharp'
|
|
} else if (lang == 'nu') {
|
|
return 'nu'
|
|
} else if (lang == 'java') {
|
|
return 'java'
|
|
} else if (lang == 'rlang') {
|
|
return 'r'
|
|
// for related places search: ADD_NEW_LANG
|
|
} else if (lang == undefined) {
|
|
return 'typescript'
|
|
} else {
|
|
return lang
|
|
}
|
|
}
|
|
|
|
export function extToScriptLang(lang: string): 'bun' | 'python3' | undefined {
|
|
switch (lang) {
|
|
case 'ts':
|
|
return 'bun'
|
|
case 'py':
|
|
return 'python3'
|
|
}
|
|
return undefined
|
|
}
|
|
export type ScriptSchedule = {
|
|
summary: string | undefined
|
|
args: Record<string, any>
|
|
cron: string
|
|
timezone: string
|
|
enabled: boolean
|
|
}
|
|
|
|
// Load the schedule of a flow given its path and the workspace
|
|
export async function loadScriptSchedule(
|
|
path: string,
|
|
workspace: string
|
|
): Promise<ScriptSchedule | undefined> {
|
|
const existsSchedule = await ScheduleService.existsSchedule({
|
|
workspace,
|
|
path
|
|
})
|
|
|
|
if (!existsSchedule) {
|
|
return undefined
|
|
}
|
|
|
|
const schedule = await ScheduleService.getSchedule({
|
|
workspace,
|
|
path
|
|
})
|
|
|
|
return {
|
|
summary: schedule.summary ?? undefined,
|
|
enabled: schedule.enabled,
|
|
cron: schedule.schedule,
|
|
timezone: schedule.timezone,
|
|
args: schedule.args ?? {}
|
|
}
|
|
}
|
|
|
|
export async function loadSchemaFlow(path: string): Promise<Schema> {
|
|
const flow = await FlowService.getFlowByPath({
|
|
workspace: get(workspaceStore)!,
|
|
path: path ?? ''
|
|
})
|
|
return flow.schema as any
|
|
}
|
|
|
|
export function scriptPathToHref(path: string, hubBaseUrl: string): string {
|
|
if (path.startsWith('hub/')) {
|
|
return hubBaseUrl + '/from_version/' + path.substring(4)
|
|
} else {
|
|
return `${base}/scripts/get/${path}?workspace=${get(workspaceStore)}`
|
|
}
|
|
}
|
|
|
|
export function flowPathToHref(path: string, hubBaseUrl: string = get(hubBaseUrlStore)): string {
|
|
if (path.startsWith('hub/flows/')) {
|
|
const hubFlowId = getHubFlowIdFromPath(path)
|
|
return hubFlowId ? `${hubBaseUrl}/flows/${hubFlowId}` : hubBaseUrl
|
|
}
|
|
|
|
return `${base}/flows/get/${path}?workspace=${get(workspaceStore)}`
|
|
}
|
|
|
|
const scriptLanguagesArray: [SupportedLanguage | 'docker' | 'bunnative', string][] = [
|
|
['bun', 'TypeScript (Bun)'],
|
|
['python3', 'Python'],
|
|
['deno', 'TypeScript (Deno)'],
|
|
['bash', 'Bash'],
|
|
['go', 'Go'],
|
|
['nativets', 'REST'],
|
|
['bunnative', 'REST'],
|
|
['postgresql', 'PostgreSQL'],
|
|
['mysql', 'MySQL'],
|
|
['bigquery', 'BigQuery'],
|
|
['oracledb', 'Oracle Database'],
|
|
['snowflake', 'Snowflake'],
|
|
['mssql', 'MS SQL Server'],
|
|
['graphql', 'GraphQL'],
|
|
['powershell', 'PowerShell'],
|
|
['php', 'PHP'],
|
|
['rust', 'Rust'],
|
|
['ansible', 'Ansible'],
|
|
['csharp', 'C#'],
|
|
['docker', 'Docker'],
|
|
['nu', 'Nu'],
|
|
['java', 'Java'],
|
|
['duckdb', 'DuckDB'],
|
|
['ruby', 'Ruby'],
|
|
['rlang', 'R']
|
|
// for related places search: ADD_NEW_LANG
|
|
]
|
|
export function processLangs(selected: string | undefined, langs: string[]): string[] {
|
|
if (selected === 'nativets') {
|
|
return langs
|
|
} else {
|
|
let ls = langs.filter((lang) => lang !== 'nativets')
|
|
|
|
//those languages are newer and may not be in the saved list
|
|
let nl = ['bunnative', 'rust', 'ansible', 'csharp', 'nu', 'java', 'duckdb', 'ruby', 'rlang']
|
|
// for related places search: ADD_NEW_LANG
|
|
nl.forEach((lang) => {
|
|
if (!ls.includes(lang)) {
|
|
ls.push(lang)
|
|
}
|
|
})
|
|
return ls
|
|
}
|
|
}
|
|
|
|
export const defaultScriptLanguages = Object.fromEntries(scriptLanguagesArray)
|
|
|
|
export async function getScriptByPath(path: string): Promise<{
|
|
content: string
|
|
language: SupportedLanguage
|
|
schema: any
|
|
description: string
|
|
tag: string | undefined
|
|
concurrent_limit: number | undefined
|
|
concurrency_time_window_s: number | undefined
|
|
lock?: string
|
|
created_at?: string
|
|
hash?: string
|
|
}> {
|
|
if (path.startsWith('hub/')) {
|
|
const { content, language, schema, lockfile } = await ScriptService.getHubScriptByPath({ path })
|
|
|
|
return {
|
|
content,
|
|
language: language as SupportedLanguage,
|
|
schema,
|
|
description: '',
|
|
tag: undefined,
|
|
concurrent_limit: undefined,
|
|
concurrency_time_window_s: undefined,
|
|
lock: lockfile
|
|
}
|
|
} else {
|
|
const script = await ScriptService.getScriptByPath({
|
|
workspace: get(workspaceStore)!,
|
|
path: path ?? ''
|
|
})
|
|
return {
|
|
content: script.content,
|
|
language: script.language,
|
|
schema: script.schema,
|
|
description: script.description,
|
|
tag: script.tag,
|
|
concurrent_limit: script.concurrent_limit,
|
|
concurrency_time_window_s: script.concurrency_time_window_s,
|
|
lock: script.lock,
|
|
hash: script.hash,
|
|
created_at: script.created_at
|
|
}
|
|
}
|
|
}
|
|
|
|
export async function getLatestHashForScript(path: string): Promise<string> {
|
|
const script = await ScriptService.getScriptByPath({
|
|
workspace: get(workspaceStore)!,
|
|
path: path ?? ''
|
|
})
|
|
return script.hash
|
|
}
|