fix(cloud): harden edge gateways, api-server ssrf, supabase fail-closed quota, and web/admin lifecycle
This commit is contained in:
parent
2a009e421a
commit
c68e81e0aa
46 changed files with 2553 additions and 294 deletions
|
|
@ -164,3 +164,41 @@ Deno.test('another user\'s document stays hidden', async () => {
|
|||
const response = await call()
|
||||
assert(response.status === 404 && provider.calls === 0, 'foreign document was embedded')
|
||||
})
|
||||
|
||||
Deno.test('embedChunks_공급자200오응답또는저장실패_청구된유닛은환불하지않는다', async () => {
|
||||
const invalidProvider: EmbeddingProvider = {
|
||||
embed: () => Promise.resolve({ ok: false as const, reason: 'invalid' as const }),
|
||||
}
|
||||
const usageInvalid = new MemoryUsageStore('pro', TODAY)
|
||||
const storeInvalid = new FakeKnowledgeStore(chunks(2))
|
||||
const handlerInvalid = createEmbedChunksHandler({
|
||||
authenticate: () => Promise.resolve({ id: USER }),
|
||||
embeddingProvider: () => invalidProvider,
|
||||
knowledgeStore: () => storeInvalid,
|
||||
usageStore: () => usageInvalid,
|
||||
now: () => NOW,
|
||||
})
|
||||
const invalidResp = await handlerInvalid(new Request('https://edge/embed-chunks', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ document_id: DOC }),
|
||||
}))
|
||||
assert(invalidResp.status === 502, `expected 502, got ${invalidResp.status}`)
|
||||
assert(usageInvalid.rows.get(TODAY) === 2, `invalid 200 response must keep units charged, got ${usageInvalid.rows.get(TODAY)}`)
|
||||
|
||||
const usageDbFail = new MemoryUsageStore('pro', TODAY)
|
||||
const storeDbFail = new FakeKnowledgeStore(chunks(2))
|
||||
storeDbFail.saveEmbedding = () => Promise.resolve(false)
|
||||
const handlerDbFail = createEmbedChunksHandler({
|
||||
authenticate: () => Promise.resolve({ id: USER }),
|
||||
embeddingProvider: () => new FakeProvider(false),
|
||||
knowledgeStore: () => storeDbFail,
|
||||
usageStore: () => usageDbFail,
|
||||
now: () => NOW,
|
||||
})
|
||||
const dbFailResp = await handlerDbFail(new Request('https://edge/embed-chunks', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ document_id: DOC }),
|
||||
}))
|
||||
assert(dbFailResp.status === 502, `expected 502, got ${dbFailResp.status}`)
|
||||
assert(usageDbFail.rows.get(TODAY) === 2, `local DB save failure must not refund billed units, got ${usageDbFail.rows.get(TODAY)}`)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -57,14 +57,24 @@ export interface EmbedChunksDeps {
|
|||
now?(): Date
|
||||
}
|
||||
|
||||
interface EmbedBatchOutcome {
|
||||
saved: number
|
||||
refund: boolean
|
||||
}
|
||||
|
||||
async function embedBatch(
|
||||
provider: EmbeddingProvider,
|
||||
store: KnowledgeIndexStore,
|
||||
documentId: string,
|
||||
batch: KnowledgeChunkRow[],
|
||||
): Promise<number> {
|
||||
): Promise<EmbedBatchOutcome> {
|
||||
const outcome = await provider.embed(batch.map((chunk) => chunk.content))
|
||||
if (!outcome.ok || outcome.data.length !== batch.length) return 0
|
||||
if (!outcome.ok) {
|
||||
return { saved: 0, refund: outcome.reason === 'upstream' }
|
||||
}
|
||||
if (outcome.data.length !== batch.length) {
|
||||
return { saved: 0, refund: false }
|
||||
}
|
||||
|
||||
const received = new Set<number>()
|
||||
let saved = 0
|
||||
|
|
@ -82,7 +92,7 @@ async function embedBatch(
|
|||
received.add(item.index)
|
||||
if (await store.saveEmbedding(documentId, batch[item.index].id, item.embedding)) saved += 1
|
||||
}
|
||||
return saved
|
||||
return { saved, refund: false }
|
||||
}
|
||||
|
||||
export function createEmbedChunksHandler(deps: EmbedChunksDeps): (req: Request) => Promise<Response> {
|
||||
|
|
@ -155,15 +165,15 @@ export function createEmbedChunksHandler(deps: EmbedChunksDeps): (req: Request)
|
|||
let failed = 0
|
||||
let unspentUnits = 0
|
||||
for (const batch of planEmbeddingBatches(chunks)) {
|
||||
let saved = 0
|
||||
let outcome: EmbedBatchOutcome = { saved: 0, refund: false }
|
||||
try {
|
||||
saved = await embedBatch(provider, store, documentId, batch)
|
||||
outcome = await embedBatch(provider, store, documentId, batch)
|
||||
} catch {
|
||||
saved = 0
|
||||
outcome = { saved: 0, refund: false }
|
||||
}
|
||||
embedded += saved
|
||||
failed += batch.length - saved
|
||||
if (saved === 0) unspentUnits += embeddingUnits(batch.map((chunk) => chunk.content))
|
||||
embedded += outcome.saved
|
||||
failed += batch.length - outcome.saved
|
||||
if (outcome.refund) unspentUnits += embeddingUnits(batch.map((chunk) => chunk.content))
|
||||
}
|
||||
await refundEmbeddingUnits(usage, user.id, reservation, unspentUnits, now())
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue