mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-25 08:00:59 +00:00
fix premium info computation
This commit is contained in:
Ruben Fiszel
@@ -252,7 +252,7 @@ async fn premium_info(
|
||||
require_admin(authed.is_admin, &authed.username)?;
|
||||
let mut tx = db.begin().await?;
|
||||
let row = sqlx::query_as::<_, PremiumWorkspaceInfo>(
|
||||
"SELECT premium, usage.usage FROM workspace LEFT JOIN usage ON workspace.id = $1 AND usage.is_workspace IS true WHERE workspace.id = $1",
|
||||
"SELECT premium, usage.usage FROM workspace LEFT JOIN usage ON usage.id = $1 AND usage.is_workspace IS true WHERE workspace.id = $1",
|
||||
)
|
||||
.bind(w_id)
|
||||
.fetch_one(&mut *tx)
|
||||
|
||||
@@ -295,7 +295,7 @@ pub async fn handle_child(
|
||||
.expect("update worker ping");
|
||||
}
|
||||
let mem_peak = get_mem_peak(pid, nsjail).await;
|
||||
tracing::info!("{job_id} still running. mem peak: {}kB", mem_peak);
|
||||
tracing::info!("{job_id} in {} still running. mem peak: {}kB", _w_id, mem_peak);
|
||||
let mem_peak = if mem_peak > 0 { Some(mem_peak) } else { None };
|
||||
if sqlx::query_scalar!("UPDATE queue SET mem_peak = GREATEST($1, mem_peak), last_ping = now() WHERE id = $2 RETURNING canceled", mem_peak, job_id)
|
||||
.fetch_optional(&db)
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
import Tooltip from '$lib/components/Tooltip.svelte'
|
||||
import WorkspaceUserSettings from '$lib/components/settings/WorkspaceUserSettings.svelte'
|
||||
import { WORKSPACE_SHOW_SLACK_CMD, WORKSPACE_SHOW_WEBHOOK_CLI_SYNC } from '$lib/consts'
|
||||
import type { User } from '$lib/gen'
|
||||
import { OauthService, Script, WorkspaceService } from '$lib/gen'
|
||||
import {
|
||||
enterpriseLicense,
|
||||
@@ -24,19 +23,17 @@
|
||||
workspaceStore
|
||||
} from '$lib/stores'
|
||||
import { sendUserToast } from '$lib/toast'
|
||||
import { capitalize, setQueryWithoutLoad } from '$lib/utils'
|
||||
import { setQueryWithoutLoad } from '$lib/utils'
|
||||
import { faSlack } from '@fortawesome/free-brands-svg-icons'
|
||||
import { faBarsStaggered, faExternalLink, faScroll } from '@fortawesome/free-solid-svg-icons'
|
||||
import { faBarsStaggered, faScroll } from '@fortawesome/free-solid-svg-icons'
|
||||
import { Slack } from 'lucide-svelte'
|
||||
import DataTable from '$lib/components/table/DataTable.svelte'
|
||||
import Cell from '$lib/components/table/Cell.svelte'
|
||||
|
||||
let users: User[] | undefined = undefined
|
||||
import PremiumInfo from '$lib/components/settings/PremiumInfo.svelte'
|
||||
|
||||
let initialPath: string
|
||||
let scriptPath: string
|
||||
let team_name: string | undefined
|
||||
let itemKind: 'flow' | 'script' = 'flow'
|
||||
let premium_info: { premium: boolean; usage?: number } | undefined = undefined
|
||||
let plan: string | undefined = undefined
|
||||
let customer_id: string | undefined = undefined
|
||||
let webhook: string | undefined = undefined
|
||||
@@ -152,16 +149,9 @@
|
||||
errorHandlerInitialPath = errorHandlerScriptPath
|
||||
}
|
||||
|
||||
async function loadPremiumInfo() {
|
||||
if (isCloudHosted()) {
|
||||
premium_info = await WorkspaceService.getPremiumInfo({ workspace: $workspaceStore! })
|
||||
}
|
||||
}
|
||||
|
||||
$: {
|
||||
if ($workspaceStore) {
|
||||
loadSettings()
|
||||
loadPremiumInfo()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,27 +171,6 @@
|
||||
sendUserToast(`workspace error handler removed`)
|
||||
}
|
||||
}
|
||||
|
||||
const plans = {
|
||||
Free: [
|
||||
'Users use their individual global free-tier quotas when doing executions in this workspace',
|
||||
'<b>1 000</b> free global executions per-user per month'
|
||||
],
|
||||
Team: [
|
||||
`<b>$10/mo</b> per seat`,
|
||||
`Every seat includes <b>10 000</b> executions`,
|
||||
`Every seat includes either 1 user OR 2 operators`
|
||||
],
|
||||
Enterprise: [
|
||||
`<b>Dedicated</b> and isolated database and workers available (EU/US/Asia)`,
|
||||
`<b>Dedicated</b> entire cluster available for (EU/US/Asia)`,
|
||||
`<b>SAML</b> support with group syncing`,
|
||||
`<b>SLA</b>`,
|
||||
`<b>Priority Support 24/7 with 3h response time and automation engineer assistance</b>`,
|
||||
`<b>Design partners for Roadmap</b>`,
|
||||
`<div class="mt-4">Self-hosted licenses also available</div>`
|
||||
]
|
||||
}
|
||||
</script>
|
||||
|
||||
<CenteredPage>
|
||||
@@ -267,199 +236,7 @@
|
||||
>
|
||||
{/if}
|
||||
{:else if tab == 'premium'}
|
||||
{#if isCloudHosted()}
|
||||
<div class="my-8" />
|
||||
<div class="flex flex-col gap-1">
|
||||
<div class=" text-primary text-md font-semibold"> Plans </div>
|
||||
</div>
|
||||
{#if customer_id}
|
||||
<div class="mt-2 mb-2">
|
||||
<Button
|
||||
endIcon={{ icon: faExternalLink }}
|
||||
href="/api/w/{$workspaceStore}/workspaces/billing_portal">Customer Portal</Button
|
||||
>
|
||||
<p class="text-xs text-tertiary mt-1">
|
||||
See invoices, change billing information or subscription details
|
||||
</p>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="text-xs my-4">
|
||||
{#if premium_info?.premium}
|
||||
<div class="flex flex-col gap-0.5">
|
||||
{#if plan}
|
||||
<div class="text-base inline font-bold leading-8 mb-2">
|
||||
Current plan: {capitalize(plan ?? 'free')} plan
|
||||
</div>
|
||||
{:else}
|
||||
<div class="inline text-lg font-bold">Current plan: Free plan</div>
|
||||
{/if}
|
||||
|
||||
{#if plan}
|
||||
{@const team_factor = plan == 'team' ? 10 : 40}
|
||||
{@const user_nb = users?.filter((x) => !x.operator)?.length ?? 0}
|
||||
{@const operator_nb = users?.filter((x) => x.operator)?.length ?? 0}
|
||||
{@const seats_from_users = Math.ceil(user_nb + operator_nb / 2)}
|
||||
{@const seats_from_comps = Math.ceil((premium_info?.usage ?? 0) / 10000)}
|
||||
|
||||
<div class="w-full">
|
||||
<DataTable>
|
||||
<tbody class="divide-y">
|
||||
<tr>
|
||||
<Cell first>
|
||||
Authors
|
||||
<Tooltip light>
|
||||
Actual pricing is calculated on the MAXIMUM number of users in a given
|
||||
billing period, see the customer portal for more info.
|
||||
</Tooltip>
|
||||
</Cell>
|
||||
<Cell last numeric>
|
||||
<div class="text-base font-bold">
|
||||
{user_nb}
|
||||
</div>
|
||||
</Cell>
|
||||
</tr>
|
||||
<tr>
|
||||
<Cell first>
|
||||
Operators
|
||||
<Tooltip light>
|
||||
Actual pricing is calculated on the MAXIMUM number of operators in a
|
||||
given billing period, see the customer portal for more info.
|
||||
</Tooltip>
|
||||
</Cell>
|
||||
<Cell last numeric>
|
||||
<div class="text-base font-bold">
|
||||
{operator_nb}
|
||||
</div>
|
||||
</Cell>
|
||||
</tr>
|
||||
<tr>
|
||||
<Cell first>Seats from authors + operators</Cell>
|
||||
<Cell last numeric>
|
||||
<div class="text-base font-bold">
|
||||
ceil({user_nb} + {operator_nb}/2) = {seats_from_users}
|
||||
</div>
|
||||
</Cell>
|
||||
</tr>
|
||||
<tr>
|
||||
<Cell first>Computations executed this month</Cell>
|
||||
<Cell last numeric>
|
||||
<div class="text-base font-bold">
|
||||
{premium_info?.usage ?? 0}
|
||||
</div>
|
||||
</Cell>
|
||||
</tr>
|
||||
<tr>
|
||||
<Cell first>Seats from computations</Cell>
|
||||
<Cell last numeric>
|
||||
<div class="text-base font-bold">
|
||||
ceil({premium_info?.usage ?? 0} / 10 000) = {seats_from_comps}
|
||||
</div>
|
||||
</Cell>
|
||||
</tr>
|
||||
<tr>
|
||||
<Cell first>Total seats</Cell>
|
||||
<Cell last numeric>
|
||||
<div class="text-base font-bold">
|
||||
max({seats_from_comps}, {seats_from_users}) * {team_factor} = ${Math.max(
|
||||
seats_from_comps,
|
||||
seats_from_users
|
||||
) * team_factor}/mo
|
||||
</div>
|
||||
</Cell>
|
||||
</tr>
|
||||
</tbody>
|
||||
</DataTable>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
This workspace is <b>NOT</b> on a team plan. Users use their global free-tier quotas when
|
||||
doing executions in this workspace. Upgrade to a Team or Enterprise plan to unlock unlimited
|
||||
executions in this workspace.
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="text-base font-bold leading-8 mb-2 pt-8"> All plans </div>
|
||||
|
||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
|
||||
{#each Object.entries(plans) as [planTitle, planDesc]}
|
||||
<div class="box p-4 text-xs flex flex-col h-full overflow-hidden prose-sm rounded-md">
|
||||
<h2 class="mb-4">{planTitle}</h2>
|
||||
<ul class="list-disc text-sm p-4">
|
||||
{#each planDesc as item}
|
||||
<li class="mt-2">{@html item}</li>
|
||||
{/each}
|
||||
</ul>
|
||||
|
||||
<div class="grow" />
|
||||
{#if planTitle == 'Team'}
|
||||
{#if plan != 'team'}
|
||||
<div class="mt-4 mx-auto">
|
||||
<Button
|
||||
size="lg"
|
||||
color="dark"
|
||||
href="/api/w/{$workspaceStore}/workspaces/checkout?plan=team"
|
||||
>
|
||||
Upgrade to the Team plan</Button
|
||||
>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="mx-auto text-md font-semibold">Workspace is on the team plan</div>
|
||||
{/if}
|
||||
{:else if planTitle == 'Enterprise'}
|
||||
{#if plan != 'enterprise'}
|
||||
<div class="mt-4 mx-auto">
|
||||
<Button
|
||||
size="xs"
|
||||
color="dark"
|
||||
href="https://www.windmill.dev/pricing"
|
||||
target="_blank"
|
||||
>
|
||||
See more
|
||||
</Button>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="mx-auto text-lg font-semibold">Workspace is on enterprise plan</div>
|
||||
{/if}
|
||||
{:else if !plan}
|
||||
<Badge class="mx-auto text-lg font-semibold">Workspace is on the free plan</Badge>
|
||||
{:else}
|
||||
<div class="mt-4 w-full">
|
||||
<Button href="/api/w/{$workspaceStore}/workspaces/checkout" color="dark"
|
||||
>Upgrade to the {planTitle} plan
|
||||
</Button>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
<div class="flex flex-col gap-1 my-8 w-full items-center">
|
||||
<div class="text-primary text-md font-semibold"> Frequently asked questions </div>
|
||||
|
||||
<div class="flex flex-col gap-4">
|
||||
<div>
|
||||
<div class="text-sm mb-1 text-secondary"> What is an execution? </div>
|
||||
<div class="text-xs max-w-xl border-b pb-4 text-tertiary">
|
||||
The single credit-unit is called an "execution". An execution corresponds to a
|
||||
single job whose duration is less than 1s. For any additional seconds of
|
||||
computation, an additional execution is accounted for. Jobs are executed on one
|
||||
powerful virtual CPU with 2Gb of memory. Most jobs will take less than 200ms to
|
||||
execute.
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="text-sm mb-1 text-secondary">
|
||||
What is the difference between an author and an operator?
|
||||
</div>
|
||||
<div class="text-xs max-w-xl text-tertiary">
|
||||
An author can write scripts/flows/apps/variables/resources. An operator can only
|
||||
run/view them.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
<PremiumInfo {customer_id} {plan} />
|
||||
{:else if tab == 'slack'}
|
||||
<div class="flex flex-col gap-4 my-8">
|
||||
<div class="flex flex-col gap-1">
|
||||
|
||||
Reference in New Issue
Block a user