Skip to content

Commit bb42733

Browse files
committed
fix
1 parent c9cd0a6 commit bb42733

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

pages/api/home/home.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const Home = ({
8787
key: apiKey,
8888
},
8989
);
90-
if (dispatch && data) {
90+
if (dispatch && data && (Array.isArray(data) ? data.length > 0 : Object.keys(data).length > 0)) {
9191
dispatch({field: 'models', value: data});
9292
}
9393
}

services/useApiService.ts

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,37 @@ const useApiService = () => {
3030
// );
3131

3232
const getModels = async (params: GetModelsRequestProps) => {
33-
let url = `${params.url}/v1/models`;
34-
try {
35-
const response = await fetch(url, {
36-
headers: {
37-
'Content-Type': 'application/json',
38-
Authorization: `Bearer ${params.key ? params.key : process.env.NEXT_PUBLIC_OPENAI_API_KEY}`
39-
},
40-
});
41-
const res = await response.json()
42-
const data:modelObject[] = res.data
43-
// test data
44-
// const data:modelObject[] = [{
45-
// id: "Llama-2-7B:llama-2-chat", "created": 1699511491, "object": "model", "owned_by": "Not specified"
46-
// }, {
47-
// id: "Llama-2-13B:llama-2-chat", "created": 1699511491, "object": "model", "owned_by": "Not specified"
48-
// }]
49-
if(data && data.length > 0){
50-
return data.map(item => {
51-
if (item.id.indexOf(":") !== -1 && !item.name){
52-
item.name = item.id.split(":")[1]
53-
item.id = item.id.split(":")[0]
54-
}
55-
return item
56-
})
57-
}else {
58-
return []
33+
if(params.url){
34+
let url = `${params.url}/v1/models`;
35+
try {
36+
const response = await fetch(url, {
37+
headers: {
38+
'Content-Type': 'application/json',
39+
Authorization: `Bearer ${params.key ? params.key : process.env.NEXT_PUBLIC_OPENAI_API_KEY}`
40+
},
41+
});
42+
const res = await response.json()
43+
const data:modelObject[] = res.data
44+
// test data
45+
// const data:modelObject[] = [{
46+
// id: "Llama-2-7B:llama-2-chat", "created": 1699511491, "object": "model", "owned_by": "Not specified"
47+
// }, {
48+
// id: "Llama-2-13B:llama-2-chat", "created": 1699511491, "object": "model", "owned_by": "Not specified"
49+
// }]
50+
if(data && data.length > 0){
51+
return data.map(item => {
52+
if (item.id.indexOf(":") !== -1 && !item.name){
53+
item.name = item.id.split(":")[1]
54+
item.id = item.id.split(":")[0]
55+
}
56+
return item
57+
})
58+
}else {
59+
return []
60+
}
61+
} catch (e) {
62+
return {}
5963
}
60-
} catch (e) {
61-
return {}
6264
}
6365
}
6466

0 commit comments

Comments
 (0)