@mistralai/mistralai 1.9.18 → 1.10.0

package/src/lib/event-streams.ts

@@ -5,260 +5,133 @@
 export type ServerEvent<T> = {
   data?: T | undefined;
   event?: string | undefined;
-  retry?: number | undefined;
   id?: string | undefined;
+  retry?: number | undefined;
 };
-const LF = 0x0a;
-const CR = 0x0d;
-const NEWLINE_CHARS = new Set([LF, CR]);
-const MESSAGE_BOUNDARIES = [
-  new Uint8Array([CR, LF, CR, LF]),
-  new Uint8Array([CR, CR]),
-  new Uint8Array([LF, LF]),
-];
-
-export class EventStream<Event extends ServerEvent<unknown>> {
-  private readonly stream: ReadableStream<Uint8Array>;
-  private readonly decoder: (rawEvent: ServerEvent<string>) => Event;
-
-  constructor(init: {
-    stream: ReadableStream<Uint8Array>;
-    decoder: (rawEvent: ServerEvent<string>) => Event;
-  }) {
-    this.stream = init.stream;
-    this.decoder = init.decoder;
-  }
-
-  async *[Symbol.asyncIterator](): AsyncGenerator<Event, void, unknown> {
-    const reader = this.stream.getReader();
-    let buffer = new Uint8Array([]);
-    let position = 0;
-
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
-        }
 
-        const newBuffer = new Uint8Array(buffer.length + value.length);
-        newBuffer.set(buffer);
-        newBuffer.set(value, buffer.length);
-        buffer = newBuffer;
-
-        for (let i = position; i < buffer.length; i++) {
-          const boundary = findBoundary(buffer, i);
-          if (boundary == null) {
-            continue;
-          }
-
-          const chunk = buffer.slice(position, i);
-          position = i + boundary.length;
-          const event = parseEvent(chunk, this.decoder);
-          if (event != null) {
-            yield event;
+export class EventStream<T extends ServerEvent<unknown>>
+  extends ReadableStream<T>
+{
+  constructor(
+    responseBody: ReadableStream<Uint8Array>,
+    parse: (x: ServerEvent<string>) => IteratorResult<T, undefined>,
+  ) {
+    const upstream = responseBody.getReader();
+    let buffer: Uint8Array = new Uint8Array();
+    super({
+      async pull(downstream) {
+        try {
+          while (true) {
+            const match = findBoundary(buffer);
+            if (!match) {
+              const chunk = await upstream.read();
+              if (chunk.done) return downstream.close();
+              buffer = concatBuffer(buffer, chunk.value);
+              continue;
+            }
+            const message = buffer.slice(0, match.index);
+            buffer = buffer.slice(match.index + match.length);
+            const item = parseMessage(message, parse);
+            if (item?.value) return downstream.enqueue(item.value);
+            if (item?.done) {
+              await upstream.cancel("done");
+              return downstream.close();
+            }
           }
+        } catch (e) {
+          downstream.error(e);
+          await upstream.cancel(e);
         }
+      },
+      cancel: reason => upstream.cancel(reason),
+    });
+  }
 
-        if (position > 0) {
-          buffer = buffer.slice(position);
-          position = 0;
-        }
-      }
-
-      if (buffer.length > 0) {
-        const event = parseEvent(buffer, this.decoder);
-        if (event != null) {
-          yield event;
+  // Polyfill for older browsers
+  [Symbol.asyncIterator](): AsyncIterableIterator<T> {
+    const fn = (ReadableStream.prototype as any)[Symbol.asyncIterator];
+    if (typeof fn === "function") return fn.call(this);
+    const reader = this.getReader();
+    return {
+      next: async () => {
+        const r = await reader.read();
+        if (r.done) {
+          reader.releaseLock();
+          return { done: true, value: undefined };
         }
-      }
-    } catch (e: unknown) {
-      if (e instanceof Error && e.name === "AbortError") {
-        return;
-      }
-
-      throw e;
-    } finally {
-      reader.releaseLock();
-    }
+        return { done: false, value: r.value };
+      },
+      throw: async (e) => {
+        await reader.cancel(e);
+        reader.releaseLock();
+        return { done: true, value: undefined };
+      },
+      return: async () => {
+        await reader.cancel("done");
+        reader.releaseLock();
+        return { done: true, value: undefined };
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+    };
   }
 }
 
-function findBoundary(buffer: Uint8Array, start: number): Uint8Array | null {
-  const char1 = buffer[start];
-  const char2 = buffer[start + 1];
-
-  // Don't bother checking if the first two characters are not new line
-  // characters.
-  if (
-    char1 == null
-    || char2 == null
-    || !NEWLINE_CHARS.has(char1)
-    || !NEWLINE_CHARS.has(char2)
-  ) {
-    return null;
-  }
-
-  for (const s of MESSAGE_BOUNDARIES) {
-    const seq = peekSequence(start, buffer, s);
-    if (seq != null) {
-      return seq;
-    }
-  }
-
-  return null;
+function concatBuffer(a: Uint8Array, b: Uint8Array): Uint8Array {
+  const c = new Uint8Array(a.length + b.length);
+  c.set(a, 0);
+  c.set(b, a.length);
+  return c;
 }
 
-function peekSequence(
-  position: number,
-  buffer: Uint8Array,
-  sequence: Uint8Array,
-): Uint8Array | null {
-  if (sequence.length > buffer.length - position) {
-    return null;
-  }
-
-  for (let i = 0; i < sequence.length; i++) {
-    if (buffer[position + i] !== sequence[i]) {
-      return null;
+/** Finds the first (CR,LF,CR,LF) or (CR,CR) or (LF,LF) */
+function findBoundary(
+  buf: Uint8Array,
+): { index: number; length: number } | null {
+  const len = buf.length;
+  for (let i = 0; i < len; i++) {
+    if (
+      i <= len - 4
+      && buf[i] === 13 && buf[i + 1] === 10 && buf[i + 2] === 13
+      && buf[i + 3] === 10
+    ) {
+      return { index: i, length: 4 };
+    }
+    if (i <= len - 2 && buf[i] === 13 && buf[i + 1] === 13) {
+      return { index: i, length: 2 };
+    }
+    if (i <= len - 2 && buf[i] === 10 && buf[i + 1] === 10) {
+      return { index: i, length: 2 };
     }
   }
-
-  return sequence;
+  return null;
 }
 
-function parseEvent<Event extends ServerEvent<unknown>>(
+function parseMessage<T extends ServerEvent<unknown>>(
   chunk: Uint8Array,
-  decoder: (rawEvent: ServerEvent<string>) => Event,
+  parse: (x: ServerEvent<string>) => IteratorResult<T, undefined>,
 ) {
-  if (!chunk.length) {
-    return null;
-  }
-
-  const td = new TextDecoder();
-  const raw = td.decode(chunk);
-  const lines = raw.split(/\r?\n|\r/g);
-  let publish = false;
-  const rawEvent: ServerEvent<string> = {};
-
+  const text = new TextDecoder().decode(chunk);
+  const lines = text.split(/\r\n|\r|\n/);
+  const dataLines: string[] = [];
+  const ret: ServerEvent<string> = {};
+  let ignore = true;
   for (const line of lines) {
-    if (!line) {
-      continue;
-    }
-
-    const delim = line.indexOf(":");
-    // Lines starting with a colon are ignored.
-    if (delim === 0) {
-      continue;
-    }
-
-    const field = delim > 0 ? line.substring(0, delim) : "";
-    let value = delim > 0 ? line.substring(delim + 1) : "";
-    if (value.charAt(0) === " ") {
-      value = value.substring(1);
-    }
-
-    switch (field) {
-      case "event": {
-        publish = true;
-        rawEvent.event = value;
-        break;
-      }
-      case "data": {
-        publish = true;
-        rawEvent.data ??= "";
-        rawEvent.data += value + "\n";
-        break;
-      }
-      case "id": {
-        publish = true;
-        rawEvent.id = value;
-        break;
-      }
-      case "retry": {
-        const r = parseInt(value, 10);
-        if (!Number.isNaN(r)) {
-          publish = true;
-          rawEvent.retry = r;
-        }
-        break;
-      }
+    if (!line || line.startsWith(":")) continue;
+    ignore = false;
+    const i = line.indexOf(":");
+    const field = line.slice(0, i);
+    const value = line[i + 1] === " " ? line.slice(i + 2) : line.slice(i + 1);
+    if (field === "data") dataLines.push(value);
+    else if (field === "event") ret.event = value;
+    else if (field === "id") ret.id = value;
+    else if (field === "retry") {
+      const n = Number(value);
+      if (!isNaN(n)) ret.retry = n;
     }
   }
-
-  if (!publish) {
-    return null;
-  }
-
-  if (rawEvent.data != null) {
-    rawEvent.data = rawEvent.data.slice(0, -1);
-  }
-
-  return decoder(rawEvent);
-}
-
-export function discardSentinel(
-  stream: ReadableStream<Uint8Array>,
-  sentinel: string,
-): ReadableStream<Uint8Array> {
-  return new ReadableStream<Uint8Array>({
-    async start(controller) {
-      let buffer = new Uint8Array([]);
-      let position = 0;
-      let done = false;
-      let discard = false;
-      const rdr = stream.getReader();
-      try {
-        while (!done) {
-          const result = await rdr.read();
-          const value = result.value;
-          done = done || result.done;
-          // We keep consuming from the source to its completion so it can
-          // flush all its contents and release resources.
-          if (discard) {
-            continue;
-          }
-          if (typeof value === "undefined") {
-            continue;
-          }
-
-          const newBuffer = new Uint8Array(buffer.length + value.length);
-          newBuffer.set(buffer);
-          newBuffer.set(value, buffer.length);
-          buffer = newBuffer;
-
-          for (let i = position; i < buffer.length; i++) {
-            const boundary = findBoundary(buffer, i);
-            if (boundary == null) {
-              continue;
-            }
-
-            const start = position;
-            const chunk = buffer.slice(start, i);
-            position = i + boundary.length;
-            const event = parseEvent(chunk, id);
-            if (event?.data === sentinel) {
-              controller.enqueue(buffer.slice(0, start));
-              discard = true;
-            } else {
-              controller.enqueue(buffer.slice(0, position));
-              buffer = buffer.slice(position);
-              position = 0;
-            }
-          }
-        }
-      } catch (e) {
-        controller.error(e);
-      } finally {
-        // If the source stream terminates, flush its contents and terminate.
-        // If the sentinel event was found, flush everything up to its start.
-        controller.close();
-        rdr.releaseLock();
-      }
-    },
-  });
-}
-
-function id<T>(v: T): T {
-  return v;
+  if (ignore) return;
+  if (dataLines.length) ret.data = dataLines.join("\n");
+  return parse(ret);
 }

package/src/lib/files.ts

@@ -38,3 +38,45 @@ export async function readableStreamToArrayBuffer(
 
   return concatenatedChunks.buffer as ArrayBuffer;
 }
+
+/**
+ * Determines the MIME content type based on a file's extension.
+ * Returns null if the extension is not recognized.
+ */
+export function getContentTypeFromFileName(fileName: string): string | null {
+  if (!fileName) return null;
+
+  const ext = fileName.toLowerCase().split(".").pop();
+  if (!ext) return null;
+
+  const mimeTypes: Record<string, string> = {
+    json: "application/json",
+    xml: "application/xml",
+    html: "text/html",
+    htm: "text/html",
+    txt: "text/plain",
+    csv: "text/csv",
+    pdf: "application/pdf",
+    png: "image/png",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    gif: "image/gif",
+    svg: "image/svg+xml",
+    js: "application/javascript",
+    css: "text/css",
+    zip: "application/zip",
+    tar: "application/x-tar",
+    gz: "application/gzip",
+    mp4: "video/mp4",
+    mp3: "audio/mpeg",
+    wav: "audio/wav",
+    webp: "image/webp",
+    ico: "image/x-icon",
+    woff: "font/woff",
+    woff2: "font/woff2",
+    ttf: "font/ttf",
+    otf: "font/otf",
+  };
+
+  return mimeTypes[ext] || null;
+}

package/src/lib/matchers.ts

@@ -2,15 +2,14 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKError } from "../models/errors/sdkerror.js";
-import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
-import { Result } from "../types/fp.js";
-import { discardSentinel } from "./event-streams.js";
+import { ERR, OK, Result } from "../types/fp.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
-import { safeParse } from "./schemas.js";
 
 export type Encoding =
+  | "jsonl"
   | "json"
   | "text"
   | "bytes"
@@ -20,6 +19,7 @@ export type Encoding =
   | "fail";
 
 const DEFAULT_CONTENT_TYPES: Record<Encoding, string> = {
+  jsonl: "application/jsonl",
   json: "application/json",
   text: "text/plain",
   bytes: "application/octet-stream",
@@ -73,6 +73,21 @@ export function json<T>(
   return { ...options, enc: "json", codes, schema };
 }
 
+export function jsonl<T>(
+  codes: StatusCodePredicate,
+  schema: Schema<T>,
+  options?: MatchOptions,
+): ValueMatcher<T> {
+  return { ...options, enc: "jsonl", codes, schema };
+}
+
+export function jsonlErr<E>(
+  codes: StatusCodePredicate,
+  schema: Schema<E>,
+  options?: MatchOptions,
+): ErrorMatcher<E> {
+  return { ...options, err: true, enc: "jsonl", codes, schema };
+}
 export function textErr<E>(
   codes: StatusCodePredicate,
   schema: Schema<E>,
@@ -160,17 +175,19 @@ export type MatchedError<Matchers> = Matchers extends Matcher<any, infer E>[]
   : never;
 export type MatchFunc<T, E> = (
   response: Response,
+  request: Request,
   options?: { resultKey?: string; extraFields?: Record<string, unknown> },
 ) => Promise<[result: Result<T, E>, raw: unknown]>;
 
 export function match<T, E>(
   ...matchers: Array<Matcher<T, E>>
-): MatchFunc<T, E | SDKError | SDKValidationError> {
+): MatchFunc<T, E | SDKError | ResponseValidationError> {
   return async function matchFunc(
     response: Response,
+    request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
-    [result: Result<T, E | SDKError | SDKValidationError>, raw: unknown]
+    [result: Result<T, E | SDKError | ResponseValidationError>, raw: unknown]
   > {
     let raw: unknown;
     let matcher: Matcher<T, E> | undefined;
@@ -189,21 +206,25 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      const responseBody = await response.text();
       return [{
         ok: false,
-        error: new SDKError(
-          "Unexpected API response status or content-type",
+        error: new SDKError("Unexpected Status or Content-Type", {
           response,
-          responseBody,
-        ),
-      }, responseBody];
+          request,
+          body: await response.text().catch(() => ""),
+        }),
+      }, raw];
     }
 
     const encoding = matcher.enc;
+    let body = "";
     switch (encoding) {
       case "json":
-        raw = await response.json();
+        body = await response.text();
+        raw = JSON.parse(body);
+        break;
+      case "jsonl":
+        raw = response.body;
         break;
       case "bytes":
         raw = new Uint8Array(await response.arrayBuffer());
@@ -212,18 +233,19 @@ export function match<T, E>(
         raw = response.body;
         break;
       case "text":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       case "sse":
-        raw = response.body && matcher.sseSentinel
-          ? discardSentinel(response.body, matcher.sseSentinel)
-          : response.body;
+        raw = response.body;
         break;
       case "nil":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       case "fail":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       default:
         encoding satisfies never;
@@ -233,11 +255,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new SDKError(
-          "API error occurred",
-          response,
-          typeof raw === "string" ? raw : "",
-        ),
+        error: new SDKError("API error occurred", { request, response, body }),
       }, raw];
     }
 
@@ -249,6 +267,9 @@ export function match<T, E>(
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         ...(isPlainObject(raw) ? raw : null),
+        request$: request,
+        response$: response,
+        body$: body,
       };
     } else if (resultKey) {
       data = {
@@ -267,18 +288,20 @@ export function match<T, E>(
     }
 
     if ("err" in matcher) {
-      const result = safeParse(
+      const result = safeParseResponse(
         data,
         (v: unknown) => matcher.schema.parse(v),
         "Response validation failed",
+        { request, response, body },
       );
       return [result.ok ? { ok: false, error: result.value } : result, raw];
     } else {
       return [
-        safeParse(
+        safeParseResponse(
           data,
           (v: unknown) => matcher.schema.parse(v),
           "Response validation failed",
+          { request, response, body },
         ),
         raw,
       ];
@@ -301,25 +324,22 @@ export function unpackHeaders(headers: Headers): Record<string, string[]> {
   return out;
 }
 
-/**
- * Discards the response body to free up resources.
- *
- * To learn why this is need, see the undici docs:
- * https://undici.nodejs.org/#/?id=garbage-collection
- */
-export async function discardResponseBody(res: Response) {
-  const reader = res.body?.getReader();
-  if (reader == null) {
-    return;
-  }
-
+function safeParseResponse<Inp, Out>(
+  rawValue: Inp,
+  fn: (value: Inp) => Out,
+  errorMessage: string,
+  httpMeta: { response: Response; request: Request; body: string },
+): Result<Out, ResponseValidationError> {
   try {
-    let done = false;
-    while (!done) {
-      const res = await reader.read();
-      done = res.done;
-    }
-  } finally {
-    reader.releaseLock();
+    return OK(fn(rawValue));
+  } catch (err) {
+    return ERR(
+      new ResponseValidationError(errorMessage, {
+        cause: err,
+        rawValue,
+        rawMessage: errorMessage,
+        ...httpMeta,
+      }),
+    );
   }
 }