sune-org/ORP
1
0
Fork 0
mirror of https://github.com/sune-org/ORP.git synced 2026-01-13 16:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert: Update index.js

Browse Source
This commit is contained in:
multipleof4
2025-11-15 19:41:51 -08:00
parent f385ab34c4
commit ed66b26812
1 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
index.js
View File

@@ -66,7 +66,7 @@ export class MyDurableObject {
this.error = null; this.error = null;
this.controller = null; this.controller = null;
this.oaStream = null; this.oaStream = null;
this.pending = { text: '', images: [] }; this.pending = '';
this.flushTimer = null; this.flushTimer = null;
this.lastSavedAt = 0; this.lastSavedAt = 0;
this.lastFlushedAt = 0; this.lastFlushedAt = 0;
@@ -85,13 +85,7 @@ export class MyDurableObject {
getConversationText() { getConversationText() {
const prompt = (this.messages || []).map(m => `## ${m.role}\n\n${this.extractTextFromMessage(m)}`).join('\n\n---\n\n'); const prompt = (this.messages || []).map(m => `## ${m.role}\n\n${this.extractTextFromMessage(m)}`).join('\n\n---\n\n');
const response = this.buffer.map(it => { const response = this.buffer.map(it => it.text).join('');
let content = it.text || '';
if (it.images && it.images.length > 0) {
content += '\n' + it.images.map(img => `![generated image](${String(img?.image_url?.url || '').substring(0, 60)}...)`).join('\n');
}
return content;
}).join('');
if (!prompt && !response) return ''; if (!prompt && !response) return '';
return `${prompt}\n\n---\n\n## assistant\n\n${response}`; return `${prompt}\n\n---\n\n## assistant\n\n${response}`;
} }
@@ -130,7 +124,7 @@ export class MyDurableObject {
this.phase = snap.phase || 'done'; this.phase = snap.phase || 'done';
this.error = snap.error || null; this.error = snap.error || null;
this.messages = Array.isArray(snap.messages) ? snap.messages : []; this.messages = Array.isArray(snap.messages) ? snap.messages : [];
this.pending = { text: '', images: [] }; this.pending = '';
if (this.phase === 'running') { if (this.phase === 'running') {
this.phase = 'evicted'; this.phase = 'evicted';
@@ -148,35 +142,27 @@ export class MyDurableObject {
} }
replay(ws, after) { replay(ws, after) {
this.buffer.forEach(it => { if (it.seq > after) this.send(ws, { type: 'delta', seq: it.seq, text: it.text, images: it.images }); }); this.buffer.forEach(it => { if (it.seq > after) this.send(ws, { type: 'delta', seq: it.seq, text: it.text }); });
if (this.phase === 'done') this.send(ws, { type: 'done' }); if (this.phase === 'done') this.send(ws, { type: 'done' });
else if (['error', 'evicted'].includes(this.phase)) this.send(ws, { type: 'err', message: this.error || 'The run was terminated unexpectedly.' }); else if (['error', 'evicted'].includes(this.phase)) this.send(ws, { type: 'err', message: this.error || 'The run was terminated unexpectedly.' });
} }
flush(force = false) { flush(force = false) {
if (this.flushTimer) { clearTimeout(this.flushTimer); this.flushTimer = null; } if (this.flushTimer) { clearTimeout(this.flushTimer); this.flushTimer = null; }
if (this.pending.text || (this.pending.images && this.pending.images.length > 0)) { if (this.pending) {
this.buffer.push({ seq: ++this.seq, ...this.pending }); this.buffer.push({ seq: ++this.seq, text: this.pending });
this.bcast({ type: 'delta', seq: this.seq, ...this.pending }); this.bcast({ type: 'delta', seq: this.seq, text: this.pending });
this.pending = { text: '', images: [] }; this.pending = '';
this.lastFlushedAt = Date.now(); this.lastFlushedAt = Date.now();
} }
if (force) this.saveSnapshot(); if (force) this.saveSnapshot();
} }
queueUpdate({ text, images }) { queueDelta(text) {
const hasImages = images && images.length > 0; if (!text) return;
if (text) this.pending.text += text; this.pending += text;
if (hasImages) { if (this.pending.length >= BATCH_BYTES) this.flush(false);
if (!this.pending.images) this.pending.images = []; else if (!this.flushTimer) this.flushTimer = setTimeout(() => this.flush(false), BATCH_MS);
this.pending.images.push(...images);
}
if (hasImages || (this.pending.text && this.pending.text.length >= BATCH_BYTES)) {
this.flush(false);
} else if (!this.flushTimer && this.pending.text) {
this.flushTimer = setTimeout(() => this.flush(false), BATCH_MS);
}
} }
async fetch(req) { async fetch(req) {
@@ -193,7 +179,7 @@ export class MyDurableObject {
if (req.method === 'GET') { if (req.method === 'GET') {
await this.autopsy(); await this.autopsy();
const text = this.buffer.map(it => it.text).join('') + (this.pending.text || ''); const text = this.buffer.map(it => it.text).join('') + this.pending;
const isTerminal = ['done', 'error', 'evicted'].includes(this.phase); const isTerminal = ['done', 'error', 'evicted'].includes(this.phase);
const isError = ['error', 'evicted'].includes(this.phase); const isError = ['error', 'evicted'].includes(this.phase);
const payload = { rid: this.rid, seq: this.seq, phase: this.phase, done: isTerminal, error: isError ? (this.error || 'The run was terminated unexpectedly.') : null, text }; const payload = { rid: this.rid, seq: this.seq, phase: this.phase, done: isTerminal, error: isError ? (this.error || 'The run was terminated unexpectedly.') : null, text };
@@ -256,7 +242,7 @@ export class MyDurableObject {
try { try {
for await (const event of this.oaStream) { for await (const event of this.oaStream) {
if (this.phase !== 'running') break; if (this.phase !== 'running') break;
if (event.type.endsWith('.delta') && event.delta) this.queueUpdate({ text: event.delta }); if (event.type.endsWith('.delta') && event.delta) this.queueDelta(event.delta);
} }
} finally { } finally {
try { this.oaStream?.controller?.abort(); } catch {} try { this.oaStream?.controller?.abort(); } catch {}
@@ -290,7 +276,7 @@ export class MyDurableObject {
if (body.reasoning?.enabled) payload.extended_thinking = { enabled: true, ...(body.reasoning.budget && { max_thinking_tokens: body.reasoning.budget }) }; if (body.reasoning?.enabled) payload.extended_thinking = { enabled: true, ...(body.reasoning.budget && { max_thinking_tokens: body.reasoning.budget }) };
const stream = client.messages.stream(payload); const stream = client.messages.stream(payload);
stream.on('text', text => { if (this.phase === 'running') this.queueUpdate({ text }); }); stream.on('text', text => { if (this.phase === 'running') this.queueDelta(text); });
await stream.finalMessage(); await stream.finalMessage();
} }
@@ -325,12 +311,12 @@ export class MyDurableObject {
try { try {
JSON.parse(line.substring(6))?.candidates?.[0]?.content?.parts?.forEach(p => { JSON.parse(line.substring(6))?.candidates?.[0]?.content?.parts?.forEach(p => {
if (p.thought?.thought) { if (p.thought?.thought) {
this.queueUpdate({ text: p.thought.thought }); this.queueDelta(p.thought.thought);
hasReasoning = true; hasReasoning = true;
} }
if (p.text) { if (p.text) {
if (hasReasoning && !hasContent) this.queueUpdate({ text: '\n' }); if (hasReasoning && !hasContent) this.queueDelta('\n');
this.queueUpdate({ text: p.text }); this.queueDelta(p.text);
hasContent = true; hasContent = true;
} }
}); });
@@ -347,26 +333,13 @@ export class MyDurableObject {
for await (const chunk of stream) { for await (const chunk of stream) {
if (this.phase !== 'running') break; if (this.phase !== 'running') break;
const delta = chunk?.choices?.[0]?.delta; const delta = chunk?.choices?.[0]?.delta;
if (!delta) continue; if (delta?.reasoning && body.reasoning?.exclude !== true) {
this.queueDelta(delta.reasoning);
if (delta.reasoning && body.reasoning?.exclude !== true) {
this.queueUpdate({ text: delta.reasoning });
hasReasoning = true; hasReasoning = true;
} }
if (delta?.content) {
const hasNewContent = delta.content || (delta.images && delta.images.length > 0); if (hasReasoning && !hasContent) this.queueDelta('\n');
if (hasNewContent) { this.queueDelta(delta.content);
const update = {};
if (hasReasoning && !hasContent) {
update.text = '\n';
}
if (delta.content) {
update.text = (update.text || '') + delta.content;
}
if (delta.images) {
update.images = delta.images;
}
this.queueUpdate(update);
hasContent = true; hasContent = true;
} }
} }
@@ -434,7 +407,7 @@ export class MyDurableObject {
mapContentPartToResponses(part) { mapContentPartToResponses(part) {
const type = part?.type || 'text'; const type = part?.type || 'text';
if (['image_url', 'input_image'].includes(type)) return (part?.image_url?.url || part?.image_url) ? { type: 'input_image', image_url: String(part?.image_url?.url || part?.image_url) } : null; if (['image_url', 'input_image'].includes(type)) return (part?.image_url?.url || part?.image_url) ? { type: 'input_image', image_url: String(part?.image_url?.url || part?.image_url) } : null;
if (['text', 'input_text'].includes(type)) return { type: 'input_text', text: String(type === 'text' ? (p.text ?? p.content ?? '') : (part.text ?? '')) }; if (['text', 'input_text'].includes(type)) return { type: 'input_text', text: String(type === 'text' ? (part.text ?? part.content ?? '') : (part.text ?? '')) };
return { type: 'input_text', text: `[${type}:${part?.file?.filename || 'file'}]` }; return { type: 'input_text', text: `[${type}:${part?.file?.filename || 'file'}]` };
} }
@@ -468,3 +441,4 @@ export class MyDurableObject {
return contents; return contents;
} }
} }