Merge pull request #8486 from sagemathinc/price-upd-20250805

pricing: incorporate summer changes

Author: williamstein

src/packages/frontend/purchases/license-editor.tsx

@@ -4,21 +4,23 @@ single license.  It doesn't manage actually coordinating purchases, showing pric
 or anything like that.
 */
 
-import type { PurchaseInfo } from "@cocalc/util/licenses/purchase/types";
-import type { Changes } from "@cocalc/util/purchases/cost-to-edit-license";
 import {
   Alert,
   DatePicker,
   InputNumber,
-  Switch,
   Select,
+  Switch,
   Table,
   Tag,
 } from "antd";
 import dayjs from "dayjs";
-import { MAX } from "@cocalc/util/licenses/purchase/consts";
 import { useMemo, useState } from "react";
 
+import { MAX } from "@cocalc/util/licenses/purchase/consts";
+import { MIN_DISK_GB } from "@cocalc/util/upgrades/consts";
+import type { PurchaseInfo } from "@cocalc/util/licenses/purchase/types";
+import type { Changes } from "@cocalc/util/purchases/cost-to-edit-license";
+
 type Field =
   | "start"
   | "end"
@@ -217,7 +219,7 @@ export default function LicenseEditor({
             value: (
               <InputNumber
                 disabled={disabledFields?.has("custom_disk")}
-                min={3}
+                min={Math.min(info.custom_disk || MIN_DISK_GB, MIN_DISK_GB)}
                 max={MAX.disk}
                 step={1}
                 value={info.custom_disk}

src/packages/next/components/store/quota-config-presets.tsx

@@ -3,11 +3,14 @@
  *  License: MS-RSL – see LICENSE.md for details
  */
 
+import { ReactNode } from "react";
+
 import { IconName } from "@cocalc/frontend/components/icon";
 import { Uptime } from "@cocalc/util/consts/site-license";
+import { MAX_DISK_GB } from "@cocalc/util/upgrades/consts";
 import { Paragraph } from "components/misc";
 import A from "components/misc/A";
-import { ReactNode } from "react";
+import { STANDARD_DISK } from "@cocalc/util/consts/billing";
 
 export type Preset = "standard" | "instructor" | "research";
 
@@ -19,7 +22,7 @@ export const PRESET_MATCH_FIELDS: Record<string, string> = {
   ram: "memory",
   uptime: "idle timeout",
   member: "member hosting",
-};
+} as const;
 
 export interface PresetConfig {
   icon: IconName;
@@ -42,7 +45,6 @@ type PresetEntries = {
 // some constants to keep text and preset in sync
 const STANDARD_CPU = 1;
 const STANDARD_RAM = 4;
-const STANDARD_DISK = 3;
 
 const PRESET_STANDARD_NAME = "Standard";
 
@@ -149,7 +151,7 @@ export const SITE_LICENSE: PresetEntries = {
     ),
     cpu: 1,
     ram: 2 * STANDARD_RAM,
-    disk: 15,
+    disk: Math.min(Math.max(15, 4 * STANDARD_DISK), MAX_DISK_GB),
     uptime: "medium",
     member: true,
   },
@@ -191,8 +193,8 @@ export const SITE_LICENSE: PresetEntries = {
       </>
     ),
     cpu: 2,
-    ram: 10,
-    disk: 10,
+    ram: 2 * STANDARD_RAM,
+    disk: Math.min(Math.max(15, 4 * STANDARD_DISK), MAX_DISK_GB),
     uptime: "day",
     member: true,
   },
@@ -246,7 +248,7 @@ export const COURSE = {
     ),
     cpu: 1,
     ram: 8,
-    disk: 2 * STANDARD_DISK,
+    disk: Math.min(2 * STANDARD_DISK, MAX_DISK_GB),
     uptime: "medium",
     member: true,
   },

src/packages/next/components/store/quota-config.tsx

@@ -22,7 +22,13 @@ import { HelpIcon } from "@cocalc/frontend/components/help-icon";
 import { Icon } from "@cocalc/frontend/components/icon";
 import { displaySiteLicense } from "@cocalc/util/consts/site-license";
 import { plural, unreachable } from "@cocalc/util/misc";
-import { BOOST, DISK_DEFAULT_GB, REGULAR } from "@cocalc/util/upgrades/consts";
+import {
+  BOOST,
+  DISK_DEFAULT_GB,
+  MAX_DISK_GB,
+  MIN_DISK_GB,
+  REGULAR,
+} from "@cocalc/util/upgrades/consts";
 import type { LicenseSource } from "@cocalc/util/upgrades/shopping";
 
 import PricingItem, { Line } from "components/landing/pricing-item";
@@ -281,8 +287,29 @@ export const QuotaConfig: React.FC<Props> = (props: Props) => {
     );
   }
 
