Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: openai client sdk compatible (#2096)

Browse Source
This commit is contained in:
Louis 2024-02-20 08:01:23 +07:00 committed by GitHub
parent 2cbbe1bcd3
commit 6966c5d0ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/node/api/restful/common.ts
View File

@ -8,7 +8,7 @@ import {
createMessage, createMessage,
createThread, createThread,
getMessages, getMessages,
retrieveMesasge, retrieveMessage,
updateThread, updateThread,
} from './helper/builder' } from './helper/builder'
@ -17,10 +17,18 @@ import { startModel, stopModel } from './helper/startStopModel'
import { ModelSettingParams } from '../../../types' import { ModelSettingParams } from '../../../types'
export const commonRouter = async (app: HttpServer) => { export const commonRouter = async (app: HttpServer) => {
const normalizeData = (data: any) => {
return {
object: 'list',
data,
}
}
// Common Routes // Common Routes
// Read & Delete :: Threads | Models | Assistants // Read & Delete :: Threads | Models | Assistants
Object.keys(JanApiRouteConfiguration).forEach((key) => { Object.keys(JanApiRouteConfiguration).forEach((key) => {
app.get(`/${key}`, async (_request) => getBuilder(JanApiRouteConfiguration[key])) app.get(`/${key}`, async (_request) =>
getBuilder(JanApiRouteConfiguration[key]).then(normalizeData)
)
app.get(`/${key}/:id`, async (request: any) => app.get(`/${key}/:id`, async (request: any) =>
retrieveBuilder(JanApiRouteConfiguration[key], request.params.id) retrieveBuilder(JanApiRouteConfiguration[key], request.params.id)
@ -34,10 +42,12 @@ export const commonRouter = async (app: HttpServer) => {
// Threads // Threads
app.post(`/threads/`, async (req, res) => createThread(req.body)) app.post(`/threads/`, async (req, res) => createThread(req.body))
app.get(`/threads/:threadId/messages`, async (req, res) => getMessages(req.params.threadId)) app.get(`/threads/:threadId/messages`, async (req, res) =>
getMessages(req.params.threadId).then(normalizeData)
)
app.get(`/threads/:threadId/messages/:messageId`, async (req, res) => app.get(`/threads/:threadId/messages/:messageId`, async (req, res) =>
retrieveMesasge(req.params.threadId, req.params.messageId) retrieveMessage(req.params.threadId, req.params.messageId)
) )
app.post(`/threads/:threadId/messages`, async (req, res) => app.post(`/threads/:threadId/messages`, async (req, res) =>

2
core/src/node/api/restful/helper/builder.ts
View File

@ -125,7 +125,7 @@ export const getMessages = async (threadId: string): Promise<ThreadMessage[]> =>
} }
} }
export const retrieveMesasge = async (threadId: string, messageId: string) => { export const retrieveMessage = async (threadId: string, messageId: string) => {
const messages = await getMessages(threadId) const messages = await getMessages(threadId)
const filteredMessages = messages.filter((m) => m.id === messageId) const filteredMessages = messages.filter((m) => m.id === messageId)
if (!filteredMessages || filteredMessages.length === 0) { if (!filteredMessages || filteredMessages.length === 0) {