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

feat: update index.js

Browse Source
This commit is contained in:
multipleof4
2025-09-13 10:58:55 -07:00
parent e3e6404d78
commit fabe8585ba
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
index.js
View File

@@ -222,7 +222,7 @@ export class MyDurableObject {
} }
mapToGoogleContents(messages) { mapToGoogleContents(messages) {
return messages.reduce((acc, m) => { const contents = messages.reduce((acc, m) => {
const role = m.role === 'assistant' ? 'model' : 'user'; const role = m.role === 'assistant' ? 'model' : 'user';
const msgContent = Array.isArray(m.content) ? m.content : [{ type: 'text', text: String(m.content ?? '') }]; const msgContent = Array.isArray(m.content) ? m.content : [{ type: 'text', text: String(m.content ?? '') }];
const parts = msgContent.map(p => { const parts = msgContent.map(p => {
@@ -239,6 +239,8 @@ export class MyDurableObject {
else acc.push({ role, parts }); else acc.push({ role, parts });
return acc; return acc;
}, []); }, []);
if (contents.at(-1)?.role !== 'user') contents.pop();
return contents;
} }
async streamOpenAI({ apiKey, body }) { async streamOpenAI({ apiKey, body }) {
@@ -287,22 +289,11 @@ export class MyDurableObject {
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 });
const lines = buffer.split('\n'); for (const line of buffer.split('\n')) {
buffer = lines.pop() || '';
for (const line of lines) {
if (!line.startsWith('data: ')) continue; if (!line.startsWith('data: ')) continue;
try { try { JSON.parse(line.substring(6))?.candidates?.[0]?.content?.parts?.forEach(p => p.text && this.queueDelta(p.text)); } catch {}
const chunk = JSON.parse(line.substring(6));
const candidate = chunk?.candidates?.[0];
if (!candidate) continue;
candidate.content?.parts?.forEach(p => p.text && this.queueDelta(p.text));
const thoughts = candidate.execution_metadata?.tool_use_signals?.map(s => s.tool_code).filter(Boolean).join('');
if (thoughts) this.queueDelta(thoughts);
} catch {}
} }
buffer = buffer.slice(buffer.lastIndexOf('\n') + 1);
} }
} }
@@ -363,3 +354,4 @@ export class MyDurableObject {
await this.Heart(); await this.Heart();
} }
} }