@mistralai/mistralai 1.9.19 → 1.11.0

package/src/lib/sdks.ts

@@ -47,12 +47,14 @@ export type RequestOptions = {
    */
   serverURL?: string | URL;
   /**
+   * @deprecated `fetchOptions` has been flattened into `RequestOptions`.
+   *
    * Sets various request options on the `fetch` call made by an SDK method.
    *
    * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options|Request}
    */
   fetchOptions?: Omit<RequestInit, "method" | "body">;
-};
+} & Omit<RequestInit, "method" | "body">;
 
 type RequestConfig = {
   method: string;
@@ -63,6 +65,7 @@ type RequestConfig = {
   headers?: HeadersInit;
   security?: SecurityState | null;
   uaHeader?: string;
+  userAgent?: string | undefined;
   timeoutMs?: number;
 };
 
@@ -94,19 +97,21 @@ export class ClientSDK {
     } else {
       this.#hooks = new SDKHooks();
     }
-    this._options = { ...options, hooks: this.#hooks };
-
     const url = serverURLFromOptions(options);
     if (url) {
       url.pathname = url.pathname.replace(/\/+$/, "") + "/";
     }
+
     const { baseURL, client } = this.#hooks.sdkInit({
       baseURL: url,
       client: options.httpClient || new HTTPClient(),
     });
     this._baseURL = baseURL;
     this.#httpClient = client;
