chore: support editing the model repoID, filename, model path

gpustack · Dec 10, 2024 · 15f685f · 15f685f
1 parent acf99a6
commit 15f685f
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 43 deletions.
diff --git a/src/components/audio-player/raw-audio-player.tsx b/src/components/audio-player/raw-audio-player.tsx
@@ -66,8 +66,10 @@ const RawAudioPlayer: React.FC<AudioPlayerProps> = forwardRef((props, ref) => {
 
     audioRef.current.addEventListener('loadeddata', () => {
       initEnvents();
-      initAudioContext();
-      generateVisualData();
+      if (!audioContext.current) {
+        initAudioContext();
+        generateVisualData();
+      }
       props.onLoadedData?.();
     });
 
@@ -107,12 +109,6 @@ const RawAudioPlayer: React.FC<AudioPlayerProps> = forwardRef((props, ref) => {
     });
   };
 
-  const handleAudioOnPlay = () => {
-    audioRef.current?.play();
-  };
-
-  const handleLoadedMetadata = () => {};
-
   useImperativeHandle(ref, () => ({
     play: () => {
       audioRef.current?.play();
@@ -124,6 +120,8 @@ const RawAudioPlayer: React.FC<AudioPlayerProps> = forwardRef((props, ref) => {
 
   useEffect(() => {
     if (audioRef.current) {
+      console.log('audioRef.current', audioRef.current, props.url);
+      initEnvents();
     }
     return () => {
       if (audioContext.current) {
@@ -150,12 +148,15 @@ const RawAudioPlayer: React.FC<AudioPlayerProps> = forwardRef((props, ref) => {
 
   return (
     <audio
-      width={props.width || 300}
-      height={props.height || 40}
       controls
       autoPlay={autoplay}
       src={props.url}
       ref={audioRef}
+      style={{
+        position: 'absolute',
+        left: '-9999px',
+        opacity: 0
+      }}
       preload="metadata"
     ></audio>
   );

diff --git a/src/components/drop-down-buttons/index.less b/src/components/drop-down-buttons/index.less
@@ -0,0 +1,4 @@
+.dropdown-button.middle {
+  height: 28px;
+  width: 28px;
+}
diff --git a/src/components/drop-down-buttons/index.tsx b/src/components/drop-down-buttons/index.tsx
@@ -1,8 +1,10 @@
 import { MoreOutlined } from '@ant-design/icons';
 import { useIntl } from '@umijs/max';
 import { Button, Dropdown, Tooltip, type MenuProps } from 'antd';
+import classNames from 'classnames';
 import _ from 'lodash';
 import { memo } from 'react';
+import './index.less';
 
 interface DropdownButtonsProps {
   items: MenuProps['items'];
@@ -12,7 +14,7 @@ interface DropdownButtonsProps {
 
 const DropdownButtons: React.FC<DropdownButtonsProps> = ({
   items,
-  size = 'small',
+  size = 'middle',
   onSelect
 }) => {
   const intl = useIntl();
@@ -81,12 +83,18 @@ const DropdownButtons: React.FC<DropdownButtonsProps> = ({
               key="leftButton"
             >
               <Button
+                className={classNames('dropdown-button', size)}
                 onClick={handleButtonClick}
                 size={size}
                 icon={_.head(items)?.icon}
               ></Button>
             </Tooltip>,
-            <Button icon={<MoreOutlined />} size={size} key="menu"></Button>
+            <Button
+              icon={<MoreOutlined />}
+              size={size}
+              key="menu"
+              className={classNames('dropdown-button', size)}
+            ></Button>
           ]}
         ></Dropdown.Button>
       )}

diff --git a/src/components/seal-table/components/table-row.tsx b/src/components/seal-table/components/table-row.tsx
@@ -62,14 +62,6 @@ const TableRow: React.FC<
     }
   }, [rowSelection]);
 
-  // useEffect(() => {
-  //   if (expandedRowKeys?.includes(record[rowKey])) {
-  //     setExpanded(true);
-  //   } else {
-  //     setExpanded(false);
-  //   }
-  // }, [expandedRowKeys]);
-
   useEffect(() => {
     return () => {
       if (pollTimer.current) {
@@ -160,8 +152,6 @@ const TableRow: React.FC<
       pollTimer.current = setInterval(() => {
         handlePolling();
       }, 1000);
-    } else {
-      handleLoadChildren();
     }
   };
 
@@ -179,6 +169,20 @@ const TableRow: React.FC<
     }
   };
 
+  useEffect(() => {
+    if (expandedRowKeys?.includes(record[rowKey])) {
+      setExpanded(true);
+    } else {
+      setExpanded(false);
+    }
+  }, [expandedRowKeys]);
+
+  useEffect(() => {
+    if (expanded) {
+      handleLoadChildren();
+    }
+  }, [expanded]);
+
   useEffect(() => {
     if (!firstLoad && expanded) {
       cacheDataListRef.current = childrenData;

diff --git a/src/components/speech-content/speech-item.tsx b/src/components/speech-content/speech-item.tsx
@@ -64,6 +64,7 @@ const SpeechItem: React.FC<SpeechContentProps> = (props) => {
   }, [ref.current]);
 
   const handleOnAnalyse = useCallback((data: any, analyser: any) => {
+    console.log('data+++++++++++++++++=:', data);
     setAudioChunks((pre: any) => {
       return {
         data: data,
@@ -88,6 +89,7 @@ const SpeechItem: React.FC<SpeechContentProps> = (props) => {
 
   const handleOnAudioprocess = useCallback(
     (current: number) => {
+      console.log('current:', current);
       throttleUpdateCurrentTime(current);
     },
     [throttleUpdateCurrentTime]
@@ -119,7 +121,7 @@ const SpeechItem: React.FC<SpeechContentProps> = (props) => {
   };
 
   const handleReady = useCallback((duration: number) => {
-    console.log('duration:', duration);
+    console.log('ready+++++++++++++++', duration);
     setDuration(duration);
   }, []);
 
@@ -159,6 +161,17 @@ const SpeechItem: React.FC<SpeechContentProps> = (props) => {
             onAudioprocess={handleOnAudioprocess}
             ref={ref}
           ></AudioPlayer>
+          {/* <RawAudioPlayer
+            {...props}
+            url={props.audioUrl}
+            onReady={handleReady}
+            onEnded={handleOnFinish}
+            onPlay={handleOnPlay}
+            onPause={handleOnPause}
+            onAnalyse={handleOnAnalyse}
+            onAudioProcess={handleOnAudioprocess}
+            ref={ref}
+          ></RawAudioPlayer> */}
           {isPlay && (
             <AudioAnimation
               maxBarCount={100}

diff --git a/src/config/hotkeys.ts b/src/config/hotkeys.ts
@@ -20,6 +20,7 @@ const KeybindingsMap = {
   NEW1: ['Ctrl+1', 'Meta+1'],
   NEW2: ['Ctrl+2', 'Meta+2'],
   NEW3: ['Ctrl+3', 'Meta+3'],
+  NEW4: ['Ctrl+4', 'Meta+4'],
   FOCUS: ['/', '/'],
   ADD: ['Alt+Ctrl+Enter', 'Alt+Meta+Enter']
 };

diff --git a/src/global.less b/src/global.less
@@ -629,6 +629,10 @@ body {
 .ant-image {
   border-radius: var(--border-radius-base);
   overflow: hidden;
+
+  .ant-image-mask {
+    background: rgba(0, 0, 0, 25%);
+  }
 }
 
 .ant-message-notice-wrapper {

diff --git a/src/hooks/use-expanded-row-keys.ts b/src/hooks/use-expanded-row-keys.ts
@@ -15,6 +15,10 @@ export default function useExpandedRowKeys() {
   );
 
   const updateExpandedRowKeys = (keys: React.Key[]) => {
+    setExpandedRowKeys(keys);
+  };
+
+  const removeExpandedRowKey = (keys: React.Key[]) => {
     // remove expanded row keys that are in the deleted keys
     const newExpandedRowKeys = expandedRowKeys.filter(
       (key) => !keys.includes(key)
@@ -30,6 +34,7 @@ export default function useExpandedRowKeys() {
     expandedRowKeys,
     clearExpandedRowKeys,
     updateExpandedRowKeys,
+    removeExpandedRowKey,
     handleExpandChange
   };
 }
diff --git a/src/pages/llmodels/components/advance-config.tsx b/src/pages/llmodels/components/advance-config.tsx
@@ -36,7 +36,6 @@ interface AdvanceConfigProps {
   gpuOptions: Array<any>;
   action: PageActionType;
   source: string;
-  modelTask: Record<string, any>;
 }
 
 const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {

diff --git a/src/pages/llmodels/components/data-form.tsx b/src/pages/llmodels/components/data-form.tsx
@@ -291,7 +291,7 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
           <SealAutoComplete
             filterOption
             defaultActiveFirstOption
-            disabled={action === PageAction.EDIT}
+            disabled={false}
             options={ollamaModelOptions}
             label={intl.formatMessage({ id: 'model.form.ollama.model' })}
             placeholder={intl.formatMessage({ id: 'model.form.ollamaholder' })}
@@ -503,7 +503,6 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
         form={form}
         gpuOptions={gpuOptions}
         isGGUF={isGGUF}
-        modelTask={modelTask}
         action={action}
         source={props.source}
       ></AdvanceConfig>

diff --git a/src/pages/llmodels/components/table-list.tsx b/src/pages/llmodels/components/table-list.tsx
@@ -82,8 +82,12 @@ const Models: React.FC<ModelsProps> = ({
   const intl = useIntl();
   const navigate = useNavigate();
   const rowSelection = useTableRowSelection();
-  const { handleExpandChange, updateExpandedRowKeys, expandedRowKeys } =
-    useExpandedRowKeys();
+  const {
+    handleExpandChange,
+    updateExpandedRowKeys,
+    removeExpandedRowKey,
+    expandedRowKeys
+  } = useExpandedRowKeys();
   const { sortOrder, setSortOrder } = useTableSort({
     defaultSortOrder: 'descend'
   });
@@ -152,6 +156,20 @@ const Models: React.FC<ModelsProps> = ({
       enabled: !openAddModal && !openDeployModal.show && !openLogModal
     }
   );
+  useHotkeys(
+    HotKeys.NEW4.join(','),
+    () => {
+      setOpenDeployModal({
+        show: true,
+        width: 600,
+        source: modelSourceMap.local_path_value
+      });
+    },
+    {
+      preventDefault: true,
+      enabled: !openAddModal && !openDeployModal.show && !openLogModal
+    }
+  );
 
   const sourceOptions = [
     {
@@ -299,16 +317,20 @@ const Models: React.FC<ModelsProps> = ({
 
         const result = getSourceRepoConfigValue(openDeployModal.source, data);
 
-        await createModel({
+        const modelData = await createModel({
           data: {
             ...result.values,
             ..._.omit(data, result.omits)
           }
         });
+        console.log('modelData:', modelData);
         setOpenDeployModal({
           ...openDeployModal,
           show: false
         });
+        setTimeout(() => {
+          updateExpandedRowKeys([modelData.id]);
+        }, 300);
         message.success(intl.formatMessage({ id: 'common.message.success' }));
       } catch (error) {}
     },
@@ -324,7 +346,7 @@ const Models: React.FC<ModelsProps> = ({
       name: row.name,
       async onOk() {
         await deleteModel(row.id);
-        updateExpandedRowKeys([row.id]);
+        removeExpandedRowKey([row.id]);
         rowSelection.removeSelectedKey(row.id);
       }
     });
@@ -336,7 +358,7 @@ const Models: React.FC<ModelsProps> = ({
       async onOk() {
         await handleBatchRequest(rowSelection.selectedRowKeys, deleteModel);
         rowSelection.clearSelections();
-        updateExpandedRowKeys(rowSelection.selectedRowKeys);
+        removeExpandedRowKey(rowSelection.selectedRowKeys);
       }
     });
   };
@@ -386,7 +408,7 @@ const Models: React.FC<ModelsProps> = ({
       async onOk() {
         await deleteModelInstance(row.id);
         if (list.length === 1) {
-          updateExpandedRowKeys([row.model_id]);
+          removeExpandedRowKey([row.model_id]);
         }
       }
     });