feat(FR-1004): use server provided session resource setting in launching session

Author: ironAiken2

react/src/components/ComputeSessionNodeItems/SessionActionButtons.tsx

@@ -54,6 +54,9 @@ interface SessionActionButtonsProps {
 }
 
 const isActive = (session: SessionActionButtonsFragment$data) => {
+  if (session?.type === 'system') {
+    return session?.status === 'RUNNING';
+  }
   return !['TERMINATED', 'CANCELLED', 'TERMINATING'].includes(
     session?.status || '',
   );
@@ -283,9 +286,7 @@ const SessionActionButtons: React.FC<SessionActionButtonsProps> = ({
           <Tooltip title={t('data.explorer.RunSSH/SFTPserver')}>
             <Button
               type="primary"
-              disabled={
-                !isAppSupported(session) || !isActive(session) || !isOwner
-              }
+              disabled={!isActive(session) || !isOwner}
               size={size}
               icon={<BAISftpIcon />}
               onClick={() => {

react/src/components/FileBrowserButton.tsx

@@ -102,6 +102,8 @@ const FileBrowserButton: React.FC<FileBrowserButtonProps> = ({
             return;
           }
           const fileBrowserFormValue: StartSessionWithDefaultValue = {
+            // If the resource setting is not included when the session is created,
+            // it is created with the value determined by the server.
             sessionName: `filebrowser-${vfolder.row_id}`,
             sessionType: 'interactive',
             // use default file browser image if configured and allowed
@@ -112,10 +114,6 @@ const FileBrowserButton: React.FC<FileBrowserButtonProps> = ({
             cluster_mode: 'single-node',
             cluster_size: 1,
             mount_ids: [vfolder.row_id?.replaceAll('-', '') || ''],
-            resource: {
-              cpu: 1,
-              mem: '0.5g',
-            },
           };
 
           await startSessionWithDefault(fileBrowserFormValue)

react/src/components/SFTPServerButton.tsx

@@ -55,8 +55,7 @@ const SFTPServerButton: React.FC<SFTPServerButtonProps> = ({
     useStartSession();
   const { upsertNotification } = useSetBAINotification();
 
-  const { systemSSHImage, systemSSHImageInfo } =
-    useDefaultSystemSSHImageWithFallback();
+  const { systemSSHImage } = useDefaultSystemSSHImageWithFallback();
 
   const vfolder = useFragment(
     graphql`
@@ -110,18 +109,9 @@ const SFTPServerButton: React.FC<SFTPServerButtonProps> = ({
           />
         }
         action={async () => {
-          const resource: StartSessionWithDefaultValue['resource'] = {
-            cpu:
-              _.toNumber(
-                _.find(systemSSHImageInfo?.resource_limits, { key: 'cpu' })
-                  ?.min,
-              ) || 2,
-            mem:
-              _.find(systemSSHImageInfo?.resource_limits, { key: 'mem' })
-                ?.min || '0.5g',
-          };
-
           const sftpSessionConf: StartSessionWithDefaultValue = {
+            // If the resource setting is not included when the session is created,
+            // it is created with the value determined by the server.
             sessionName: `sftp-${vfolder?.row_id}`,
             sessionType: 'system',
             // use default system SSH image if configured and allowed
@@ -142,10 +132,6 @@ const SFTPServerButton: React.FC<SFTPServerButtonProps> = ({
             cluster_size: 1,
             mount_ids: [vfolder?.row_id?.replaceAll('-', '') || ''],
             resourceGroup: sftpScalingGroupByCurrentProject?.[0],
-            resource: {
-              cpu: resource.cpu < 2 ? 2 : resource.cpu,
-              mem: resource.mem,
-            },
           };
 
           await startSessionWithDefault(sftpSessionConf)

react/src/components/SessionFormItems/ResourceAllocationFormItems.tsx

@@ -138,6 +138,7 @@ const ResourceAllocationFormItems: React.FC<
     accessible_scaling_groups,
     (group) => group?.name === currentResourceGroupInForm,
   );
+  const currentResourceValue = Form.useWatch(['resource']);
   const currentImage = Form.useWatch(['environments', 'image'], {
     form,
     preserve: true,
@@ -205,14 +206,19 @@ const ResourceAllocationFormItems: React.FC<
   }, [currentImage, acceleratorSlotsInRG, currentEnvironmentManual]);
 
   useEffect(() => {
+    if (!currentResourceValue) {
+      form.setFieldsValue({
+        allocationPreset: 'auto-select',
+      });
+    }
     if (supportedAcceleratorTypesInRGByImage?.length === 0) {
       form.setFieldsValue({
         resource: {
           accelerator: 0,
         },
       });
     }
-  }, [supportedAcceleratorTypesInRGByImage, form]);
+  }, [supportedAcceleratorTypesInRGByImage, form, currentResourceValue]);
 
   const sessionSliderLimitAndRemaining = {
     min: 1,

react/src/hooks/useStartSession.tsx

@@ -136,7 +136,7 @@ export const useStartSession = () => {
         baiClient._config.default_session_environment,
       ),
     }),
-    ...RESOURCE_ALLOCATION_INITIAL_FORM_VALUES,
+    ..._.omit(RESOURCE_ALLOCATION_INITIAL_FORM_VALUES, ['resource']),
     resourceGroup: currentGlobalResourceGroup || undefined,
   };
 
@@ -214,26 +214,30 @@ export const useStartSession = () => {
 
         config: {
           // Resource allocation
-          resources: {
-            cpu: values.resource.cpu,
-            mem: values.resource.mem,
-            // Add accelerator only if specified
-            ...(values.resource?.acceleratorType &&
-            values.resource?.accelerator &&
-            values.resource?.accelerator > 0
-              ? {
-                  [values.resource.acceleratorType]:
-                    values.resource.accelerator,
-                }
-              : undefined),
-          },
+          ...(values?.resource && {
+            resources: {
+              cpu: values?.resource?.cpu,
+              mem: values?.resource?.mem,
+              // Add accelerator only if specified
+              ...(values.resource?.acceleratorType &&
+              values.resource?.accelerator &&
+              values.resource?.accelerator > 0
+                ? {
+                    [values.resource.acceleratorType]:
+                      values.resource.accelerator,
+                  }
+                : undefined),
+            },
+          }),
           scaling_group: values.owner?.enabled
             ? values.owner.project
             : values.resourceGroup,
-          resource_opts: {
-            shmem: values.resource.shmem,
-            // allow_fractional_resource_fragmentation can be added here if needed
-          },
+          ...(values?.resource && {
+            resource_opts: {
+              shmem: values?.resource?.shmem,
+              // allow_fractional_resource_fragmentation can be added here if needed
+            },
+          }),
 
           // Storage configuration
           [supportsMountById ? 'mount_ids' : 'mounts']: values.mount_ids,
@@ -277,7 +281,7 @@ export const useStartSession = () => {
         .createIfNotExists(
           sessionInfo.kernelName,
           formattedSessionName,
-          sessionInfo.resources,
+          sessionInfo?.resources,
           undefined,
           sessionInfo.architecture,
         )

react/src/pages/SessionLauncherPage.tsx

@@ -277,7 +277,7 @@ const SessionLauncherPage = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const mergedInitialValues = useMemo(() => {
+  const mergedInitialValues: SessionLauncherFormValue = useMemo(() => {
     return _.merge({}, defaultFormValues, formValuesFromQueryParams);
   }, [defaultFormValues, formValuesFromQueryParams]);