@digipair/skill-ollama 0.1.7 → 0.1.10

package/index.cjs2.js

@@ -45757,22 +45757,6 @@ function jsonSchemaToZod(schema) {
     }
 }
 let OllamaService = class OllamaService {
-    extractJsonFromOutput(message) {
-        const text = message.content;
-        // Define the regular expression pattern to match JSON blocks
-        const pattern = RegExp("```json\\s*((.|\\n)*?)\\s*```", "gs");
-        // Find all non-overlapping matches of the pattern in the string
-        const matches = pattern.exec(text);
-        if (matches && matches[1]) {
-            try {
-                return JSON.parse(matches[1].trim());
-            } catch (error) {
-                throw new Error(`Failed to parse: ${matches[1]}`);
-            }
-        } else {
-            throw new Error(`No JSON found in: ${message}`);
-        }
-    }
     async basic(params, _pins, _context) {
         const { modelName = 'mistral', temperature = 0, baseUrl = OLLAMA_SERVER, prompt, schema } = params;
         const model = new Ollama({
@@ -45789,7 +45773,7 @@ let OllamaService = class OllamaService {
         } else {
             const parser = new StructuredOutputParser(jsonSchemaToZod(schema));
             chain = RunnableSequence.from([
-                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}`, {
+                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}\n\nJSON:`, {
                     partialVariables: {
                         format_instructions: parser.getFormatInstructions()
                     }
@@ -45821,7 +45805,7 @@ let OllamaService = class OllamaService {
         } else {
             const parser = new StructuredOutputParser(jsonSchemaToZod(schema));
             chain = RunnableSequence.from([
-                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}`, {
+                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}\n\nJSON:`, {
                     partialVariables: {
                         format_instructions: parser.getFormatInstructions()
                     }

package/index.esm2.js

@@ -45755,22 +45755,6 @@ function jsonSchemaToZod(schema) {
     }
 }
 let OllamaService = class OllamaService {
-    extractJsonFromOutput(message) {
-        const text = message.content;
-        // Define the regular expression pattern to match JSON blocks
-        const pattern = RegExp("```json\\s*((.|\\n)*?)\\s*```", "gs");
-        // Find all non-overlapping matches of the pattern in the string
-        const matches = pattern.exec(text);
-        if (matches && matches[1]) {
-            try {
-                return JSON.parse(matches[1].trim());
-            } catch (error) {
-                throw new Error(`Failed to parse: ${matches[1]}`);
-            }
-        } else {
-            throw new Error(`No JSON found in: ${message}`);
-        }
-    }
     async basic(params, _pins, _context) {
         const { modelName = 'mistral', temperature = 0, baseUrl = OLLAMA_SERVER, prompt, schema } = params;
         const model = new Ollama({
@@ -45787,7 +45771,7 @@ let OllamaService = class OllamaService {
         } else {
             const parser = new StructuredOutputParser(jsonSchemaToZod(schema));
             chain = RunnableSequence.from([
-                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}`, {
+                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}\n\nJSON:`, {
                     partialVariables: {
                         format_instructions: parser.getFormatInstructions()
                     }
@@ -45819,7 +45803,7 @@ let OllamaService = class OllamaService {
         } else {
             const parser = new StructuredOutputParser(jsonSchemaToZod(schema));
             chain = RunnableSequence.from([
-                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}`, {
+                PromptTemplate.fromTemplate(`Answer the users question as best as possible.\n{format_instructions}\n${prompt != null ? prompt : '{prompt}'}\n\nJSON:`, {
                     partialVariables: {
                         format_instructions: parser.getFormatInstructions()
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-ollama",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "dependencies": {},
   "main": "./index.cjs.js",
   "module": "./index.esm.js"