-    this.#logger = options.debugLogger;
+
+    this._options = { ...options, hooks: this.#hooks };
+
+    this.#logger = this._options.debugLogger;
     if (!this.#logger && env().MISTRAL_DEBUG) {
       this.#logger = console;
     }
@@ -172,7 +177,9 @@ export class ClientSDK {
     cookie = cookie.startsWith("; ") ? cookie.slice(2) : cookie;
     headers.set("cookie", cookie);
 
-    const userHeaders = new Headers(options?.fetchOptions?.headers);
+    const userHeaders = new Headers(
+      options?.headers ?? options?.fetchOptions?.headers,
+    );
     for (const [k, v] of userHeaders) {
       headers.set(k, v);
     }
@@ -180,23 +187,22 @@ export class ClientSDK {
     // Only set user agent header in non-browser-like environments since CORS
     // policy disallows setting it in browsers e.g. Chrome throws an error.
     if (!isBrowserLike) {
-      headers.set(conf.uaHeader ?? "user-agent", SDK_METADATA.userAgent);
+      headers.set(
+        conf.uaHeader ?? "user-agent",
+        conf.userAgent ?? SDK_METADATA.userAgent,
+      );
     }
 
-    let fetchOptions = options?.fetchOptions;
+    const fetchOptions: Omit<RequestInit, "method" | "body"> = {
+      ...options?.fetchOptions,
+      ...options,
+    };
     if (!fetchOptions?.signal && conf.timeoutMs && conf.timeoutMs > 0) {
       const timeoutSignal = AbortSignal.timeout(conf.timeoutMs);
-      if (!fetchOptions) {
-        fetchOptions = { signal: timeoutSignal };
-      } else {
-        fetchOptions.signal = timeoutSignal;
-      }
+      fetchOptions.signal = timeoutSignal;
     }
 
     if (conf.body instanceof ReadableStream) {
-      if (!fetchOptions) {
-        fetchOptions = {};
-      }
       Object.assign(fetchOptions, { duplex: "half" });
     }
 
@@ -302,7 +308,9 @@ export class ClientSDK {
   }
 }
 
-const jsonLikeContentTypeRE = /^application\/(?:.{0,100}\+)?json/;
+const jsonLikeContentTypeRE = /(application|text)\/.*?\+*json.*/;
+const jsonlLikeContentTypeRE =
+  /(application|text)\/(.*?\+*\bjsonl\b.*|.*?\+*\bx-ndjson\b.*)/;
 async function logRequest(logger: Logger | undefined, req: Request) {
   if (!logger) {
     return;
@@ -368,9 +376,13 @@ async function logResponse(
   logger.group("Body:");
   switch (true) {
     case matchContentType(res, "application/json")
-      || jsonLikeContentTypeRE.test(ct):
+      || jsonLikeContentTypeRE.test(ct) && !jsonlLikeContentTypeRE.test(ct):
       logger.log(await res.clone().json());
       break;
+    case matchContentType(res, "application/jsonl")
+      || jsonlLikeContentTypeRE.test(ct):
+      logger.log(await res.clone().text());
+      break;
     case matchContentType(res, "text/event-stream"):
       logger.log(`<${contentType}>`);
       break;

package/src/lib/security.ts

@@ -4,10 +4,11 @@
 
 import * as components from "../models/components/index.js";
 import { env } from "./env.js";
+
 type OAuth2PasswordFlow = {
   username: string;
-  password?: string | undefined;
-  clientID: string;
+  password: string;
+  clientID?: string | undefined;
   clientSecret?: string | undefined;
   tokenURL: string;
 };
@@ -83,9 +84,14 @@ type SecurityInputOAuth2 = {
 type SecurityInputOAuth2ClientCredentials = {
   type: "oauth2:client_credentials";
   value:
-    | { clientID?: string | undefined; clientSecret?: string | undefined }
+    | {
+      clientID?: string | undefined;
+      clientSecret?: string | undefined;
+    }
     | null
+    | string
     | undefined;
+  fieldName?: string;
 };
 
 type SecurityInputOAuth2PasswordCredentials = {
@@ -94,13 +100,13 @@ type SecurityInputOAuth2PasswordCredentials = {
     | string
     | null
     | undefined;
-  fieldName: string;
+  fieldName?: string;
 };
 
 type SecurityInputCustom = {
   type: "http:custom";
   value: any | null | undefined;
-  fieldName: string;
+  fieldName?: string;
 };
 
 export type SecurityInput =
@@ -137,6 +143,9 @@ export function resolveSecurity(
           typeof o.value === "string" && !!o.value
         );
       } else if (o.type === "oauth2:client_credentials") {
+        if (typeof o.value == "string") {
+          return !!o.value;
+        }
         return o.value.clientID != null || o.value.clientSecret != null;
       } else if (typeof o.value === "string") {
         return !!o.value;
@@ -225,7 +234,9 @@ function applyBearer(
     value = `Bearer ${value}`;
   }
 
-  state.headers[spec.fieldName] = value;
+  if (spec.fieldName !== undefined) {
+    state.headers[spec.fieldName] = value;
+  }
 }
 
 export function resolveGlobalSecurity(

package/src/models/components/agent.ts

@@ -52,12 +52,12 @@ import {
 } from "./websearchtool.js";
 
 export type AgentTools =
+  | (DocumentLibraryTool & { type: "document_library" })
+  | (FunctionTool & { type: "function" })
   | (CodeInterpreterTool & { type: "code_interpreter" })
   | (ImageGenerationTool & { type: "image_generation" })
   | (WebSearchTool & { type: "web_search" })
-  | (WebSearchPremiumTool & { type: "web_search_premium" })
-  | (DocumentLibraryTool & { type: "document_library" })
-  | (FunctionTool & { type: "function" });
+  | (WebSearchPremiumTool & { type: "web_search_premium" });
 
 export const AgentObject = {
   Agent: "agent",
@@ -74,12 +74,12 @@ export type Agent = {
    */
   tools?:
     | Array<
+      | (DocumentLibraryTool & { type: "document_library" })
+      | (FunctionTool & { type: "function" })
       | (CodeInterpreterTool & { type: "code_interpreter" })
       | (ImageGenerationTool & { type: "image_generation" })
       | (WebSearchTool & { type: "web_search" })
       | (WebSearchPremiumTool & { type: "web_search_premium" })
-      | (DocumentLibraryTool & { type: "document_library" })
-      | (FunctionTool & { type: "function" })
     >
     | undefined;
   /**
@@ -90,11 +90,15 @@ export type Agent = {
   name: string;
   description?: string | null | undefined;
   handoffs?: Array<string> | null | undefined;
+  metadata?: { [k: string]: any } | null | undefined;
   object?: AgentObject | undefined;
   id: string;
   version: number;
+  versions: Array<number>;
   createdAt: Date;
   updatedAt: Date;
+  deploymentChat: boolean;
+  source: string;
 };
 
 /** @internal */
@@ -103,6 +107,16 @@ export const AgentTools$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.union([
+  DocumentLibraryTool$inboundSchema.and(
+    z.object({ type: z.literal("document_library") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
+  FunctionTool$inboundSchema.and(
+    z.object({ type: z.literal("function") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
   CodeInterpreterTool$inboundSchema.and(
     z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
       type: v.type,
@@ -123,26 +137,16 @@ export const AgentTools$inboundSchema: z.ZodType<
       type: v.type,
     })),
   ),
-  DocumentLibraryTool$inboundSchema.and(
-    z.object({ type: z.literal("document_library") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
-  FunctionTool$inboundSchema.and(
-    z.object({ type: z.literal("function") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
 ]);
 
 /** @internal */
 export type AgentTools$Outbound =
+  | (DocumentLibraryTool$Outbound & { type: "document_library" })
+  | (FunctionTool$Outbound & { type: "function" })
   | (CodeInterpreterTool$Outbound & { type: "code_interpreter" })
   | (ImageGenerationTool$Outbound & { type: "image_generation" })
   | (WebSearchTool$Outbound & { type: "web_search" })
-  | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" })
-  | (DocumentLibraryTool$Outbound & { type: "document_library" })
-  | (FunctionTool$Outbound & { type: "function" });
+  | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" });
 
 /** @internal */
 export const AgentTools$outboundSchema: z.ZodType<
@@ -150,6 +154,16 @@ export const AgentTools$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   AgentTools
 > = z.union([
+  DocumentLibraryTool$outboundSchema.and(
+    z.object({ type: z.literal("document_library") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
+  FunctionTool$outboundSchema.and(
+    z.object({ type: z.literal("function") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
   CodeInterpreterTool$outboundSchema.and(
     z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
       type: v.type,
@@ -170,16 +184,6 @@ export const AgentTools$outboundSchema: z.ZodType<
       type: v.type,
     })),
   ),
-  DocumentLibraryTool$outboundSchema.and(
-    z.object({ type: z.literal("document_library") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
-  FunctionTool$outboundSchema.and(
-    z.object({ type: z.literal("function") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
 ]);
 
 /**
@@ -234,6 +238,16 @@ export const Agent$inboundSchema: z.ZodType<Agent, z.ZodTypeDef, unknown> = z
     instructions: z.nullable(z.string()).optional(),
     tools: z.array(
       z.union([
+        DocumentLibraryTool$inboundSchema.and(
+          z.object({ type: z.literal("document_library") }).transform((v) => ({
+            type: v.type,
+          })),
+        ),
+        FunctionTool$inboundSchema.and(
+          z.object({ type: z.literal("function") }).transform((v) => ({
+            type: v.type,
+          })),
+        ),
         CodeInterpreterTool$inboundSchema.and(
           z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
             type: v.type,
@@ -254,16 +268,6 @@ export const Agent$inboundSchema: z.ZodType<Agent, z.ZodTypeDef, unknown> = z
             v,
           ) => ({ type: v.type })),
         ),
-        DocumentLibraryTool$inboundSchema.and(
-          z.object({ type: z.literal("document_library") }).transform((v) => ({
-            type: v.type,
-          })),
-        ),
-        FunctionTool$inboundSchema.and(
-          z.object({ type: z.literal("function") }).transform((v) => ({
-            type: v.type,
-          })),
-        ),
       ]),
     ).optional(),
     completion_args: CompletionArgs$inboundSchema.optional(),
@@ -271,20 +275,25 @@ export const Agent$inboundSchema: z.ZodType<Agent, z.ZodTypeDef, unknown> = z
     name: z.string(),
     description: z.nullable(z.string()).optional(),
     handoffs: z.nullable(z.array(z.string())).optional(),
+    metadata: z.nullable(z.record(z.any())).optional(),
     object: AgentObject$inboundSchema.default("agent"),
     id: z.string(),
     version: z.number().int(),
+    versions: z.array(z.number().int()),
     created_at: z.string().datetime({ offset: true }).transform(v =>
       new Date(v)
     ),
     updated_at: z.string().datetime({ offset: true }).transform(v =>
       new Date(v)
     ),
+    deployment_chat: z.boolean(),
+    source: z.string(),
   }).transform((v) => {
     return remap$(v, {
       "completion_args": "completionArgs",
       "created_at": "createdAt",
       "updated_at": "updatedAt",
+      "deployment_chat": "deploymentChat",
     });
   });
 
@@ -293,12 +302,12 @@ export type Agent$Outbound = {
   instructions?: string | null | undefined;
   tools?:
     | Array<
+      | (DocumentLibraryTool$Outbound & { type: "document_library" })
+      | (FunctionTool$Outbound & { type: "function" })
       | (CodeInterpreterTool$Outbound & { type: "code_interpreter" })
       | (ImageGenerationTool$Outbound & { type: "image_generation" })
       | (WebSearchTool$Outbound & { type: "web_search" })
       | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" })
-      | (DocumentLibraryTool$Outbound & { type: "document_library" })
-      | (FunctionTool$Outbound & { type: "function" })
     >
     | undefined;
   completion_args?: CompletionArgs$Outbound | undefined;
@@ -306,11 +315,15 @@ export type Agent$Outbound = {
   name: string;
   description?: string | null | undefined;
   handoffs?: Array<string> | null | undefined;
+  metadata?: { [k: string]: any } | null | undefined;
   object: string;
   id: string;
   version: number;
+  versions: Array<number>;
   created_at: string;
   updated_at: string;
+  deployment_chat: boolean;
+  source: string;
 };
 
 /** @internal */
@@ -322,6 +335,16 @@ export const Agent$outboundSchema: z.ZodType<
   instructions: z.nullable(z.string()).optional(),
   tools: z.array(
     z.union([
+      DocumentLibraryTool$outboundSchema.and(
+        z.object({ type: z.literal("document_library") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
+      FunctionTool$outboundSchema.and(
+        z.object({ type: z.literal("function") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
       CodeInterpreterTool$outboundSchema.and(
         z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
           type: v.type,
@@ -342,16 +365,6 @@ export const Agent$outboundSchema: z.ZodType<
           type: v.type,
         })),
       ),
-      DocumentLibraryTool$outboundSchema.and(
-        z.object({ type: z.literal("document_library") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
-      FunctionTool$outboundSchema.and(
-        z.object({ type: z.literal("function") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
     ]),
   ).optional(),
   completionArgs: CompletionArgs$outboundSchema.optional(),
@@ -359,16 +372,21 @@ export const Agent$outboundSchema: z.ZodType<
   name: z.string(),
   description: z.nullable(z.string()).optional(),
   handoffs: z.nullable(z.array(z.string())).optional(),
+  metadata: z.nullable(z.record(z.any())).optional(),
   object: AgentObject$outboundSchema.default("agent"),
   id: z.string(),
   version: z.number().int(),
+  versions: z.array(z.number().int()),
   createdAt: z.date().transform(v => v.toISOString()),
   updatedAt: z.date().transform(v => v.toISOString()),
+  deploymentChat: z.boolean(),
+  source: z.string(),
 }).transform((v) => {
   return remap$(v, {
     completionArgs: "completion_args",
     createdAt: "created_at",
     updatedAt: "updated_at",
+    deploymentChat: "deployment_chat",
   });
 });
 

package/src/models/components/agentconversation.ts

@@ -25,11 +25,16 @@ export type AgentConversation = {
    * Description of the what the conversation is about.
    */
   description?: string | null | undefined;
+  /**
+   * Custom metadata for the conversation.
+   */
+  metadata?: { [k: string]: any } | null | undefined;
   object?: AgentConversationObject | undefined;
   id: string;
   createdAt: Date;
   updatedAt: Date;
   agentId: string;
+  agentVersion?: number | null | undefined;
 };
 
 /** @internal */
@@ -61,16 +66,19 @@ export const AgentConversation$inboundSchema: z.ZodType<
 > = z.object({
   name: z.nullable(z.string()).optional(),
   description: z.nullable(z.string()).optional(),
+  metadata: z.nullable(z.record(z.any())).optional(),
   object: AgentConversationObject$inboundSchema.default("conversation"),
   id: z.string(),
   created_at: z.string().datetime({ offset: true }).transform(v => new Date(v)),
   updated_at: z.string().datetime({ offset: true }).transform(v => new Date(v)),
   agent_id: z.string(),
+  agent_version: z.nullable(z.number().int()).optional(),
 }).transform((v) => {
   return remap$(v, {
     "created_at": "createdAt",
     "updated_at": "updatedAt",
     "agent_id": "agentId",
+    "agent_version": "agentVersion",
   });
 });
 
@@ -78,11 +86,13 @@ export const AgentConversation$inboundSchema: z.ZodType<
 export type AgentConversation$Outbound = {
   name?: string | null | undefined;
   description?: string | null | undefined;
+  metadata?: { [k: string]: any } | null | undefined;
   object: string;
   id: string;
   created_at: string;
   updated_at: string;
   agent_id: string;
+  agent_version?: number | null | undefined;
 };
 
 /** @internal */
@@ -93,16 +103,19 @@ export const AgentConversation$outboundSchema: z.ZodType<
 > = z.object({
   name: z.nullable(z.string()).optional(),
   description: z.nullable(z.string()).optional(),
+  metadata: z.nullable(z.record(z.any())).optional(),
   object: AgentConversationObject$outboundSchema.default("conversation"),
   id: z.string(),
   createdAt: z.date().transform(v => v.toISOString()),
   updatedAt: z.date().transform(v => v.toISOString()),
   agentId: z.string(),
+  agentVersion: z.nullable(z.number().int()).optional(),
 }).transform((v) => {
   return remap$(v, {
     createdAt: "created_at",
     updatedAt: "updated_at",
     agentId: "agent_id",
+    agentVersion: "agent_version",
   });
 });