@llumiverse/core 0.22.0-dev.1 → 0.22.1

package/package.json

@@ -1,90 +1,91 @@
 {
-  "name": "@llumiverse/core",
-  "version": "0.22.0-dev.1",
-  "type": "module",
-  "description": "Provide an universal API to LLMs. Support for existing LLMs can be added by writing a driver.",
-  "files": [
-    "lib",
-    "src"
-  ],
-  "keywords": [
-    "llm",
-    "ai",
-    "prompt",
-    "prompt engineering",
-    "ml",
-    "machine learning",
-    "embeddings",
-    "training",
-    "model",
-    "universal",
-    "api",
-    "chatgpt",
-    "openai",
-    "vertexai",
-    "bedrock",
-    "replicate",
-    "huggingface",
-    "togetherai"
-  ],
-  "types": "./lib/types/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "async": [
-        "./lib/types/async.d.ts"
-      ],
-      "formatters": [
-        "./lib/types/formatters/index.d.ts"
-      ]
-    }
-  },
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "import": "./lib/esm/index.js",
-      "require": "./lib/cjs/index.js"
-    },
-    "./async": {
-      "types": "./lib/types/async.d.ts",
-      "import": "./lib/esm/async.js",
-      "require": "./lib/cjs/async.js"
+    "name": "@llumiverse/core",
+    "version": "0.22.1",
+    "type": "module",
+    "description": "Provide an universal API to LLMs. Support for existing LLMs can be added by writing a driver.",
+    "files": [
+        "lib",
+        "src"
+    ],
+    "keywords": [
+        "llm",
+        "ai",
+        "prompt",
+        "prompt engineering",
+        "ml",
+        "machine learning",
+        "embeddings",
+        "training",
+        "model",
+        "universal",
+        "api",
+        "chatgpt",
+        "openai",
+        "vertexai",
+        "bedrock",
+        "replicate",
+        "huggingface",
+        "togetherai"
+    ],
+    "types": "./lib/types/index.d.ts",
+    "typesVersions": {
+        "*": {
+            "async": [
+                "./lib/types/async.d.ts"
+            ],
+            "formatters": [
+                "./lib/types/formatters/index.d.ts"
+            ]
+        }
     },
-    "./formatters": {
-      "types": "./lib/types/formatters/index.d.ts",
-      "import": "./lib/esm/formatters/index.js",
-      "require": "./lib/cjs/formatters/index.js"
-    }
-  },
-  "author": "Llumiverse",
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/vertesia/llumiverse",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/vertesia/llumiverse.git"
-  },
-  "devDependencies": {
-    "@vertesia/api-fetch-client": "^0.78.0",
-    "rimraf": "^6.0.1",
-    "ts-dual-module": "^0.6.3",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
-  },
-  "dependencies": {
-    "@types/node": "^22.18.6",
-    "ajv": "^8.17.1",
-    "ajv-formats": "^3.0.1",
-    "@llumiverse/common": "0.22.0-dev.1"
-  },
-  "ts_dual_module": {
-    "outDir": "lib",
     "exports": {
-      "async": "async.js",
-      "formatters": "formatters/index.js"
+        ".": {
+            "types": "./lib/types/index.d.ts",
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        },
+        "./async": {
+            "types": "./lib/types/async.d.ts",
+            "import": "./lib/esm/async.js",
+            "require": "./lib/cjs/async.js"
+        },
+        "./formatters": {
+            "types": "./lib/types/formatters/index.d.ts",
+            "import": "./lib/esm/formatters/index.js",
+            "require": "./lib/cjs/formatters/index.js"
+        }
+    },
+    "scripts": {
+        "test": "vitest run",
+        "build": "pnpm exec tsmod build",
+        "clean": "rimraf ./lib tsconfig.tsbuildinfo"
+    },
+    "author": "Llumiverse",
+    "license": "Apache-2.0",
+    "homepage": "https://github.com/vertesia/llumiverse",
+    "repository": {
+        "type": "git",
+        "url": "git+ssh://git@github.com/vertesia/llumiverse.git"
+    },
+    "devDependencies": {
+        "@vertesia/api-fetch-client": "^0.74.0",
+        "rimraf": "^6.0.1",
+        "ts-dual-module": "^0.6.3",
+        "typescript": "^5.9.2",
+        "vitest": "^3.2.4"
+    },
+    "dependencies": {
+        "@llumiverse/common": "workspace:*",
+        "@types/node": "^22.17.1",
+        "ajv": "^8.17.1",
+        "ajv-formats": "^3.0.1",
+        "jsonrepair": "^3.13.1"
+    },
+    "ts_dual_module": {
+        "outDir": "lib",
+        "exports": {
+            "async": "async.js",
+            "formatters": "formatters/index.js"
+        }
     }
-  },
-  "scripts": {
-    "test": "vitest run",
-    "build": "pnpm exec tsmod build",
-    "clean": "rimraf ./lib tsconfig.tsbuildinfo"
-  }
-}
+}

