modelfusion 0.130.1 → 0.131.0

package/model-function/generate-text/PromptTemplateTextStreamingModel.js

@@ -1,4 +1,4 @@
-import { StructureFromTextStreamingModel } from "../generate-structure/StructureFromTextStreamingModel.js";
+import { ObjectFromTextStreamingModel } from "../generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateTextGenerationModel } from "./PromptTemplateTextGenerationModel.js";
 export class PromptTemplateTextStreamingModel extends PromptTemplateTextGenerationModel {
     constructor(options) {
@@ -11,8 +11,8 @@ export class PromptTemplateTextStreamingModel extends PromptTemplateTextGenerati
     extractTextDelta(delta) {
         return this.model.extractTextDelta(delta);
     }
-    asStructureGenerationModel(promptTemplate) {
-        return new StructureFromTextStreamingModel({
+    asObjectGenerationModel(promptTemplate) {
+        return new ObjectFromTextStreamingModel({
             model: this,
             template: promptTemplate,
         });

package/model-function/generate-text/TextGenerationPromptTemplate.d.ts

@@ -1,6 +1,6 @@
 import { PromptTemplate } from "../PromptTemplate.js";
 /**
- * Prompt templates format a source prompt into the structure of a target prompt.
+ * Prompt templates format a source prompt as a target prompt.
  */
 export interface TextGenerationPromptTemplate<SOURCE_PROMPT, TARGET_PROMPT> extends PromptTemplate<SOURCE_PROMPT, TARGET_PROMPT> {
     /**

package/model-function/index.cjs

@@ -29,7 +29,7 @@ __exportStar(require("./generate-image/ImageGenerationModel.cjs"), exports);
 __exportStar(require("./generate-image/PromptTemplateImageGenerationModel.cjs"), exports);
 __exportStar(require("./generate-image/generateImage.cjs"), exports);
 __exportStar(require("./generate-speech/index.cjs"), exports);
-__exportStar(require("./generate-structure/index.cjs"), exports);
+__exportStar(require("./generate-object/index.cjs"), exports);
 __exportStar(require("./generate-text/index.cjs"), exports);
 __exportStar(require("./generate-transcription/TranscriptionEvent.cjs"), exports);
 __exportStar(require("./generate-transcription/TranscriptionModel.cjs"), exports);

package/model-function/index.d.ts

@@ -13,7 +13,7 @@ export * from "./generate-image/ImageGenerationModel.js";
 export * from "./generate-image/PromptTemplateImageGenerationModel.js";
 export * from "./generate-image/generateImage.js";
 export * from "./generate-speech/index.js";
-export * from "./generate-structure/index.js";
+export * from "./generate-object/index.js";
 export * from "./generate-text/index.js";
 export * from "./generate-transcription/TranscriptionEvent.js";
 export * from "./generate-transcription/TranscriptionModel.js";

package/model-function/index.js

@@ -13,7 +13,7 @@ export * from "./generate-image/ImageGenerationModel.js";
 export * from "./generate-image/PromptTemplateImageGenerationModel.js";
 export * from "./generate-image/generateImage.js";
 export * from "./generate-speech/index.js";
-export * from "./generate-structure/index.js";
+export * from "./generate-object/index.js";
 export * from "./generate-text/index.js";
 export * from "./generate-transcription/TranscriptionEvent.js";
 export * from "./generate-transcription/TranscriptionModel.js";

package/model-provider/cohere/CohereTextGenerationModel.cjs

@@ -134,7 +134,7 @@ class CohereTextGenerationModel 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)(cohereTextGenerationResponseSchema),
         }));
     }

package/model-provider/cohere/CohereTextGenerationModel.js

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

package/model-provider/elevenlabs/ElevenLabsSpeechModel.cjs

@@ -134,7 +134,7 @@ class ElevenLabsSpeechModel extends AbstractModel_js_1.AbstractModel {
                 queue.push({ type: "error", error: parseResult.error });
                 return;
             }
-            const response = parseResult.data;
+            const response = parseResult.value;
             if ("error" in response) {
                 queue.push({ type: "error", error: response });
                 return;

package/model-provider/elevenlabs/ElevenLabsSpeechModel.js

@@ -131,7 +131,7 @@ export class ElevenLabsSpeechModel extends AbstractModel {
                 queue.push({ type: "error", error: parseResult.error });
                 return;
             }
-            const response = parseResult.data;
+            const response = parseResult.value;
             if ("error" in response) {
                 queue.push({ type: "error", error: response });
                 return;

package/model-provider/huggingface/HuggingFaceTextGenerationModel.cjs

@@ -112,7 +112,7 @@ class HuggingFaceTextGenerationModel 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)(huggingFaceTextGenerationResponseSchema),
         }));
     }

package/model-provider/huggingface/HuggingFaceTextGenerationModel.js

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

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.cjs

@@ -22,7 +22,7 @@ function text() {
 }
 exports.text = text;
 /**
- * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.d.ts

@@ -7,7 +7,7 @@ import { LlamaCppCompletionPrompt } from "./LlamaCppCompletionModel.js";
  */
 export declare function text(): TextGenerationPromptTemplate<string, LlamaCppCompletionPrompt>;
 /**
- * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */

package/model-provider/llamacpp/LlamaCppBakLLaVA1PromptTemplate.js

@@ -18,7 +18,7 @@ export function text() {
     };
 }
 /**
- * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt structure.
+ * BakLLaVA 1 uses a Vicuna 1 prompt. This mapping combines it with the LlamaCpp prompt.
  *
  * @see https://github.com/SkunkworksAI/BakLLaVA
  */

package/model-provider/llamacpp/LlamaCppCompletionModel.cjs

@@ -8,7 +8,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
+const ObjectFromTextStreamingModel_js_1 = require("../../model-function/generate-object/ObjectFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
@@ -138,7 +138,7 @@ class LlamaCppCompletionModel 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)(llamaCppTextGenerationResponseSchema),
         }));
     }
@@ -170,13 +170,13 @@ class LlamaCppCompletionModel extends AbstractModel_js_1.AbstractModel {
     extractTextDelta(delta) {
         return delta.content;
     }
-    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/llamacpp/LlamaCppCompletionModel.d.ts

@@ -6,8 +6,8 @@ import { JsonSchemaProducer } from "../../core/schema/JsonSchemaProducer.js";
 import { Schema } from "../../core/schema/Schema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { Delta } from "../../model-function/Delta.js";
-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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
@@ -387,7 +387,7 @@ export declare class LlamaCppCompletionModel<CONTEXT_WINDOW_SIZE extends number
         content: string;
     }>>>;
     extractTextDelta(delta: unknown): string;
-    asStructureGenerationModel<INPUT_PROMPT, LlamaCppPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, LlamaCppPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, LlamaCppPrompt, TextStreamingModel<LlamaCppPrompt, TextGenerationModelSettings>>;
+    asObjectGenerationModel<INPUT_PROMPT, LlamaCppPrompt>(promptTemplate: ObjectFromTextPromptTemplate<INPUT_PROMPT, LlamaCppPrompt> | FlexibleObjectFromTextPromptTemplate<INPUT_PROMPT, unknown>): ObjectFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, TextGenerationModelSettings>> | ObjectFromTextStreamingModel<INPUT_PROMPT, LlamaCppPrompt, TextStreamingModel<LlamaCppPrompt, TextGenerationModelSettings>>;
     withJsonOutput(schema: Schema<unknown> & JsonSchemaProducer): this;
     private get promptTemplateProvider();
     withTextPrompt(): PromptTemplateTextStreamingModel<string, LlamaCppCompletionPrompt, LlamaCppCompletionModelSettings<CONTEXT_WINDOW_SIZE>, this>;

package/model-provider/llamacpp/LlamaCppCompletionModel.js

@@ -5,7 +5,7 @@ import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { parseJSON } from "../../core/schema/parseJSON.js";
 import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { AsyncQueue } from "../../util/AsyncQueue.js";
@@ -135,7 +135,7 @@ export class LlamaCppCompletionModel extends AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse(validateTypes({
-            structure: rawResponse,
+            value: rawResponse,
             schema: zodSchema(llamaCppTextGenerationResponseSchema),
         }));
     }
@@ -167,13 +167,13 @@ export class LlamaCppCompletionModel extends AbstractModel {
     extractTextDelta(delta) {
         return delta.content;
     }
-    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/mistral/MistralChatModel.cjs

@@ -93,7 +93,7 @@ class MistralChatModel 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)(mistralChatResponseSchema),
         }));
     }

