Merge remote-tracking branch 'origin/master' into onprem-simplify-software-img

Author: haraldschilly

src/packages/database/postgres/site-license/hook.test.ts

@@ -70,13 +70,14 @@ test("allow for much larger max_upgrades", () => {
     {},
     { userX: {} },
     { a: site_licenses.a },
-    site_settings
+    site_settings,
   );
   expect(q1).toEqual({
     quota: {
       network: true,
       member_host: false,
       privileged: false,
+      gpu: false,
       memory_request: 1000,
       cpu_request: 0.1,
       disk_quota: 3000,
@@ -94,7 +95,7 @@ test("allow for much larger max_upgrades", () => {
     {},
     { userX: {} },
     site_licenses,
-    site_settings
+    site_settings,
   );
   expect(q2).toEqual({
     quota: {
@@ -110,6 +111,7 @@ test("allow for much larger max_upgrades", () => {
       memory_request: 1000,
       network: true,
       privileged: false,
+      gpu: false,
     },
     reasons: {},
   });
@@ -155,13 +157,14 @@ test("two licenses", () => {
     {},
     { userX: {} },
     { a: site_licenses.a },
-    site_settings
+    site_settings,
   );
   expect(q1).toEqual({
     quota: {
       network: true,
       member_host: false,
       privileged: false,
+      gpu: false,
       memory_request: 1000,
       cpu_request: 0.05,
       disk_quota: 3000,
@@ -179,13 +182,14 @@ test("two licenses", () => {
     {},
     { userX: {} },
     site_licenses,
-    site_settings
+    site_settings,
   );
   expect(q1).toEqual({
     quota: {
       network: true,
       member_host: false,
       privileged: false,
+      gpu: false,
       memory_request: 1000,
       cpu_request: 0.05,
       disk_quota: 3000,
@@ -213,6 +217,7 @@ test("two licenses", () => {
       memory_request: 1000,
       network: true,
       privileged: false,
+      gpu: false,
     },
     reasons: {},
   });
@@ -311,7 +316,7 @@ test("two licenses", () => {
 //         memory_limit: 1000,
 //         memory_request: 200,
 //         network: false,
-//         privileged: false,
+//            privileged: false,gpu:false,
 //       },
 //       reasons: {},
 //     });

src/packages/frontend/components/text-input.tsx

@@ -20,6 +20,7 @@ interface Props {
   onBlur?: () => void;
   disabled?: boolean;
   style?: CSS;
+  size?: "small";
 }
 
 export const TextInput: React.FC<Props> = React.memo(
@@ -34,6 +35,7 @@ export const TextInput: React.FC<Props> = React.memo(
       onBlur,
       disabled = false,
       style,
+      size,
     } = props;
 
     const inputRef = React.useRef<any>(null);
@@ -65,6 +67,7 @@ export const TextInput: React.FC<Props> = React.memo(
               style={{ marginBottom: "15px" }}
               bsStyle="success"
               onClick={saveChange}
+              bsSize={size === "small" ? "xsmall" : undefined}
             >
               <Icon name="save" /> Save
             </Button>
@@ -87,6 +90,7 @@ export const TextInput: React.FC<Props> = React.memo(
             onFocus={onFocus}
             onBlur={onBlur}
             disabled={disabled}
+            size={size === "small" ? "small" : undefined}
           />
         </Form.Item>
       );
@@ -98,5 +102,5 @@ export const TextInput: React.FC<Props> = React.memo(
         {render_save_button()}
       </Form>
     );
-  }
+  },
 );

src/packages/frontend/project/settings/quota-editor/admin-quotas.tsx

@@ -5,6 +5,8 @@
 
 import { useEffect, useState } from "react";
 import { Button, Card, Popconfirm, Popover } from "antd";
+import { isEqual } from "lodash";
+
 import { alert_message } from "@cocalc/frontend/alerts";
 import { Icon, Loading } from "@cocalc/frontend/components";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
@@ -13,16 +15,16 @@ import { PROJECT_UPGRADES } from "@cocalc/util/schema";
 import type { ProjectSettings } from "../types";
 import QuotaRow from "./quota-row";
 import type { QuotaParams } from "./types";
-import { isEqual } from "lodash";
-import { useRedux } from "@cocalc/frontend/app-framework";
+import { CSS, useRedux } from "@cocalc/frontend/app-framework";
 
 const QUOTA_PARAMS = PROJECT_UPGRADES.params;
 
 interface Props {
   project_id: string;
+  style?: CSS;
 }
 
-export default function AdminQuotas({ project_id }: Props) {
+export default function AdminQuotas({ project_id, style }: Props) {
   const projectSettings: ProjectSettings | undefined = useRedux([
     "projects",
     "project_map",
@@ -114,6 +116,7 @@ export default function AdminQuotas({ project_id }: Props) {
 
   return (
     <Card
+      style={style}
       title={
         <>
           <Icon name="user-plus" /> Admin Quota Editor

src/packages/frontend/project/settings/run-quota/hooks.tsx

@@ -3,37 +3,39 @@
  *  License: AGPLv3 s.t. "Commons Clause" – see LICENSE.md for details
  */
 
-import { Map, List } from "immutable";
+import { List, Map } from "immutable";
 import { fromPairs, isEqual } from "lodash";
 
+import { ProjectStatus } from "@cocalc/comm/project-status/types";
 import {
+  TypedMap,
   useEffect,
   useMemo,
   useState,
   useTypedRedux,
 } from "@cocalc/frontend/app-framework";
-import { ProjectStatus } from "@cocalc/comm/project-status/types";
 import {
   KUCALC_COCALC_COM,
   KUCALC_DISABLED,
   KUCALC_ON_PREMISES,
 } from "@cocalc/util/db-schema/site-defaults";
 import { round1, seconds2hms, server_time } from "@cocalc/util/misc";
 import { PROJECT_UPGRADES } from "@cocalc/util/schema";
+import { GPU } from "@cocalc/util/types/site-licenses";
 import {
+  Upgrades,
   quota2upgrade_key,
   upgrade2quota_key,
-  Upgrades,
 } from "@cocalc/util/upgrades/quota";
 import { IdleTimeoutPct, PercentBar, renderBoolean } from "./components";
 import {
-  booleanValueStr,
   CurrentUsage,
   DisplayQuota,
   MAX_UPGRADES,
   PARAMS,
-  renderValueUnit,
   Usage,
+  booleanValueStr,
+  renderValueUnit,
 } from "./misc";
 
 export function useRunQuota(
@@ -53,7 +55,14 @@ export function useRunQuota(
     } else {
       return rq
         .map((val, key) => {
-          if (typeof val !== "number") {
+          if (key === "gpu") {
+            const v = val as boolean | TypedMap<GPU>;
+            if (typeof v === "boolean") {
+              return v ? 1 : null;
+            } else {
+              return v?.get("num", 0);
+            }
+          } else if (typeof val !== "number") {
             return val;
           } else if (key == "idle_timeout") {
             return seconds2hms(val, false, false);
@@ -120,9 +129,9 @@ export function useCurrentUsage({
   const last_edited: Date | undefined = project_map
     ?.get(project_id)
     ?.get("last_edited");
-  const runQuota: Map<string, number | List<object>> | undefined = project_map
-    ?.get(project_id)
-    ?.get("run_quota");
+  const runQuota:
+    | Map<string, number | Map<string, number | string> | List<object>>
+    | undefined = project_map?.get(project_id)?.get("run_quota");
 
   const [currentUsage, setCurrentUsage] = useState<CurrentUsage>({});
 
@@ -233,6 +242,14 @@ export function useCurrentUsage({
               const p = runQuota?.get(key);
               const x = List.isList(p) ? p?.size : "N/A";
               return [key, { display: `${x}`, element: <>{x}</> }];
+            case "gpu":
+              const gpu = runQuota?.get(key);
+              if (!gpu) return [key, { display: "N/A", element: <>N/A</> }];
+              const num = Map.isMap(gpu) ? gpu.get("num", 1) : 1;
+              return [
+                key,
+                { display: `${num}`, element: <>{JSON.stringify(num)}</> },
+              ];
             default:
               return [key, { display: name, element: <>{name}</> }];
           }
@@ -258,9 +275,9 @@ export function useDisplayedFields(): string[] {
     // we have to make a copy, because we might modify it below
     const fields: string[] = [...PROJECT_UPGRADES.field_order];
 
-    // on kucalc on-prem, we add ext_rw and patch
+    // on kucalc on-prem, we add ext_rw, patch and gpu
     if (kucalc === KUCALC_ON_PREMISES) {
-      fields.push(...["ext_rw", "patch"]);
+      fields.push(...["ext_rw", "patch", "gpu"]);
     }
 
     return fields.filter((key: keyof Upgrades) => {

src/packages/frontend/project/settings/run-quota/run-quota.tsx

@@ -166,6 +166,10 @@ export const RunQuota: React.FC<Props> = React.memo(
       const { key, quota, quotaDedicated, usage } = record;
       if (QUOTAS_BOOLEAN.includes(key as any)) {
         return `This quota is ${booleanValueStr(quota)}.`;
+      } else if (key === "gpu") {
+        return usage != null
+          ? `There are ${usage.display} GPU(s) requested.`
+          : ``;
       } else if (key === "patch") {
         return usage != null
           ? `There are ${usage.display} patch(es) in total.`
@@ -221,6 +225,7 @@ export const RunQuota: React.FC<Props> = React.memo(
       // the usage of a boolean quota is always the same as its value
       if (QUOTAS_BOOLEAN.includes(record.key as any)) return;
       if (record.key === "patch") return;
+      if (record.key === "gpu") return;
       const usage: Usage = record.usage;
       if (usage == null) return;
       const { element } = usage;
@@ -243,15 +248,13 @@ export const RunQuota: React.FC<Props> = React.memo(
 
       if (typeof val === "boolean") {
         return renderBoolean(val, projectIsRunning);
-      } else if (typeof val === "number") {
-        if (record.key === "idle_timeout") {
-          return val;
-        }
+      } else if (record.key === "idle_timeout") {
+        return val;
       } else if (Array.isArray(val)) {
         return val.length;
       } else {
         return (
-          <Text strong={true} style={style}>
+          <Text strong style={style}>
             <NoWrap>{val}</NoWrap>
           </Text>
         );