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

Fix: Add newline after thoughts and enable for Google

Browse Source
This commit is contained in:
multipleof4
2025-11-01 14:08:12 -07:00
parent e022ab2242
commit 7ded1318f7
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
index.js
View File

@@ -272,14 +272,26 @@ export class MyDurableObject {
if (!resp.ok) throw new Error(`Google API error: ${resp.status} ${await resp.text()}`); if (!resp.ok) throw new Error(`Google API error: ${resp.status} ${await resp.text()}`);
const reader = resp.body.getReader(); const reader = resp.body.getReader();
const decoder = new TextDecoder(); const decoder = new TextDecoder();
let buffer = ''; let buffer = '', hasReasoning = false, hasContent = false;
while (this.phase === 'running') { while (this.phase === 'running') {
const { done, value } = await reader.read(); const { done, value } = await reader.read();
if (done) break; if (done) break;
buffer += decoder.decode(value, { stream: true }); buffer += decoder.decode(value, { stream: true });
for (const line of buffer.split('\n')) { for (const line of buffer.split('\n')) {
if (!line.startsWith('data: ')) continue; if (!line.startsWith('data: ')) continue;
try { JSON.parse(line.substring(6))?.candidates?.[0]?.content?.parts?.forEach(p => p.text && this.queueDelta(p.text)); } catch {} try {
JSON.parse(line.substring(6))?.candidates?.[0]?.content?.parts?.forEach(p => {
if (p.thought?.thought) {
this.queueDelta(p.thought.thought);
hasReasoning = true;
}
if (p.text) {
if (hasReasoning && !hasContent) this.queueDelta('\n');
this.queueDelta(p.text);
hasContent = true;
}
});
} catch {}
} }
buffer = buffer.slice(buffer.lastIndexOf('\n') + 1); buffer = buffer.slice(buffer.lastIndexOf('\n') + 1);
} }
@@ -288,11 +300,19 @@ export class MyDurableObject {
async streamOpenRouter({ apiKey, body }) { async streamOpenRouter({ apiKey, body }) {
const client = new OpenAI({ apiKey, baseURL: 'https://openrouter.ai/api/v1' }); const client = new OpenAI({ apiKey, baseURL: 'https://openrouter.ai/api/v1' });
const stream = await client.chat.completions.create({ ...body, stream: true }, { signal: this.controller.signal }); const stream = await client.chat.completions.create({ ...body, stream: true }, { signal: this.controller.signal });
let hasReasoning = false, hasContent = false;
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?.reasoning && body.reasoning?.exclude !== true) this.queueDelta(delta.reasoning); if (delta?.reasoning && body.reasoning?.exclude !== true) {
if (delta?.content) this.queueDelta(delta.content); this.queueDelta(delta.reasoning);
hasReasoning = true;
}
if (delta?.content) {
if (hasReasoning && !hasContent) this.queueDelta('\n');
this.queueDelta(delta.content);
hasContent = true;
}
} }
} }