@micdrop/openai 1.0.5 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.mts +2 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +18 -18
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +18 -18
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/index.d.mts
CHANGED
|
@@ -5,8 +5,9 @@ import { PassThrough } from 'stream';
|
|
|
5
5
|
interface OpenaiAgentOptions extends AgentOptions {
|
|
6
6
|
apiKey: string;
|
|
7
7
|
model?: string;
|
|
8
|
-
maxRetry?: number;
|
|
9
8
|
settings?: Omit<OpenAI.Responses.ResponseCreateParamsStreaming, 'input' | 'model'>;
|
|
9
|
+
maxRetry?: number;
|
|
10
|
+
maxSteps?: number;
|
|
10
11
|
}
|
|
11
12
|
declare class OpenaiAgent extends Agent<OpenaiAgentOptions> {
|
|
12
13
|
private openai;
|
package/dist/index.d.ts
CHANGED
|
@@ -5,8 +5,9 @@ import { PassThrough } from 'stream';
|
|
|
5
5
|
interface OpenaiAgentOptions extends AgentOptions {
|
|
6
6
|
apiKey: string;
|
|
7
7
|
model?: string;
|
|
8
|
-
maxRetry?: number;
|
|
9
8
|
settings?: Omit<OpenAI.Responses.ResponseCreateParamsStreaming, 'input' | 'model'>;
|
|
9
|
+
maxRetry?: number;
|
|
10
|
+
maxSteps?: number;
|
|
10
11
|
}
|
|
11
12
|
declare class OpenaiAgent extends Agent<OpenaiAgentOptions> {
|
|
12
13
|
private openai;
|
package/dist/index.js
CHANGED
|
@@ -41,8 +41,9 @@ var import_openai = __toESM(require("openai"));
|
|
|
41
41
|
var import_stream = require("stream");
|
|
42
42
|
var import_zod = __toESM(require("zod"));
|
|
43
43
|
var DEFAULT_MODEL = "gpt-4o";
|
|
44
|
-
var
|
|
44
|
+
var DEFAULT_MAX_STEPS = 5;
|
|
45
45
|
var DEFAULT_MAX_RETRIES = 3;
|
|
46
|
+
var DEFAULT_RETRY_DELAY = 500;
|
|
46
47
|
var OpenaiAgent = class extends import_server.Agent {
|
|
47
48
|
constructor(options) {
|
|
48
49
|
super(options);
|
|
@@ -60,13 +61,14 @@ var OpenaiAgent = class extends import_server.Agent {
|
|
|
60
61
|
});
|
|
61
62
|
return stream;
|
|
62
63
|
}
|
|
63
|
-
async generateAnswer(stream,
|
|
64
|
-
if (
|
|
65
|
-
console.error("[OpenaiAgent] Max
|
|
64
|
+
async generateAnswer(stream, stepCount = 0, tryCount = 0) {
|
|
65
|
+
if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {
|
|
66
|
+
console.error("[OpenaiAgent] Max steps reached");
|
|
66
67
|
return;
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
-
|
|
69
|
+
const abortController = new AbortController();
|
|
70
|
+
this.abortController = abortController;
|
|
71
|
+
const signal = abortController.signal;
|
|
70
72
|
let extracting = false;
|
|
71
73
|
const extractOptions = this.getExtractOptions();
|
|
72
74
|
try {
|
|
@@ -75,16 +77,14 @@ var OpenaiAgent = class extends import_server.Agent {
|
|
|
75
77
|
model: this.options.model || DEFAULT_MODEL,
|
|
76
78
|
input: this.buildInput(),
|
|
77
79
|
tools: this.buildTools(),
|
|
78
|
-
temperature: 0.5,
|
|
79
|
-
max_output_tokens: 250,
|
|
80
80
|
stream: true,
|
|
81
81
|
...this.options.settings
|
|
82
82
|
},
|
|
83
83
|
{ signal }
|
|
84
84
|
);
|
|
85
|
-
let hasAnswer = false;
|
|
86
85
|
let skipAnswer = false;
|
|
87
86
|
for await (const event of response) {
|
|
87
|
+
if (abortController !== this.abortController) return;
|
|
88
88
|
switch (event.type) {
|
|
89
89
|
case "response.output_text.delta":
|
|
90
90
|
this.log(`Answer chunk: "${event.delta}"`);
|
|
@@ -109,8 +109,7 @@ var OpenaiAgent = class extends import_server.Agent {
|
|
|
109
109
|
const { message, metadata } = this.extract(event.text);
|
|
110
110
|
this.addAssistantMessage(message, metadata);
|
|
111
111
|
stream.end();
|
|
112
|
-
|
|
113
|
-
break;
|
|
112
|
+
return;
|
|
114
113
|
case "response.output_item.done":
|
|
115
114
|
if (event.item.type === "function_call") {
|
|
116
115
|
const toolCall = event.item;
|
|
@@ -129,15 +128,16 @@ var OpenaiAgent = class extends import_server.Agent {
|
|
|
129
128
|
break;
|
|
130
129
|
}
|
|
131
130
|
}
|
|
132
|
-
if (
|
|
133
|
-
|
|
131
|
+
if (abortController !== this.abortController) return;
|
|
132
|
+
if (!skipAnswer) {
|
|
133
|
+
await this.generateAnswer(stream, stepCount + 1);
|
|
134
134
|
}
|
|
135
135
|
} catch (error) {
|
|
136
|
-
if (
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
136
|
+
if (error instanceof import_openai.default.APIUserAbortError) return;
|
|
137
|
+
console.error("[OpenaiAgent] Error answering:", error);
|
|
138
|
+
if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRIES)) {
|
|
139
|
+
await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY));
|
|
140
|
+
await this.generateAnswer(stream, stepCount, tryCount + 1);
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/OpenaiAgent.ts","../src/OpenaiSTT.ts"],"sourcesContent":["export * from './OpenaiAgent'\nexport * from './OpenaiSTT'\n","import { Agent, AgentOptions } from '@micdrop/server'\nimport OpenAI from 'openai'\nimport { PassThrough } from 'stream'\nimport z, { toJSONSchema } from 'zod'\n\nexport interface OpenaiAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n maxRetry?: number\n settings?: Omit<\n OpenAI.Responses.ResponseCreateParamsStreaming,\n 'input' | 'model'\n >\n}\n\nconst DEFAULT_MODEL = 'gpt-4o'\nconst DEFAULT_MAX_CALLS = 5\nconst DEFAULT_MAX_RETRIES = 3\n\nexport class OpenaiAgent extends Agent<OpenaiAgentOptions> {\n private openai: OpenAI\n private abortController?: AbortController\n\n constructor(options: OpenaiAgentOptions) {\n super(options)\n this.openai = new OpenAI({ apiKey: options.apiKey })\n }\n\n answer() {\n this.cancel()\n this.log('Start answering')\n const stream = new PassThrough()\n\n this.generateAnswer(stream).finally(() => {\n this.abortController = undefined\n if (stream.writable) {\n stream.end()\n }\n })\n\n return stream\n }\n\n private async generateAnswer(\n stream: PassThrough,\n callCount = 0,\n tryCount = 0\n ): Promise<void> {\n if (callCount >= (this.options.maxRetry || DEFAULT_MAX_CALLS)) {\n console.error('[OpenaiAgent] Max calls reached')\n return\n }\n\n this.abortController = new AbortController()\n const signal = this.abortController.signal\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate answer\n const response = await this.openai.responses.create(\n {\n model: this.options.model || DEFAULT_MODEL,\n input: this.buildInput(),\n tools: this.buildTools(),\n temperature: 0.5,\n max_output_tokens: 250,\n stream: true,\n ...this.options.settings,\n },\n { signal }\n )\n let hasAnswer = false\n let skipAnswer = false\n\n // Handle response events\n for await (const event of response) {\n switch (event.type) {\n case 'response.output_text.delta':\n this.log(`Answer chunk: \"${event.delta}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = event.delta.indexOf(\n extractOptions.startTag\n )\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = event.delta\n .slice(0, startTagIndex)\n .trimEnd()\n stream.write(messagePart)\n break\n }\n } else {\n // Extracting, don't write to stream\n break\n }\n }\n\n // Send chunk\n stream.write(event.delta)\n break\n\n case 'response.output_text.done':\n const { message, metadata } = this.extract(event.text)\n this.addAssistantMessage(message, metadata)\n stream.end()\n hasAnswer = true\n break\n\n case 'response.output_item.done':\n if (event.item.type === 'function_call') {\n const toolCall = event.item\n const result = await this.executeTool({\n role: 'tool_call',\n toolCallId: toolCall.call_id,\n toolName: toolCall.name,\n parameters: toolCall.arguments,\n })\n if (result.skipAnswer) {\n skipAnswer = true\n }\n }\n break\n\n default:\n break\n }\n }\n\n // Query again in case of tool call\n if (!hasAnswer && !skipAnswer) {\n await this.generateAnswer(stream, callCount + 1)\n }\n } catch (error) {\n if (!(error instanceof OpenAI.APIUserAbortError)) {\n console.error('[OpenaiAgent] Error answering:', error)\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRIES)) {\n await this.generateAnswer(stream, callCount, tryCount + 1)\n }\n }\n }\n }\n\n private buildInput(): OpenAI.Responses.ResponseInput {\n return this.conversation.map((message) => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n type: 'function_call',\n call_id: message.toolCallId,\n name: message.toolName,\n arguments: JSON.stringify(message.parameters),\n }\n case 'tool_result':\n return {\n type: 'function_call_output',\n call_id: message.toolCallId,\n output: message.output,\n }\n }\n })\n }\n\n private buildTools(): OpenAI.Responses.Tool[] | undefined {\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return undefined\n\n return this.tools.map((tool) => ({\n type: 'function',\n name: tool.name,\n description: tool.description,\n strict: true,\n parameters: toJSONSchema(tool.inputSchema || z.object()),\n }))\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n","import { FileSTT } from '@micdrop/server'\n\n/**\n * OpenAI Whisper STT\n *\n * @see https://platform.openai.com/docs/guides/speech-to-text?lang=curl\n */\n\nexport interface OpenaiSTTOptions {\n apiKey: string\n model?: string\n language?: string\n}\n\nconst DEFAULT_MODEL = 'whisper-1'\n\nexport class OpenaiSTT extends FileSTT {\n constructor(private options: OpenaiSTTOptions) {\n super()\n }\n\n async transcribeFile(file: File) {\n // Prepare form data\n const formData = new FormData()\n formData.append('file', file)\n formData.append('model', this.options.model || DEFAULT_MODEL)\n formData.append('response_format', 'text')\n\n if (this.options.language) {\n formData.append('language', this.options.language)\n }\n\n const response = await fetch(\n 'https://api.openai.com/v1/audio/transcriptions',\n {\n method: 'POST',\n headers: {\n Authorization: `Bearer ${this.options.apiKey}`,\n },\n body: formData,\n }\n )\n\n if (!response.ok) {\n this.log('Failed to transcribe audio', await response.json())\n throw new Error(`Failed to transcribe audio: ${response.statusText}`)\n }\n\n const transcript = await response.text()\n this.log(`Received transcript: \"${transcript}\"`)\n\n return transcript\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAoC;AACpC,oBAAmB;AACnB,oBAA4B;AAC5B,iBAAgC;AAYhC,IAAM,gBAAgB;AACtB,IAAM,oBAAoB;AAC1B,IAAM,sBAAsB;AAErB,IAAM,cAAN,cAA0B,oBAA0B;AAAA,EAIzD,YAAY,SAA6B;AACvC,UAAM,OAAO;AACb,SAAK,SAAS,IAAI,cAAAA,QAAO,EAAE,QAAQ,QAAQ,OAAO,CAAC;AAAA,EACrD;AAAA,EAEA,SAAS;AACP,SAAK,OAAO;AACZ,SAAK,IAAI,iBAAiB;AAC1B,UAAM,SAAS,IAAI,0BAAY;AAE/B,SAAK,eAAe,MAAM,EAAE,QAAQ,MAAM;AACxC,WAAK,kBAAkB;AACvB,UAAI,OAAO,UAAU;AACnB,eAAO,IAAI;AAAA,MACb;AAAA,IACF,CAAC;AAED,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,eACZ,QACA,YAAY,GACZ,WAAW,GACI;AACf,QAAI,cAAc,KAAK,QAAQ,YAAY,oBAAoB;AAC7D,cAAQ,MAAM,iCAAiC;AAC/C;AAAA,IACF;AAEA,SAAK,kBAAkB,IAAI,gBAAgB;AAC3C,UAAM,SAAS,KAAK,gBAAgB;AAGpC,QAAI,aAAa;AACjB,UAAM,iBAAiB,KAAK,kBAAkB;AAE9C,QAAI;AAEF,YAAM,WAAW,MAAM,KAAK,OAAO,UAAU;AAAA,QAC3C;AAAA,UACE,OAAO,KAAK,QAAQ,SAAS;AAAA,UAC7B,OAAO,KAAK,WAAW;AAAA,UACvB,OAAO,KAAK,WAAW;AAAA,UACvB,aAAa;AAAA,UACb,mBAAmB;AAAA,UACnB,QAAQ;AAAA,UACR,GAAG,KAAK,QAAQ;AAAA,QAClB;AAAA,QACA,EAAE,OAAO;AAAA,MACX;AACA,UAAI,YAAY;AAChB,UAAI,aAAa;AAGjB,uBAAiB,SAAS,UAAU;AAClC,gBAAQ,MAAM,MAAM;AAAA,UAClB,KAAK;AACH,iBAAK,IAAI,kBAAkB,MAAM,KAAK,GAAG;AAGzC,gBAAI,gBAAgB;AAClB,kBAAI,CAAC,YAAY;AACf,sBAAM,gBAAgB,MAAM,MAAM;AAAA,kBAChC,eAAe;AAAA,gBACjB;AACA,oBAAI,kBAAkB,IAAI;AACxB,+BAAa;AACb,wBAAM,cAAc,MAAM,MACvB,MAAM,GAAG,aAAa,EACtB,QAAQ;AACX,yBAAO,MAAM,WAAW;AACxB;AAAA,gBACF;AAAA,cACF,OAAO;AAEL;AAAA,cACF;AAAA,YACF;AAGA,mBAAO,MAAM,MAAM,KAAK;AACxB;AAAA,UAEF,KAAK;AACH,kBAAM,EAAE,SAAS,SAAS,IAAI,KAAK,QAAQ,MAAM,IAAI;AACrD,iBAAK,oBAAoB,SAAS,QAAQ;AAC1C,mBAAO,IAAI;AACX,wBAAY;AACZ;AAAA,UAEF,KAAK;AACH,gBAAI,MAAM,KAAK,SAAS,iBAAiB;AACvC,oBAAM,WAAW,MAAM;AACvB,oBAAM,SAAS,MAAM,KAAK,YAAY;AAAA,gBACpC,MAAM;AAAA,gBACN,YAAY,SAAS;AAAA,gBACrB,UAAU,SAAS;AAAA,gBACnB,YAAY,SAAS;AAAA,cACvB,CAAC;AACD,kBAAI,OAAO,YAAY;AACrB,6BAAa;AAAA,cACf;AAAA,YACF;AACA;AAAA,UAEF;AACE;AAAA,QACJ;AAAA,MACF;AAGA,UAAI,CAAC,aAAa,CAAC,YAAY;AAC7B,cAAM,KAAK,eAAe,QAAQ,YAAY,CAAC;AAAA,MACjD;AAAA,IACF,SAAS,OAAO;AACd,UAAI,EAAE,iBAAiB,cAAAA,QAAO,oBAAoB;AAChD,gBAAQ,MAAM,kCAAkC,KAAK;AACrD,YAAI,YAAY,KAAK,QAAQ,YAAY,sBAAsB;AAC7D,gBAAM,KAAK,eAAe,QAAQ,WAAW,WAAW,CAAC;AAAA,QAC3D;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,aAA6C;AACnD,WAAO,KAAK,aAAa,IAAI,CAAC,YAAY;AACxC,cAAQ,QAAQ,MAAM;AAAA,QACpB,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACH,iBAAO;AAAA,YACL,MAAM,QAAQ;AAAA,YACd,SAAS,QAAQ;AAAA,UACnB;AAAA,QACF,KAAK;AACH,iBAAO;AAAA,YACL,MAAM;AAAA,YACN,SAAS,QAAQ;AAAA,YACjB,MAAM,QAAQ;AAAA,YACd,WAAW,KAAK,UAAU,QAAQ,UAAU;AAAA,UAC9C;AAAA,QACF,KAAK;AACH,iBAAO;AAAA,YACL,MAAM;AAAA,YACN,SAAS,QAAQ;AAAA,YACjB,QAAQ,QAAQ;AAAA,UAClB;AAAA,MACJ;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,aAAkD;AAExD,UAAM,cAAc,KAAK,aAAa,SAAS;AAC/C,QAAI,CAAC,YAAa,QAAO;AAEzB,WAAO,KAAK,MAAM,IAAI,CAAC,UAAU;AAAA,MAC/B,MAAM;AAAA,MACN,MAAM,KAAK;AAAA,MACX,aAAa,KAAK;AAAA,MAClB,QAAQ;AAAA,MACR,gBAAY,yBAAa,KAAK,eAAe,WAAAC,QAAE,OAAO,CAAC;AAAA,IACzD,EAAE;AAAA,EACJ;AAAA,EAEA,SAAS;AACP,QAAI,CAAC,KAAK,gBAAiB;AAC3B,SAAK,IAAI,QAAQ;AACjB,SAAK,gBAAgB,MAAM;AAC3B,SAAK,kBAAkB;AAAA,EACzB;AACF;;;ACnMA,IAAAC,iBAAwB;AAcxB,IAAMC,iBAAgB;AAEf,IAAM,YAAN,cAAwB,uBAAQ;AAAA,EACrC,YAAoB,SAA2B;AAC7C,UAAM;AADY;AAAA,EAEpB;AAAA,EAEA,MAAM,eAAe,MAAY;AAE/B,UAAM,WAAW,IAAI,SAAS;AAC9B,aAAS,OAAO,QAAQ,IAAI;AAC5B,aAAS,OAAO,SAAS,KAAK,QAAQ,SAASA,cAAa;AAC5D,aAAS,OAAO,mBAAmB,MAAM;AAEzC,QAAI,KAAK,QAAQ,UAAU;AACzB,eAAS,OAAO,YAAY,KAAK,QAAQ,QAAQ;AAAA,IACnD;AAEA,UAAM,WAAW,MAAM;AAAA,MACrB;AAAA,MACA;AAAA,QACE,QAAQ;AAAA,QACR,SAAS;AAAA,UACP,eAAe,UAAU,KAAK,QAAQ,MAAM;AAAA,QAC9C;AAAA,QACA,MAAM;AAAA,MACR;AAAA,IACF;AAEA,QAAI,CAAC,SAAS,IAAI;AAChB,WAAK,IAAI,8BAA8B,MAAM,SAAS,KAAK,CAAC;AAC5D,YAAM,IAAI,MAAM,+BAA+B,SAAS,UAAU,EAAE;AAAA,IACtE;AAEA,UAAM,aAAa,MAAM,SAAS,KAAK;AACvC,SAAK,IAAI,yBAAyB,UAAU,GAAG;AAE/C,WAAO;AAAA,EACT;AACF;","names":["OpenAI","z","import_server","DEFAULT_MODEL"]}
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/OpenaiAgent.ts","../src/OpenaiSTT.ts"],"sourcesContent":["export * from './OpenaiAgent'\nexport * from './OpenaiSTT'\n","import { Agent, AgentOptions } from '@micdrop/server'\nimport OpenAI from 'openai'\nimport { PassThrough } from 'stream'\nimport z, { toJSONSchema } from 'zod'\n\nexport interface OpenaiAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n settings?: Omit<\n OpenAI.Responses.ResponseCreateParamsStreaming,\n 'input' | 'model'\n >\n maxRetry?: number\n maxSteps?: number\n}\n\nconst DEFAULT_MODEL = 'gpt-4o'\nconst DEFAULT_MAX_STEPS = 5\nconst DEFAULT_MAX_RETRIES = 3\nconst DEFAULT_RETRY_DELAY = 500\n\nexport class OpenaiAgent extends Agent<OpenaiAgentOptions> {\n private openai: OpenAI\n private abortController?: AbortController\n\n constructor(options: OpenaiAgentOptions) {\n super(options)\n this.openai = new OpenAI({ apiKey: options.apiKey })\n }\n\n answer() {\n this.cancel()\n this.log('Start answering')\n const stream = new PassThrough()\n\n this.generateAnswer(stream).finally(() => {\n this.abortController = undefined\n if (stream.writable) {\n stream.end()\n }\n })\n\n return stream\n }\n\n private async generateAnswer(\n stream: PassThrough,\n stepCount = 0,\n tryCount = 0\n ): Promise<void> {\n if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {\n console.error('[OpenaiAgent] Max steps reached')\n return\n }\n\n const abortController = new AbortController()\n this.abortController = abortController\n const signal = abortController.signal\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate answer\n const response = await this.openai.responses.create(\n {\n model: this.options.model || DEFAULT_MODEL,\n input: this.buildInput(),\n tools: this.buildTools(),\n stream: true,\n ...this.options.settings,\n },\n { signal }\n )\n let skipAnswer = false\n\n // Handle response events\n for await (const event of response) {\n if (abortController !== this.abortController) return\n switch (event.type) {\n case 'response.output_text.delta':\n this.log(`Answer chunk: \"${event.delta}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = event.delta.indexOf(\n extractOptions.startTag\n )\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = event.delta\n .slice(0, startTagIndex)\n .trimEnd()\n stream.write(messagePart)\n break\n }\n } else {\n // Extracting, don't write to stream\n break\n }\n }\n\n // Send chunk\n stream.write(event.delta)\n break\n\n case 'response.output_text.done':\n const { message, metadata } = this.extract(event.text)\n this.addAssistantMessage(message, metadata)\n stream.end()\n // Stop query now that we have a complete answer\n // Note: OpenAI can sometimes return multiple outputs.\n // See https://community.openai.com/t/how-to-prevent-the-api-returning-multiple-outputs/1251365/28\n // We can prompt it like this to avoid consuming too many tokens:\n // `Return one complete answer and then stop`\n return\n\n case 'response.output_item.done':\n if (event.item.type === 'function_call') {\n const toolCall = event.item\n const result = await this.executeTool({\n role: 'tool_call',\n toolCallId: toolCall.call_id,\n toolName: toolCall.name,\n parameters: toolCall.arguments,\n })\n if (result.skipAnswer) {\n skipAnswer = true\n }\n }\n break\n\n default:\n break\n }\n }\n\n if (abortController !== this.abortController) return\n\n // Query again in case of tool call\n if (!skipAnswer) {\n await this.generateAnswer(stream, stepCount + 1)\n }\n } catch (error) {\n if (error instanceof OpenAI.APIUserAbortError) return\n console.error('[OpenaiAgent] Error answering:', error)\n\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRIES)) {\n await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY))\n await this.generateAnswer(stream, stepCount, tryCount + 1)\n }\n }\n }\n\n private buildInput(): OpenAI.Responses.ResponseInput {\n return this.conversation.map((message) => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n type: 'function_call',\n call_id: message.toolCallId,\n name: message.toolName,\n arguments: JSON.stringify(message.parameters),\n }\n case 'tool_result':\n return {\n type: 'function_call_output',\n call_id: message.toolCallId,\n output: message.output,\n }\n }\n })\n }\n\n private buildTools(): OpenAI.Responses.Tool[] | undefined {\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return undefined\n\n return this.tools.map((tool) => ({\n type: 'function',\n name: tool.name,\n description: tool.description,\n strict: true,\n parameters: toJSONSchema(tool.inputSchema || z.object()),\n }))\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n","import { FileSTT } from '@micdrop/server'\n\n/**\n * OpenAI Whisper STT\n *\n * @see https://platform.openai.com/docs/guides/speech-to-text?lang=curl\n */\n\nexport interface OpenaiSTTOptions {\n apiKey: string\n model?: string\n language?: string\n}\n\nconst DEFAULT_MODEL = 'whisper-1'\n\nexport class OpenaiSTT extends FileSTT {\n constructor(private options: OpenaiSTTOptions) {\n super()\n }\n\n async transcribeFile(file: File) {\n // Prepare form data\n const formData = new FormData()\n formData.append('file', file)\n formData.append('model', this.options.model || DEFAULT_MODEL)\n formData.append('response_format', 'text')\n\n if (this.options.language) {\n formData.append('language', this.options.language)\n }\n\n const response = await fetch(\n 'https://api.openai.com/v1/audio/transcriptions',\n {\n method: 'POST',\n headers: {\n Authorization: `Bearer ${this.options.apiKey}`,\n },\n body: formData,\n }\n )\n\n if (!response.ok) {\n this.log('Failed to transcribe audio', await response.json())\n throw new Error(`Failed to transcribe audio: ${response.statusText}`)\n }\n\n const transcript = await response.text()\n this.log(`Received transcript: \"${transcript}\"`)\n\n return transcript\n }\n}\n"],"mappings":"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","names":["OpenAI","z","import_server","DEFAULT_MODEL"]}
|
package/dist/index.mjs
CHANGED
|
@@ -4,8 +4,9 @@ import OpenAI from "openai";
|
|
|
4
4
|
import { PassThrough } from "stream";
|
|
5
5
|
import z, { toJSONSchema } from "zod";
|
|
6
6
|
var DEFAULT_MODEL = "gpt-4o";
|
|
7
|
-
var
|
|
7
|
+
var DEFAULT_MAX_STEPS = 5;
|
|
8
8
|
var DEFAULT_MAX_RETRIES = 3;
|
|
9
|
+
var DEFAULT_RETRY_DELAY = 500;
|
|
9
10
|
var OpenaiAgent = class extends Agent {
|
|
10
11
|
constructor(options) {
|
|
11
12
|
super(options);
|
|
@@ -23,13 +24,14 @@ var OpenaiAgent = class extends Agent {
|
|
|
23
24
|
});
|
|
24
25
|
return stream;
|
|
25
26
|
}
|
|
26
|
-
async generateAnswer(stream,
|
|
27
|
-
if (
|
|
28
|
-
console.error("[OpenaiAgent] Max
|
|
27
|
+
async generateAnswer(stream, stepCount = 0, tryCount = 0) {
|
|
28
|
+
if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {
|
|
29
|
+
console.error("[OpenaiAgent] Max steps reached");
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
const abortController = new AbortController();
|
|
33
|
+
this.abortController = abortController;
|
|
34
|
+
const signal = abortController.signal;
|
|
33
35
|
let extracting = false;
|
|
34
36
|
const extractOptions = this.getExtractOptions();
|
|
35
37
|
try {
|
|
@@ -38,16 +40,14 @@ var OpenaiAgent = class extends Agent {
|
|
|
38
40
|
model: this.options.model || DEFAULT_MODEL,
|
|
39
41
|
input: this.buildInput(),
|
|
40
42
|
tools: this.buildTools(),
|
|
41
|
-
temperature: 0.5,
|
|
42
|
-
max_output_tokens: 250,
|
|
43
43
|
stream: true,
|
|
44
44
|
...this.options.settings
|
|
45
45
|
},
|
|
46
46
|
{ signal }
|
|
47
47
|
);
|
|
48
|
-
let hasAnswer = false;
|
|
49
48
|
let skipAnswer = false;
|
|
50
49
|
for await (const event of response) {
|
|
50
|
+
if (abortController !== this.abortController) return;
|
|
51
51
|
switch (event.type) {
|
|
52
52
|
case "response.output_text.delta":
|
|
53
53
|
this.log(`Answer chunk: "${event.delta}"`);
|
|
@@ -72,8 +72,7 @@ var OpenaiAgent = class extends Agent {
|
|
|
72
72
|
const { message, metadata } = this.extract(event.text);
|
|
73
73
|
this.addAssistantMessage(message, metadata);
|
|
74
74
|
stream.end();
|
|
75
|
-
|
|
76
|
-
break;
|
|
75
|
+
return;
|
|
77
76
|
case "response.output_item.done":
|
|
78
77
|
if (event.item.type === "function_call") {
|
|
79
78
|
const toolCall = event.item;
|
|
@@ -92,15 +91,16 @@ var OpenaiAgent = class extends Agent {
|
|
|
92
91
|
break;
|
|
93
92
|
}
|
|
94
93
|
}
|
|
95
|
-
if (
|
|
96
|
-
|
|
94
|
+
if (abortController !== this.abortController) return;
|
|
95
|
+
if (!skipAnswer) {
|
|
96
|
+
await this.generateAnswer(stream, stepCount + 1);
|
|
97
97
|
}
|
|
98
98
|
} catch (error) {
|
|
99
|
-
if (
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
99
|
+
if (error instanceof OpenAI.APIUserAbortError) return;
|
|
100
|
+
console.error("[OpenaiAgent] Error answering:", error);
|
|
101
|
+
if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRIES)) {
|
|
102
|
+
await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY));
|
|
103
|
+
await this.generateAnswer(stream, stepCount, tryCount + 1);
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
}
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/OpenaiAgent.ts","../src/OpenaiSTT.ts"],"sourcesContent":["import { Agent, AgentOptions } from '@micdrop/server'\nimport OpenAI from 'openai'\nimport { PassThrough } from 'stream'\nimport z, { toJSONSchema } from 'zod'\n\nexport interface OpenaiAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n maxRetry?: number\n settings?: Omit<\n OpenAI.Responses.ResponseCreateParamsStreaming,\n 'input' | 'model'\n >\n}\n\nconst DEFAULT_MODEL = 'gpt-4o'\nconst DEFAULT_MAX_CALLS = 5\nconst DEFAULT_MAX_RETRIES = 3\n\nexport class OpenaiAgent extends Agent<OpenaiAgentOptions> {\n private openai: OpenAI\n private abortController?: AbortController\n\n constructor(options: OpenaiAgentOptions) {\n super(options)\n this.openai = new OpenAI({ apiKey: options.apiKey })\n }\n\n answer() {\n this.cancel()\n this.log('Start answering')\n const stream = new PassThrough()\n\n this.generateAnswer(stream).finally(() => {\n this.abortController = undefined\n if (stream.writable) {\n stream.end()\n }\n })\n\n return stream\n }\n\n private async generateAnswer(\n stream: PassThrough,\n callCount = 0,\n tryCount = 0\n ): Promise<void> {\n if (callCount >= (this.options.maxRetry || DEFAULT_MAX_CALLS)) {\n console.error('[OpenaiAgent] Max calls reached')\n return\n }\n\n this.abortController = new AbortController()\n const signal = this.abortController.signal\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate answer\n const response = await this.openai.responses.create(\n {\n model: this.options.model || DEFAULT_MODEL,\n input: this.buildInput(),\n tools: this.buildTools(),\n temperature: 0.5,\n max_output_tokens: 250,\n stream: true,\n ...this.options.settings,\n },\n { signal }\n )\n let hasAnswer = false\n let skipAnswer = false\n\n // Handle response events\n for await (const event of response) {\n switch (event.type) {\n case 'response.output_text.delta':\n this.log(`Answer chunk: \"${event.delta}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = event.delta.indexOf(\n extractOptions.startTag\n )\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = event.delta\n .slice(0, startTagIndex)\n .trimEnd()\n stream.write(messagePart)\n break\n }\n } else {\n // Extracting, don't write to stream\n break\n }\n }\n\n // Send chunk\n stream.write(event.delta)\n break\n\n case 'response.output_text.done':\n const { message, metadata } = this.extract(event.text)\n this.addAssistantMessage(message, metadata)\n stream.end()\n hasAnswer = true\n break\n\n case 'response.output_item.done':\n if (event.item.type === 'function_call') {\n const toolCall = event.item\n const result = await this.executeTool({\n role: 'tool_call',\n toolCallId: toolCall.call_id,\n toolName: toolCall.name,\n parameters: toolCall.arguments,\n })\n if (result.skipAnswer) {\n skipAnswer = true\n }\n }\n break\n\n default:\n break\n }\n }\n\n // Query again in case of tool call\n if (!hasAnswer && !skipAnswer) {\n await this.generateAnswer(stream, callCount + 1)\n }\n } catch (error) {\n if (!(error instanceof OpenAI.APIUserAbortError)) {\n console.error('[OpenaiAgent] Error answering:', error)\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRIES)) {\n await this.generateAnswer(stream, callCount, tryCount + 1)\n }\n }\n }\n }\n\n private buildInput(): OpenAI.Responses.ResponseInput {\n return this.conversation.map((message) => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n type: 'function_call',\n call_id: message.toolCallId,\n name: message.toolName,\n arguments: JSON.stringify(message.parameters),\n }\n case 'tool_result':\n return {\n type: 'function_call_output',\n call_id: message.toolCallId,\n output: message.output,\n }\n }\n })\n }\n\n private buildTools(): OpenAI.Responses.Tool[] | undefined {\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return undefined\n\n return this.tools.map((tool) => ({\n type: 'function',\n name: tool.name,\n description: tool.description,\n strict: true,\n parameters: toJSONSchema(tool.inputSchema || z.object()),\n }))\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n","import { FileSTT } from '@micdrop/server'\n\n/**\n * OpenAI Whisper STT\n *\n * @see https://platform.openai.com/docs/guides/speech-to-text?lang=curl\n */\n\nexport interface OpenaiSTTOptions {\n apiKey: string\n model?: string\n language?: string\n}\n\nconst DEFAULT_MODEL = 'whisper-1'\n\nexport class OpenaiSTT extends FileSTT {\n constructor(private options: OpenaiSTTOptions) {\n super()\n }\n\n async transcribeFile(file: File) {\n // Prepare form data\n const formData = new FormData()\n formData.append('file', file)\n formData.append('model', this.options.model || DEFAULT_MODEL)\n formData.append('response_format', 'text')\n\n if (this.options.language) {\n formData.append('language', this.options.language)\n }\n\n const response = await fetch(\n 'https://api.openai.com/v1/audio/transcriptions',\n {\n method: 'POST',\n headers: {\n Authorization: `Bearer ${this.options.apiKey}`,\n },\n body: formData,\n }\n )\n\n if (!response.ok) {\n this.log('Failed to transcribe audio', await response.json())\n throw new Error(`Failed to transcribe audio: ${response.statusText}`)\n }\n\n const transcript = await response.text()\n this.log(`Received transcript: \"${transcript}\"`)\n\n return transcript\n }\n}\n"],"mappings":"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","names":["DEFAULT_MODEL"]}
|
|
1
|
+
{"version":3,"sources":["../src/OpenaiAgent.ts","../src/OpenaiSTT.ts"],"sourcesContent":["import { Agent, AgentOptions } from '@micdrop/server'\nimport OpenAI from 'openai'\nimport { PassThrough } from 'stream'\nimport z, { toJSONSchema } from 'zod'\n\nexport interface OpenaiAgentOptions extends AgentOptions {\n apiKey: string\n model?: string\n settings?: Omit<\n OpenAI.Responses.ResponseCreateParamsStreaming,\n 'input' | 'model'\n >\n maxRetry?: number\n maxSteps?: number\n}\n\nconst DEFAULT_MODEL = 'gpt-4o'\nconst DEFAULT_MAX_STEPS = 5\nconst DEFAULT_MAX_RETRIES = 3\nconst DEFAULT_RETRY_DELAY = 500\n\nexport class OpenaiAgent extends Agent<OpenaiAgentOptions> {\n private openai: OpenAI\n private abortController?: AbortController\n\n constructor(options: OpenaiAgentOptions) {\n super(options)\n this.openai = new OpenAI({ apiKey: options.apiKey })\n }\n\n answer() {\n this.cancel()\n this.log('Start answering')\n const stream = new PassThrough()\n\n this.generateAnswer(stream).finally(() => {\n this.abortController = undefined\n if (stream.writable) {\n stream.end()\n }\n })\n\n return stream\n }\n\n private async generateAnswer(\n stream: PassThrough,\n stepCount = 0,\n tryCount = 0\n ): Promise<void> {\n if (stepCount >= (this.options.maxSteps || DEFAULT_MAX_STEPS)) {\n console.error('[OpenaiAgent] Max steps reached')\n return\n }\n\n const abortController = new AbortController()\n this.abortController = abortController\n const signal = abortController.signal\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate answer\n const response = await this.openai.responses.create(\n {\n model: this.options.model || DEFAULT_MODEL,\n input: this.buildInput(),\n tools: this.buildTools(),\n stream: true,\n ...this.options.settings,\n },\n { signal }\n )\n let skipAnswer = false\n\n // Handle response events\n for await (const event of response) {\n if (abortController !== this.abortController) return\n switch (event.type) {\n case 'response.output_text.delta':\n this.log(`Answer chunk: \"${event.delta}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = event.delta.indexOf(\n extractOptions.startTag\n )\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = event.delta\n .slice(0, startTagIndex)\n .trimEnd()\n stream.write(messagePart)\n break\n }\n } else {\n // Extracting, don't write to stream\n break\n }\n }\n\n // Send chunk\n stream.write(event.delta)\n break\n\n case 'response.output_text.done':\n const { message, metadata } = this.extract(event.text)\n this.addAssistantMessage(message, metadata)\n stream.end()\n // Stop query now that we have a complete answer\n // Note: OpenAI can sometimes return multiple outputs.\n // See https://community.openai.com/t/how-to-prevent-the-api-returning-multiple-outputs/1251365/28\n // We can prompt it like this to avoid consuming too many tokens:\n // `Return one complete answer and then stop`\n return\n\n case 'response.output_item.done':\n if (event.item.type === 'function_call') {\n const toolCall = event.item\n const result = await this.executeTool({\n role: 'tool_call',\n toolCallId: toolCall.call_id,\n toolName: toolCall.name,\n parameters: toolCall.arguments,\n })\n if (result.skipAnswer) {\n skipAnswer = true\n }\n }\n break\n\n default:\n break\n }\n }\n\n if (abortController !== this.abortController) return\n\n // Query again in case of tool call\n if (!skipAnswer) {\n await this.generateAnswer(stream, stepCount + 1)\n }\n } catch (error) {\n if (error instanceof OpenAI.APIUserAbortError) return\n console.error('[OpenaiAgent] Error answering:', error)\n\n if (tryCount < (this.options.maxRetry || DEFAULT_MAX_RETRIES)) {\n await new Promise((resolve) => setTimeout(resolve, DEFAULT_RETRY_DELAY))\n await this.generateAnswer(stream, stepCount, tryCount + 1)\n }\n }\n }\n\n private buildInput(): OpenAI.Responses.ResponseInput {\n return this.conversation.map((message) => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n type: 'function_call',\n call_id: message.toolCallId,\n name: message.toolName,\n arguments: JSON.stringify(message.parameters),\n }\n case 'tool_result':\n return {\n type: 'function_call_output',\n call_id: message.toolCallId,\n output: message.output,\n }\n }\n })\n }\n\n private buildTools(): OpenAI.Responses.Tool[] | undefined {\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return undefined\n\n return this.tools.map((tool) => ({\n type: 'function',\n name: tool.name,\n description: tool.description,\n strict: true,\n parameters: toJSONSchema(tool.inputSchema || z.object()),\n }))\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n","import { FileSTT } from '@micdrop/server'\n\n/**\n * OpenAI Whisper STT\n *\n * @see https://platform.openai.com/docs/guides/speech-to-text?lang=curl\n */\n\nexport interface OpenaiSTTOptions {\n apiKey: string\n model?: string\n language?: string\n}\n\nconst DEFAULT_MODEL = 'whisper-1'\n\nexport class OpenaiSTT extends FileSTT {\n constructor(private options: OpenaiSTTOptions) {\n super()\n }\n\n async transcribeFile(file: File) {\n // Prepare form data\n const formData = new FormData()\n formData.append('file', file)\n formData.append('model', this.options.model || DEFAULT_MODEL)\n formData.append('response_format', 'text')\n\n if (this.options.language) {\n formData.append('language', this.options.language)\n }\n\n const response = await fetch(\n 'https://api.openai.com/v1/audio/transcriptions',\n {\n method: 'POST',\n headers: {\n Authorization: `Bearer ${this.options.apiKey}`,\n },\n body: formData,\n }\n )\n\n if (!response.ok) {\n this.log('Failed to transcribe audio', await response.json())\n throw new Error(`Failed to transcribe audio: ${response.statusText}`)\n }\n\n const transcript = await response.text()\n this.log(`Received transcript: \"${transcript}\"`)\n\n return transcript\n }\n}\n"],"mappings":"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","names":["DEFAULT_MODEL"]}
|