Skip to content

Commit 66e8f83

Browse files
committed
fix: did not cache workers and clusters in model files
1 parent 41ebcec commit 66e8f83

File tree

2 files changed

+46
-24
lines changed

2 files changed

+46
-24
lines changed

src/atoms/models.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,30 @@ export const getRequestId = () => {
2020
return store.get(requestIdAtom);
2121
};
2222

23+
// store for cluster list: res.items from api
2324
export const clusterListAtom = atom<
2425
{
2526
label: string;
2627
value: number;
28+
provider: string;
29+
state: string;
30+
is_default: boolean;
31+
workers: number;
32+
ready_workers: number;
33+
gpus: number;
2734
}[]
2835
>([]);
2936

37+
// store for worker list: res.items from api
3038
export const workerListAtom = atom<
3139
{
3240
label: string;
3341
value: number;
42+
cluster_id: number;
43+
state: string;
44+
id: number;
45+
labels: Record<string, any>;
46+
name: string;
3447
}[]
3548
>([]);
3649

src/pages/llmodels/hooks/use-form-initial-values.ts

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ export const useGenerateWorkerOptions = () => {
153153
{ state: string; labels: Record<string, string>; cluster_id: number }
154154
>[]
155155
>([]);
156+
const [, setClusterListAtom] = useAtom(clusterListAtom);
157+
const [, setWorkerListAtom] = useAtom(workerListAtom);
156158

157159
const generateCascaderWorkerOptions = (
158160
workerList: WorkerListItem[],
@@ -201,29 +203,31 @@ export const useGenerateWorkerOptions = () => {
201203
const data = await getDataList();
202204
const [workerList, clusterList] = data;
203205
generateCascaderWorkerOptions(workerList, clusterList);
204-
setWorkersList(
205-
workerList.map((item) => ({
206-
cluster_id: item.cluster_id,
207-
state: item.state,
208-
label: item.name,
209-
value: item.id,
210-
id: item.id,
211-
labels: item.labels || {},
212-
name: item.name
213-
}))
214-
);
215-
setClusterList(
216-
clusterList.map((item) => ({
217-
label: item.name,
218-
value: item.id,
219-
provider: item.provider as string,
220-
state: item.state,
221-
is_default: item.is_default,
222-
workers: item.workers,
223-
ready_workers: item.ready_workers,
224-
gpus: item.gpus
225-
}))
226-
);
206+
207+
const workerOptions = workerList.map((item) => ({
208+
cluster_id: item.cluster_id,
209+
state: item.state,
210+
label: item.name,
211+
value: item.id,
212+
id: item.id,
213+
labels: item.labels || {},
214+
name: item.name
215+
}));
216+
const clusterOptions = clusterList.map((item) => ({
217+
label: item.name,
218+
value: item.id,
219+
provider: item.provider as string,
220+
state: item.state,
221+
is_default: item.is_default,
222+
workers: item.workers,
223+
ready_workers: item.ready_workers,
224+
gpus: item.gpus
225+
}));
226+
227+
setWorkersList(workerOptions);
228+
setClusterList(clusterOptions);
229+
setWorkerListAtom(workerOptions);
230+
setClusterListAtom(clusterOptions);
227231
};
228232
return {
229233
getWorkerOptionList,
@@ -280,7 +284,12 @@ export default function useFormInitialValues() {
280284
const list =
281285
data.items?.map((item) => ({
282286
label: item.name,
283-
value: item.id
287+
value: item.id,
288+
cluster_id: item.cluster_id,
289+
state: item.state,
290+
id: item.id,
291+
labels: item.labels || {},
292+
name: item.name
284293
})) || [];
285294
setWorkerList(data.items);
286295
setWorkerListAtom(list);

0 commit comments

Comments
 (0)