modelfusion 0.130.1 → 0.131.0

package/model-provider/openai/AbstractOpenAIChatModel.cjs

@@ -86,7 +86,7 @@ class AbstractOpenAIChatModel extends AbstractModel_js_1.AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
-            structure: rawResponse,
+            value: rawResponse,
             schema: (0, ZodSchema_js_1.zodSchema)(openAIChatResponseSchema),
         }));
     }

package/model-provider/openai/AbstractOpenAIChatModel.js

@@ -83,7 +83,7 @@ export class AbstractOpenAIChatModel extends AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse(validateTypes({
-            structure: rawResponse,
+            value: rawResponse,
             schema: zodSchema(openAIChatResponseSchema),
         }));
     }

package/model-provider/openai/AbstractOpenAICompletionModel.cjs

@@ -75,7 +75,7 @@ class AbstractOpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse((0, validateTypes_js_1.validateTypes)({
-            structure: rawResponse,
+            value: rawResponse,
             schema: (0, ZodSchema_js_1.zodSchema)(OpenAICompletionResponseSchema),
         }));
     }

package/model-provider/openai/AbstractOpenAICompletionModel.js

@@ -72,7 +72,7 @@ export class AbstractOpenAICompletionModel extends AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse(validateTypes({
-            structure: rawResponse,
+            value: rawResponse,
             schema: zodSchema(OpenAICompletionResponseSchema),
         }));
     }

package/model-provider/openai/{OpenAIChatFunctionCallStructureGenerationModel.cjs → OpenAIChatFunctionCallObjectGenerationModel.cjs}

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAIChatFunctionCallStructureGenerationModel = void 0;
+exports.OpenAIChatFunctionCallObjectGenerationModel = void 0;
 const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
-const StructureParseError_js_1 = require("../../model-function/generate-structure/StructureParseError.cjs");
-const parsePartialJson_js_1 = require("../../model-function/generate-structure/parsePartialJson.cjs");
+const ObjectParseError_js_1 = require("../../model-function/generate-object/ObjectParseError.cjs");
+const parsePartialJson_js_1 = require("../../util/parsePartialJson.cjs");
 const AbstractOpenAIChatModel_js_1 = require("./AbstractOpenAIChatModel.cjs");
 const OpenAIChatPromptTemplate_js_1 = require("./OpenAIChatPromptTemplate.cjs");