package/model-provider/mistral/MistralChatModel.js

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

package/model-provider/ollama/OllamaChatModel.cjs

@@ -9,7 +9,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
+const ObjectFromTextStreamingModel_js_1 = require("../../model-function/generate-object/ObjectFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
@@ -125,7 +125,7 @@ class OllamaChatModel 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)(ollamaChatResponseSchema),
         }));
     }
@@ -161,13 +161,13 @@ class OllamaChatModel extends AbstractModel_js_1.AbstractModel {
             template: promptTemplate,
         });
     }
-    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,
             });
@@ -266,7 +266,7 @@ exports.OllamaChatResponseFormat = {
                     requestBodyValues,
                 });
             }
-            if (parsedResult.data.done === false) {
+            if (parsedResult.value.done === false) {
                 throw new ApiCallError_js_1.ApiCallError({
                     message: "Incomplete Ollama response received",
                     statusCode: response.status,
@@ -276,7 +276,7 @@ exports.OllamaChatResponseFormat = {
                     isRetryable: true,
                 });
             }
-            return parsedResult.data;
+            return parsedResult.value;
         }),
     },
     /**

package/model-provider/ollama/OllamaChatModel.d.ts

@@ -3,8 +3,8 @@ import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
@@ -103,7 +103,7 @@ export declare class OllamaChatModel extends AbstractModel<OllamaChatModelSettin
     extractTextDelta(delta: unknown): string | undefined;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaChatPrompt, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaChatPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaChatPrompt, this>;
-    asStructureGenerationModel<INPUT_PROMPT, OllamaChatPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, TextStreamingModel<OllamaChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
+    asObjectGenerationModel<INPUT_PROMPT, OllamaChatPrompt>(promptTemplate: ObjectFromTextPromptTemplate<INPUT_PROMPT, OllamaChatPrompt> | FlexibleObjectFromTextPromptTemplate<INPUT_PROMPT, unknown>): ObjectFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | ObjectFromTextStreamingModel<INPUT_PROMPT, OllamaChatPrompt, TextStreamingModel<OllamaChatPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     withTextPrompt(): PromptTemplateTextStreamingModel<string, OllamaChatPrompt, OllamaChatModelSettings, this>;
     withInstructionPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").InstructionPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;
     withChatPrompt(): PromptTemplateTextStreamingModel<import("../../index.js").ChatPrompt, OllamaChatPrompt, OllamaChatModelSettings, this>;

package/model-provider/ollama/OllamaChatModel.js

@@ -6,7 +6,7 @@ import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
@@ -122,7 +122,7 @@ export class OllamaChatModel extends AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse(validateTypes({
-            structure: rawResponse,
+            value: rawResponse,
             schema: zodSchema(ollamaChatResponseSchema),
         }));
     }
@@ -158,13 +158,13 @@ export class OllamaChatModel extends AbstractModel {
             template: promptTemplate,
         });
     }
-    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,
             });
@@ -262,7 +262,7 @@ export const OllamaChatResponseFormat = {
                     requestBodyValues,
                 });
             }
-            if (parsedResult.data.done === false) {
+            if (parsedResult.value.done === false) {
                 throw new ApiCallError({
                     message: "Incomplete Ollama response received",
                     statusCode: response.status,
@@ -272,7 +272,7 @@ export const OllamaChatResponseFormat = {
                     isRetryable: true,
                 });
             }
-            return parsedResult.data;
+            return parsedResult.value;
         }),
     },
     /**

package/model-provider/ollama/OllamaCompletionModel.cjs

@@ -9,7 +9,7 @@ const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const validateTypes_js_1 = require("../../core/schema/validateTypes.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
-const StructureFromTextStreamingModel_js_1 = require("../../model-function/generate-structure/StructureFromTextStreamingModel.cjs");
+const ObjectFromTextStreamingModel_js_1 = require("../../model-function/generate-object/ObjectFromTextStreamingModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextGenerationToolCallModel_js_1 = require("../../tool/generate-tool-call/TextGenerationToolCallModel.cjs");
@@ -128,7 +128,7 @@ class OllamaCompletionModel 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)(ollamaCompletionResponseSchema),
         }));
     }
@@ -153,13 +153,13 @@ class OllamaCompletionModel extends AbstractModel_js_1.AbstractModel {
         const chunk = delta;
         return chunk.done === true ? undefined : chunk.response;
     }
-    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,
             });
@@ -272,7 +272,7 @@ exports.OllamaCompletionResponseFormat = {
                     requestBodyValues,
                 });
             }
-            if (parsedResult.data.done === false) {
+            if (parsedResult.value.done === false) {
                 throw new ApiCallError_js_1.ApiCallError({
                     message: "Incomplete Ollama response received",
                     statusCode: response.status,
@@ -282,7 +282,7 @@ exports.OllamaCompletionResponseFormat = {
                     isRetryable: true,
                 });
             }
-            return parsedResult.data;
+            return parsedResult.value;
         }),
     },
     /**

package/model-provider/ollama/OllamaCompletionModel.d.ts

@@ -3,8 +3,8 @@ import { FunctionCallOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-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 { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextStreamingBaseModel, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
@@ -137,7 +137,7 @@ export declare class OllamaCompletionModel<CONTEXT_WINDOW_SIZE extends number |
         context?: number[] | undefined;
     }>>>;
     extractTextDelta(delta: unknown): string | undefined;
-    asStructureGenerationModel<INPUT_PROMPT, OllamaCompletionPrompt>(promptTemplate: StructureFromTextPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt> | FlexibleStructureFromTextPromptTemplate<INPUT_PROMPT, unknown>): StructureFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | StructureFromTextStreamingModel<INPUT_PROMPT, OllamaCompletionPrompt, TextStreamingModel<OllamaCompletionPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
+    asObjectGenerationModel<INPUT_PROMPT, OllamaCompletionPrompt>(promptTemplate: ObjectFromTextPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt> | FlexibleObjectFromTextPromptTemplate<INPUT_PROMPT, unknown>): ObjectFromTextStreamingModel<INPUT_PROMPT, unknown, TextStreamingModel<unknown, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>> | ObjectFromTextStreamingModel<INPUT_PROMPT, OllamaCompletionPrompt, TextStreamingModel<OllamaCompletionPrompt, import("../../model-function/generate-text/TextGenerationModel.js").TextGenerationModelSettings>>;
     asToolCallGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
     asToolCallsOrTextGenerationModel<INPUT_PROMPT>(promptTemplate: ToolCallsPromptTemplate<INPUT_PROMPT, OllamaCompletionPrompt>): TextGenerationToolCallsModel<INPUT_PROMPT, OllamaCompletionPrompt, this>;
     private get promptTemplateProvider();

package/model-provider/ollama/OllamaCompletionModel.js

@@ -6,7 +6,7 @@ import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { safeParseJSON } from "../../core/schema/parseJSON.js";
 import { validateTypes } from "../../core/schema/validateTypes.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { StructureFromTextStreamingModel } from "../../model-function/generate-structure/StructureFromTextStreamingModel.js";
+import { ObjectFromTextStreamingModel } from "../../model-function/generate-object/ObjectFromTextStreamingModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationToolCallModel, } from "../../tool/generate-tool-call/TextGenerationToolCallModel.js";
@@ -125,7 +125,7 @@ export class OllamaCompletionModel extends AbstractModel {
     }
     restoreGeneratedTexts(rawResponse) {
         return this.processTextGenerationResponse(validateTypes({
-            structure: rawResponse,
+            value: rawResponse,
             schema: zodSchema(ollamaCompletionResponseSchema),
         }));
     }
@@ -150,13 +150,13 @@ export class OllamaCompletionModel extends AbstractModel {
         const chunk = delta;
         return chunk.done === true ? undefined : chunk.response;
     }
-    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,
             });
@@ -268,7 +268,7 @@ export const OllamaCompletionResponseFormat = {
                     requestBodyValues,
                 });
             }
-            if (parsedResult.data.done === false) {
+            if (parsedResult.value.done === false) {
                 throw new ApiCallError({
                     message: "Incomplete Ollama response received",
                     statusCode: response.status,
@@ -278,7 +278,7 @@ export const OllamaCompletionResponseFormat = {
                     isRetryable: true,
                 });
             }
-            return parsedResult.data;
+            return parsedResult.value;
         }),
     },
     /**

package/model-provider/ollama/OllamaCompletionModel.test.cjs

@@ -5,8 +5,8 @@ const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
 const retryNever_js_1 = require("../../core/api/retryNever.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const jsonStructurePrompt_js_1 = require("../../model-function/generate-structure/jsonStructurePrompt.cjs");
-const streamStructure_js_1 = require("../../model-function/generate-structure/streamStructure.cjs");
+const jsonObjectPrompt_js_1 = require("../../model-function/generate-object/jsonObjectPrompt.cjs");
+const streamObject_js_1 = require("../../model-function/generate-object/streamObject.cjs");
 const generateText_js_1 = require("../../model-function/generate-text/generateText.cjs");
 const streamText_js_1 = require("../../model-function/generate-text/streamText.cjs");
 const JsonTestServer_js_1 = require("../../test/JsonTestServer.cjs");
@@ -93,7 +93,7 @@ describe("streamText", () => {
         ]);
     });
 });
-describe("streamStructure", () => {
+describe("streamObject", () => {
     const server = new StreamingTestServer_js_1.StreamingTestServer("http://127.0.0.1:11434/api/generate");
     server.setupTestEnvironment();
     it("should return a text stream", async () => {
@@ -114,21 +114,23 @@ describe("streamStructure", () => {
                 `"total_duration":521893000,"load_duration":957666,"prompt_eval_count":74,"prompt_eval_duration":302508000,` +
                 `"eval_count":12,"eval_duration":215282000}\n`,
         ];
-        const stream = await (0, streamStructure_js_1.streamStructure)({
+        const stream = await (0, streamObject_js_1.streamObject)({
             model: new OllamaCompletionModel_js_1.OllamaCompletionModel({
                 model: "mistral:text",
                 promptTemplate: OllamaCompletionPrompt_js_1.Text,
                 format: "json",
                 raw: true,
-            }).asStructureGenerationModel(jsonStructurePrompt_js_1.jsonStructurePrompt.text()),
+            }).asObjectGenerationModel(jsonObjectPrompt_js_1.jsonObjectPrompt.text()),
             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/ollama/OllamaCompletionModel.test.js

@@ -3,8 +3,8 @@ import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { retryNever } from "../../core/api/retryNever.js";
 import { zodSchema } from "../../core/schema/ZodSchema.js";
-import { jsonStructurePrompt } from "../../model-function/generate-structure/jsonStructurePrompt.js";
-import { streamStructure } from "../../model-function/generate-structure/streamStructure.js";
+import { jsonObjectPrompt } from "../../model-function/generate-object/jsonObjectPrompt.js";
+import { streamObject } from "../../model-function/generate-object/streamObject.js";
 import { generateText } from "../../model-function/generate-text/generateText.js";
 import { streamText } from "../../model-function/generate-text/streamText.js";
 import { JsonTestServer } from "../../test/JsonTestServer.js";
@@ -91,7 +91,7 @@ describe("streamText", () => {
         ]);
     });
 });
-describe("streamStructure", () => {
+describe("streamObject", () => {
     const server = new StreamingTestServer("http://127.0.0.1:11434/api/generate");
     server.setupTestEnvironment();
     it("should return a text stream", async () => {
@@ -112,21 +112,23 @@ describe("streamStructure", () => {
                 `"total_duration":521893000,"load_duration":957666,"prompt_eval_count":74,"prompt_eval_duration":302508000,` +
                 `"eval_count":12,"eval_duration":215282000}\n`,
         ];
-        const stream = await streamStructure({
+        const stream = await streamObject({
             model: new OllamaCompletionModel({
                 model: "mistral:text",
                 promptTemplate: Text,
                 format: "json",
                 raw: true,
-            }).asStructureGenerationModel(jsonStructurePrompt.text()),
+            }).asObjectGenerationModel(jsonObjectPrompt.text()),
             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)
         ]);
     });
 });