Compare commits

..
13 changed files with 76 additions and 55 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
"@ant-design/pro-components": "3.1.0-0",
"@antv/g6": "^5.0.51",
"@braintree/sanitize-url": "^7.1.1",
"@gpustack/core-ui": "^1.0.36",
"@gpustack/core-ui": "^1.0.37",
"@huggingface/gguf": "^0.1.7",
"@huggingface/hub": "^0.15.1",
"@huggingface/tasks": "^0.11.6",
+5 -5
View File
@@ -24,8 +24,8 @@ importers:
specifier: ^7.1.1
version: 7.1.2
'@gpustack/core-ui':
specifier: ^1.0.36
version: 1.0.36(czdvzceysqw7iv6pct2ucnb23e)
specifier: ^1.0.37
version: 1.0.37(czdvzceysqw7iv6pct2ucnb23e)
'@huggingface/gguf':
specifier: ^0.1.7
version: 0.1.18
@@ -1481,8 +1481,8 @@ packages:
resolution: {integrity: sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==, tarball: https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz}
deprecated: the package is rather renamed to @formatjs/ecma-abstract with some changes in functionality (primarily selectUnit is removed and we don't plan to make any further changes to this package
'@gpustack/core-ui@1.0.36':
resolution: {integrity: sha512-gF8ShMZ2SKYo3+skfsI3zo+aBSsXqKGMX+jWaKv81e38bDwJw71C33TR64d+6MyV9iUoFOoSK+ht1GefyvR17g==, tarball: https://registry.npmjs.org/@gpustack/core-ui/-/core-ui-1.0.36.tgz}
'@gpustack/core-ui@1.0.37':
resolution: {integrity: sha512-eP9uD4Eg04i2S+AQMwVh/siX8EjfAsZTiuaybe73hNahuJXV6/gqd+67zzBq27lmZRpa4Ao5CSX8JSjz06AONA==, tarball: https://registry.npmjs.org/@gpustack/core-ui/-/core-ui-1.0.37.tgz}
peerDependencies:
'@ant-design/icons': ^6.1.0
'@ant-design/pro-components': 3.1.0-0
@@ -10802,7 +10802,7 @@ snapshots:
'@formatjs/intl-utils@2.3.0': {}
'@gpustack/core-ui@1.0.36(czdvzceysqw7iv6pct2ucnb23e)':
'@gpustack/core-ui@1.0.37(czdvzceysqw7iv6pct2ucnb23e)':
dependencies:
'@ant-design/icons': 6.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@ant-design/pro-components': 3.1.0-0(antd@6.3.7(date-fns@2.30.0)(moment@2.30.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+1 -2
View File
@@ -1,4 +1,3 @@
import { nsLocalJSONStorage } from '@gpustack/core-ui/utils';
import { getDefaultStore } from 'jotai';
import { atomWithStorage } from 'jotai/utils';
@@ -9,7 +8,7 @@ export interface PaginationState {
export const paginationAtom = atomWithStorage<Record<string, any>>(
'paginationStatus',
{},
nsLocalJSONStorage,
undefined,
{ getOnInit: true }
);
+7 -10
View File
@@ -1,5 +1,4 @@
import { COLOR_PRIMARY } from '@/config/theme';
import { nsLocal, nsLocalJSONStorage } from '@gpustack/core-ui/utils';
import { atom } from 'jotai';
import { atomWithStorage } from 'jotai/utils';
@@ -24,7 +23,9 @@ export const defaultSettings: UserSettings = {
export const getStorageUserSettings = () => {
if (typeof window === 'undefined') return defaultSettings;
try {
const savedSettings = JSON.parse(nsLocal.get('userSettings') || '{}');
const savedSettings = JSON.parse(
localStorage.getItem('userSettings') || '{}'
);
return {
...defaultSettings,
...savedSettings
@@ -34,13 +35,9 @@ export const getStorageUserSettings = () => {
}
};
export const userSettingsAtom = atomWithStorage<UserSettings>(
'userSettings',
{
...getStorageUserSettings()
},
nsLocalJSONStorage
);
export const userSettingsAtom = atomWithStorage<UserSettings>('userSettings', {
...getStorageUserSettings()
});
export const userSettingsHelperAtom = atom(
(get) => get(userSettingsAtom),
@@ -62,6 +59,6 @@ export const hideModalTemporarilyAtom = atom<boolean>(false);
export const collapsedMenuGroupsAtom = atomWithStorage<string[]>(
'collapsedMenuGroups',
[],
nsLocalJSONStorage,
undefined,
{ getOnInit: true }
);
+1 -3
View File
@@ -1,11 +1,9 @@
import { nsLocalJSONStorage } from '@gpustack/core-ui/utils';
import { getDefaultStore } from 'jotai';
import { atomWithStorage } from 'jotai/utils';
export const tabActiveAtom = atomWithStorage<Map<string, any>>(
'tabActiveStatus',
new Map(),
nsLocalJSONStorage
new Map()
);
export const setActiveStatus = (key: string, value: any) => {
+4 -10
View File
@@ -1,12 +1,7 @@
import { nsLocal, nsLocalJSONStorage } from '@gpustack/core-ui/utils';
import { atom } from 'jotai';
import { atomWithStorage } from 'jotai/utils';
export const userAtom = atomWithStorage<any>(
'userInfo',
null,
nsLocalJSONStorage
);
export const userAtom = atomWithStorage<any>('userInfo', null);
// Backs the `currentOrganizationId` localStorage key. Stays null in
// builds with no Org context (single-tenant), and is shared with any
@@ -14,8 +9,7 @@ export const userAtom = atomWithStorage<any>(
// without one side having to import from the other.
export const currentOrganizationIdAtom = atomWithStorage<number | null>(
'currentOrganizationId',
null,
nsLocalJSONStorage
null
);
export const GPUStackVersionAtom = atom<{
@@ -76,7 +70,7 @@ export const getCurrentOrgNamespace = (
const getStoredCurrentOrgId = (): number | null => {
try {
const raw = nsLocal.get('currentOrganizationId');
const raw = localStorage.getItem('currentOrganizationId');
if (!raw) return null;
const value = JSON.parse(raw);
return typeof value === 'number' ? value : null;
@@ -114,7 +108,7 @@ export const getOrgById = (
const target = String(id);
for (const key of ORG_CACHE_KEYS) {
try {
const raw = nsLocal.get(key);
const raw = localStorage.getItem(key);
if (!raw) continue;
const list = JSON.parse(raw) as CachedOrg[];
if (!Array.isArray(list)) continue;
+5 -4
View File
@@ -1,17 +1,18 @@
import { defaultSettings } from '@/atoms/settings';
import { nsLocal } from '@gpustack/core-ui/utils';
import { getDefaultStore } from 'jotai';
export const clearStorageUserSettings = () => {
try {
const savedSettings = JSON.parse(nsLocal.get('userSettings') || '{}');
const savedSettings = JSON.parse(
localStorage.getItem('userSettings') || '{}'
);
// colorPrimary is an enterprise-wide branding setting (set by admins
// and applied by `onAppInit` from /enterprise/settings), not a per-user
// preference. Preserve it across login — otherwise the next layout
// mount triggers `atomWithStorage.onMount`, re-reads localStorage,
// and falls back to the default color until a full page refresh
// re-runs `applyEnterpriseSettings`.
nsLocal.set(
localStorage.setItem(
'userSettings',
JSON.stringify({
...savedSettings,
@@ -25,7 +26,7 @@ export const clearStorageUserSettings = () => {
export const resetStorageUserSettings = () => {
try {
nsLocal.set(
localStorage.setItem(
'userSettings',
JSON.stringify({
...defaultSettings,
+8 -2
View File
@@ -40,6 +40,11 @@ export default function useWatchList<T = Record<string, any>>(API: string) {
}
});
const cancelWatch = useMemoizedFn(() => {
chunkRequestRef.current?.current?.cancel?.();
listRequestTokenRef.current?.cancel?.();
});
const queryAllDataList = async (
params: Global.SearchParams,
options?: any
@@ -78,14 +83,15 @@ export default function useWatchList<T = Record<string, any>>(API: string) {
useEffect(() => {
createWatchChunkRequest();
return () => {
chunkRequestRef.current?.cancel?.();
listRequestTokenRef.current?.cancel?.();
cancelWatch();
};
}, []);
return {
watchDataList,
setWatchDataList,
startWatch: createWatchChunkRequest,
cancelWatch,
deleteItemFromCache: handleDeleteItemFromCache
};
}
+5 -3
View File
@@ -1,6 +1,5 @@
import externalLinks from '@/constants/external-links';
import { GithubFilled } from '@ant-design/icons';
import { nsLocal } from '@gpustack/core-ui/utils';
import { useIntl } from '@umijs/max';
import { Tooltip } from 'antd';
import { useEffect, useState } from 'react';
@@ -67,7 +66,7 @@ type CacheEntry = { value: number; time: number };
const readCache = (): CacheEntry | null => {
try {
const raw = nsLocal.get(CACHE_KEY);
const raw = localStorage.getItem(CACHE_KEY);
if (!raw) return null;
const parsed = JSON.parse(raw);
if (typeof parsed?.value !== 'number' || typeof parsed?.time !== 'number') {
@@ -81,7 +80,10 @@ const readCache = (): CacheEntry | null => {
const writeCache = (value: number) => {
try {
nsLocal.set(CACHE_KEY, JSON.stringify({ value, time: Date.now() }));
localStorage.setItem(
CACHE_KEY,
JSON.stringify({ value, time: Date.now() })
);
} catch {
// ignore quota errors
}
+3 -4
View File
@@ -5,9 +5,7 @@ import { PageActionType } from '@/config/types';
import useBodyScroll from '@/hooks/use-body-scroll';
import useExpandedRowKeys from '@/hooks/use-expanded-row-keys';
import useTableRowSelection from '@/hooks/use-table-row-selection';
import useWatchList from '@/hooks/use-watch-list';
import useNoResourceResult from '@/pages/llmodels/hooks/use-no-resource-result';
import { MODEL_ROUTE_TARGETS } from '@/pages/model-routes/apis';
import { TargetStatusValueMap } from '@/pages/model-routes/config';
import useOpenPlayground from '@/pages/model-routes/hooks/use-open-playground';
import useGranfanaLink from '@/pages/resources/hooks/use-grafana-link';
@@ -92,6 +90,7 @@ interface ModelsProps {
loadend: boolean;
total: number;
filterValues?: Record<string, any>;
targetList?: any[];
}
const getFormattedData = (record: any, extraData = {}) => ({
@@ -129,7 +128,8 @@ const Models: React.FC<ModelsProps> = ({
queryParams,
loading,
loadend,
total
total,
targetList = []
}) => {
const { generateFormValues, clusterList, workerList } =
useDeploymentsContext();
@@ -155,7 +155,6 @@ const Models: React.FC<ModelsProps> = ({
expandedRowKeys
} = useExpandedRowKeys(expandAtom);
const { handleOpenPlayGround } = useOpenPlayground();
const { watchDataList: targetList } = useWatchList(MODEL_ROUTE_TARGETS);
const { openViewLogsModal, openViewLogsModalStatus, closeViewLogsModal } =
useViewInstanceLogs();
+10
View File
@@ -3,6 +3,8 @@ import useSetChunkRequest from '@/hooks/use-chunk-request';
import { usePaginationStatus } from '@/hooks/use-pagination-status';
import { useTableMultiSort } from '@/hooks/use-table-sort';
import useUpdateChunkedList from '@/hooks/use-update-chunk-list';
import useWatchList from '@/hooks/use-watch-list';
import { MODEL_ROUTE_TARGETS } from '@/pages/model-routes/apis';
import { TableOrder, TableProvider } from '@gpustack/core-ui';
import { useMemoizedFn } from 'ahooks';
import _ from 'lodash';
@@ -31,6 +33,11 @@ const Models = forwardRef((props, ref) => {
const { setChunkRequest, createAxiosToken } = useSetChunkRequest();
const { setChunkRequest: setModelInstanceChunkRequest } =
useSetChunkRequest();
const {
watchDataList: targetList,
startWatch: startTargetsWatch,
cancelWatch: cancelTargetsWatch
} = useWatchList(MODEL_ROUTE_TARGETS);
const [modelInstances, setModelInstances] = useState<any[]>([]);
const [dataSource, setDataSource] = useState<{
dataList: ListItem[];
@@ -255,6 +262,7 @@ const Models = forwardRef((props, ref) => {
cacheInsDataListRef.current = [];
chunkInstanceRequedtRef.current?.current?.cancel?.();
instancesToken.current?.cancel?.();
cancelTargetsWatch();
});
const resumeRequestsOnPageActive = useMemoizedFn(async () => {
@@ -265,6 +273,7 @@ const Models = forwardRef((props, ref) => {
await getAllModelInstances();
await createModelsInstanceChunkRequest();
await createModelsChunkRequest();
await startTargetsWatch();
});
const handleOnCancelViewLogs = useMemoizedFn(async () => {
@@ -483,6 +492,7 @@ const Models = forwardRef((props, ref) => {
total={dataSource.total}
deleteIds={dataSource.deletedIds}
filterValues={filterValues}
targetList={targetList}
></TableList>
</TableProvider>
);
+24 -8
View File
@@ -10,7 +10,6 @@
import { queryClusterList } from '@/pages/cluster-management/apis';
import { ProviderValueMap } from '@/pages/cluster-management/config';
import { queryResourceEvents } from '@/pages/usage/apis/resource';
import { nsSession } from '@gpustack/core-ui/utils';
// Probes the caller's cluster list once so access predicates can gate
// GPU Service (Kubernetes-only). Cheap (one list request) and never
@@ -34,13 +33,20 @@ export const probeHasKubernetesCluster = async (): Promise<
const value = (res?.items ?? []).some(
(c) => c?.provider === ProviderValueMap.Kubernetes
);
// nsSession swallows write errors (Safari private mode); the access
// predicate already handles a missing value as "unknown".
nsSession.set(HAS_K8S_CLUSTER_KEY, JSON.stringify(value));
try {
window.sessionStorage.setItem(HAS_K8S_CLUSTER_KEY, JSON.stringify(value));
} catch {
// sessionStorage may be unavailable (Safari private mode); the
// access predicate already handles a missing value as "unknown".
}
return value;
} catch (error) {
console.error('probeHasKubernetesCluster error', error);
nsSession.remove(HAS_K8S_CLUSTER_KEY);
try {
window.sessionStorage.removeItem(HAS_K8S_CLUSTER_KEY);
} catch {
// ignore
}
return undefined;
}
};
@@ -63,12 +69,22 @@ export const probeHasResourceEvents = async (): Promise<
}
);
const value = (res?.pagination?.total ?? 0) > 0;
// nsSession swallows write errors; predicate treats missing as unknown.
nsSession.set(HAS_RESOURCE_EVENTS_KEY, JSON.stringify(value));
try {
window.sessionStorage.setItem(
HAS_RESOURCE_EVENTS_KEY,
JSON.stringify(value)
);
} catch {
// sessionStorage may be unavailable; predicate treats missing as unknown.
}
return value;
} catch (error) {
console.error('probeHasResourceEvents error', error);
nsSession.remove(HAS_RESOURCE_EVENTS_KEY);
try {
window.sessionStorage.removeItem(HAS_RESOURCE_EVENTS_KEY);
} catch {
// ignore
}
return undefined;
}
};
+2 -3
View File
@@ -1,4 +1,3 @@
import { NS_STORE_NAME } from '@gpustack/core-ui/utils';
import localStore from './store';
const IS_FIRST_LOGIN = 'is_first_login';
@@ -6,7 +5,7 @@ const IS_FIRST_LOGIN = 'is_first_login';
const REMEMBER_ME_KEY = 'r_m';
const CRYPT_TEXT = 'seal';
const store = localStore.createInstance({ name: NS_STORE_NAME });
const store = localStore.createInstance({ name: '_xWXJKJ_S1Sna_' });
// Kept to remove credentials saved by the old "remember me" feature.
const removeRememberMe = (key: string) => {
@@ -38,9 +37,9 @@ const writeColumnSettings = (key: string, data: any) => {
export {
CRYPT_TEXT,
IS_FIRST_LOGIN,
REMEMBER_ME_KEY,
readColumnSettings,
readState,
REMEMBER_ME_KEY,
removeRememberMe,
writeColumnSettings,
writeState