package/src/json.ts

@@ -1,181 +1,16 @@
 import { JSONValue } from "@llumiverse/common";
+import { jsonrepair } from 'jsonrepair';
 
 function extractJsonFromText(text: string): string {
     const start = text.indexOf("{");
     const end = text.lastIndexOf("}");
-    text = text.substring(start, end + 1);
-    return text.replace(/\\n/g, "");
+    return text.substring(start, end + 1);
 }
 
 export function extractAndParseJSON(text: string): JSONValue {
     return parseJSON(extractJsonFromText(text));
 }
 
-const RX_DQUOTE = /^"([^"\\]|\\.)*"/us;
-const RX_SQUOTE = /^'([^'\\]|\\.)*'/us;
-const RX_NUMBER = /^-?\d+(\.\d+)?/;
-const RX_BOOLEAN = /^true|false/;
-const RX_NULL = /^null/;
-const RX_KEY = /^[$_a-zA-Z][$_a-zA-Z0-9]*/;
-const RX_PUNCTUATION = /^\s*([\[\]{}:,])\s*/;
-
-function fixText(value: string) {
-    return value.replaceAll('\n', '\\n').replaceAll('\r', '\\r');
-}
-
-function decodeSingleQuotedString(value: string) {
-    return JSON.parse('"' + value.slice(1, -1).replaceAll(/(?<!\\)"/g, '\\"') + '"');
-}
-
-export class JsonParser {
-    pos: number = 0;
-
-    constructor(public text: string) { }
-
-    skip(n: number) {
-        this.text = this.text.substring(n);
-        this.pos += n;
-    }
-
-    tryReadPunctuation() {
-        const m = RX_PUNCTUATION.exec(this.text);
-        if (m) {
-            this.skip(m[0].length);
-            return m[1];
-        }
-    }
-
-    readKey() {
-        const first = this.text.charCodeAt(0);
-        if (first === 34) { // "
-            const m = RX_DQUOTE.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return JSON.parse(m[0]);
-            }
-        } else if (first === 39) { // '
-            const m = RX_SQUOTE.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return decodeSingleQuotedString(m[0]);
-            }
-        } else {
-            const m = RX_KEY.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return m[0];
-            }
-        }
-        throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
-    }
-
-    readScalar() {
-        const first = this.text.charCodeAt(0);
-        if (first === 34) { // "
-            const m = RX_DQUOTE.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return JSON.parse(fixText(m[0]));
-            }
-        } else if (first === 39) { // '
-            const m = RX_SQUOTE.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return decodeSingleQuotedString(fixText(m[0]));
-            }
-        } else {
-            let m = RX_NUMBER.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return parseFloat(m[0]);
-            }
-            m = RX_BOOLEAN.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return m[0] === 'true';
-            }
-            m = RX_NULL.exec(this.text);
-            if (m) {
-                this.skip(m[0].length);
-                return null;
-            }
-        }
-        throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
-    }
-
-    readObject() {
-        let key: string | undefined;
-        const obj: any = {};
-        while (true) {
-            if (!key) { // read key
-                const p = this.tryReadPunctuation();
-                if (p === '}') {
-                    return obj;
-                } else if (p === ',') {
-                    continue;
-                } else if (p) {
-                    throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
-                }
-                key = this.readKey();
-                if (!key) {
-                    throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
-                }
-                if (this.tryReadPunctuation() !== ':') {
-                    throw new Error('Expected a colon at position ' + this.pos + ' but found ' + this.text);
-                };
-            } else { // read value
-                const value = this.readValue();
-                if (value === undefined) {
-                    throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
-                }
-                obj[key] = value;
-                key = undefined;
-            }
-        }
-    }
-
-    readArray() {
-        const ar: any[] = [];
-        while (true) {
-            const p = this.tryReadPunctuation();
-            if (p === ',') {
-                continue;
-            } else if (p === ']') {
-                return ar;
-            } else if (p === '[') {
-                ar.push(this.readArray());
-            } else if (p === '{') {
-                ar.push(this.readObject());
-            } else if (!p) {
-                ar.push(this.readScalar());
-            } else {
-                throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
-            }
-        }
-    }
-
-    readValue() {
-        const p = this.tryReadPunctuation();
-        if (p === '{') {
-            return this.readObject();
-        } else if (p === '[') {
-            return this.readArray();
-        } else if (!p) {
-            return this.readScalar();
-        }
-    }
-
-    static parse(text: string) {
-        const parser = new JsonParser(text);
-        const r = parser.readValue();
-        if (r === undefined) {
-            throw new Error('Not a valid JSON');
-        }
-        return r;
-    }
-}
-
-
 export function parseJSON(text: string): JSONValue {
     text = text.trim();
     try {
@@ -183,7 +18,7 @@ export function parseJSON(text: string): JSONValue {
     } catch (err: any) {
         // use a relaxed parser
         try {
-            return JsonParser.parse(text);
+            return JSON.parse(jsonrepair(text));
         } catch (err2: any) { // throw the original error
             throw err;
         }

package/src/validation.ts

@@ -1,8 +1,8 @@
+import { CompletionResult, ResultValidationError } from "@llumiverse/common";
 import { Ajv } from 'ajv';
 import addFormats from 'ajv-formats';
 import { extractAndParseJSON } from "./json.js";
 import { resolveField } from './resolver.js';
-import { CompletionResult, completionResultToString, ResultValidationError } from "@llumiverse/common";
 
 
 const ajv = new Ajv({
@@ -28,6 +28,25 @@ export class ValidationError extends Error implements ResultValidationError {
     }
 }
 
+function parseCompletionAsJson(data: CompletionResult[]) {
+    let lastError: ValidationError | undefined;
+    for (const part of data) {
+        if (part.type === "text") {
+            const text = part.value.trim();
+            try {
+                return extractAndParseJSON(text);
+            } catch (error: any) {
+                lastError = new ValidationError("json_error", error.message);
+            }
+        }
+    }
+    if (!lastError) {
+        lastError = new ValidationError("json_error", "No JSON compatible response found in completion result");
+    }
+    throw lastError;
+}
+
+
 export function validateResult(data: CompletionResult[], schema: Object): CompletionResult[] {
     let json;
     if (Array.isArray(data)) {
@@ -35,9 +54,8 @@ export function validateResult(data: CompletionResult[], schema: Object): Comple
         if (jsonResults.length > 0) {
             json = jsonResults[0].value;
         } else {
-            const stringResult = data.map(completionResultToString).join("");
             try {
-                json = extractAndParseJSON(stringResult);
+                json = parseCompletionAsJson(data);
             } catch (error: any) {
                 throw new ValidationError("json_error", error.message)
             }