Prevent fetch response status forwarding Fixes #3864
| @@ -250,7 +250,7 @@ async function sendClaudeRequest(request, response) { | |||
| 250 | if (!generateResponse.ok) { | 250 | if (!generateResponse.ok) { |
| 251 | const generateResponseText = await generateResponse.text(); | 251 | const generateResponseText = await generateResponse.text(); |
| 252 | console.warn(color.red(`Claude API returned error: ${generateResponse.status} ${generateResponse.statusText}\n${generateResponseText}\n${divider}`)); | 252 | console.warn(color.red(`Claude API returned error: ${generateResponse.status} ${generateResponse.statusText}\n${generateResponseText}\n${divider}`)); |
| 253 | return response.status(generateResponse.status).send({ error: true }); | 253 | return response.status(500).send({ error: true }); |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | /** @type {any} */ | 256 | /** @type {any} */ |
| @@ -463,7 +463,7 @@ async function sendMakerSuiteRequest(request, response) { | |||
| 463 | } else { | 463 | } else { |
| 464 | if (!generateResponse.ok) { | 464 | if (!generateResponse.ok) { |
| 465 | console.warn(`Google AI Studio API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`); | 465 | console.warn(`Google AI Studio API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`); |
| 466 | return response.status(generateResponse.status).send({ error: true }); | 466 | return response.status(500).send({ error: true }); |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | /** @type {any} */ | 469 | /** @type {any} */ |
| @@ -450,7 +450,7 @@ ollama.post('/download', async function (request, response) { | |||
| 450 | 450 | ||
| 451 | if (!fetchResponse.ok) { | 451 | if (!fetchResponse.ok) { |
| 452 | console.error('Download error:', fetchResponse.status, fetchResponse.statusText); | 452 | console.error('Download error:', fetchResponse.status, fetchResponse.statusText); |
| 453 | return response.status(fetchResponse.status).send({ error: true }); | 453 | return response.status(500).send({ error: true }); |
| 454 | } | 454 | } |
| 455 | 455 | ||
| 456 | console.debug('Ollama pull response:', await fetchResponse.json()); | 456 | console.debug('Ollama pull response:', await fetchResponse.json()); |
| @@ -659,14 +659,14 @@ tabby.post('/download', async function (request, response) { | |||
| 659 | } | 659 | } |
| 660 | } else { | 660 | } else { |
| 661 | console.error('API Permission error:', permissionResponse.status, permissionResponse.statusText); | 661 | console.error('API Permission error:', permissionResponse.status, permissionResponse.statusText); |
| 662 | return response.status(permissionResponse.status).send({ error: true }); | 662 | return response.status(500).send({ error: true }); |
| 663 | } | 663 | } |
| 664 | 664 | ||
| 665 | const fetchResponse = await fetch(`${baseUrl}/v1/download`, args); | 665 | const fetchResponse = await fetch(`${baseUrl}/v1/download`, args); |
| 666 | 666 | ||
| 667 | if (!fetchResponse.ok) { | 667 | if (!fetchResponse.ok) { |
| 668 | console.error('Download error:', fetchResponse.status, fetchResponse.statusText); | 668 | console.error('Download error:', fetchResponse.status, fetchResponse.statusText); |
| 669 | return response.status(fetchResponse.status).send({ error: true }); | 669 | return response.status(500).send({ error: true }); |
| 670 | } | 670 | } |
| 671 | 671 | ||
| 672 | return response.send({ ok: true }); | 672 | return response.send({ ok: true }); |
| @@ -45,7 +45,7 @@ router.post('/caption-image', async (request, response) => { | |||
| 45 | if (!result.ok) { | 45 | if (!result.ok) { |
| 46 | const error = await result.json(); | 46 | const error = await result.json(); |
| 47 | console.error(`Google AI Studio API returned error: ${result.status} ${result.statusText}`, error); | 47 | console.error(`Google AI Studio API returned error: ${result.status} ${result.statusText}`, error); |
| 48 | return response.status(result.status).send({ error: true }); | 48 | return response.status(500).send({ error: true }); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | /** @type {any} */ | 51 | /** @type {any} */ |
| @@ -270,7 +270,7 @@ router.post('/generate', async function (req, res) { | |||
| 270 | // ignore | 270 | // ignore |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | return res.status(response.status).send({ error: { message } }); | 273 | return res.status(500).send({ error: { message } }); |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | /** @type {any} */ | 276 | /** @type {any} */ |