chore(git): merge pull request #47 from deepsquare-io/staging

deepsquare-io · Dec 4, 2023 · fca4609 · fca4609 · vercel · Dec 4, 2023
2 parents 605291e + 15366fd
commit fca4609
Show file tree

Hide file tree

Showing 28 changed files with 126 additions and 109 deletions.
diff --git a/abi/IJobRepository.ts b/abi/IJobRepository.ts
@@ -71,7 +71,7 @@ export const IJobRepositoryAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {
@@ -297,7 +297,7 @@ export const IJobRepositoryAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {
@@ -569,7 +569,7 @@ export const IJobRepositoryAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {
@@ -854,7 +854,7 @@ export const IJobRepositoryAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {

diff --git a/abi/JobRepository.ts b/abi/JobRepository.ts
@@ -187,7 +187,7 @@ export const JobRepositoryAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {
@@ -413,7 +413,7 @@ export const JobRepositoryAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {
@@ -754,7 +754,7 @@ export const JobRepositoryAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {
@@ -1038,7 +1038,7 @@ export const JobRepositoryAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {
@@ -1344,7 +1344,7 @@ export const JobRepositoryAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {

diff --git a/abi/MetaScheduler.ts b/abi/MetaScheduler.ts
@@ -232,7 +232,7 @@ export const MetaSchedulerAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {
@@ -821,7 +821,7 @@ export const MetaSchedulerAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {

diff --git a/abi/Tools.ts b/abi/Tools.ts
@@ -61,7 +61,7 @@ export const ToolsAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {
@@ -192,7 +192,7 @@ export const ToolsAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {
@@ -346,7 +346,7 @@ export const ToolsAbi =
             [
               {
                 "internalType": "uint64",
-                "name": "gpusPerTask",
+                "name": "gpus",
                 "type": "uint64"
               },
               {
@@ -605,7 +605,7 @@ export const ToolsAbi =
         [
           {
             "internalType": "uint64",
-            "name": "gpusPerTask",
+            "name": "gpus",
             "type": "uint64"
           },
           {

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "@apollo/client": "^3.8.7",
     "@apollo/server": "^4.9.5",
     "@as-integrations/next": "^3.0.0",
-    "@deepsquare/deepsquare-client": "^0.15.0",
+    "@deepsquare/deepsquare-client": "0.16.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hookform/resolvers": "^2.9.11",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/blender/page.tsx b/src/app/blender/page.tsx
@@ -85,9 +85,9 @@ export default function BlenderPage() {
         outputFormat: BlenderOutputFormat.PNG,
         renderEngine: BlenderRenderEngine.CYCLES,
         nTasks: 1,
-        cpuPerTask: 8,
+        cpusPerTask: 8,
         memPerCpu: 6000,
-        gpuPerTask: 1,
+        gpusPerTask: 1,
       },
       jobName: `${WorkloadType.BLENDER} - ${generate({ exactly: 3, maxLength: 4 })?.join(' ') ?? ''}`,
     },
@@ -153,7 +153,7 @@ export default function BlenderPage() {
                 <>
                   <Grid item xs={1}>
                     <h4 className="m-0 font-normal">CPU per task</h4>
-                    <NumberField name="details.cpuPerTask" control={control} type="number" defaultValue={4} />
+                    <NumberField name="details.cpusPerTask" control={control} type="number" defaultValue={4} />
                   </Grid>
                   <Grid item xs={1}>
                     <h4 className="m-0 font-normal">Memory per CPU (MB)</h4>
@@ -178,8 +178,8 @@ export default function BlenderPage() {
           </Card>
           <CreditSubform
             gpuQty={watch('details.nTasks')}
-            cpuQty={watch('details.nTasks')! * watch('details.cpuPerTask')!}
-            memQty={watch('details.nTasks')! * watch('details.cpuPerTask')! * watch('details.memPerCpu')!}
+            cpuQty={watch('details.nTasks')! * watch('details.cpusPerTask')!}
+            memQty={watch('details.nTasks')! * watch('details.cpusPerTask')! * watch('details.memPerCpu')!}
           />
           <SendButton>Render</SendButton>
         </div>

diff --git a/src/app/sandbox/page.tsx b/src/app/sandbox/page.tsx
@@ -161,11 +161,7 @@ const SandboxPage: NextPage = () => {
 
           <CreditSubform
             defaultDuration={20}
-            gpuQty={
-              json?.resources?.tasks && json?.resources?.gpusPerTask
-                ? json.resources.tasks * json.resources.gpusPerTask
-                : undefined
-            }
+            gpuQty={json?.resources?.gpus}
             cpuQty={
               json?.resources?.tasks && json?.resources?.cpusPerTask
                 ? json.resources.tasks * json.resources.cpusPerTask

diff --git a/src/app/status/page.tsx b/src/app/status/page.tsx
@@ -363,14 +363,10 @@ const StatusPage: NextPage = withConnectionRequired(() => {
                   dayjs(Number(value.time.start * 1000n)),
                   'minutes',
                 )}{' '}
-                min × {value.definition.ntasks.toString()} tasks ×
+                min × &#91; {value.definition.ntasks.toString()} tasks ×
               </div>
               <div>
-                &#40; {value.definition.gpusPerTask.toString()} GPU/task ×{' '}
-                {formatCredit(value.provider.providerPrices.gpuPricePerMin)} credits/(GPU.min)
-              </div>
-              <div>
-                + {value.definition.cpusPerTask.toString()} CPU/task ×{' '}
+                &#40; {value.definition.cpusPerTask.toString()} CPU/task ×{' '}
                 {formatCredit(value.provider.providerPrices.cpuPricePerMin)} credits/(CPU.min)
               </div>
               <div>
@@ -381,6 +377,10 @@ const StatusPage: NextPage = withConnectionRequired(() => {
                 })}{' '}
                 credits/(GB.min) &#41;
               </div>
+              <div>
+                + {value.definition.gpus.toString()} GPU × {formatCredit(value.provider.providerPrices.gpuPricePerMin)}{' '}
+                credits/(GPU.min) &#93;
+              </div>
             </div>
           </Popover>
         )}

diff --git a/src/app/texttoimage/page.tsx b/src/app/texttoimage/page.tsx
@@ -72,8 +72,8 @@ const TextToImagePage: NextPage = () => {
       jobName: `${WorkloadType.TEXTTOIMAGE} - ${generate({ exactly: 3, maxLength: 4 })?.join(' ') ?? ''}`,
       details: {
         nTasks: 4,
-        gpuPerTask: 1,
-        cpuPerTask: 8,
+        gpusPerTask: 1,
+        cpusPerTask: 8,
         memPerCpu: 8000,
         ttiModel: TextToImageModel['sd-2-1'],
         steps: '150',
@@ -119,8 +119,8 @@ const TextToImagePage: NextPage = () => {
           <CreditSubform
             defaultDuration={10}
             gpuQty={watch('details.nTasks')}
-            cpuQty={watch('details.nTasks')! * watch('details.cpuPerTask')!}
-            memQty={watch('details.nTasks')! * watch('details.cpuPerTask')! * watch('details.memPerCpu')!}
+            cpuQty={watch('details.nTasks')! * watch('details.cpusPerTask')!}
+            memQty={watch('details.nTasks')! * watch('details.cpusPerTask')! * watch('details.memPerCpu')!}
           />
           <SendButton>Generate</SendButton>
         </div>

diff --git a/src/app/unity/page.tsx b/src/app/unity/page.tsx
@@ -58,8 +58,8 @@ const schema = (maxAmount: bigint, minAmount: bigint, ignoreBalance: boolean) =>
       archiveLink: y.string().required(),
       binaryPath: y.string().required(),
       additionalArgs: y.string().notRequired(),
-      gpuPerTask: y.number().integer().min(0).max(2),
-      cpuPerTask: y.number().integer().min(0).max(16),
+      gpusPerTask: y.number().integer().min(0).max(2),
+      cpusPerTask: y.number().integer().min(0).max(16),
       memPerCpu: y
         .number()
         .integer()
@@ -82,8 +82,8 @@ const UnityPage: NextPage = () => {
       jobName: `${WorkloadType.URS} - ${generate({ exactly: 3, maxLength: 4 })?.join(' ') ?? ''}`,
       details: {
         nTasks: 1,
-        gpuPerTask: 1,
-        cpuPerTask: 4,
+        gpusPerTask: 1,
+        cpusPerTask: 4,
         memPerCpu: 4096,
         binaryPath: '',
         archiveLink: '',
@@ -133,11 +133,11 @@ const UnityPage: NextPage = () => {
             <Grid className="pt-5" container spacing={2.5} columns={2}>
               <Grid item xs={1}>
                 <h4 className="m-0 font-normal">GPU(s)</h4>
-                <NumberField name="details.gpuPerTask" control={control} type="number" min={1} />
+                <NumberField name="details.gpusPerTask" control={control} type="number" min={1} />
               </Grid>
               <Grid item xs={1}>
                 <h4 className="m-0 font-normal">CPU(s)</h4>
-                <NumberField name="details.cpuPerTask" control={control} type="number" min={1} />
+                <NumberField name="details.cpusPerTask" control={control} type="number" min={1} />
               </Grid>
               <Grid item xs={1}>
                 <h4 className="m-0 font-normal">Memory (MB) per CPU</h4>
@@ -146,9 +146,9 @@ const UnityPage: NextPage = () => {
             </Grid>
           </Card>
           <CreditSubform
-            gpuQty={watch('details.gpuPerTask')}
-            cpuQty={watch('details.cpuPerTask')}
-            memQty={watch('details.cpuPerTask')! * watch('details.memPerCpu')!}
+            gpuQty={watch('details.gpusPerTask')}
+            cpuQty={watch('details.cpusPerTask')}
+            memQty={watch('details.cpusPerTask')! * watch('details.memPerCpu')!}
           />
           <SendButton>Render</SendButton>
         </div>

diff --git a/src/app/upscaling/page.tsx b/src/app/upscaling/page.tsx
@@ -75,8 +75,8 @@ const NewPage: NextPage = () => {
       labels: [],
       details: {
         nTasks: 1,
-        gpuPerTask: 1,
-        cpuPerTask: 8,
+        gpusPerTask: 1,
+        cpusPerTask: 8,
         memPerCpu: 8000,
         isVideo: false,
         isAnime: false,

diff --git a/src/components/ui/containers/HardwareRecap/HardwareRecap.tsx b/src/components/ui/containers/HardwareRecap/HardwareRecap.tsx
@@ -38,7 +38,28 @@ const HardwareRecap: FC<HardwareRecapProps> = ({ defaultDuration, gpuQty = 0, cp
     });
   }, [defaultDuration]);
 
-  const { data: provider } = useGetProviderPrices('0x75761B17c3088ce5Cd8e02575c6DAa438FFA6e12');
+  const { data, error } = useGetProviderPrices('0x75761B17c3088ce5Cd8e02575c6DAa438FFA6e12');
+
+  // TODO: HACK: Return fake data on error
+  const provider = useMemo(() => {
+    if (error || !data) {
+      return {
+        cpuPricePerMin: 950000000000000000n,
+        gpuPricePerMin: 8500000000000000000n,
+        memPricePerMin: 80000000000000n,
+      };
+    }
+
+    // Return fake also if everything is zero
+    if (!data.cpuPricePerMin && !data.gpuPricePerMin && !data.memPricePerMin) {
+      return {
+        cpuPricePerMin: 950000000000000000n,
+        gpuPricePerMin: 8500000000000000000n,
+        memPricePerMin: 80000000000000n,
+      };
+    }
+    return data;
+  }, [data, error]);
 
   const { setValue, formState } = useFormContext<CreditSubformData>();
 
@@ -60,8 +81,6 @@ const HardwareRecap: FC<HardwareRecapProps> = ({ defaultDuration, gpuQty = 0, cp
     setOpen(!!formState.errors.credit);
   }, [formState.errors]);
 
-  if (!provider) return null;
-
   const rows = [
     ...(gpuQty !== 0
       ? [