@ax-llm/ax 10.0.42 → 10.0.44

package/index.cjs

@@ -58,6 +58,13 @@ __export(index_exports, {
   AxAIOpenAIModel: () => AxAIOpenAIModel,
   AxAIReka: () => AxAIReka,
   AxAIRekaModel: () => AxAIRekaModel,
+  AxAIServiceAuthenticationError: () => AxAIServiceAuthenticationError,
+  AxAIServiceError: () => AxAIServiceError,
+  AxAIServiceNetworkError: () => AxAIServiceNetworkError,
+  AxAIServiceResponseError: () => AxAIServiceResponseError,
+  AxAIServiceStatusError: () => AxAIServiceStatusError,
+  AxAIServiceStreamTerminatedError: () => AxAIServiceStreamTerminatedError,
+  AxAIServiceTimeoutError: () => AxAIServiceTimeoutError,
   AxAITogether: () => AxAITogether,
   AxAgent: () => AxAgent,
   AxApacheTika: () => AxApacheTika,
@@ -182,15 +189,21 @@ var import_api = require("@opentelemetry/api");
 // util/sse.ts
 var import_web = require("stream/web");
 var SSEParser = class extends import_web.TransformStream {
-  constructor(dataParser = JSON.parse) {
+  buffer = "";
+  currentEvent = { rawData: "" };
+  dataParser;
+  onError;
+  constructor(options = {}) {
     super({
       transform: (chunk, controller) => this.handleChunk(chunk, controller),
       flush: (controller) => this.handleFlush(controller)
     });
-    this.dataParser = dataParser;
+    this.dataParser = options.dataParser || JSON.parse;
+    this.onError = options.onError || ((error, rawData) => {
+      console.warn("Failed to parse event data:", error);
+      console.log("Raw data that failed to parse:", rawData);
+    });
   }
-  buffer = "";
-  currentEvent = { rawData: "" };
   handleChunk(chunk, controller) {
     this.buffer += chunk;
     this.processBuffer(controller);
@@ -198,24 +211,28 @@ var SSEParser = class extends import_web.TransformStream {
   handleFlush(controller) {
     this.processBuffer(controller);
     if (this.currentEvent.rawData) {
-      this.emitEvent(controller);
+      this.processEvent(controller);
     }
   }
   processBuffer(controller) {
-    const lines = this.buffer.split(/\r\n|\r|\n/);
+    const normalizedBuffer = this.buffer.replace(/\r\n|\r/g, "\n");
+    const lines = normalizedBuffer.split("\n");
     this.buffer = lines.pop() || "";
     for (const line of lines) {
-      if (line.trim() === "") {
-        this.emitEvent(controller);
+      if (line === "") {
+        this.processEvent(controller);
       } else {
         this.parseLine(line);
       }
     }
   }
   parseLine(line) {
+    if (line.startsWith(":")) {
+      return;
+    }
     const colonIndex = line.indexOf(":");
     if (colonIndex === -1) {
-      this.currentEvent.rawData += this.currentEvent.rawData ? "\n" + line.trim() : line.trim();
+      this.currentEvent.rawData += (this.currentEvent.rawData && !this.currentEvent.rawData.endsWith("\n") ? "\n" : "") + line.trim();
       return;
     }
     const field = line.slice(0, colonIndex).trim();
@@ -225,7 +242,7 @@ var SSEParser = class extends import_web.TransformStream {
         this.currentEvent.event = value;
         break;
       case "data":
-        this.currentEvent.rawData += this.currentEvent.rawData ? "\n" + value : value;
+        this.currentEvent.rawData += (this.currentEvent.rawData && !this.currentEvent.rawData.endsWith("\n") ? "\n" : "") + value;
         break;
       case "id":
         this.currentEvent.id = value;
@@ -239,21 +256,20 @@ var SSEParser = class extends import_web.TransformStream {
       }
     }
   }
-  emitEvent(controller) {
+  processEvent(controller) {
     if (this.currentEvent.rawData) {
-      if (this.currentEvent.rawData.trim() === "[DONE]" || this.currentEvent.rawData.trim().startsWith("[")) {
+      if (!this.currentEvent.event) {
+        this.currentEvent.event = "message";
+      }
+      if (this.currentEvent.rawData.trim() === "[DONE]") {
+        this.currentEvent = { rawData: "" };
         return;
-      } else {
-        try {
-          const parsedData = this.dataParser(this.currentEvent.rawData);
-          controller.enqueue(parsedData);
-        } catch (e) {
-          console.warn("Failed to parse event data:", e);
-          console.log(
-            "Raw data that failed to parse:",
-            this.currentEvent.rawData
-          );
-        }
+      }
+      try {
+        const parsedData = this.dataParser(this.currentEvent.rawData);
+        controller.enqueue(parsedData);
+      } catch (e) {
+        this.onError(e, this.currentEvent.rawData);
       }
       this.currentEvent = { rawData: "" };
     }
@@ -290,52 +306,305 @@ var TextDecoderStreamPolyfill = class extends import_web2.TransformStream {
 };
 
 // util/apicall.ts
+var defaultRetryConfig = {
+  maxRetries: 3,
+  initialDelayMs: 1e3,
+  maxDelayMs: 6e4,
+  // Increased to 60 seconds
+  backoffFactor: 2,
+  retryableStatusCodes: [500, 408, 429, 502, 503, 504]
+};
+var defaultTimeoutMs = 3e4;
 var textDecoderStream = import_web3.TextDecoderStream ?? TextDecoderStreamPolyfill;
+var AxAIServiceError = class extends Error {
+  constructor(message, url, requestBody, context = {}) {
+    super(message);
+    this.url = url;
+    this.requestBody = requestBody;
+    this.context = context;
+    this.name = "AxAIServiceError";
+    this.timestamp = (/* @__PURE__ */ new Date()).toISOString();
+    this.errorId = crypto.randomUUID();
+  }
+  timestamp;
+  errorId;
+  toString() {
+    return `${this.name} [${this.errorId}]: ${this.message}
+Timestamp: ${this.timestamp}
+URL: ${this.url}${this.requestBody ? `
+Request Body: ${JSON.stringify(this.requestBody, null, 2)}` : ""}${this.context ? `
+Context: ${JSON.stringify(this.context, null, 2)}` : ""}`;
+  }
+  toJSON() {
+    return {
+      name: this.name,
+      errorId: this.errorId,
+      message: this.message,
+      timestamp: this.timestamp,
+      url: this.url,
+      requestBody: this.requestBody,
+      context: this.context,
+      stack: this.stack
+    };
+  }
+};
+var AxAIServiceStatusError = class extends AxAIServiceError {
+  constructor(status, statusText, url, requestBody, context) {
+    super(`HTTP ${status} - ${statusText}`, url, requestBody, {
+      httpStatus: status,
+      httpStatusText: statusText,
+      ...context
+    });
+    this.status = status;
+    this.statusText = statusText;
+    this.name = "AxAIServiceStatusError";
+  }
+};
+var AxAIServiceNetworkError = class extends AxAIServiceError {
+  constructor(originalError, url, requestBody, context) {
+    super(`Network Error: ${originalError.message}`, url, requestBody, {
+      originalErrorName: originalError.name,
+      originalErrorStack: originalError.stack,
+      ...context
+    });
+    this.originalError = originalError;
+    this.name = "AxAIServiceNetworkError";
+    this.stack = originalError.stack;
+  }
+};
+var AxAIServiceResponseError = class extends AxAIServiceError {
+  constructor(message, url, requestBody, context) {
+    super(message, url, requestBody, context);
+    this.name = "AxAIServiceResponseError";
+  }
+};
+var AxAIServiceStreamTerminatedError = class extends AxAIServiceError {
+  constructor(url, requestBody, lastChunk, context) {
+    super("Stream terminated unexpectedly by remote host", url, requestBody, {
+      lastChunk,
+      ...context
+    });
+    this.lastChunk = lastChunk;
+    this.name = "AxAIServiceStreamTerminatedError";
+  }
+};
+var AxAIServiceTimeoutError = class extends AxAIServiceError {
+  constructor(url, timeoutMs, requestBody, context) {
+    super(`Request timeout after ${timeoutMs}ms`, url, requestBody, {
+      timeoutMs,
+      ...context
+    });
+    this.name = "AxAIServiceTimeoutError";
+  }
+};
+var AxAIServiceAuthenticationError = class extends AxAIServiceError {
+  constructor(url, requestBody, context) {
+    super("Authentication failed", url, requestBody, context);
+    this.name = "AxAIServiceAuthenticationError";
+  }
+};
+function calculateRetryDelay(attempt, config) {
+  const delay = Math.min(
+    config.maxDelayMs,
+    config.initialDelayMs * Math.pow(config.backoffFactor, attempt)
+  );
+  return delay * (0.75 + Math.random() * 0.5);
+}
+function createRequestMetrics() {
+  return {
+    startTime: Date.now(),
+    retryCount: 0
+  };
+}
+function updateRetryMetrics(metrics) {
+  metrics.retryCount++;
+  metrics.lastRetryTime = Date.now();
+}
 var apiCall = async (api, json) => {
+  const retryConfig = { ...defaultRetryConfig, ...api.retry };
+  const timeoutMs = api.timeout ?? defaultTimeoutMs;
+  const metrics = createRequestMetrics();
   const baseUrl = new URL(process.env["PROXY"] ?? api.url);
   const apiPath = import_path.default.join(baseUrl.pathname, api.name ?? "/", baseUrl.search);
   const apiUrl = new URL(apiPath, baseUrl);
+  const requestId = crypto.randomUUID();
   if (api.span?.isRecording()) {
     api.span.setAttributes({
       "http.request.method": api.put ? "PUT" : "POST",
-      "url.full": apiUrl.href
+      "url.full": apiUrl.href,
+      "request.id": requestId,
+      "request.startTime": metrics.startTime
     });
   }
-  let res;
-  try {
-    res = await (api.fetch ?? fetch)(apiUrl, {
-      method: api.put ? "PUT" : "POST",
-      headers: {
-        "Content-Type": "application/json",
-        ...api.headers
-      },
-      body: JSON.stringify(json)
-    });
-    if (res.status >= 400) {
-      const reqBody = JSON.stringify(json, null, 2);
-      throw new Error(
-        `API Request Error: ${res.status}, ${res.statusText}
-:Request Body: ${reqBody}`
-      );
-    }
-    if (!api.stream) {
-      const resJson = await res.json();
-      return resJson;
-    }
-    if (!res.body) {
-      throw new Error("Response body is null");
-    }
-    const st = res.body.pipeThrough(new textDecoderStream()).pipeThrough(new SSEParser());
-    return st;
-  } catch (e) {
-    if (api.span?.isRecording()) {
-      api.span.recordException(e);
+  let attempt = 0;
+  while (true) {
+    const controller = new AbortController();
+    let timeoutId = setTimeout(() => {
+      controller.abort("Request timeout");
+    }, timeoutMs);
+    try {
+      const res = await (api.fetch ?? fetch)(apiUrl, {
+        method: api.put ? "PUT" : "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Request-ID": requestId,
+          "X-Retry-Count": attempt.toString(),
+          ...api.headers
+        },
+        body: JSON.stringify(json),
+        signal: controller.signal
+      });
+      clearTimeout(timeoutId);
+      if (res.status === 401 || res.status === 403) {
+        throw new AxAIServiceAuthenticationError(apiUrl.href, json, { metrics });
+      }
+      if (res.status >= 400 && attempt < retryConfig.maxRetries && retryConfig.retryableStatusCodes.includes(res.status)) {
+        const delay = calculateRetryDelay(attempt, retryConfig);
+        attempt++;
+        updateRetryMetrics(metrics);
+        if (api.span?.isRecording()) {
+          api.span.addEvent("retry", {
+            attempt,
+            delay,
+            status: res.status,
+            "metrics.startTime": metrics.startTime,
+            "metrics.retryCount": metrics.retryCount,
+            "metrics.lastRetryTime": metrics.lastRetryTime
+          });
+        }
+        clearTimeout(timeoutId);
+        continue;
+      }
+      if (res.status >= 400) {
+        throw new AxAIServiceStatusError(
+          res.status,
+          res.statusText,
+          apiUrl.href,
+          json,
+          { metrics }
+        );
+      }
+      if (!api.stream) {
+        const resJson = await res.json();
+        if (api.span?.isRecording()) {
+          api.span.setAttributes({
+            "response.time": Date.now() - metrics.startTime,
+            "response.retries": metrics.retryCount
+          });
+        }
+        return resJson;
+      }
+      if (!res.body) {
+        throw new AxAIServiceResponseError(
+          "Response body is null",
+          apiUrl.href,
+          json,
+          { metrics }
+        );
+      }
+      let lastChunk;
+      let chunkCount = 0;
+      const trackingStream = new TransformStream({
+        transform(chunk, controller2) {
+          lastChunk = chunk;
+          chunkCount++;
+          metrics.streamChunks = chunkCount;
+          metrics.lastChunkTime = Date.now();
+          controller2.enqueue(chunk);
+        },
+        flush(controller2) {
+          if (api.span?.isRecording()) {
+            api.span.setAttributes({
+              "stream.chunks": chunkCount,
+              "stream.duration": Date.now() - metrics.startTime,
+              "response.retries": metrics.retryCount
+            });
+          }
+          controller2.terminate();
+        }
+      });
+      const wrappedStream = new import_web3.ReadableStream({
+        start(controller2) {
+          const reader = res.body.pipeThrough(new textDecoderStream()).pipeThrough(new SSEParser()).pipeThrough(trackingStream).getReader();
+          async function read() {
+            try {
+              while (true) {
+                const { done, value } = await reader.read();
+                if (done) {
+                  controller2.close();
+                  break;
+                } else {
+                  controller2.enqueue(value);
+                }
+              }
+            } catch (e) {
+              const error = e;
+              const streamMetrics = {
+                ...metrics,
+                streamDuration: Date.now() - metrics.startTime
+              };
+              if (error.name === "AbortError" || error.message?.includes("aborted")) {
+                controller2.error(
+                  new AxAIServiceStreamTerminatedError(
+                    apiUrl.href,
+                    json,
+                    lastChunk,
+                    { streamMetrics }
+                  )
+                );
+              } else {
+                controller2.error(
+                  new AxAIServiceResponseError(
+                    `Stream processing error: ${error.message}`,
+                    apiUrl.href,
+                    json,
+                    { streamMetrics }
+                  )
+                );
+              }
+            } finally {
+              reader.releaseLock();
+            }
+          }
+          read();
+        }
+      });
+      return wrappedStream;
+    } catch (error) {
+      clearTimeout(timeoutId);
+      if (error instanceof Error && error.name === "AbortError") {
+        throw new AxAIServiceTimeoutError(apiUrl.href, timeoutMs, json, {
+          metrics
+        });
+      }
+      if (api.span?.isRecording()) {
+        api.span.recordException(error);
+        api.span.setAttributes({
+          "error.time": Date.now() - metrics.startTime,
+          "error.retries": metrics.retryCount
+        });
+      }
+      if (error instanceof AxAIServiceNetworkError && attempt < retryConfig.maxRetries) {
+        const delay = calculateRetryDelay(attempt, retryConfig);
+        attempt++;
+        updateRetryMetrics(metrics);
+        if (api.span?.isRecording()) {
+          api.span.addEvent("retry", {
+            attempt,
+            delay,
+            error: error.message,
+            "metrics.startTime": metrics.startTime,
+            "metrics.retryCount": metrics.retryCount,
+            "metrics.lastRetryTime": metrics.lastRetryTime
+          });
+        }
+        continue;
+      }
+      if (error instanceof AxAIServiceError) {
+        error.context["metrics"] = metrics;
+      }
+      throw error;
     }
-    const reqBody = JSON.stringify(json, null, 2);
-    throw new Error(
-      `API Response Error: ${apiUrl.href}, ${e}
-Request Body: ${reqBody}`
-    );
   }
 };
 
@@ -3583,9 +3852,6 @@ var assertStreamingAssertions = (asserts, values, xstate, content, final) => {
   }
 };
 
-// dsp/extract.ts
-var import_json5 = __toESM(require("json5"), 1);
-
 // dsp/datetime.ts
 var import_moment_timezone = __toESM(require("moment-timezone"), 1);
 
@@ -3616,104 +3882,143 @@ var import_crypto = require("crypto");
 var SignatureParser = class {
   input;
   position;
+  currentFieldName = null;
   constructor(input) {
     this.input = input;
     this.position = 0;
   }
   parse() {
-    this.skipWhitespace();
-    const optionalDesc = this.parseParsedString();
-    this.skipWhitespace();
-    const inputs = this.parseInputParsedFieldList();
-    this.skipWhitespace();
-    this.expect("->");
-    this.skipWhitespace();
-    const outputs = this.parseOutputParsedFieldList();
-    return {
-      desc: optionalDesc?.trim(),
-      inputs,
-      outputs
-    };
-  }
-  parseInputParsedFieldList() {
-    const fields = [];
-    fields.push(this.parseInputParsedField());
-    while (this.match(",")) {
+    try {
       this.skipWhitespace();
-      fields.push(this.parseInputParsedField());
-    }
-    return fields;
-  }
-  parseOutputParsedFieldList() {
-    const fields = [];
-    fields.push(this.parseOutputParsedField());
-    while (this.match(",")) {
+      const optionalDesc = this.parseParsedString();
       this.skipWhitespace();
-      fields.push(this.parseOutputParsedField());
-    }
-    return fields;
-  }
-  parseInputParsedField() {
-    this.skipWhitespace();
-    const name = this.parseParsedIdentifier();
-    const isOptional = this.match("?");
-    let type;
-    if (this.match(":")) {
+      const inputs = this.parseFieldList(this.parseField.bind(this), "input");
       this.skipWhitespace();
-      const typeName = this.parseTypeNotClass();
-      const isArray = this.match("[]");
-      type = { name: typeName, isArray };
+      if (this.position >= this.input.length) {
+        throw new Error(
+          'Incomplete signature: Missing output section. Expected "->" followed by output fields'
+        );
+      }
+      this.expect("->");
+      this.skipWhitespace();
+      if (this.position >= this.input.length) {
+        throw new Error(
+          'Incomplete signature: No output fields specified after "->"'
+        );
+      }
+      const outputs = this.parseFieldList(this.parseField.bind(this), "output");
+      return {
+        desc: optionalDesc?.trim(),
+        inputs,
+        outputs
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      const context = this.getErrorContext();
+      throw new Error(`${errorMessage}
+${context}`);
+    }
+  }
+  getErrorContext() {
+    const start = Math.max(0, this.position - 20);
+    const end = Math.min(this.input.length, this.position + 20);
+    const before = this.input.slice(start, this.position);
+    const after = this.input.slice(this.position, end);
+    const pointer = " ".repeat(before.length) + "^";
+    return `Near position ${this.position}:
+${before}${after}
+${pointer}`;
+  }
+  parseFieldList(parseFieldFn, section) {
+    const fields = [];
+    this.skipWhitespace();
+    if (this.position >= this.input.length) {
+      throw new Error(`Empty ${section} section: Expected at least one field`);
+    }
+    try {
+      fields.push(parseFieldFn());
+    } catch (error) {
+      throw new Error(
+        `Invalid first ${section} field: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
     }
     this.skipWhitespace();
-    const desc = this.parseParsedString();
-    return {
-      name,
-      desc: desc?.trim(),
-      type,
-      isOptional
-    };
+    while (this.position < this.input.length) {
+      if (this.input[this.position] === "-" && this.input[this.position + 1] === ">") {
+        break;
+      }
+      if (this.match(",")) {
+        this.skipWhitespace();
+        if (this.position >= this.input.length) {
+          throw new Error(
+            `Unexpected end of input after comma in ${section} section`
+          );
+        }
+        try {
+          fields.push(parseFieldFn());
+        } catch (error) {
+          throw new Error(
+            `Invalid ${section} field after comma: ${error instanceof Error ? error.message : "Unknown error"}`
+          );
+        }
+        this.skipWhitespace();
+      } else {
+        break;
+      }
+    }
+    return fields;
   }
-  parseOutputParsedField() {
+  parseField() {
     this.skipWhitespace();
     const name = this.parseParsedIdentifier();
+    this.currentFieldName = name;
     const isOptional = this.match("?");
+    let type;
     this.skipWhitespace();
     if (this.match(":")) {
       this.skipWhitespace();
       if (this.match("class")) {
         const isArray = this.match("[]");
         this.skipWhitespace();
-        const desc = this.parseParsedString();
-        if (!desc) {
+        const desc2 = this.parseParsedString();
+        if (!desc2) {
           throw new Error(
-            "Expected description containing class names after type 'class'"
+            `Field "${name}": Expected class names in quotes after "class" type. Example: class "MyClass1, MyClass2"`
           );
         }
-        const classNames = desc.split(",").map((s) => s.trim());
-        return {
-          name,
-          type: { name: "class", isArray, classes: classNames },
-          isOptional
-        };
+        const classes = desc2.split(/[,\s]+/).map((s) => s.trim()).filter((s) => s.length > 0);
+        if (classes.length === 0) {
+          throw new Error(
+            `Field "${name}": Empty class list provided. At least one class name is required`
+          );
+        }
+        type = { name: "class", isArray, classes };
       } else {
-        const typeName = this.parseTypeNotClass();
-        const isArray = this.match("[]");
-        this.skipWhitespace();
-        const desc = this.parseParsedString();
-        return {
-          name,
-          desc: desc?.trim(),
-          type: { name: typeName, isArray },
-          isOptional
-        };
+        try {
+          const typeName = this.parseTypeNotClass();
+          const isArray = this.match("[]");
+          type = { name: typeName, isArray };
+        } catch (error) {
+          throw new Error(
+            `Field "${name}": ${error instanceof Error ? error.message : "Unknown error"}`
+          );
+        }
       }
+    }
+    this.skipWhitespace();
+    const desc = this.parseParsedString();
+    if (type?.name === "class") {
+      return {
+        name,
+        desc: desc?.trim(),
+        type,
+        isOptional
+      };
     } else {
-      this.skipWhitespace();
-      const desc = this.parseParsedString();
       return {
         name,
         desc: desc?.trim(),
-        type: void 0,
+        type,
         isOptional
       };
     }
@@ -3729,14 +4034,17 @@ var SignatureParser = class {
       "datetime",
       "date"
     ];
-    for (const type of types) {
-      if (this.match(type)) {
-        return type;
-      }
+    const foundType = types.find((type) => this.match(type));
+    if (!foundType) {
+      const currentWord = this.input.slice(this.position).match(/^\w+/)?.[0] || "empty";
+      throw new Error(
+        `Invalid type "${currentWord}". Expected one of: ${types.join(", ")}`
+      );
     }
-    throw new Error(`Expected one of ${types.join(", ")}`);
+    return foundType;
   }
   parseParsedIdentifier() {
+    this.skipWhitespace();
     const match = /^[a-zA-Z_][a-zA-Z_0-9]*/.exec(
       this.input.slice(this.position)
     );
@@ -3744,40 +4052,69 @@ var SignatureParser = class {
       this.position += match[0].length;
       return match[0];
     }
-    throw new Error("Expected identifier");
+    const invalidMatch = /^\S+/.exec(this.input.slice(this.position));
+    const invalidId = invalidMatch ? invalidMatch[0] : "empty";
+    throw new Error(
+      `Invalid identifier "${invalidId}". Identifiers must start with a letter or underscore and contain only letters, numbers, or underscores`
+    );
   }
   parseParsedString() {
-    if (this.match("'")) {
-      const endQuote = this.input.indexOf("'", this.position);
-      if (endQuote === -1) throw new Error("Unterminated string");
-      const content = this.input.slice(this.position, endQuote);
-      this.position = endQuote + 1;
-      return content;
-    } else if (this.match('"')) {
-      const endQuote = this.input.indexOf('"', this.position);
-      if (endQuote === -1) throw new Error("Unterminated string");
-      const content = this.input.slice(this.position, endQuote);
-      this.position = endQuote + 1;
-      return content;
+    const quoteChars = ["'", '"'];
+    for (const quoteChar of quoteChars) {
+      if (this.match(quoteChar)) {
+        let content = "";
+        let escaped = false;
+        let startPos = this.position;
+        while (this.position < this.input.length) {
+          const char = this.input[this.position];
+          this.position++;
+          if (escaped) {
+            content += char;
+            escaped = false;
+          } else if (char === "\\") {
+            escaped = true;
+          } else if (char === quoteChar) {
+            return content;
+          } else {
+            content += char;
+          }
+        }
+        const partialString = this.input.slice(startPos, this.position);
+        throw new Error(
+          `Unterminated string starting at position ${startPos}: "${partialString}..."`
+        );
+      }
     }
     return void 0;
   }
   skipWhitespace() {
-    const match = /^[ \t\r\n]+/.exec(this.input.slice(this.position));
+    const match = /^[\s\t\r\n]+/.exec(this.input.slice(this.position));
     if (match) {
       this.position += match[0].length;
     }
   }
-  match(str) {
-    if (this.input.startsWith(str, this.position)) {
-      this.position += str.length;
-      return true;
+  match(strOrRegex) {
+    let match;
+    if (typeof strOrRegex === "string") {
+      if (this.input.startsWith(strOrRegex, this.position)) {
+        this.position += strOrRegex.length;
+        return true;
+      }
+    } else {
+      match = strOrRegex.exec(this.input.slice(this.position));
+      if (match) {
+        this.position += match[0].length;
+        return true;
+      }
     }
     return false;
   }
   expect(str) {
     if (!this.match(str)) {
-      throw new Error(`Expected "${str}"`);
+      const found = this.input.slice(this.position, this.position + 10);
+      throw new Error(
+        `Expected "${str}" but found "${found}..." at position ${this.position}`
+      );
     }
   }
 };
@@ -5011,7 +5348,7 @@ function validateAndParseFieldValue(field, fieldValue) {
   if (field.type?.name === "json") {
     try {
       const text = extractBlock(fieldValue);
-      value = import_json5.default.parse(text);
+      value = JSON.parse(text);
       return value;
     } catch (e) {
       throw new ValidationError({
@@ -5024,7 +5361,7 @@ function validateAndParseFieldValue(field, fieldValue) {
   if (field.type?.isArray) {
     try {
       try {
-        value = import_json5.default.parse(fieldValue);
+        value = JSON.parse(fieldValue);
       } catch {
         value = parseMarkdownList(fieldValue);
       }
@@ -5077,9 +5414,6 @@ var extractBlock = (input) => {
   return input;
 };
 
-// dsp/functions.ts
-var import_json52 = __toESM(require("json5"), 1);
-
 // dsp/jsonschema.ts
 var validateJSONSchema = (schema) => {
   const errors = [];
@@ -5137,7 +5471,7 @@ var AxFunctionProcessor = class {
   executeFunction = async (fnSpec, func, options) => {
     let args;
     if (typeof func.args === "string" && func.args.length > 0) {
-      args = import_json52.default.parse(func.args);
+      args = JSON.parse(func.args);
     } else {
       args = func.args;
     }
@@ -5424,37 +5758,35 @@ var AxGen = class extends AxProgramWithSignature {
     functions
   }) {
     const values = {};
-    const result = res.results[0];
-    if (!result) {
-      throw new Error("No result found");
-    }
-    if (res.modelUsage) {
-      this.usage.push({ ...usageInfo, ...res.modelUsage });
-    }
-    mem.addResult(result, sessionId);
-    if (result.content) {
-      extractValues(this.signature, values, result.content);
-      assertAssertions(this.asserts, values);
-    }
-    if (result.functionCalls) {
-      const funcs = parseFunctionCalls(ai, result.functionCalls, values);
-      if (funcs) {
-        if (!functions) {
-          throw new Error("Functions are not defined");
+    for (const result of res.results ?? []) {
+      if (res.modelUsage) {
+        this.usage.push({ ...usageInfo, ...res.modelUsage });
+      }
+      mem.addResult(result, sessionId);
+      if (result.content) {
+        extractValues(this.signature, values, result.content);
+        assertAssertions(this.asserts, values);
+      }
+      if (result.functionCalls) {
+        const funcs = parseFunctionCalls(ai, result.functionCalls, values);
+        if (funcs) {
+          if (!functions) {
+            throw new Error("Functions are not defined");
+          }
+          const fx = await processFunctions(
+            ai,
+            functions,
+            funcs,
+            mem,
+            sessionId,
+            traceId
+          );
+          this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
         }
-        const fx = await processFunctions(
-          ai,
-          functions,
-          funcs,
-          mem,
-          sessionId,
-          traceId
-        );
-        this.functionsExecuted = /* @__PURE__ */ new Set([...this.functionsExecuted, ...fx]);
       }
-    }
-    if (result.finishReason === "length") {
-      throw new Error("Max tokens reached before completion");
+      if (result.finishReason === "length") {
+        throw new Error("Max tokens reached before completion");
+      }
     }
     return { ...values };
   }
@@ -5834,6 +6166,25 @@ var AxBalancer = class _AxBalancer {
       try {
         return await this.currentService.chat(req, options);
       } catch (e) {
+        if (!(e instanceof AxAIServiceError)) {
+          throw e;
+        }
+        switch (e.constructor) {
+          case AxAIServiceAuthenticationError:
+            throw e;
+          case AxAIServiceStatusError:
+            break;
+          case AxAIServiceNetworkError:
+            break;
+          case AxAIServiceResponseError:
+            break;
+          case AxAIServiceStreamTerminatedError:
+            break;
+          case AxAIServiceTimeoutError:
+            break;
+          default:
+            throw e;
+        }
         console.warn(`Service ${this.currentService.getName()} failed`);
         if (!this.getNextService()) {
           throw e;
@@ -7520,6 +7871,13 @@ var AxRAG = class extends AxChainOfThought {
   AxAIOpenAIModel,
   AxAIReka,
   AxAIRekaModel,
+  AxAIServiceAuthenticationError,
+  AxAIServiceError,
+  AxAIServiceNetworkError,
+  AxAIServiceResponseError,
+  AxAIServiceStatusError,
+  AxAIServiceStreamTerminatedError,
+  AxAIServiceTimeoutError,
   AxAITogether,
   AxAgent,
   AxApacheTika,