-class OpenAIChatFunctionCallStructureGenerationModel {
+class OpenAIChatFunctionCallObjectGenerationModel {
     constructor({ model, fnName, fnDescription, promptTemplate, }) {
         Object.defineProperty(this, "model", {
             enumerable: true,
@@ -76,7 +76,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
         return this.withPromptTemplate((0, OpenAIChatPromptTemplate_js_1.chat)());
     }
     withPromptTemplate(promptTemplate) {
-        return new OpenAIChatFunctionCallStructureGenerationModel({
+        return new OpenAIChatFunctionCallObjectGenerationModel({
             model: this.model,
             fnName: this.fnName,
             fnDescription: this.fnDescription,
@@ -84,7 +84,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
         });
     }
     withSettings(additionalSettings) {
-        return new OpenAIChatFunctionCallStructureGenerationModel({
+        return new OpenAIChatFunctionCallObjectGenerationModel({
             model: this.model.withSettings(additionalSettings),
             fnName: this.fnName,
             fnDescription: this.fnDescription,
@@ -98,7 +98,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
      *
      * @see https://platform.openai.com/docs/guides/gpt/function-calling
      */
-    async doGenerateStructure(schema, prompt, // first argument of the function
+    async doGenerateObject(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
         const rawResponse = await this.model
@@ -129,13 +129,13 @@ class OpenAIChatFunctionCallStructureGenerationModel {
             };
         }
         catch (error) {
-            throw new StructureParseError_js_1.StructureParseError({
+            throw new ObjectParseError_js_1.ObjectParseError({
                 valueText,
                 cause: error,
             });
         }
     }
-    async doStreamStructure(schema, prompt, // first argument of the function
+    async doStreamObject(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
         return this.model.callAPI(expandedPrompt, options, {
@@ -150,7 +150,7 @@ class OpenAIChatFunctionCallStructureGenerationModel {
             ],
         });
     }
-    extractStructureTextDelta(delta) {
+    extractObjectTextDelta(delta) {
         const chunk = delta;
         if (chunk.object !== "chat.completion.chunk") {
             return undefined;
@@ -162,8 +162,8 @@ class OpenAIChatFunctionCallStructureGenerationModel {
         }
         return firstChoice.delta.function_call?.arguments;
     }
-    parseAccumulatedStructureText(accumulatedText) {
+    parseAccumulatedObjectText(accumulatedText) {
         return (0, parsePartialJson_js_1.parsePartialJson)(accumulatedText);
     }
 }
-exports.OpenAIChatFunctionCallStructureGenerationModel = OpenAIChatFunctionCallStructureGenerationModel;
+exports.OpenAIChatFunctionCallObjectGenerationModel = OpenAIChatFunctionCallObjectGenerationModel;

package/model-provider/openai/{OpenAIChatFunctionCallStructureGenerationModel.d.ts → OpenAIChatFunctionCallObjectGenerationModel.d.ts}

@@ -1,11 +1,11 @@
 import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
 import { Schema } from "../../core/schema/Schema.js";
-import { StructureStreamingModel } from "../../model-function/generate-structure/StructureGenerationModel.js";
+import { ObjectStreamingModel } from "../../model-function/generate-object/ObjectGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { OpenAIChatPrompt } from "./AbstractOpenAIChatModel.js";
 import { OpenAIChatModel, OpenAIChatSettings } from "./OpenAIChatModel.js";
-export declare class OpenAIChatFunctionCallStructureGenerationModel<PROMPT_TEMPLATE extends TextGenerationPromptTemplate<unknown, OpenAIChatPrompt>> implements StructureStreamingModel<Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
+export declare class OpenAIChatFunctionCallObjectGenerationModel<PROMPT_TEMPLATE extends TextGenerationPromptTemplate<unknown, OpenAIChatPrompt>> implements ObjectStreamingModel<Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
 OpenAIChatSettings> {
     readonly model: OpenAIChatModel;
     readonly fnName: string;
@@ -107,16 +107,16 @@ OpenAIChatSettings> {
     /**
      * Returns this model with a text prompt template.
      */
-    withTextPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<string, OpenAIChatPrompt>>;
+    withTextPrompt(): OpenAIChatFunctionCallObjectGenerationModel<TextGenerationPromptTemplate<string, OpenAIChatPrompt>>;
     /**
      * Returns this model with an instruction prompt template.
      */
-    withInstructionPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../index.js").InstructionPrompt, OpenAIChatPrompt>>;
+    withInstructionPrompt(): OpenAIChatFunctionCallObjectGenerationModel<TextGenerationPromptTemplate<import("../../index.js").InstructionPrompt, OpenAIChatPrompt>>;
     /**
      * Returns this model with a chat prompt template.
      */
-    withChatPrompt(): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<import("../../index.js").ChatPrompt, OpenAIChatPrompt>>;
-    withPromptTemplate<TARGET_PROMPT_FORMAT extends TextGenerationPromptTemplate<unknown, OpenAIChatPrompt>>(promptTemplate: TARGET_PROMPT_FORMAT): OpenAIChatFunctionCallStructureGenerationModel<TARGET_PROMPT_FORMAT>;
+    withChatPrompt(): OpenAIChatFunctionCallObjectGenerationModel<TextGenerationPromptTemplate<import("../../index.js").ChatPrompt, OpenAIChatPrompt>>;
+    withPromptTemplate<TARGET_PROMPT_FORMAT extends TextGenerationPromptTemplate<unknown, OpenAIChatPrompt>>(promptTemplate: TARGET_PROMPT_FORMAT): OpenAIChatFunctionCallObjectGenerationModel<TARGET_PROMPT_FORMAT>;
     withSettings(additionalSettings: Partial<OpenAIChatSettings>): this;
     /**
      * JSON generation uses the OpenAI GPT function calling API.
@@ -125,7 +125,7 @@ OpenAIChatSettings> {
      *
      * @see https://platform.openai.com/docs/guides/gpt/function-calling
      */
-    doGenerateStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
+    doGenerateObject(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
     options: FunctionCallOptions): Promise<{
         rawResponse: {
             object: "chat.completion";
@@ -168,7 +168,7 @@ OpenAIChatSettings> {
             totalTokens: number;
         };
     }>;
-    doStreamStructure(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
+    doStreamObject(schema: Schema<unknown> & JsonSchemaProducer, prompt: Parameters<PROMPT_TEMPLATE["format"]>[0], // first argument of the function
     options: FunctionCallOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
         object: string;
         id: string;
@@ -196,6 +196,6 @@ OpenAIChatSettings> {
         model?: string | undefined;
         system_fingerprint?: string | null | undefined;
     }>>>;
-    extractStructureTextDelta(delta: unknown): string | undefined;
-    parseAccumulatedStructureText(accumulatedText: string): unknown;
+    extractObjectTextDelta(delta: unknown): string | undefined;
+    parseAccumulatedObjectText(accumulatedText: string): unknown;
 }

package/model-provider/openai/{OpenAIChatFunctionCallStructureGenerationModel.js → OpenAIChatFunctionCallObjectGenerationModel.js}

@@ -1,9 +1,9 @@
 import SecureJSON from "secure-json-parse";
-import { StructureParseError } from "../../model-function/generate-structure/StructureParseError.js";
-import { parsePartialJson } from "../../model-function/generate-structure/parsePartialJson.js";
+import { ObjectParseError } from "../../model-function/generate-object/ObjectParseError.js";
+import { parsePartialJson } from "../../util/parsePartialJson.js";
 import { OpenAIChatResponseFormat, } from "./AbstractOpenAIChatModel.js";
 import { chat, instruction, text } from "./OpenAIChatPromptTemplate.js";
-export class OpenAIChatFunctionCallStructureGenerationModel {
+export class OpenAIChatFunctionCallObjectGenerationModel {
     constructor({ model, fnName, fnDescription, promptTemplate, }) {
         Object.defineProperty(this, "model", {
             enumerable: true,
@@ -70,7 +70,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
         return this.withPromptTemplate(chat());
     }
     withPromptTemplate(promptTemplate) {
-        return new OpenAIChatFunctionCallStructureGenerationModel({
+        return new OpenAIChatFunctionCallObjectGenerationModel({
             model: this.model,
             fnName: this.fnName,
             fnDescription: this.fnDescription,
@@ -78,7 +78,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
         });
     }
     withSettings(additionalSettings) {
-        return new OpenAIChatFunctionCallStructureGenerationModel({
+        return new OpenAIChatFunctionCallObjectGenerationModel({
             model: this.model.withSettings(additionalSettings),
             fnName: this.fnName,
             fnDescription: this.fnDescription,
@@ -92,7 +92,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
      *
      * @see https://platform.openai.com/docs/guides/gpt/function-calling
      */
-    async doGenerateStructure(schema, prompt, // first argument of the function
+    async doGenerateObject(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
         const rawResponse = await this.model
@@ -123,13 +123,13 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
             };
         }
         catch (error) {
-            throw new StructureParseError({
+            throw new ObjectParseError({
                 valueText,
                 cause: error,
             });
         }
     }
-    async doStreamStructure(schema, prompt, // first argument of the function
+    async doStreamObject(schema, prompt, // first argument of the function
     options) {
         const expandedPrompt = this.promptTemplate.format(prompt);
         return this.model.callAPI(expandedPrompt, options, {
@@ -144,7 +144,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
             ],
         });
     }
-    extractStructureTextDelta(delta) {
+    extractObjectTextDelta(delta) {
         const chunk = delta;
         if (chunk.object !== "chat.completion.chunk") {
             return undefined;
@@ -156,7 +156,7 @@ export class OpenAIChatFunctionCallStructureGenerationModel {
         }
         return firstChoice.delta.function_call?.arguments;
     }
-    parseAccumulatedStructureText(accumulatedText) {
+    parseAccumulatedObjectText(accumulatedText) {
         return parsePartialJson(accumulatedText);
     }
 }

package/model-provider/openai/OpenAIChatModel.cjs

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatModel = exports.calculateOpenAIChatCostInMillicents = exports.isOpenAIChatModel = exports.getOpenAIChatModelInformation = exports.OPENAI_CHAT_MODELS = void 0;
-const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
+const ObjectFromTextStreamingModel_js_1 = require("../../model-function/generate-object/ObjectFromTextStreamingModel.cjs");
 const PromptTemplateFullTextModel_js_1 = require("../../model-function/generate-text/PromptTemplateFullTextModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AbstractOpenAIChatModel_js_1 = require("./AbstractOpenAIChatModel.cjs");
-const OpenAIChatFunctionCallStructureGenerationModel_js_1 = require("./OpenAIChatFunctionCallStructureGenerationModel.cjs");
+const OpenAIChatFunctionCallObjectGenerationModel_js_1 = require("./OpenAIChatFunctionCallObjectGenerationModel.cjs");
 const OpenAIChatPromptTemplate_js_1 = require("./OpenAIChatPromptTemplate.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
 const countOpenAIChatMessageTokens_js_1 = require("./countOpenAIChatMessageTokens.cjs");
@@ -210,21 +210,21 @@ class OpenAIChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpenAIChatMod
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    asFunctionCallStructureGenerationModel({ fnName, fnDescription, }) {
-        return new OpenAIChatFunctionCallStructureGenerationModel_js_1.OpenAIChatFunctionCallStructureGenerationModel({
+    asFunctionCallObjectGenerationModel({ fnName, fnDescription, }) {
+        return new OpenAIChatFunctionCallObjectGenerationModel_js_1.OpenAIChatFunctionCallObjectGenerationModel({
             model: this,
             fnName,
             fnDescription,
             promptTemplate: (0, OpenAIChatPromptTemplate_js_1.identity)(),
         });
     }
-    asStructureGenerationModel(promptTemplate) {
+    asObjectGenerationModel(promptTemplate) {
         return "adaptModel" in promptTemplate
-            ? new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+            ? new ObjectFromTextStreamingModel_js_1.ObjectFromTextStreamingModel({
                 model: promptTemplate.adaptModel(this),
                 template: promptTemplate,
             })
-            : new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+            : new ObjectFromTextStreamingModel_js_1.ObjectFromTextStreamingModel({
                 model: this,
                 template: promptTemplate,
             });

package/model-provider/openai/OpenAIChatModel.d.ts

@@ -1,12 +1,12 @@
-import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { FlexibleObjectFromTextPromptTemplate, ObjectFromTextPromptTemplate } from "../../model-function/generate-object/ObjectFromTextPromptTemplate.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
 import { TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
 import { ToolCallGenerationModel } from "../../tool/generate-tool-call/ToolCallGenerationModel.js";
 import { ToolCallsGenerationModel } from "../../tool/generate-tool-calls/ToolCallsGenerationModel.js";
 import { AbstractOpenAIChatModel, AbstractOpenAIChatSettings, OpenAIChatPrompt, OpenAIChatResponse } from "./AbstractOpenAIChatModel.js";
-import { OpenAIChatFunctionCallStructureGenerationModel } from "./OpenAIChatFunctionCallStructureGenerationModel.js";
+import { OpenAIChatFunctionCallObjectGenerationModel } from "./OpenAIChatFunctionCallObjectGenerationModel.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 export declare const OPENAI_CHAT_MODELS: {
     "gpt-4": {
@@ -136,11 +136,11 @@ export declare class OpenAIChatModel extends AbstractOpenAIChatModel<OpenAIChatS
      */
     countPromptTokens(messages: OpenAIChatPrompt): Promise<number>;
     get settingsForEvent(): Partial<OpenAIChatSettings>;
-    asFunctionCallStructureGenerationModel({ fnName, fnDescription, }: {
+    asFunctionCallObjectGenerationModel({ fnName, fnDescription, }: {
         fnName: string;
         fnDescription?: string;
-    }): OpenAIChatFunctionCallStructureGenerationModel<TextGenerationPromptTemplate<OpenAIChatPrompt, OpenAIChatPrompt>>;
-    asStructureGenerationModel<INPUT_PROMPT, OpenAIChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, TextStreamingModel<OpenAIChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
+    }): OpenAIChatFunctionCallObjectGenerationModel<TextGenerationPromptTemplate<OpenAIChatPrompt, OpenAIChatPrompt>>;
+    asObjectGenerationModel<INPUT_PROMPT, OpenAIChatPrompt>(promptTemplate: ObjectFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt> | FlexibleObjectFromTextPromptTemplate<INPUT_PROMPT, unknown>): ObjectFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | ObjectFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, TextStreamingModel<OpenAIChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     withTextPrompt(): PromptTemplateFullTextModel<string, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withInstructionPrompt(): PromptTemplateFullTextModel<import("../../index.js").InstructionPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;
     withChatPrompt(): PromptTemplateFullTextModel<import("../../index.js").ChatPrompt, OpenAIChatPrompt, OpenAIChatSettings, this>;

package/model-provider/openai/OpenAIChatModel.js

@@ -1,8 +1,8 @@
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AbstractOpenAIChatModel, } from "./AbstractOpenAIChatModel.js";
-import { OpenAIChatFunctionCallStructureGenerationModel } from "./OpenAIChatFunctionCallStructureGenerationModel.js";
+import { OpenAIChatFunctionCallObjectGenerationModel } from "./OpenAIChatFunctionCallObjectGenerationModel.js";
 import { chat, identity, instruction, text, } from "./OpenAIChatPromptTemplate.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
 import { countOpenAIChatPromptTokens } from "./countOpenAIChatMessageTokens.js";
@@ -204,21 +204,21 @@ export class OpenAIChatModel extends AbstractOpenAIChatModel {
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    asFunctionCallStructureGenerationModel({ fnName, fnDescription, }) {
-        return new OpenAIChatFunctionCallStructureGenerationModel({
+    asFunctionCallObjectGenerationModel({ fnName, fnDescription, }) {
+        return new OpenAIChatFunctionCallObjectGenerationModel({
             model: this,
             fnName,
             fnDescription,
             promptTemplate: identity(),
         });
     }
-    asStructureGenerationModel(promptTemplate) {
+    asObjectGenerationModel(promptTemplate) {
         return "adaptModel" in promptTemplate
-            ? new StructureFromTextStreamingModel({
+            ? new ObjectFromTextStreamingModel({
                 model: promptTemplate.adaptModel(this),
                 template: promptTemplate,
             })
-            : new StructureFromTextStreamingModel({
+            : new ObjectFromTextStreamingModel({
                 model: this,
                 template: promptTemplate,
             });

package/model-provider/openai/OpenAIChatModel.test.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const zod_1 = require("zod");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const streamStructure_js_1 = require("../../model-function/generate-structure/streamStructure.cjs");
+const streamObject_js_1 = require("../../model-function/generate-object/streamObject.cjs");
 const streamText_js_1 = require("../../model-function/generate-text/streamText.cjs");
 const StreamingTestServer_js_1 = require("../../test/StreamingTestServer.cjs");
 const arrayFromAsync_js_1 = require("../../test/arrayFromAsync.cjs");
@@ -38,7 +38,7 @@ describe("streamText", () => {
         expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual(["A"]);
     });
 });
-describe("streamStructure", () => {
+describe("streamObject", () => {
     const server = new StreamingTestServer_js_1.StreamingTestServer("https://api.openai.com/v1/chat/completions");
     server.setupTestEnvironment();
     it("should return a text stream", async () => {
@@ -76,12 +76,12 @@ describe("streamStructure", () => {
                 `"choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"stop"}]}\n\n`,
             `data: [DONE]\n\n`,
         ];
-        const stream = await (0, streamStructure_js_1.streamStructure)({
+        const stream = await (0, streamObject_js_1.streamObject)({
             model: new OpenAIChatModel_js_1.OpenAIChatModel({
                 api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
                 model: "gpt-3.5-turbo",
             })
-                .asFunctionCallStructureGenerationModel({
+                .asFunctionCallObjectGenerationModel({
                 fnName: "generateCharacter",
                 fnDescription: "Generate character descriptions.",
             })
@@ -89,11 +89,13 @@ describe("streamStructure", () => {
             schema: (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({ name: zod_1.z.string() })),
             prompt: "generate a name",
         });
-        expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
+        const streamAsArray = await (0, arrayFromAsync_js_1.arrayFromAsync)(stream);
+        expect(streamAsArray.map((entry) => entry.partialObject)).toStrictEqual([
             {},
             { name: "" },
             { name: "M" },
             { name: "Mike" },
+            { name: "Mike" }, // double occurrence on purpose (stream text)
         ]);
     });
 });

package/model-provider/openai/OpenAIChatModel.test.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { zodSchema } from "../../core/schema/ZodSchema.js";
-import { streamStructure } from "../../model-function/generate-structure/streamStructure.js";
+import { streamObject } from "../../model-function/generate-object/streamObject.js";
 import { streamText } from "../../model-function/generate-text/streamText.js";
 import { StreamingTestServer } from "../../test/StreamingTestServer.js";
 import { arrayFromAsync } from "../../test/arrayFromAsync.js";
@@ -36,7 +36,7 @@ describe("streamText", () => {
         expect(await arrayFromAsync(stream)).toStrictEqual(["A"]);
     });
 });
-describe("streamStructure", () => {
+describe("streamObject", () => {
     const server = new StreamingTestServer("https://api.openai.com/v1/chat/completions");
     server.setupTestEnvironment();
     it("should return a text stream", async () => {
@@ -74,12 +74,12 @@ describe("streamStructure", () => {
                 `"choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"stop"}]}\n\n`,
             `data: [DONE]\n\n`,
         ];
-        const stream = await streamStructure({
+        const stream = await streamObject({
             model: new OpenAIChatModel({
                 api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
                 model: "gpt-3.5-turbo",
             })
-                .asFunctionCallStructureGenerationModel({
+                .asFunctionCallObjectGenerationModel({
                 fnName: "generateCharacter",
                 fnDescription: "Generate character descriptions.",
             })
@@ -87,11 +87,13 @@ describe("streamStructure", () => {
             schema: zodSchema(z.object({ name: z.string() })),
             prompt: "generate a name",
         });
-        expect(await arrayFromAsync(stream)).toStrictEqual([
+        const streamAsArray = await arrayFromAsync(stream);
+        expect(streamAsArray.map((entry) => entry.partialObject)).toStrictEqual([
             {},
             { name: "" },
             { name: "M" },
             { name: "Mike" },
+            { name: "Mike" }, // double occurrence on purpose (stream text)
         ]);
     });
 });

package/model-provider/openai-compatible/OpenAICompatibleChatModel.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICompatibleChatModel = void 0;
-const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
+const ObjectFromTextStreamingModel_js_1 = require("../../model-function/generate-object/ObjectFromTextStreamingModel.cjs");
 const PromptTemplateFullTextModel_js_1 = require("../../model-function/generate-text/PromptTemplateFullTextModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AbstractOpenAIChatModel_js_1 = require("../openai/AbstractOpenAIChatModel.cjs");
@@ -57,13 +57,13 @@ class OpenAICompatibleChatModel extends AbstractOpenAIChatModel_js_1.AbstractOpe
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    asStructureGenerationModel(promptTemplate) {
+    asObjectGenerationModel(promptTemplate) {
         return "adaptModel" in promptTemplate
-            ? new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+            ? new ObjectFromTextStreamingModel_js_1.ObjectFromTextStreamingModel({
                 model: promptTemplate.adaptModel(this),
                 template: promptTemplate,
             })
-            : new StructureFromTextStreamingModel_js_1.StructureFromTextStreamingModel({
+            : new ObjectFromTextStreamingModel_js_1.ObjectFromTextStreamingModel({
                 model: this,
                 template: promptTemplate,
             });

package/model-provider/openai-compatible/OpenAICompatibleChatModel.d.ts

@@ -1,5 +1,5 @@
-import { FlexibleStructureFromTextPromptTemplate, StructureFromTextPromptTemplate } from "../../model-function/generate-structure/StructureFromTextPromptTemplate.js";
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { FlexibleObjectFromTextPromptTemplate, ObjectFromTextPromptTemplate } from "../../model-function/generate-object/ObjectFromTextPromptTemplate.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
 import { TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
@@ -27,7 +27,7 @@ export declare class OpenAICompatibleChatModel extends AbstractOpenAIChatModel<O
     readonly tokenizer: undefined;
     readonly countPromptTokens: undefined;
     get settingsForEvent(): Partial<OpenAICompatibleChatSettings>;
-    asStructureGenerationModel<INPUT_PROMPT, OpenAIChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, TextStreamingModel<OpenAIChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
+    asObjectGenerationModel<INPUT_PROMPT, OpenAIChatPrompt>(promptTemplate: ObjectFromTextPromptTemplate<INPUT_PROMPT, OpenAIChatPrompt> | FlexibleObjectFromTextPromptTemplate<INPUT_PROMPT, unknown>): ObjectFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | ObjectFromTextStreamingModel<INPUT_PROMPT, OpenAIChatPrompt, TextStreamingModel<OpenAIChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     withTextPrompt(): PromptTemplateFullTextModel<string, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
     withInstructionPrompt(): PromptTemplateFullTextModel<import("../../index.js").InstructionPrompt, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;
     withChatPrompt(): PromptTemplateFullTextModel<import("../../index.js").ChatPrompt, OpenAIChatPrompt, OpenAICompatibleChatSettings, this>;

package/model-provider/openai-compatible/OpenAICompatibleChatModel.js

@@ -1,4 +1,4 @@
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateFullTextModel } from "../../model-function/generate-text/PromptTemplateFullTextModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AbstractOpenAIChatModel, } from "../openai/AbstractOpenAIChatModel.js";
@@ -54,13 +54,13 @@ export class OpenAICompatibleChatModel extends AbstractOpenAIChatModel {
         ];
         return Object.fromEntries(Object.entries(this.settings).filter(([key]) => eventSettingProperties.includes(key)));
     }
-    asStructureGenerationModel(promptTemplate) {
+    asObjectGenerationModel(promptTemplate) {
         return "adaptModel" in promptTemplate
-            ? new StructureFromTextStreamingModel({
+            ? new ObjectFromTextStreamingModel({
                 model: promptTemplate.adaptModel(this),
                 template: promptTemplate,
             })
-            : new StructureFromTextStreamingModel({
+            : new ObjectFromTextStreamingModel({
                 model: this,
                 template: promptTemplate,
             });

package/model-provider/whispercpp/WhisperCppTranscriptionModel.cjs

@@ -100,9 +100,9 @@ const successfulResponseHandler = async ({ response, url, requestBodyValues }) =
             requestBodyValues,
         });
     }
-    if ("error" in parsedResult.data) {
+    if ("error" in parsedResult.value) {
         throw new ApiCallError_js_1.ApiCallError({
-            message: parsedResult.data.error,
+            message: parsedResult.value.error,
             statusCode: response.status,
             responseBody,
             url,
@@ -110,7 +110,7 @@ const successfulResponseHandler = async ({ response, url, requestBodyValues }) =
         });
     }
     return {
-        text: parsedResult.data.text.trim(),
+        text: parsedResult.value.text.trim(),
     };
 };
 const failedResponseHandler = async ({ response, url, requestBodyValues, }) => {

package/model-provider/whispercpp/WhisperCppTranscriptionModel.js

@@ -96,9 +96,9 @@ const successfulResponseHandler = async ({ response, url, requestBodyValues }) =
             requestBodyValues,
         });
     }
-    if ("error" in parsedResult.data) {
+    if ("error" in parsedResult.value) {
         throw new ApiCallError({
-            message: parsedResult.data.error,
+            message: parsedResult.value.error,
             statusCode: response.status,
             responseBody,
             url,
@@ -106,7 +106,7 @@ const successfulResponseHandler = async ({ response, url, requestBodyValues }) =
         });
     }
     return {
-        text: parsedResult.data.text.trim(),
+        text: parsedResult.value.text.trim(),
     };
 };
 const failedResponseHandler = async ({ response, url, requestBodyValues, }) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modelfusion",
   "description": "The TypeScript library for building AI applications.",
-  "version": "0.130.1",
+  "version": "0.131.0",
   "author": "Lars Grammel",
   "license": "MIT",
   "keywords": [

package/tool/WebSearchTool.cjs

@@ -13,7 +13,7 @@ const RETURN_TYPE_SCHEMA = (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
 }));
 // expose the schemas to library consumers:
 const createParameters = (description) => 
-// same structure, but with description:
+// same schema, but with description:
 (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
     query: zod_1.z.string().describe(description),
 }));

package/tool/WebSearchTool.js

@@ -10,7 +10,7 @@ const RETURN_TYPE_SCHEMA = zodSchema(z.object({
 }));
 // expose the schemas to library consumers:
 const createParameters = (description) => 
-// same structure, but with description:
+// same schema, but with description:
 zodSchema(z.object({
     query: z.string().describe(description),
 }));

package/tool/generate-tool-call/generateToolCall.cjs

@@ -37,7 +37,7 @@ async function generateToolCall({ model, tool, prompt, fullResponse, ...options
                     extractedValue: {
                         id: toolCall.id,
                         name: tool.name,
-                        args: parseResult.data,
+                        args: parseResult.value,
                     },
                     usage: result.usage,
                 };