[chore] Fix type errors

This commit is contained in:
Cohee
2024-10-11 21:33:36 +03:00
parent 72138c632d
commit 4fcad0752f
25 changed files with 78 additions and 44 deletions

View File

@@ -28,6 +28,10 @@ export const router = express.Router();
*/
async function parseOllamaStream(jsonStream, request, response) {
try {
if (!jsonStream.body) {
throw new Error('No body in the response');
}
let partialData = '';
jsonStream.body.on('data', (data) => {
const chunk = data.toString();
@@ -153,6 +157,7 @@ router.post('/status', jsonParser, async function (request, response) {
return response.status(400);
}
/** @type {any} */
let data = await modelsReply.json();
if (request.body.legacy_api) {
@@ -190,6 +195,7 @@ router.post('/status', jsonParser, async function (request, response) {
const modelInfoReply = await fetch(modelInfoUrl, args);
if (modelInfoReply.ok) {
/** @type {any} */
const modelInfo = await modelInfoReply.json();
console.log('Ooba model info:', modelInfo);
@@ -206,6 +212,7 @@ router.post('/status', jsonParser, async function (request, response) {
const modelInfoReply = await fetch(modelInfoUrl, args);
if (modelInfoReply.ok) {
/** @type {any} */
const modelInfo = await modelInfoReply.json();
console.log('Tabby model info:', modelInfo);
@@ -359,6 +366,7 @@ router.post('/generate', jsonParser, async function (request, response) {
const completionsReply = await fetch(url, args);
if (completionsReply.ok) {
/** @type {any} */
const data = await completionsReply.json();
console.log('Endpoint response:', data);
@@ -415,7 +423,6 @@ ollama.post('/download', jsonParser, async function (request, response) {
name: name,
stream: false,
}),
timeout: 0,
});
if (!fetchResponse.ok) {
@@ -448,7 +455,6 @@ ollama.post('/caption-image', jsonParser, async function (request, response) {
images: [request.body.image],
stream: false,
}),
timeout: 0,
});
if (!fetchResponse.ok) {
@@ -456,6 +462,7 @@ ollama.post('/caption-image', jsonParser, async function (request, response) {
return response.status(500).send({ error: true });
}
/** @type {any} */
const data = await fetchResponse.json();
console.log('Ollama caption response:', data);
@@ -487,7 +494,6 @@ llamacpp.post('/caption-image', jsonParser, async function (request, response) {
const fetchResponse = await fetch(`${baseUrl}/completion`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
timeout: 0,
body: JSON.stringify({
prompt: `USER:[img-1]${String(request.body.prompt).trim()}\nASSISTANT:`,
image_data: [{ data: request.body.image, id: 1 }],
@@ -502,6 +508,7 @@ llamacpp.post('/caption-image', jsonParser, async function (request, response) {
return response.status(500).send({ error: true });
}
/** @type {any} */
const data = await fetchResponse.json();
console.log('LlamaCpp caption response:', data);
@@ -531,7 +538,6 @@ llamacpp.post('/props', jsonParser, async function (request, response) {
const fetchResponse = await fetch(`${baseUrl}/props`, {
method: 'GET',
timeout: 0,
});
if (!fetchResponse.ok) {
@@ -566,7 +572,6 @@ llamacpp.post('/slots', jsonParser, async function (request, response) {
if (request.body.action === 'info') {
fetchResponse = await fetch(`${baseUrl}/slots`, {
method: 'GET',
timeout: 0,
});
} else {
if (!/^\d+$/.test(request.body.id_slot)) {
@@ -579,7 +584,6 @@ llamacpp.post('/slots', jsonParser, async function (request, response) {
fetchResponse = await fetch(`${baseUrl}/slots/${request.body.id_slot}?action=${request.body.action}`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
timeout: 0,
body: JSON.stringify({
filename: request.body.action !== 'erase' ? `${request.body.filename}` : undefined,
}),
@@ -623,6 +627,7 @@ tabby.post('/download', jsonParser, async function (request, response) {
});
if (permissionResponse.ok) {
/** @type {any} */
const permissionJson = await permissionResponse.json();
if (permissionJson['permission'] !== 'admin') {