+  function generateDiskPresets(min: number, max: number): number[] {
+    if (min >= max) return [min];
+
+    const range = max - min;
+    const presets = [min]; // Always include minimum
+
+    //  Create 3-4 evenly spaced values
+    const step = Math.ceil(range / 4);
+    let current = min + step;
+    while (current < max) {
+      presets.push(current);
+      current += step;
+    }
+
+    presets.push(max); // Always include maximum
+    return [...new Set(presets)].sort((a, b) => a - b); // Remove duplicates and sort
+  }
+
   function disk() {
-    // 2022-06: price increase "version 2": minimum disk we sell (also the free quota) is 3gb, not 1gb
+    // Generate dynamic presets based on MIN_DISK_GB and MAX_DISK_GB
+    const presets = boost
+      ? [0, ...generateDiskPresets(MIN_DISK_GB, PARAMS.disk.max).slice(0, 3)] // For boost, include 0 and limit to 3 additional values
+      : generateDiskPresets(MIN_DISK_GB, MAX_DISK_GB);
     return (
       <Form.Item
         label="Disk space"
@@ -314,9 +341,7 @@ export const QuotaConfig: React.FC<Props> = (props: Props) => {
             onChange();
           }}
           units={"G Disk"}
-          presets={
-            boost ? [0, 3, 6, PARAMS.disk.max] : [3, 5, 10, PARAMS.disk.max]
-          }
+          presets={presets}
         />
       </Form.Item>
     );

src/packages/util/consts/billing.ts

@@ -10,8 +10,16 @@ export const AVG_YEAR_DAYS = 12 * AVG_MONTH_DAYS;
 export const ONE_MONTH_MS = AVG_MONTH_DAYS * ONE_DAY_MS;
 
 // throughout the UI, we show this price as the minimum (per month)
-export const LICENSE_MIN_PRICE = "about $6/month";
+// It is nice if it is vague enough to match price changes.
+export const LICENSE_MIN_PRICE = "a few $ per month";
 
 // Trial Banner in the UI
 export const EVALUATION_PERIOD_DAYS = 3;
 export const BANNER_NON_DISMISSIBLE_DAYS = 7;
+
+// The "standard license" disk size.
+// used in next/store and student-pay
+// Aug 2025: changed from 3 to 10 GB in anticipation of the new file server
+// However, the actual presets are capped at the maximum disk size.
+// That disk max is in util/upgrades/consts.ts
+export const STANDARD_DISK = 10;

src/packages/util/licenses/purchase/compute-cost.test.ts

@@ -1,11 +1,13 @@
 import { compute_cost } from "./compute-cost";
 import { decimalMultiply } from "@cocalc/util/stripe/calc";
 
