Skip to content

Commit 20c50dc

Browse files
committed
fix: Handle errors and cache models correctly
1 parent c589db2 commit 20c50dc

File tree

5 files changed

+6
-23
lines changed

5 files changed

+6
-23
lines changed

src/lib/forward-error.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ export async function forwardError(c: Context, error: unknown) {
99
consola.error("Error occurred:", error)
1010

1111
if (error instanceof HTTPError) {
12+
const errorText = await error.response.text()
1213
return c.json(
1314
{
1415
error: {
15-
message: await error.response.text(),
16+
message: errorText,
1617
type: "error",
1718
},
1819
},

src/lib/models.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
import consola from "consola"
22

3-
import type { GetModelsResponse } from "~/services/copilot/get-models/types"
4-
53
import { getModels } from "~/services/copilot/get-models"
64

75
import { state } from "./state"
86

9-
export const modelsCache = {
10-
_models: null as GetModelsResponse | null,
11-
12-
setModels(models: GetModelsResponse) {
13-
this._models = models
14-
},
15-
16-
getModels() {
17-
return this._models
18-
},
19-
}
20-
217
export async function cacheModels(): Promise<void> {
228
const models = await getModels()
239
state.models = models

src/routes/chat-completions/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ completionRoutes.post("/", async (c) => {
1010
try {
1111
return await handleCompletion(c)
1212
} catch (error) {
13-
return forwardError(c, error)
13+
return await forwardError(c, error)
1414
}
1515
})

src/routes/embeddings/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ embeddingRoutes.post("/", async (c) => {
1515

1616
return c.json(response)
1717
} catch (error) {
18-
return forwardError(c, error)
18+
return await forwardError(c, error)
1919
}
2020
})

src/routes/models/route.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import consola from "consola"
21
import { Hono } from "hono"
3-
import { FetchError } from "ofetch"
42

3+
import { forwardError } from "~/lib/forward-error"
54
import { getModels } from "~/services/copilot/get-models"
65

76
export const modelRoutes = new Hono()
@@ -11,9 +10,6 @@ modelRoutes.get("/", async (c) => {
1110
const models = await getModels()
1211
return c.json(models)
1312
} catch (error) {
14-
if (error instanceof FetchError) {
15-
consola.error(`Request failed: ${error.message}`, error.response?._data)
16-
}
17-
throw error
13+
return await forwardError(c, error)
1814
}
1915
})

0 commit comments

Comments
 (0)