Extract backend API utilities into src/backendApi.js
This commit is contained in:
41
src/App.jsx
41
src/App.jsx
@@ -36,6 +36,12 @@ import {
|
|||||||
migrateLegacySearxUrl,
|
migrateLegacySearxUrl,
|
||||||
resolveBackendApiUrl,
|
resolveBackendApiUrl,
|
||||||
} from './appConfig'
|
} from './appConfig'
|
||||||
|
import {
|
||||||
|
expectBackendJson,
|
||||||
|
getErrorText,
|
||||||
|
isAbortError,
|
||||||
|
readBackendErrorText,
|
||||||
|
} from './backendApi'
|
||||||
import { sanitizeChatTitle, splitThinkBlocks } from './chatText'
|
import { sanitizeChatTitle, splitThinkBlocks } from './chatText'
|
||||||
import { buildModelPickerOptions } from './modelPicker'
|
import { buildModelPickerOptions } from './modelPicker'
|
||||||
import {
|
import {
|
||||||
@@ -217,45 +223,10 @@ export default function App() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function isAbortError(error) {
|
|
||||||
return error?.name === 'AbortError'
|
|
||||||
}
|
|
||||||
|
|
||||||
function messageHasImageAttachments(message) {
|
function messageHasImageAttachments(message) {
|
||||||
return Array.isArray(message?.attachments) && message.attachments.some(attachmentIsImage)
|
return Array.isArray(message?.attachments) && message.attachments.some(attachmentIsImage)
|
||||||
}
|
}
|
||||||
|
|
||||||
function getErrorText(error) {
|
|
||||||
if (error instanceof Error && error.message) return error.message
|
|
||||||
return String(error)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function readBackendErrorText(response) {
|
|
||||||
const bodyText = await response.text().catch(() => '')
|
|
||||||
if (bodyText) {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(bodyText)
|
|
||||||
if (typeof data?.detail === 'string' && data.detail.trim()) {
|
|
||||||
return data.detail.trim()
|
|
||||||
}
|
|
||||||
if (typeof data?.message === 'string' && data.message.trim()) {
|
|
||||||
return data.message.trim()
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
return bodyText.trim()
|
|
||||||
}
|
|
||||||
return `HTTP ${response.status}`
|
|
||||||
}
|
|
||||||
|
|
||||||
async function expectBackendJson(response) {
|
|
||||||
const data = await response.json().catch(() => null)
|
|
||||||
if (response.ok) return data
|
|
||||||
const detail = typeof data?.detail === 'string'
|
|
||||||
? data.detail
|
|
||||||
: (typeof data?.message === 'string' ? data.message : '')
|
|
||||||
throw new Error(detail || `HTTP ${response.status}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fetchModelCapabilities(modelName, signal) {
|
async function fetchModelCapabilities(modelName, signal) {
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
`${backendApiUrl}/models/capabilities?name=${encodeURIComponent(modelName)}`,
|
`${backendApiUrl}/models/capabilities?name=${encodeURIComponent(modelName)}`,
|
||||||
|
|||||||
34
src/backendApi.js
Normal file
34
src/backendApi.js
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
export function isAbortError(error) {
|
||||||
|
return error?.name === 'AbortError'
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getErrorText(error) {
|
||||||
|
if (error instanceof Error && error.message) return error.message
|
||||||
|
return String(error)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function readBackendErrorText(response) {
|
||||||
|
const bodyText = await response.text().catch(() => '')
|
||||||
|
if (bodyText) {
|
||||||
|
try {
|
||||||
|
const data = JSON.parse(bodyText)
|
||||||
|
if (typeof data?.detail === 'string' && data.detail.trim()) {
|
||||||
|
return data.detail.trim()
|
||||||
|
}
|
||||||
|
if (typeof data?.message === 'string' && data.message.trim()) {
|
||||||
|
return data.message.trim()
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
return bodyText.trim()
|
||||||
|
}
|
||||||
|
return `HTTP ${response.status}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function expectBackendJson(response) {
|
||||||
|
const data = await response.json().catch(() => null)
|
||||||
|
if (response.ok) return data
|
||||||
|
const detail = typeof data?.detail === 'string'
|
||||||
|
? data.detail
|
||||||
|
: (typeof data?.message === 'string' ? data.message : '')
|
||||||
|
throw new Error(detail || `HTTP ${response.status}`)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user