-describe("use the compute-cost function with v1 pricing, no version, and a test version to compute the price of a license", () => {
+const MONTHLY_V1 = 27.15;
+
+describe("compute-cost v1 pricing", () => {
   // This is a monthly business subscription for 3 projects with 1 cpu, 2 GB ram and 3 GB disk,
   // using v1 pricing.  On the website right now it says this should cost:
   //   "Cost: USD $27.15 monthly USD $9.05 per project"
-  const monthly1 = 27.15;
+  const monthly1 = MONTHLY_V1;
   const info1 = {
     version: "1",
     end: new Date("2024-01-06T22:00:02.582Z"),
@@ -103,3 +105,53 @@ describe("a couple more consistency checks with prod", () => {
     expect(cost.cost).toBe(amount);
   });
 });
+
+describe("compute-cost v3 pricing", () => {
+  // This is a monthly business subscription for 3 projects with 1 cpu, 2 GB ram and 3 GB disk,
+  // using v3 pricing.
+  const monthly3 = 31.5;
+  const info1 = {
+    version: "3",
+    end: new Date("2024-01-06T22:00:02.582Z"),
+    type: "quota",
+    user: "business",
+    boost: false,
+    start: new Date("2023-12-05T17:15:55.781Z"),
+    upgrade: "custom",
+    quantity: 3,
+    account_id: "6aae57c6-08f1-4bb5-848b-3ceb53e61ede",
+    custom_cpu: 1,
+    custom_ram: 2,
+    custom_disk: 3,
+    subscription: "monthly",
+    custom_member: true,
+    custom_uptime: "short",
+    custom_dedicated_cpu: 0,
+    custom_dedicated_ram: 0,
+  } as const;
+
+  it("computes the cost", () => {
+    const cost1 = compute_cost(info1);
+    expect(decimalMultiply(cost1.cost_sub_month, cost1.quantity)).toBe(
+      monthly3,
+    );
+  });
+
+  it("version 1 is the default", () => {
+    const info = { ...info1 };
+    // @ts-ignore
+    delete info["version"];
+    const cost = compute_cost(info);
+    expect(decimalMultiply(cost.cost_sub_month, cost.quantity)).toBe(
+      MONTHLY_V1,
+    );
+  });
+
+  it("computes correct cost with a different version of pricing params", () => {
+    const info = { ...info1 };
+    // @ts-ignore
+    info.version = "test_1";
+    const cost = compute_cost(info);
+    expect(decimalMultiply(cost.cost_sub_month, cost.quantity)).toBe(54.3);
+  });
+});

src/packages/util/licenses/purchase/compute-cost.ts

@@ -134,7 +134,9 @@ export function compute_cost(info: PurchaseInfo): Cost {
   cost_per_project_per_month *=
     COSTS.user_discount[user] * COSTS.sub_discount[subscription];
 
-  cost_per_project_per_month = round2up(cost_per_project_per_month);
+  // If the numbers were picked to give clean prices, it is possible to get
+  // things like 12.50000001 and we do NOT want to round it up to 12.51.
+  cost_per_project_per_month = round2up(cost_per_project_per_month - 0.00001);
 
   // It's convenient in all cases to have the actual amount we will be charging
   // for both monthly and yearly available.

src/packages/util/licenses/purchase/consts.ts

@@ -11,7 +11,7 @@ import costVersions from "./cost-versions";
 // is used when the version is not defined.
 const FALLBACK_VERSION = "1";
 
-export const CURRENT_VERSION = "1";
+export const CURRENT_VERSION = "3";
 
 // Another gamble implicit in this is that pre's are available.  When they
 // aren't, cocalc.com switches to uses MUCH more expensive non-preemptibles.

src/packages/util/licenses/purchase/cost-versions.ts

@@ -67,6 +67,25 @@ const COST = {
     ALWAYS_RUNNING_FACTOR: 2,
   },
 
+  3: {
+    SUB_DISCOUNT: { no: 1, monthly: 0.9, yearly: 0.75 },
+    GCE_COSTS: {
+      ram: 0.625, // for pre-emptibles
+      cpu: 5, // for pre-emptibles
+      disk: 0.04, // per GB/month
+      non_pre_factor: 3.5, // Roughly Google's factor for non-preemptible's
+    },
+    // 2025-08: Andrey increases it to 1
+    COST_MULTIPLIER: 1,
+    NONMEMBER_DENSITY: 2,
+    ACADEMIC_DISCOUNT: 0.6,
+    // 2025-08: in anticipation of new file storage
+    DISK_FACTOR: 6.25,
+    RAM_OVERCOMMIT: 5,
+    CPU_OVERCOMMIT: 10,
+    ALWAYS_RUNNING_FACTOR: 2,
+  },
+
   // this version is PURELY for testing purposes
   test_1: {
     SUB_DISCOUNT: { no: 1, monthly: 0.9, yearly: 0.85 },

src/packages/util/licenses/purchase/purchase-info.ts

@@ -1,11 +1,12 @@
+import dayjs from "dayjs";
+
+import type { Date0 } from "@cocalc/util/types/store";
 import type {
   Period,
   SiteLicenseDescriptionDB,
 } from "@cocalc/util/upgrades/shopping";
-import type { PurchaseInfo, StartEndDates, Subscription } from "./types";
 import { CURRENT_VERSION } from "./consts";
-import type { Date0 } from "@cocalc/util/types/store";
-import dayjs from "dayjs";
+import type { PurchaseInfo, StartEndDates, Subscription } from "./types";
 
 // this ALWAYS returns purchaseInfo that is the *current* version.
 export default function getPurchaseInfo(

src/packages/util/licenses/purchase/student-pay.ts

@@ -1,6 +1,8 @@
-import type { PurchaseInfo } from "./types";
 import dayjs from "dayjs";
 
+import { STANDARD_DISK } from "@cocalc/util/consts/billing";
+import type { PurchaseInfo } from "./types";
+
 export const DEFAULT_PURCHASE_INFO = {
   type: "quota",
   user: "academic",
@@ -11,7 +13,7 @@ export const DEFAULT_PURCHASE_INFO = {
   custom_dedicated_cpu: 0,
   custom_ram: 4,
   custom_dedicated_ram: 0,
-  custom_disk: 3,
+  custom_disk: STANDARD_DISK,
   custom_member: true,
   custom_uptime: "short",
   start: new Date(),