hyperstack pricing, done correctly

Author: williamstein

src/packages/next/components/landing/live-demo.tsx

@@ -7,7 +7,7 @@ export function liveDemoUrl(context) {
   return getSupportUrl({
     subject: "Contact Us!",
     type: "question",
-    body: `I would like to chat with a Sales Representative!\n\nWHEN IS A GOOD TIME (include timezone!): [REQUIRED]\n\nYOUR ORGANIZATION: [REQUIRED]\n\n(Only requests filled out in good faith will receive a response.)\n`,
+    body: `I would like to chat with a CoCalc Representative!\n\nWHEN IS A GOOD TIME (include timezone!): [REQUIRED]\n\nYOUR ORGANIZATION: [REQUIRED]\n\n(Only requests filled out in good faith will receive a response.)\n`,
     hideExtra: true,
     context,
     url: "",

src/packages/server/compute/cloud/hyperstack/pricing-data.ts

@@ -8,6 +8,13 @@ util/compute/cloud/hyperstack/pricing.ts
 We of course include not-available options so that we can compute
 the current price of any VM.
 
+VERY IMPORTANT!!!  The pricebook that Hyperstack returns to us has (see [1])
+two fields "value" and "original_value".   We signed a contract with Hyperstack
+stating that we will not divulge the "value" field.  Thus below in creating
+the version of this data that should be sent to customers, be very careful to
+only access and use the "original_value" field!
+
+[1] https://infrahub-doc.nexgencloud.com/docs/api-reference/pricebook-resources/pricebook
 */
 
 import type {
@@ -107,10 +114,15 @@ export default async function getPricingData(
     }
   }
 
-  const { compute_servers_markup_percentage: markup } =
-    await getServerSettings();
-  const external_ip_cost_per_hour = Number(priceMap["PublicIP"].value);
-  const ssd_cost_per_hour = Number(priceMap["Cloud-SSD"].value);
+  const {
+    compute_servers_markup_percentage: global_markup,
+    hyperstack_compute_servers_markup_percentage: hyperstack_markup,
+  } = await getServerSettings();
+  const markup = hyperstack_markup
+    ? parseFloat(hyperstack_markup)
+    : global_markup;
+  const external_ip_cost_per_hour = Number(priceMap["PublicIP"].original_value);
+  const ssd_cost_per_hour = Number(priceMap["Cloud-SSD"].original_value);
   const x = { options, markup, external_ip_cost_per_hour, ssd_cost_per_hour };
 
   ttlCache.set("x", x);
@@ -127,17 +139,17 @@ function computeCost({
   gpu_count,
 }): number | string {
   let cost =
-    Number(priceMap["Cloud-SSD"].value) * disk +
-    Number(priceMap["PublicIP"].value);
+    Number(priceMap["Cloud-SSD"].original_value) * disk +
+    Number(priceMap["PublicIP"].original_value);
   if (gpu) {
     // for machines with GPU's, the cost seems to be the internal disk (which we do not use at all)
     // plus the cost of an ip address, plus the gpu cost.
-    cost += Number(priceMap[gpu].value) * gpu_count;
+    cost += Number(priceMap[gpu].original_value) * gpu_count;
   } else {
     // for NON-GPU machines (cpu only) the cost is a function of the number of cpu's and the amount of ram.
     cost +=
-      Number(priceMap["vCPU (cpu-only-flavors)"].value) * cpu +
-      Number(priceMap["RAM (cpu-only-flavors)"].value) * ram;
+      Number(priceMap["vCPU (cpu-only-flavors)"].original_value) * cpu +
+      Number(priceMap["RAM (cpu-only-flavors)"].original_value) * ram;
   }
   return cost;
 }

src/packages/util/db-schema/site-defaults.ts

@@ -34,6 +34,8 @@ export const TAGS = [
   "GitHub",
   "Pay as you Go",
   "Compute Servers",
+  "Google Cloud",
+  "Hyperstack",
   "AI LLM",
   "Theme",
   "On-Prem",

src/packages/util/db-schema/site-settings-extras.ts

@@ -247,6 +247,7 @@ export type SiteSettingsExtrasKeys =
   //  | "lambda_cloud_api_key"
   | "hyperstack_api_key"
   | "hyperstack_compute_servers_prefix"
+  | "hyperstack_compute_servers_markup_percentage"
   | "hyperstack_ssh_public_key"
   | "hyperstack_balance_alert_thresh"
   | "hyperstack_balance_alert_emails"
@@ -757,8 +758,8 @@ export const EXTRAS: SettingsExtras = {
     tags: ["Compute Servers"],
   },
   compute_servers_markup_percentage: {
-    name: "Compute Servers -- Markup Percentage",
-    desc: "The markup percentage that we add to the cost we pay to the cloud service providers.  This accounts for maintenance, dev, servers, and *bandwidth* (which can be massive). For example, '30' would mean we add 30% to the price that the cloud service provides charge us for compute, and we currently gamble regarding bandwidth costs.",
+    name: "Compute Servers - Markup Percentage",
+    desc: "The default markup percentage that we add to the cost we pay to the cloud service providers.  This accounts for maintenance, dev, servers, and *bandwidth* (which can be massive). For example, '30' would mean we add 30% to the price that the cloud service provides charge us for compute, and we currently gamble regarding bandwidth costs.  There may be more customized pricing and markups for specific providers configured elsewhere.",
     default: "30",
     show: (conf) => only_commercial(conf) && compute_servers_enabled(conf),
     to_val: toFloat,
@@ -771,38 +772,47 @@ export const EXTRAS: SettingsExtras = {
     default: "",
     password: true,
     show: compute_servers_hyperstack_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Hyperstack"],
   },
   hyperstack_compute_servers_prefix: {
     name: "Compute Servers: Hyperstack - Resource Prefix",
     desc: "Prepend this string to all Hyperstack resources that are created, e.g., VM names, disks, etc.  If the prefix is 'cocalc', then the compute server with id 17 will be called 'cocalc-17'.  REQUIRED or Hyperstack will not work.",
     default: "cocalc",
     to_val: to_trimmed_str,
     show: compute_servers_hyperstack_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Hyperstack"],
+  },
+  hyperstack_compute_servers_markup_percentage: {
+    name: "Compute Servers: Hyperstack - Markup Percentage",
+    desc: "Markup percentage specifically for hyperstack.  If not given (i.e., empty string), the global compute server markup is used.  This is always the markup on the public list price, and has nothing to do with negotiated wholesale pricing.",
+    default: "",
+    show: compute_servers_hyperstack_enabled,
+    to_val: to_trimmed_str,
+    valid: () => true,
+    tags: ["Compute Servers", "Hyperstack"],
   },
   hyperstack_ssh_public_key: {
     name: "Compute Servers: Hyperstack - Public SSH Key",
     desc: "A public SSH key that grants access to all Hyperstack VM's for admin and debugging purposes.  REQUIRED or Hyperstack will not work.",
     default: "",
     password: true,
     show: compute_servers_hyperstack_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Hyperstack"],
   },
   hyperstack_balance_alert_thresh: {
     name: "Compute Servers: Hyperstack - Balance Alert Threshold",
     desc: "If your credit balance goes below this amount on the Hyperstack site, then you will be emailed (assuming email is configured).",
     default: "25",
     to_val: to_int,
     show: compute_servers_hyperstack_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Hyperstack"],
   },
   hyperstack_balance_alert_emails: {
     name: "Compute Servers: Hyperstack - Balance Email Addresses",
     desc: "If your credit balance goes below your configured threshold, then these email addresses will get an alert message.  Separate addresses by commas.",
     default: "",
     show: compute_servers_hyperstack_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Hyperstack"],
   },
 
   //   lambda_cloud_api_key: {
@@ -827,7 +837,7 @@ export const EXTRAS: SettingsExtras = {
     multiline: 5,
     password: true,
     show: compute_servers_google_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Google Cloud"],
   },
   google_cloud_bigquery_billing_service_account_json: {
     name: "Compute Servers: Google Cloud BigQuery Service Account Json",
@@ -836,7 +846,7 @@ export const EXTRAS: SettingsExtras = {
     multiline: 5,
     password: true,
     show: compute_servers_google_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Google Cloud"],
   },
   google_cloud_bigquery_detailed_billing_table: {
     name: "Compute Servers: Google Cloud Detailed Billing BigQuery Table Name",
@@ -845,15 +855,15 @@ export const EXTRAS: SettingsExtras = {
     to_val: to_trimmed_str,
     show: compute_servers_google_enabled,
     valid: (x) => !x || x.includes(".detailed_billing."),
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Google Cloud"],
   },
   google_cloud_compute_servers_prefix: {
     name: "Compute Servers: Google Cloud - Resource Prefix",
     desc: "Prepend this string to all Google cloud resources that are created, e.g., VM names, etc. This is useful if you are using a single Google cloud project for more than just this one cocalc server.  KEEP THIS SHORT!  If the prefix is 'comput', then the compute server with id 17 will be called 'compute-17'.  You very likely want to change this, especially if you have several servers in the same Google cloud project; it must be different between different servers.",
     default: "compute",
     to_val: to_trimmed_str,
     show: compute_servers_google_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Google Cloud"],
     valid: () => true,
   },
   google_cloud_compute_servers_image_prefix: {
@@ -862,7 +872,7 @@ export const EXTRAS: SettingsExtras = {
     default: "cocalc",
     to_val: to_trimmed_str,
     show: compute_servers_google_enabled,
-    tags: ["Compute Servers"],
+    tags: ["Compute Servers", "Google Cloud"],
     valid: () => true,
   },