From 939f46c7e6c79a02da22c08798ec653e040c0ee3 Mon Sep 17 00:00:00 2001
From: jialin <jialinkuang@126.com>
Date: Thu, 3 Apr 2025 13:34:48 +0800
Subject: [PATCH] fix: miss gpu_selector value in catalog

---
 src/components/copy-button/index.tsx          |  14 ++-
 src/locales/en-US/common.ts                   |   1 +
 src/locales/ja-JP/common.ts                   |   5 +
 src/locales/ru-RU/common.ts                   |   5 +
 src/locales/zh-CN/common.ts                   |   1 +
 .../llmodels/components/advance-config.tsx    |  20 +--
 .../components/deploy-builtin-modal.tsx       |  34 ++++-
 .../llmodels/components/deploy-modal.tsx      |   2 +-
 .../llmodels/components/update-modal.tsx      |  10 +-
 src/pages/llmodels/config/form-context.ts     |   2 +-
 src/pages/llmodels/config/index.ts            |   1 -
 src/pages/llmodels/hooks/index.ts             |   3 +-
 .../resources/components/model-files.tsx      | 117 +++++++++++++-----
 src/utils/index.ts                            |   5 +-
 14 files changed, 156 insertions(+), 64 deletions(-)

diff --git a/src/components/copy-button/index.tsx b/src/components/copy-button/index.tsx
index 368f40d0..48bbd173 100644
--- a/src/components/copy-button/index.tsx
+++ b/src/components/copy-button/index.tsx
@@ -2,7 +2,7 @@ import { CheckCircleFilled, CopyOutlined } from '@ant-design/icons';
 import { useIntl } from '@umijs/max';
 import { Button, Tooltip, message } from 'antd';
 import ClipboardJS from 'clipboard';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 type CopyButtonProps = {
   children?: React.ReactNode;
@@ -63,6 +63,13 @@ const CopyButton: React.FC<CopyButtonProps> = ({
     }
   };
 
+  const tipTitle = useMemo(() => {
+    if (copied) {
+      return intl.formatMessage({ id: 'common.button.copied' });
+    }
+    return tips ?? intl.formatMessage({ id: 'common.button.copy' });
+  }, [copied, intl, tips]);
+
   useEffect(() => {
     initClipboard();
     return () => {
@@ -71,10 +78,7 @@ const CopyButton: React.FC<CopyButtonProps> = ({
   }, [buttonRef]);
 
   return (
-    <Tooltip
-      title={tips ?? intl.formatMessage({ id: 'common.button.copy' })}
-      placement={placement}
-    >
+    <Tooltip title={tipTitle} placement={placement}>
       <Button
         className="copy-button"
         ref={buttonRef}
diff --git a/src/locales/en-US/common.ts b/src/locales/en-US/common.ts
index 14b94c98..a1be4f36 100644
--- a/src/locales/en-US/common.ts
+++ b/src/locales/en-US/common.ts
@@ -15,6 +15,7 @@ export default {
   'common.button.run': 'Run',
   'common.button.viewcode': 'View Code',
   'common.button.copy': 'Copy',
+  'common.button.copied': 'Copied',
   'common.button.collapse': 'Collapse',
   'common.button.expand': 'Expand',
   'common.button.cancel': 'Cancel',
diff --git a/src/locales/ja-JP/common.ts b/src/locales/ja-JP/common.ts
index 5e6d9f87..1737c24d 100644
--- a/src/locales/ja-JP/common.ts
+++ b/src/locales/ja-JP/common.ts
@@ -15,6 +15,7 @@ export default {
   'common.button.run': '実行',
   'common.button.viewcode': 'コードを表示',
   'common.button.copy': 'コピー',
+  'common.button.copied': 'Copied',
   'common.button.collapse': '折りたたむ',
   'common.button.expand': '展開',
   'common.button.cancel': 'キャンセル',
@@ -235,3 +236,7 @@ export default {
   'common.text.error': 'エラー',
   'common.text.tips': 'ヒント'
 };
+
+// ========== To-Do: Translate Keys (Remove After Translation) ==========
+// 1. 'common.button.copied',
+// ========== End of To-Do List ==========
diff --git a/src/locales/ru-RU/common.ts b/src/locales/ru-RU/common.ts
index 1d6df20d..977c0b48 100644
--- a/src/locales/ru-RU/common.ts
+++ b/src/locales/ru-RU/common.ts
@@ -15,6 +15,7 @@ export default {
   'common.button.run': 'Запустить',
   'common.button.viewcode': 'Посмотреть код',
   'common.button.copy': 'Копировать',
+  'common.button.copied': 'Copied',
   'common.button.collapse': 'Свернуть',
   'common.button.expand': 'Развернуть',
   'common.button.cancel': 'Отмена',
@@ -233,3 +234,7 @@ export default {
   'common.text.error': 'Ошибка',
   'common.text.tips': 'Советы'
 };
+
+// ========== To-Do: Translate Keys (Remove After Translation) ==========
+// 1. 'common.button.copied',
+// ========== End of To-Do List ==========
diff --git a/src/locales/zh-CN/common.ts b/src/locales/zh-CN/common.ts
index 049de0f8..ab385725 100644
--- a/src/locales/zh-CN/common.ts
+++ b/src/locales/zh-CN/common.ts
@@ -15,6 +15,7 @@ export default {
   'common.button.run': '运行',
   'common.button.viewcode': '查看代码',
   'common.button.copy': '复制',
+  'common.button.copied': '复制成功',
   'common.button.collapse': '折叠',
   'common.button.expand': '展开',
   'common.button.submit': '提交',
diff --git a/src/pages/llmodels/components/advance-config.tsx b/src/pages/llmodels/components/advance-config.tsx
index 18701c16..5e71f48c 100644
--- a/src/pages/llmodels/components/advance-config.tsx
+++ b/src/pages/llmodels/components/advance-config.tsx
@@ -157,32 +157,18 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
 
   const handleBackendParametersOnBlur = () => {
     const backendParams = form.getFieldValue('backend_parameters');
-    console.log('backendParams==', backendParams);
-    onValuesChange?.({
-      source: source,
-      allValues: form.getFieldsValue(),
-      changedValues: {}
-    });
+    onValuesChange?.({}, form.getFieldsValue());
   };
 
   const handleSelectorOnBlur = () => {
     const workerSelector = form.getFieldValue('worker_selector');
-    console.log('workerSelector==', workerSelector);
-    onValuesChange?.({
-      source: source,
-      allValues: form.getFieldsValue(),
-      changedValues: {}
-    });
+    onValuesChange?.({}, form.getFieldsValue());
   };
 
   const handleBackendVersionOnBlur = () => {
     const backendVersion = form.getFieldValue('backend_version');
     if (backendVersion) {
-      onValuesChange?.({
-        source: source,
-        allValues: form.getFieldsValue(),
-        changedValues: {}
-      });
+      onValuesChange?.({}, form.getFieldsValue());
     }
   };
 
diff --git a/src/pages/llmodels/components/deploy-builtin-modal.tsx b/src/pages/llmodels/components/deploy-builtin-modal.tsx
index fc1e6936..f3892206 100644
--- a/src/pages/llmodels/components/deploy-builtin-modal.tsx
+++ b/src/pages/llmodels/components/deploy-builtin-modal.tsx
@@ -111,6 +111,11 @@ const AddModal: React.FC<AddModalProps> = (props) => {
     form.current?.submit?.();
   };
 
+  const pickSomeFieldsValue = () => {
+    const formData = form.current?.getFieldsValue();
+    return _.pick(formData, ['worker_selector', 'gpu_selector', 'env']);
+  };
+
   const generateSubmitData = (formData: FormData) => {
     const gpuSelector = generateGPUIds(formData);
     const data = {
@@ -285,13 +290,32 @@ const AddModal: React.FC<AddModalProps> = (props) => {
   };
 
   const onValuesChange = async (changedValues: any, allValues: any) => {
+    const data = {
+      ..._.omit(selectSpecRef.current, ['name']),
+      ...allValues
+    };
     handleOnValuesChange?.({
       changedValues,
-      allValues: generateSubmitData(allValues),
+      allValues: data,
       source: props.source
     });
   };
 
+  const handleAdvanceOnValuesChange = (data: {
+    changedValues: any;
+    allValues: any;
+    source: string;
+  }) => {
+    handleOnValuesChange?.({
+      changedValues: data.changedValues,
+      allValues: {
+        ..._.omit(selectSpecRef.current, ['name']),
+        ...data.allValues
+      },
+      source: data.source
+    });
+  };
+
   const handleBackendChange = (backend: string) => {
     if (backend === backendOptionsMap.vllm) {
       setIsGGUF(false);
@@ -392,7 +416,8 @@ const AddModal: React.FC<AddModalProps> = (props) => {
       quantization: val
     });
     form.current.setFieldsValue({
-      ...data
+      ...data,
+      ...pickSomeFieldsValue()
     });
     handleCheckFormData();
   };
@@ -413,7 +438,8 @@ const AddModal: React.FC<AddModalProps> = (props) => {
 
     // set form data
     form.current.setFieldsValue({
-      ...data
+      ...data,
+      ...pickSomeFieldsValue()
     });
     handleCheckFormData();
   };
@@ -497,7 +523,7 @@ const AddModal: React.FC<AddModalProps> = (props) => {
           quantizationOptions: quantizationOptions,
           onSizeChange: handleOnSizeChange,
           onQuantizationChange: handleOnQuantizationChange,
-          onValuesChange: handleOnValuesChange
+          onValuesChange: onValuesChange
         }}
       >
         <FormWrapper>
diff --git a/src/pages/llmodels/components/deploy-modal.tsx b/src/pages/llmodels/components/deploy-modal.tsx
index 3c7dc8fa..dd6a800d 100644
--- a/src/pages/llmodels/components/deploy-modal.tsx
+++ b/src/pages/llmodels/components/deploy-modal.tsx
@@ -275,7 +275,7 @@ const AddModal: FC<AddModalProps> = (props) => {
           value={{
             isGGUF: isGGUF,
             modelFileOptions: props.modelFileOptions,
-            onValuesChange: handleOnValuesChange
+            onValuesChange: onValuesChange
           }}
         >
           <FormWrapper>
diff --git a/src/pages/llmodels/components/update-modal.tsx b/src/pages/llmodels/components/update-modal.tsx
index 640a6644..e6d43072 100644
--- a/src/pages/llmodels/components/update-modal.tsx
+++ b/src/pages/llmodels/components/update-modal.tsx
@@ -331,6 +331,14 @@ const UpdateModal: React.FC<AddModalProps> = (props) => {
     });
   };
 
+  const handleManulOnValuesChange = (changedValues: any, allValues: any) => {
+    handleOnValuesChange({
+      changedValues,
+      allValues,
+      source: formData?.source as string
+    });
+  };
+
   const handleOnClose = () => {
     onCancel?.();
   };
@@ -425,7 +433,7 @@ const UpdateModal: React.FC<AddModalProps> = (props) => {
       >
         <FormContext.Provider
           value={{
-            onValuesChange: handleOnValuesChange
+            onValuesChange: handleManulOnValuesChange
           }}
         >
           <Form
diff --git a/src/pages/llmodels/config/form-context.ts b/src/pages/llmodels/config/form-context.ts
index d71509dd..230f1ab2 100644
--- a/src/pages/llmodels/config/form-context.ts
+++ b/src/pages/llmodels/config/form-context.ts
@@ -8,7 +8,7 @@ interface FormContextProps {
   modelFileOptions?: any[];
   onSizeChange?: (val: number) => void;
   onQuantizationChange?: (val: string) => void;
-  onValuesChange?: (val: any) => void;
+  onValuesChange?: (changedValues: any, allValues: any) => void;
 }
 
 interface FormInnerContextProps {
diff --git a/src/pages/llmodels/config/index.ts b/src/pages/llmodels/config/index.ts
index 9949dcb0..60961575 100644
--- a/src/pages/llmodels/config/index.ts
+++ b/src/pages/llmodels/config/index.ts
@@ -366,7 +366,6 @@ export const getSourceRepoConfigValue = (
       omits.push(key);
     }
   });
-
   return {
     values: { ...result, ..._.omit(data, omits) }
   };
diff --git a/src/pages/llmodels/hooks/index.ts b/src/pages/llmodels/hooks/index.ts
index fc8fd80b..0000e3a7 100644
--- a/src/pages/llmodels/hooks/index.ts
+++ b/src/pages/llmodels/hooks/index.ts
@@ -382,7 +382,7 @@ export const useCheckCompatibility = () => {
 
     return {
       gpu_selector: {
-        gpu_ids: result
+        gpu_ids: result || []
       }
     };
   };
@@ -393,6 +393,7 @@ export const useCheckCompatibility = () => {
     source: string;
   }) => {
     const { changedValues, allValues, source } = params;
+    console.log('params+++++++', params);
 
     if (
       _.isEqual(cacheFormValuesRef.current, allValues) ||
diff --git a/src/pages/resources/components/model-files.tsx b/src/pages/resources/components/model-files.tsx
index 98344c33..53e2f7ed 100644
--- a/src/pages/resources/components/model-files.tsx
+++ b/src/pages/resources/components/model-files.tsx
@@ -1,8 +1,8 @@
 import { modelsExpandKeysAtom } from '@/atoms/models';
 import AutoTooltip from '@/components/auto-tooltip';
-import CopyButton from '@/components/copy-button';
 import DeleteModal from '@/components/delete-modal';
 import DropdownButtons from '@/components/drop-down-buttons';
+import OverlayScroller from '@/components/overlay-scroller';
 import { FilterBar } from '@/components/page-tools';
 import StatusTag from '@/components/status-tag';
 import { PageAction } from '@/config';
@@ -25,12 +25,25 @@ import {
 import { SourceType } from '@/pages/llmodels/config/types';
 import DownloadModal from '@/pages/llmodels/download';
 import { convertFileSize } from '@/utils';
+import {
+  CheckCircleFilled,
+  CopyOutlined,
+  InfoCircleOutlined
+} from '@ant-design/icons';
 import { useIntl, useNavigate } from '@umijs/max';
-import { ConfigProvider, Empty, Table, Tag, message } from 'antd';
+import {
+  ConfigProvider,
+  Empty,
+  Table,
+  Tag,
+  Tooltip,
+  Typography,
+  message
+} from 'antd';
 import dayjs from 'dayjs';
 import { useAtom } from 'jotai';
 import _ from 'lodash';
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import {
   useGenerateFormEditInitialValues,
@@ -86,6 +99,44 @@ const PathWrapper = styled.div`
   }
 `;
 
+const ItemWrapper = styled.ul`
+  max-width: 300px;
+  margin: 0;
+  padding-inline: 8px 0;
+  word-break: break-word;
+`;
+
+const FilesTag = styled(Tag)`
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  margin-inline: 4px 0;
+  height: 22px;
+  border-radius: var(--border-radius-base);
+`;
+
+const TooltipTitle: React.FC<{ path: string }> = ({ path }) => {
+  const intl = useIntl();
+  return (
+    <Typography.Paragraph
+      style={{ background: 'transparent', color: 'inherit' }}
+      copyable={{
+        icon: [
+          <CopyOutlined key="copy-icon" />,
+          <CheckCircleFilled key="copied-icon" />
+        ],
+        text: path,
+        tooltips: [
+          intl.formatMessage({ id: 'common.button.copy' }),
+          intl.formatMessage({ id: 'common.button.copied' })
+        ]
+      }}
+    >
+      {path}
+    </Typography.Paragraph>
+  );
+};
+
 const getWorkerName = (
   id: number,
   workersList: Global.BaseOption<number>[]
@@ -260,27 +311,33 @@ const ModelFiles = () => {
   };
 
   const renderParts = (record: ListItem) => {
-    const parts = _.tail(record.resolved_paths);
-    if (!parts.length) {
+    const parts = record.resolved_paths || [];
+    if (parts.length <= 1) {
       return null;
     }
 
+    const renderItem = () => {
+      return (
+        <ItemWrapper>
+          {parts.map((item: string, index: number) => {
+            return <li key={index}>{_.split(item, /[\\/]/).pop()}</li>;
+          })}
+        </ItemWrapper>
+      );
+    };
+
     return (
-      <Tag
-        className="flex-center"
-        color="purple"
-        style={{
-          marginRight: 0,
-          marginLeft: 4,
-          height: 22,
-          borderRadius: 'var(--border-radius-base)'
-        }}
+      <Tooltip
+        title={<OverlayScroller>{renderItem()}</OverlayScroller>}
+        overlayInnerStyle={{ width: 'max-content', maxWidth: 300 }}
       >
-        <span style={{ opacity: 1 }}>
-          {record.resolved_paths?.length}{' '}
-          {intl.formatMessage({ id: 'models.form.files' })}
-        </span>
-      </Tag>
+        <FilesTag color="purple" icon={<InfoCircleOutlined />}>
+          <span style={{ opacity: 1 }}>
+            {record.resolved_paths?.length}{' '}
+            {intl.formatMessage({ id: 'models.form.files' })}
+          </span>
+        </FilesTag>
+      </Tooltip>
     );
   };
 
@@ -467,19 +524,17 @@ const ModelFiles = () => {
         return (
           record.resolved_paths?.length > 0 && (
             <PathWrapper>
-              <AutoTooltip ghost title={record.resolved_paths?.[0]} showTitle>
+              <AutoTooltip
+                ghost
+                showTitle
+                title={
+                  <TooltipTitle
+                    path={record.resolved_paths?.[0]}
+                  ></TooltipTitle>
+                }
+              >
                 <span>{getResolvedPath(record.resolved_paths)}</span>
               </AutoTooltip>
-              <span className="btn-wrapper">
-                <CopyButton
-                  text={record.resolved_paths?.[0]}
-                  type="link"
-                  btnStyle={{ width: 18, paddingInline: 2 }}
-                  tips={intl.formatMessage({
-                    id: 'resources.modelfiles.copy.tips'
-                  })}
-                ></CopyButton>
-              </span>
               {renderParts(record)}
             </PathWrapper>
           )
@@ -493,7 +548,7 @@ const ModelFiles = () => {
       render: (text: string, record: ListItem) => {
         return (
           <AutoTooltip ghost maxWidth={100}>
-            <span>{convertFileSize(record.size, 1)}</span>
+            <span>{convertFileSize(record.size, 1, true)}</span>
           </AutoTooltip>
         );
       }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index e031b4ac..a85440cd 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -21,11 +21,12 @@ export const handleBatchRequest = async (
 
 export const convertFileSize = (
   sizeInBytes: number | undefined,
-  prec?: number
+  prec?: number,
+  allowEmpty = false
 ) => {
   const precision = prec ?? 1;
   if (!sizeInBytes) {
-    return '0';
+    return allowEmpty ? '' : '0';
   }
   if (sizeInBytes < 1024) {
     return `${sizeInBytes.toFixed(precision)} B`;