@zimtsui/typechat 0.0.98 → 0.0.100

package/build/{native-engines.d → engines}/google/transport.js

@@ -1,15 +1,15 @@
 import * as Google from '@google/genai';
 import * as Undici from 'undici';
 import { loggers } from "../../telemetry.js";
-import * as ChoiceCodec from "../../compatible-engine.d/google/choice-codec.js";
+import * as ChoiceCodec from "./structuring-choice-codec.js";
 import { MIMEType } from 'whatwg-mimetype';
-export class GoogleNativeTransport {
+export class Transport {
     apiURL;
     inferenceParams;
     providerSpec;
     fdm;
     throttle;
-    choice;
+    structuringChoice;
     codeExecution;
     urlContext;
     googleSearch;
@@ -22,7 +22,7 @@ export class GoogleNativeTransport {
         this.providerSpec = options.providerSpec;
         this.fdm = options.fdm;
         this.throttle = options.throttle;
-        this.choice = options.choice;
+        this.structuringChoice = options.structuringChoice;
         this.codeExecution = options.codeExecution;
         this.urlContext = options.urlContext;
         this.googleSearch = options.googleSearch;
@@ -31,13 +31,14 @@ export class GoogleNativeTransport {
         this.billing = options.billing;
     }
     async fetch(wfctx, session, signal) {
+        await this.throttle.requests(wfctx);
+        // Prepare request body
         const systemInstruction = session.developerMessage && this.messageCodec.encodeDeveloperMessage(session.developerMessage);
         const contents = this.messageCodec.encodeChatMessages(session.chatMessages);
-        await this.throttle.requests(wfctx);
-        const apifds = this.toolCodec.encodeFunctionDeclarationMap(this.fdm);
+        const apiFds = this.toolCodec.encodeFunctionDeclarationMap();
         const apiTools = [];
-        if (apifds.length)
-            apiTools.push({ functionDeclarations: apifds });
+        if (apiFds.length)
+            apiTools.push({ functionDeclarations: apiFds });
         if (this.urlContext)
             apiTools.push({ urlContext: {} });
         if (this.googleSearch)
@@ -45,8 +46,8 @@ export class GoogleNativeTransport {
         if (this.codeExecution)
             apiTools.push({ codeExecution: {} });
         const apiToolConfig = {};
-        if (apifds.length)
-            apiToolConfig.functionCallingConfig = ChoiceCodec.encode(this.choice);
+        if (apiFds.length)
+            apiToolConfig.functionCallingConfig = ChoiceCodec.encode(this.structuringChoice);
         const reqbody = {
             contents,
             tools: apiTools.length ? apiTools : undefined,
@@ -55,6 +56,7 @@ export class GoogleNativeTransport {
             generationConfig: this.inferenceParams.additionalOptions,
         };
         loggers.message.debug(reqbody);
+        // Send request
         const res = await Undici.fetch(this.apiURL, {
             method: 'POST',
             headers: {
@@ -66,6 +68,7 @@ export class GoogleNativeTransport {
             signal,
         });
         loggers.message.debug(res);
+        // Get response
         if (res.ok) { }
         else {
             const contentType = res.headers.get('Content-Type');
@@ -81,6 +84,8 @@ export class GoogleNativeTransport {
                 throw new Error(res.statusText, { cause: res });
         }
         const response = await res.json();
+        loggers.message.debug(response);
+        // Validate response
         if (response.candidates?.[0]?.content?.parts?.length) { }
         else
             throw new SyntaxError('Content missing', { cause: response });
@@ -89,15 +94,15 @@ export class GoogleNativeTransport {
         if (response.candidates[0].finishReason === Google.FinishReason.STOP) { }
         else
             throw new SyntaxError('Abnormal finish reason', { cause: response });
+        if (response.usageMetadata) { }
+        else
+            throw new SyntaxError('Usage metadata missing', { cause: response });
         for (const part of response.candidates[0].content.parts) {
             if (part.text)
                 loggers.inference.info(part.text);
             if (part.functionCall)
                 loggers.message.info(part.functionCall);
         }
-        if (response.usageMetadata) { }
-        else
-            throw new SyntaxError('Usage metadata missing', { cause: response });
         wfctx.cost?.(this.billing.charge(response.usageMetadata));
         return this.messageCodec.decodeAiMessage(response.candidates[0].content);
     }

package/build/engines/google/transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/google/transport.ts"],"names":[],"mappings":"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"}

package/build/engines/google.d.ts

@@ -0,0 +1,41 @@
+import { Engine, Middleware } from '../engine.ts';
+import { Function } from '../function.ts';
+import { Verbatim } from '../verbatim.ts';
+import { MessageCodec } from './google/message-codec.ts';
+import { ToolCodec } from './google/tool-codec.ts';
+import { Billing } from './google/billing.ts';
+import { Transport } from './google/transport.ts';
+import { InferenceContext } from '../inference-context.ts';
+import * as MessageModule from './google/message.ts';
+export type GoogleEngine<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = GoogleEngine.Instance<fdm, vdm>;
+export declare namespace GoogleEngine {
+    class Instance<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> extends Engine.Instance<fdm, vdm> {
+        protected options: GoogleEngine.Options<fdm, vdm>;
+        protected toolCodec: ToolCodec<fdm>;
+        protected messageCodec: MessageCodec<fdm, vdm>;
+        protected billing: Billing;
+        protected transport: Transport<fdm, vdm>;
+        protected structuringValidator: Engine.StructuringValidator.From<fdm, vdm>;
+        protected codeExecution: boolean;
+        protected urlContext: boolean;
+        protected googleSearch: boolean;
+        constructor(options: GoogleEngine.Options<fdm, vdm>);
+        clone(): GoogleEngine<fdm, vdm>;
+        protected infer(wfctx: InferenceContext, session: Engine.Session.From<fdm, vdm>): Promise<RoleMessage.Ai.From<fdm, vdm>>;
+        stateless(wfctx: InferenceContext, session: Engine.Session.From<fdm, vdm>): Promise<RoleMessage.Ai.From<fdm, vdm>>;
+        stateful(wfctx: InferenceContext, session: Engine.Session.From<fdm, vdm>): Promise<RoleMessage.Ai.From<fdm, vdm>>;
+        useStateless(middleware: Middleware.From<fdm, vdm>): GoogleEngine<fdm, vdm>;
+        useStateful(middleware: Middleware.From<fdm, vdm>): GoogleEngine<fdm, vdm>;
+        /**
+         * @param session mutable
+         */
+        agentloop(wfctx: InferenceContext, session: Engine.Session.From<fdm, vdm>, fnm: Function.Map<fdm>, vhm: Verbatim.Handler.Map<vdm>, limit?: number): AsyncGenerator<string, string, void>;
+    }
+    interface Options<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> extends Engine.Options<fdm, vdm> {
+        codeExecution?: boolean;
+        urlContext?: boolean;
+        googleSearch?: boolean;
+    }
+    const create: Engine.Create;
+    export import RoleMessage = MessageModule.RoleMessage;
+}

package/build/engines/google.js

@@ -0,0 +1,151 @@
+import { Engine } from "../engine.js";
+import { Function } from "../function.js";
+import { MessageCodec } from "./google/message-codec.js";
+import { ToolCodec } from "./google/tool-codec.js";
+import { Billing } from "./google/billing.js";
+import { env } from 'node:process';
+import { Agent, ProxyAgent } from 'undici';
+import { StructuringValidator } from "../engine/structuring-validator.js";
+import { Transport } from "./google/transport.js";
+import * as MessageModule from "./google/message.js";
+export var GoogleEngine;
+(function (GoogleEngine) {
+    class Instance extends Engine.Instance {
+        options;
+        toolCodec;
+        messageCodec;
+        billing;
+        transport;
+        structuringValidator;
+        codeExecution;
+        urlContext;
+        googleSearch;
+        constructor(options) {
+            super(options);
+            this.options = options;
+            this.codeExecution = options.codeExecution ?? false;
+            this.urlContext = options.urlContext ?? false;
+            this.googleSearch = options.googleSearch ?? false;
+            const proxyUrl = options.endpointSpec.proxy || env.https_proxy || env.HTTPS_PROXY;
+            this.providerSpecs.dispatcher = proxyUrl
+                ? new ProxyAgent({
+                    uri: proxyUrl,
+                    headersTimeout: 0,
+                    bodyTimeout: 0,
+                })
+                : new Agent({
+                    headersTimeout: 0,
+                    bodyTimeout: 0,
+                });
+            if (options.endpointSpec.parallelToolCall === false)
+                throw new Error('Parallel tool calling is required by Google engine.');
+            this.toolCodec = new ToolCodec({
+                fdm: this.fdm,
+            });
+            this.messageCodec = new MessageCodec({
+                toolCodec: this.toolCodec,
+                vdm: this.vdm,
+                codeExecution: this.codeExecution,
+            });
+            this.billing = new Billing({ pricing: this.pricing });
+            this.transport = new Transport({
+                inferenceParams: this.inferenceOptions,
+                providerSpec: this.providerSpecs,
+                fdm: this.fdm,
+                throttle: this.throttle,
+                structuringChoice: this.structuringChoice,
+                codeExecution: this.codeExecution,
+                urlContext: this.urlContext,
+                googleSearch: this.googleSearch,
+                messageCodec: this.messageCodec,
+                toolCodec: this.toolCodec,
+                billing: this.billing,
+            });
+            this.structuringValidator = new StructuringValidator({ structuringChoice: this.structuringChoice });
+        }
+        clone() {
+            const engine = new GoogleEngine.Instance(this.options);
+            engine.middlewaresStateless = [...this.middlewaresStateless];
+            engine.middlewaresStateful = [...this.middlewaresStateful];
+            return engine;
+        }
+        async infer(wfctx, session) {
+            return await super.infer(wfctx, session);
+        }
+        async stateless(wfctx, session) {
+            return await super.stateless(wfctx, session);
+        }
+        async stateful(wfctx, session) {
+            return await super.stateful(wfctx, session);
+        }
+        useStateless(middleware) {
+            return super.useStateless(middleware);
+        }
+        useStateful(middleware) {
+            return super.useStateful(middleware);
+        }
+        /**
+         * @param session mutable
+         */
+        async *agentloop(wfctx, session, fnm, vhm, limit = Number.POSITIVE_INFINITY) {
+            for (let i = 0; i < limit; i++) {
+                const response = await this.stateful(wfctx, session);
+                if (response.allChat())
+                    return response.getChat();
+                const pfress = [];
+                const pvress = [];
+                for (const part of response.getParts()) {
+                    if (part instanceof Engine.RoleMessage.Ai.Part.Text) {
+                        const textPart = part;
+                        yield textPart.text;
+                        for (const vreq of textPart.vreqs) {
+                            const vh = vhm[vreq.name];
+                            pvress.push((async () => new GoogleEngine.RoleMessage.User.Part.Text(await vh.call(vhm, vreq.args)))());
+                        }
+                    }
+                    else if (part instanceof Function.Call) {
+                        const fcall = part;
+                        const f = fnm[fcall.name];
+                        pfress.push((async () => {
+                            try {
+                                return Function.Response.Successful.of({
+                                    id: fcall.id,
+                                    name: fcall.name,
+                                    text: await f.call(fnm, fcall.args),
+                                });
+                            }
+                            catch (e) {
+                                if (e instanceof Function.Error) { }
+                                else
+                                    throw e;
+                                return Function.Response.Failed.of({
+                                    id: fcall.id,
+                                    name: fcall.name,
+                                    error: e.message,
+                                });
+                            }
+                        })());
+                    }
+                    else if (part instanceof GoogleEngine.RoleMessage.Ai.Part.ExecutableCode) {
+                        yield GoogleEngine.RoleMessage.Ai.encodeExecutableCodePart(part);
+                    }
+                    else if (part instanceof GoogleEngine.RoleMessage.Ai.Part.CodeExecutionResult) {
+                        yield GoogleEngine.RoleMessage.Ai.encodeCodeExecutionResultPart(part);
+                    }
+                    else
+                        throw new Error();
+                }
+                const fress = await Promise.all(pfress);
+                const vress = await Promise.all(pvress);
+                session.chatMessages.push(new GoogleEngine.RoleMessage.User([...fress, ...vress]));
+            }
+            throw new Engine.FunctionCallLimitExceeded('Function call limit exceeded.');
+        }
+    }
+    GoogleEngine.Instance = Instance;
+    GoogleEngine.create = function (options) {
+        return new Instance(options);
+    };
+    GoogleEngine.RoleMessage = MessageModule.RoleMessage;
+})(GoogleEngine || (GoogleEngine = {}));
+//# sourceMappingURL=google.js.map

package/build/engines/google.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/engines/google.ts"],"names":[],"mappings":"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"}

package/build/engines/openai-chatcompletions/billing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/billing.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,OAAO;IACN,OAAO,CAAU;IAC3B,YAAmB,OAAwB;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,KAA6B;QACvC,MAAM,kBAAkB,GAAG,KAAK,CAAC,qBAAqB,EAAE,aAAa,IAAI,CAAC,CAAC;QAC3E,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,GAAG,kBAAkB,CAAC;QACrE,OAAO,CACH,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,mBAAmB,GAAG,GAAG;YACnD,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,kBAAkB,GAAG,GAAG;YAClD,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,iBAAiB,GAAG,GAAG,CAC3D,CAAC;IACN,CAAC;CACJ"}

package/build/engines/openai-chatcompletions/message-codec.d.ts

@@ -0,0 +1,22 @@
+import { Engine } from '../../engine.ts';
+import { Function } from '../../function.ts';
+import OpenAI from 'openai';
+import type { ToolCodec } from './tool-codec.ts';
+import type { Verbatim } from '../../verbatim.ts';
+export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
+    protected toolCodec: ToolCodec<fdm>;
+    protected vdm: vdm;
+    constructor(options: MessageCodec.Options<fdm, vdm>);
+    decodeAiMessage(message: OpenAI.ChatCompletionMessage): Engine.RoleMessage.Ai.From<fdm, vdm>;
+    encodeDeveloperMessage(developerMessage: Engine.RoleMessage.Developer): OpenAI.ChatCompletionSystemMessageParam;
+    encodeUserMessage(userMessage: Engine.RoleMessage.User.From<fdm>): [OpenAI.ChatCompletionUserMessageParam] | OpenAI.ChatCompletionToolMessageParam[];
+    encodeAiMessage(aiMessage: Engine.RoleMessage.Ai.From<fdm, vdm>): OpenAI.ChatCompletionAssistantMessageParam;
+    encodeRoleMessage(roleMessage: Engine.Session.ChatMessage.From<fdm, vdm> | Engine.RoleMessage.Developer): OpenAI.ChatCompletionMessageParam[];
+    encodeRoleMessages(chatMessages: (Engine.Session.ChatMessage.From<fdm, vdm> | Engine.RoleMessage.Developer)[]): OpenAI.ChatCompletionMessageParam[];
+}
+export declare namespace MessageCodec {
+    interface Options<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
+        toolCodec: ToolCodec<fdm>;
+        vdm: vdm;
+    }
+}

package/build/engines/openai-chatcompletions/message-codec.js

@@ -0,0 +1,80 @@
+import { Engine } from "../../engine.js";
+import { Function } from "../../function.js";
+import * as VerbatimCodec from "../../verbatim/codec.js";
+export class MessageCodec {
+    toolCodec;
+    vdm;
+    constructor(options) {
+        this.toolCodec = options.toolCodec;
+        this.vdm = options.vdm;
+    }
+    decodeAiMessage(message) {
+        const parts = [];
+        if (message.content) {
+            const vreqs = VerbatimCodec.Request.decode(message.content, this.vdm);
+            parts.push(new Engine.RoleMessage.Ai.Part.Text(message.content, vreqs));
+        }
+        if (message.tool_calls)
+            for (const apifc of message.tool_calls)
+                if (apifc.type === 'function')
+                    parts.push(this.toolCodec.decodeFunctionCall(apifc));
+                else
+                    throw new Error();
+        if (parts.length)
+            return new Engine.RoleMessage.Ai(parts);
+        else
+            throw new SyntaxError('Content or tool calls not found in Response', { cause: message });
+    }
+    encodeDeveloperMessage(developerMessage) {
+        return {
+            role: 'system',
+            content: developerMessage.getOnlyTextParts().map(part => part.text).join(''),
+        };
+    }
+    encodeUserMessage(userMessage) {
+        const textParts = userMessage.getTextParts();
+        const fress = userMessage.getFunctionResponses();
+        if (textParts.length && !fress.length)
+            return [{ role: 'user', content: textParts.map(part => ({ type: 'text', text: part.text })) }];
+        else if (!textParts.length && fress.length)
+            return fress.map(fres => this.toolCodec.encodeFunctionResponse(fres));
+        else if (textParts.length && fress.length)
+            throw new Error('Mixed text and function response parts in user message are not supported by OpenAI ChatCompletions API.');
+        else
+            throw new Error('Unsupported user message type.');
+    }
+    encodeAiMessage(aiMessage) {
+        const parts = aiMessage.getParts();
+        const textParts = [];
+        const fcParts = [];
+        for (const part of parts) {
+            if (part instanceof Engine.RoleMessage.Ai.Part.Text)
+                textParts.push(part);
+            else if (part instanceof Function.Call)
+                fcParts.push(part);
+        }
+        return {
+            role: 'assistant',
+            content: textParts.length ? textParts.map(part => part.text).join('') : undefined,
+            tool_calls: fcParts.length ? fcParts.map(fcall => this.toolCodec.encodeFunctionCall(fcall)) : undefined,
+        };
+    }
+    encodeRoleMessage(roleMessage) {
+        if (roleMessage instanceof Engine.RoleMessage.Developer)
+            return [this.encodeDeveloperMessage(roleMessage)];
+        else if (roleMessage instanceof Engine.RoleMessage.User) {
+            const userMessage = roleMessage;
+            return this.encodeUserMessage(userMessage);
+        }
+        else if (roleMessage instanceof Engine.RoleMessage.Ai) {
+            const aiMessage = roleMessage;
+            return [this.encodeAiMessage(aiMessage)];
+        }
+        else
+            throw new Error();
+    }
+    encodeRoleMessages(chatMessages) {
+        return chatMessages.map(chatMessage => this.encodeRoleMessage(chatMessage)).flat();
+    }
+}
+//# sourceMappingURL=message-codec.js.map

package/build/engines/openai-chatcompletions/message-codec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/message-codec.ts"],"names":[],"mappings":"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"}

package/build/{compatible-engine.d/openai-chatcompletions/choice-codec.d.ts → engines/openai-chatcompletions/structuring-choice-codec.d.ts}

@@ -1,5 +1,5 @@
 import type { Function } from '../../function.ts';
 import type { Verbatim } from '../../verbatim.ts';
 import OpenAI from 'openai';
-import { Structuring } from '../../compatible-engine/structuring.ts';
-export declare function encode<fdu extends Function.Decl.Proto, vdu extends Verbatim.Decl.Proto>(choice: Structuring.Choice<fdu, vdu>): OpenAI.ChatCompletionToolChoiceOption;
+import { StructuringChoice } from '../../structuring-choice.ts';
+export declare function encode<fdu extends Function.Decl.Proto, vdu extends Verbatim.Decl.Proto>(structuringChoice: StructuringChoice): OpenAI.ChatCompletionToolChoiceOption;

package/build/engines/openai-chatcompletions/structuring-choice-codec.js

@@ -0,0 +1,22 @@
+import { StructuringChoice } from "../../structuring-choice.js";
+export function encode(structuringChoice) {
+    if (structuringChoice === StructuringChoice.NONE)
+        return 'none';
+    else if (structuringChoice === StructuringChoice.REQUIRED)
+        return 'auto';
+    else if (structuringChoice === StructuringChoice.ANYONE)
+        return 'auto';
+    else if (structuringChoice === StructuringChoice.AUTO)
+        return 'auto';
+    else if (structuringChoice === StructuringChoice.TCall.REQUIRED)
+        return 'required';
+    else if (structuringChoice === StructuringChoice.TCall.ANYONE)
+        return 'required';
+    else if (structuringChoice === StructuringChoice.VRequest.REQUIRED)
+        return 'none';
+    else if (structuringChoice === StructuringChoice.VRequest.ANYONE)
+        return 'none';
+    else
+        throw new Error();
+}
+//# sourceMappingURL=structuring-choice-codec.js.map

package/build/engines/openai-chatcompletions/structuring-choice-codec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structuring-choice-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/structuring-choice-codec.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,MAAM,UAAU,MAAM,CAIlB,iBAAoC;IAEpC,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;SAC3D,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,QAAQ;QAAE,OAAO,MAAM,CAAC;SACpE,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;SAClE,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;SAEhE,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,UAAU,CAAC;SAC9E,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,UAAU,CAAC;SAE5E,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,QAAQ,CAAC,QAAQ;QAAE,OAAO,MAAM,CAAC;SAC7E,IAAI,iBAAiB,KAAK,iBAAiB,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;;QAE3E,MAAM,IAAI,KAAK,EAAE,CAAC;AAC3B,CAAC"}

package/build/engines/openai-chatcompletions/tool-codec.d.ts

@@ -0,0 +1,17 @@
+import { Function } from '../../function.ts';
+import OpenAI from 'openai';
+export declare class ToolCodec<in out fdm extends Function.Decl.Map.Proto> {
+    protected fdm: fdm;
+    protected apiFds: OpenAI.ChatCompletionTool[];
+    constructor(options: ToolCodec.Options<fdm>);
+    encodeFunctionCall(fcall: Function.Call.From<fdm>): OpenAI.ChatCompletionMessageToolCall;
+    decodeFunctionCall(apifc: OpenAI.ChatCompletionMessageFunctionToolCall): Function.Call.From<fdm>;
+    encodeFunctionResponse(fres: Function.Response.From<fdm>): OpenAI.ChatCompletionToolMessageParam;
+    protected static encodeFunctionDeclarationEntry<fdu extends Function.Decl.Proto>(fdentry: Function.Decl.Entry.Of<fdu>): OpenAI.ChatCompletionTool;
+    encodeFunctionDeclarationMap(): OpenAI.ChatCompletionTool[];
+}
+export declare namespace ToolCodec {
+    interface Options<in out fdm extends Function.Decl.Map.Proto> {
+        fdm: fdm;
+    }
+}

package/build/{api-types → engines}/openai-chatcompletions/tool-codec.js

@@ -2,19 +2,22 @@ import { Parse, ParseError } from 'typebox/schema';
 import { Function } from "../../function.js";
 export class ToolCodec {
     fdm;
+    apiFds;
     constructor(options) {
         this.fdm = options.fdm;
+        const fdentries = Object.entries(this.fdm);
+        this.apiFds = fdentries.map(fdentry => ToolCodec.encodeFunctionDeclarationEntry(fdentry));
     }
-    encodeFunctionCall(fc) {
-        if (fc.id) { }
+    encodeFunctionCall(fcall) {
+        if (fcall.id) { }
         else
             throw new Error();
         return {
-            id: fc.id,
+            id: fcall.id,
             type: 'function',
             function: {
-                name: fc.name,
-                arguments: JSON.stringify(fc.args),
+                name: fcall.name,
+                arguments: JSON.stringify(fcall.args),
             },
         };
     }
@@ -46,26 +49,26 @@ export class ToolCodec {
             args,
         });
     }
-    encodeFunctionResponse(fr) {
-        if (fr.id) { }
+    encodeFunctionResponse(fres) {
+        if (fres.id) { }
         else
             throw new Error();
-        if (fr instanceof Function.Response.Successful)
+        if (fres instanceof Function.Response.Successful)
             return {
                 role: 'tool',
-                tool_call_id: fr.id,
-                content: fr.text,
+                tool_call_id: fres.id,
+                content: fres.text,
             };
-        else if (fr instanceof Function.Response.Failed)
+        else if (fres instanceof Function.Response.Failed)
             return {
                 role: 'tool',
-                tool_call_id: fr.id,
-                content: fr.error,
+                tool_call_id: fres.id,
+                content: fres.error,
             };
         else
             throw new Error();
     }
-    encodeFunctionDeclarationEntry(fdentry) {
+    static encodeFunctionDeclarationEntry(fdentry) {
         return {
             type: 'function',
             function: {
@@ -76,9 +79,8 @@ export class ToolCodec {
             },
         };
     }
-    encodeFunctionDeclarationMap(fdm) {
-        const fdentries = Object.entries(fdm);
-        return fdentries.map(fdentry => this.encodeFunctionDeclarationEntry(fdentry));
+    encodeFunctionDeclarationMap() {
+        return this.apiFds.slice();
     }
 }
 //# sourceMappingURL=tool-codec.js.map

package/build/engines/openai-chatcompletions/tool-codec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/tool-codec.ts"],"names":[],"mappings":"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"}

package/build/{compatible-engine.d → engines}/openai-chatcompletions/transport.d.ts

@@ -1,38 +1,36 @@
-import { RoleMessage, type Session } from '../../compatible-engine/session.ts';
 import { Function } from '../../function.ts';
 import OpenAI from 'openai';
 import type { InferenceContext } from '../../inference-context.ts';
 import type { Verbatim } from '../../verbatim.ts';
-import type { Engine } from '../../engine.ts';
-import { type InferenceParams, type ProviderSpec } from '../../engine.ts';
-import type { Billing } from '../../api-types/openai-chatcompletions/billing.ts';
-import type { ToolCodec } from '../../api-types/openai-chatcompletions/tool-codec.ts';
+import { type InferenceOptions, type ProviderSpecs, Engine } from '../../engine.ts';
+import type { Billing } from './billing.ts';
+import type { ToolCodec } from './tool-codec.ts';
 import { Throttle } from '../../throttle.ts';
 import { type MessageCodec } from './message-codec.ts';
-import type { Structuring } from '../../compatible-engine/structuring.ts';
-export declare class Transport<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> implements Engine.Transport<RoleMessage.User.From<fdm>, RoleMessage.Ai.From<fdm, vdm>, RoleMessage.Developer, Session.From<fdm, vdm>> {
+import type { StructuringChoice } from '../../structuring-choice.ts';
+export declare class Transport<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> implements Engine.Transport<fdm, vdm> {
     protected client: OpenAI;
-    protected inferenceParams: InferenceParams;
-    protected providerSpec: ProviderSpec;
+    protected inferenceParams: InferenceOptions;
+    protected providerSpec: ProviderSpecs;
     protected fdm: fdm;
     protected throttle: Throttle;
-    protected choice: Structuring.Choice.From<fdm, vdm>;
+    protected structuringChoice: StructuringChoice;
     protected messageCodec: MessageCodec<fdm, vdm>;
     protected toolCodec: ToolCodec<fdm>;
     protected billing: Billing;
     constructor(options: Transport.Options<fdm, vdm>);
-    protected makeParams(session: Session.From<fdm, vdm>): OpenAI.ChatCompletionCreateParamsStreaming;
+    protected makeParams(session: Engine.Session.From<fdm, vdm>): OpenAI.ChatCompletionCreateParamsStreaming;
     mergeToolCall(apifc: OpenAI.ChatCompletionChunk.Choice.Delta.ToolCall): OpenAI.ChatCompletionMessageToolCall;
     mergeCompletion(stock: OpenAI.ChatCompletionChunk): OpenAI.ChatCompletion;
-    fetch(wfctx: InferenceContext, session: Session.From<fdm, vdm>, signal?: AbortSignal): Promise<RoleMessage.Ai.From<fdm, vdm>>;
+    fetch(wfctx: InferenceContext, session: Engine.Session.From<fdm, vdm>, signal?: AbortSignal): Promise<Engine.RoleMessage.Ai.From<fdm, vdm>>;
 }
 export declare namespace Transport {
     interface Options<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
-        inferenceParams: InferenceParams;
-        providerSpec: ProviderSpec;
+        inferenceParams: InferenceOptions;
+        providerSpec: ProviderSpecs;
         fdm: fdm;
         throttle: Throttle;
-        choice: Structuring.Choice.From<fdm, vdm>;
+        structuringChoice: StructuringChoice;
         messageCodec: MessageCodec<fdm, vdm>;
         toolCodec: ToolCodec<fdm>;
         billing: Billing;