@mastra/core 0.1.27-alpha.21 → 0.1.27-alpha.23

package/dist/llm/index.d.ts

@@ -1,4 +1,4 @@
-import { CoreMessage, CoreTool as CT, LanguageModelV1 } from 'ai';
+import { CoreMessage, CoreTool as CT, LanguageModelV1, StreamObjectResult, StreamTextResult, GenerateObjectResult, GenerateTextResult } from 'ai';
 import { ZodSchema } from 'zod';
 import { Integration } from '../integration';
 import { Logger } from '../logger';
@@ -6,9 +6,12 @@ import { Run } from '../run/types';
 import { Telemetry } from '../telemetry';
 import { AllTools, CoreTool, ToolApi } from '../tools/types';
 import { CustomModelConfig, EmbeddingModelConfig, GoogleGenerativeAISettings, ModelConfig, StructuredOutput } from './types';
+type GenerateReturn<S extends boolean, Z> = S extends true ? Z extends ZodSchema ? StreamObjectResult<any, any, any> : StreamTextResult<any> : Z extends ZodSchema ? GenerateObjectResult<any> : GenerateTextResult<any, any>;
 export declare class LLM<TTools, TIntegrations extends Integration[] | undefined = undefined, TKeys extends keyof AllTools<TTools, TIntegrations> = keyof AllTools<TTools, TIntegrations>> {
     #private;
-    constructor();
+    constructor({ model }: {
+        model: ModelConfig;
+    });
     /**
      * Set the concrete tools for the agent
      * @param tools
@@ -28,7 +31,7 @@ export declare class LLM<TTools, TIntegrations extends Integration[] | undefined
         tracer: import("@opentelemetry/api").Tracer;
         isEnabled: boolean;
     } | undefined;
-    getModelType(model: ModelConfig): string;
+    getModelType(): string;
     createOpenAICompatibleModel({ baseURL, apiKey, defaultModelName, modelName, fetch, }: {
         baseURL: string;
         apiKey: string;
@@ -75,36 +78,47 @@ export declare class LLM<TTools, TIntegrations extends Integration[] | undefined
     private isBaseOutputType;
     private baseOutputTypeSchema;
     private createOutputSchema;
-    text({ model, messages, onStepFinish, maxSteps, enabledTools, runId, }: {
+    generate<S extends boolean = false, Z extends ZodSchema | undefined = undefined>(messages: string | CoreMessage[], { schema, stream, maxSteps, onFinish, onStepFinish, enabledTools, convertedTools, runId, }?: {
+        runId?: string;
+        stream?: S;
+        schema?: Z;
+        onFinish?: (result: string) => Promise<void> | void;
+        onStepFinish?: (step: string) => void;
+        maxSteps?: number;
         enabledTools?: Partial<Record<TKeys, boolean>>;
-        model: ModelConfig;
+        convertedTools?: Record<TKeys, CoreTool>;
+    }): Promise<GenerateReturn<S, Z>>;
+    __text({ messages, onStepFinish, maxSteps, enabledTools, runId, convertedTools, }: {
+        enabledTools?: Partial<Record<TKeys, boolean>>;
+        convertedTools?: Record<TKeys, CoreTool>;
         messages: CoreMessage[];
         onStepFinish?: (step: string) => void;
         maxSteps?: number;
-    } & Run): Promise<import("ai").GenerateTextResult<{}, never>>;
-    textObject({ model, messages, onStepFinish, maxSteps, enabledTools, structuredOutput, runId, }: {
+    } & Run): Promise<GenerateTextResult<{}, never>>;
+    __textObject({ messages, onStepFinish, maxSteps, enabledTools, convertedTools, structuredOutput, runId, }: {
         structuredOutput: StructuredOutput | ZodSchema;
         enabledTools?: Partial<Record<TKeys, boolean>>;
-        model: ModelConfig;
+        convertedTools?: Record<TKeys, CoreTool>;
         messages: CoreMessage[];
         onStepFinish?: (step: string) => void;
         maxSteps?: number;
-    } & Run): Promise<import("ai").GenerateObjectResult<any>>;
-    stream({ model, messages, onStepFinish, onFinish, maxSteps, enabledTools, runId, }: {
-        model: ModelConfig;
+    } & Run): Promise<GenerateObjectResult<any>>;
+    __stream({ messages, onStepFinish, onFinish, maxSteps, enabledTools, runId, convertedTools, }: {
         enabledTools?: Partial<Record<TKeys, boolean>>;
+        convertedTools?: Record<TKeys, CoreTool>;
         messages: CoreMessage[];
         onStepFinish?: (step: string) => void;
         onFinish?: (result: string) => Promise<void> | void;
         maxSteps?: number;
-    } & Run): Promise<import("ai").StreamTextResult<{}>>;
-    streamObject({ model, messages, onStepFinish, onFinish, maxSteps, enabledTools, structuredOutput, runId, }: {
+    } & Run): Promise<StreamTextResult<{}>>;
+    __streamObject({ messages, onStepFinish, onFinish, maxSteps, enabledTools, convertedTools, structuredOutput, runId, }: {
         structuredOutput: StructuredOutput | ZodSchema;
-        model: ModelConfig;
-        enabledTools: Partial<Record<TKeys, boolean>>;
+        enabledTools?: Partial<Record<TKeys, boolean>>;
+        convertedTools?: Record<TKeys, CoreTool>;
         messages: CoreMessage[];
         onStepFinish?: (step: string) => void;
         onFinish?: (result: string) => Promise<void> | void;
         maxSteps?: number;
-    } & Run): Promise<import("ai").StreamObjectResult<any, any, never>>;
+    } & Run): Promise<StreamObjectResult<any, any, never>>;
 }
+export {};

package/dist/llm/types.d.ts

@@ -7,7 +7,7 @@ export type OpenAIEmbeddingModelNames = 'text-embedding-3-small' | 'text-embeddi
 export type OpenAIConfig = {
     provider: 'OPEN_AI';
     name: OpenAIModel | (string & {});
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
     apiKey?: string;
 };
 export type OpenAIEmbeddingConfig = EmbeddingModelConfigBase & {
@@ -18,7 +18,7 @@ export type GoogleModel = 'gemini-1.5-pro-latest' | 'gemini-1.5-pro' | 'gemini-1
 export type GoogleConfig = {
     provider: 'GOOGLE';
     name: GoogleModel | (string & {});
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
     apiKey?: string;
 };
 export interface GoogleGenerativeAISettings {
@@ -49,7 +49,7 @@ export type AnthropicModel = 'claude-3-5-sonnet-20241022' | 'claude-3-5-sonnet-2
 export type AnthropicConfig = {
     provider: 'ANTHROPIC';
     name: AnthropicModel | (string & {});
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
     apiKey?: string;
 };
 export type GroqModel = 'llama3-groq-70b-8192-tool-use-preview' | 'llama3-groq-8b-8192-tool-use-preview' | 'gemma2-9b-it' | 'gemma-7b-it';
@@ -57,7 +57,7 @@ export type GroqConfig = {
     provider: 'GROQ';
     name: GroqModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type CohereEmbeddingModelNames = 'embed-english-v3.0' | 'embed-multilingual-v3.0' | 'embed-english-light-v3.0' | 'embed-multilingual-light-v3.0' | 'embed-english-v2.0' | 'embed-english-light-v2.0' | 'embed-multilingual-v2.0' | (string & {});
 export type CohereEmbeddingConfig = EmbeddingModelConfigBase & {
@@ -70,20 +70,20 @@ export type PerplexityConfig = {
     provider: 'PERPLEXITY';
     name: PerplexityModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type TogetherAiModel = 'codellama/CodeLlama-34b-Instruct-hf' | 'upstage/SOLAR-10.7B-Instruct-v1.0' | 'mistralai/Mixtral-8x7B-v0.1' | 'WhereIsAI/UAE-Large-V1' | 'black-forest-labs/FLUX.1-depth' | 'togethercomputer/m2-bert-80M-32k-retrieval' | 'black-forest-labs/FLUX.1-canny' | 'black-forest-labs/FLUX.1-dev' | 'black-forest-labs/FLUX.1-redux' | 'BAAI/bge-large-en-v1.5' | 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo' | 'togethercomputer/Llama-3-8b-chat-hf-int4' | 'stabilityai/stable-diffusion-xl-base-1.0' | 'Gryphe/MythoMax-L2-13b' | 'meta-llama/Meta-Llama-3-8B' | 'mistralai/Mixtral-8x7B-Instruct-v0.1' | 'deepseek-ai/deepseek-llm-67b-chat' | 'togethercomputer/m2-bert-80M-8k-retrieval' | 'llava-hf/llava-v1.6-mistral-7b-hf' | 'Qwen/Qwen2.5-Coder-32B-Instruct' | 'databricks/dbrx-instruct' | 'meta-llama/Meta-Llama-3.1-405B-Instruct-Lite-Pro' | 'meta-llama/Meta-Llama-3-8B-Instruct-Lite' | 'scb10x/scb10x-llama3-typhoon-v1-5-8b-instruct' | 'microsoft/WizardLM-2-8x22B' | 'BAAI/bge-base-en-v1.5' | 'togethercomputer/m2-bert-80M-2k-retrieval' | 'google/gemma-2b-it' | 'meta-llama/Llama-2-70b-hf' | 'mistralai/Mistral-7B-Instruct-v0.2' | 'meta-llama/LlamaGuard-2-8b' | 'mistralai/Mistral-7B-Instruct-v0.1' | 'mistralai/Mistral-7B-v0.1' | 'black-forest-labs/FLUX.1-pro' | 'black-forest-labs/FLUX.1-schnell' | 'meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo' | 'nvidia/Llama-3.1-Nemotron-70B-Instruct-HF' | 'mistralai/Mistral-7B-Instruct-v0.3' | 'Meta-Llama/Llama-Guard-7b' | 'meta-llama/Meta-Llama-3-70B-Instruct-Turbo' | 'meta-llama/Meta-Llama-3-70B-Instruct-Lite' | 'google/gemma-2-27b-it' | 'meta-llama/Llama-3-8b-chat-hf' | 'Qwen/Qwen2.5-72B-Instruct-Turbo' | 'Salesforce/Llama-Rank-V1' | 'meta-llama/Llama-Guard-3-11B-Vision-Turbo' | 'google/gemma-2-9b-it' | 'meta-llama/Llama-3.2-11B-Vision-Instruct-Turbo' | 'NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO' | 'meta-llama/Llama-3-70b-chat-hf' | 'Qwen/Qwen2.5-7B-Instruct-Turbo' | 'scb10x/scb10x-llama3-typhoon-v1-5x-4f316' | 'meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo' | 'Gryphe/MythoMax-L2-13b-Lite' | 'black-forest-labs/FLUX.1-schnell-Free' | 'meta-llama/Llama-2-7b-chat-hf' | 'meta-llama/Meta-Llama-Guard-3-8B' | 'togethercomputer/Llama-3-8b-chat-hf-int8' | 'meta-llama/Llama-Vision-Free' | 'Qwen/Qwen2-72B-Instruct' | 'mistralai/Mixtral-8x22B-Instruct-v0.1' | 'black-forest-labs/FLUX.1.1-pro' | 'meta-llama/Llama-3.2-3B-Instruct-Turbo' | 'meta-llama/Llama-2-13b-chat-hf' | 'meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo' | 'Nexusflow/NexusRaven-V2-13B' | 'bert-base-uncased' | 'WizardLM/WizardLM-13B-V1.2' | 'google/gemma-7b' | 'togethercomputer/Koala-7B' | 'zero-one-ai/Yi-34B' | 'togethercomputer/StripedHyena-Hessian-7B' | 'teknium/OpenHermes-2-Mistral-7B' | 'Qwen/Qwen2-7B-Instruct' | 'togethercomputer/guanaco-65b' | 'togethercomputer/llama-2-7b' | 'hazyresearch/M2-BERT-2k-Retrieval-Encoder-V1' | 'huggyllama/llama-7b' | 'Undi95/ReMM-SLERP-L2-13B' | 'NousResearch/Nous-Capybara-7B-V1p9' | 'lmsys/vicuna-7b-v1.3' | 'Undi95/Toppy-M-7B' | 'Qwen/Qwen2-72B' | 'NousResearch/Nous-Hermes-Llama2-70b' | 'WizardLM/WizardLM-70B-V1.0' | 'huggyllama/llama-65b' | 'lmsys/vicuna-13b-v1.5-16k' | 'openchat/openchat-3.5-1210' | 'Qwen/Qwen1.5-0.5B' | 'Qwen/Qwen1.5-4B' | 'Qwen/Qwen1.5-7B' | 'snorkelai/Snorkel-Mistral-PairRM-DPO' | 'Qwen/Qwen1.5-14B-Chat' | 'Qwen/Qwen1.5-1.8B-Chat' | 'Snowflake/snowflake-arctic-instruct' | 'togethercomputer/llama-2-13b' | 'NousResearch/Nous-Hermes-2-Mixtral-8x7B-SFT' | 'deepseek-ai/deepseek-coder-33b-instruct' | 'togethercomputer/CodeLlama-7b-Instruct' | 'NousResearch/Nous-Hermes-Llama2-13b' | 'lmsys/vicuna-13b-v1.5' | 'togethercomputer/guanaco-13b' | 'togethercomputer/CodeLlama-34b-Instruct' | 'togethercomputer/llama-2-70b' | 'codellama/CodeLlama-13b-Instruct-hf' | 'Qwen/Qwen2-7B' | 'Qwen/Qwen2-1.5B' | 'togethercomputer/CodeLlama-13b-Instruct' | 'meta-llama/Llama-2-13b-hf' | 'togethercomputer/llama-2-13b-chat' | 'huggyllama/llama-30b' | 'NousResearch/Nous-Hermes-2-Mistral-7B-DPO' | 'togethercomputer/alpaca-7b' | 'google/gemma-7b-it' | 'allenai/OLMo-7B' | 'togethercomputer/guanaco-33b' | 'togethercomputer/llama-2-7b-chat' | 'togethercomputer/SOLAR-10.7B-Instruct-v1.0-int4' | 'togethercomputer/guanaco-7b' | 'Open-Orca/Mistral-7B-OpenOrca' | 'Qwen/Qwen1.5-32B' | 'EleutherAI/llemma_7b' | 'NousResearch/Nous-Hermes-llama-2-7b' | 'Qwen/Qwen1.5-32B-Chat' | 'meta-llama/Meta-Llama-3-70B' | 'meta-llama/Llama-3-8b-hf' | 'sentence-transformers/msmarco-bert-base-dot-v5' | 'zero-one-ai/Yi-6B' | 'meta-llama/Meta-Llama-3-8B-Instruct' | 'teknium/OpenHermes-2p5-Mistral-7B' | 'Qwen/Qwen1.5-4B-Chat' | 'wavymulder/Analog-Diffusion' | 'runwayml/stable-diffusion-v1-5' | 'prompthero/openjourney' | 'meta-llama/Llama-2-7b-hf' | 'SG161222/Realistic_Vision_V3.0_VAE' | 'Qwen/Qwen1.5-0.5B-Chat' | 'codellama/CodeLlama-7b-Instruct-hf' | 'google/gemma-2b' | 'mistralai/Mixtral-8x22B' | 'meta-llama/Llama-2-70b-chat-hf' | 'zero-one-ai/Yi-34B-Chat' | 'google/gemma-2-9b' | 'meta-llama/Meta-Llama-3-70B-Instruct' | 'togethercomputer/LLaMA-2-7B-32K' | 'codellama/CodeLlama-70b-Instruct-hf' | 'NousResearch/Hermes-2-Theta-Llama-3-70B' | 'test/test11' | 'stabilityai/stable-diffusion-2-1' | 'microsoft/phi-2' | 'Qwen/Qwen1.5-7B-Chat' | 'cognitivecomputations/dolphin-2.5-mixtral-8x7b' | 'togethercomputer/evo-1-131k-base' | 'togethercomputer/evo-1-8k-base' | 'togethercomputer/llama-2-70b-chat' | 'Qwen/Qwen1.5-14B' | 'carson/ml318br' | 'meta-llama/Meta-Llama-3.1-8B-Instruct-Reference' | 'meta-llama/Meta-Llama-3.1-8B-Reference' | 'gradientai/Llama-3-70B-Instruct-Gradient-1048k' | 'meta-llama/Meta-Llama-3.1-70B-Reference' | 'meta-llama/Meta-Llama-3.1-70B-Instruct-Reference' | 'meta-llama/Llama-3-70b-hf' | 'Qwen/Qwen2-1.5B-Instruct' | 'NousResearch/Nous-Hermes-13b' | 'HuggingFaceH4/zephyr-7b-beta' | 'Austism/chronos-hermes-13b' | 'Qwen/Qwen1.5-1.8B' | 'Qwen/Qwen1.5-72B' | 'lmsys/vicuna-13b-v1.3' | 'huggyllama/llama-13b' | 'garage-bAInd/Platypus2-70B-instruct' | 'allenai/OLMo-7B-Instruct' | 'togethercomputer/Koala-13B' | 'lmsys/vicuna-7b-v1.5';
 export type TogetherAiConfig = {
     provider: 'TOGETHER_AI';
     name: TogetherAiModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type LMStudioModel = 'qwen2-7b-instruct-4bit' | 'qwen2-math-1.5b' | 'qwen2-0.5b' | 'aya-23-8b' | 'mistral-7b-v0.3' | 'stablecode' | 'cohere-command-r-v01-4bit' | 'command-r' | 'starcoder2-7b' | 'deepseek-math-7b' | 'qwen2.5-coder-14b' | 'qwen2.5-coder-32b' | 'qwen2.5-coder-3b' | 'llama-3.2-3b-instruct-4bit' | 'llama-3.2-1b' | 'llama-3.2-3b' | 'qwen2.5-coder-7b' | 'qwen2.5-14b' | 'yi-coder-9b' | 'hermes-3-llama-3.1-8b' | 'internlm-2.5-20b' | 'llava-v1.5' | 'llama-3.1-8b-instruct-4bit' | 'meta-llama-3.1-8b' | 'mistral-nemo-2407' | 'mistral-nemo-instruct-2407-4bit' | 'gemma-2-2b' | 'mathstral-7b' | 'gemma-2-9b' | 'deepseek-coder-v2-lite-instruct-4bit' | 'smollm-360m-v0.2' | 'phi-3-mini-4k-instruct-4bit' | 'gemma-2-27b' | 'codestral-22b' | 'phi-3.1-mini-128k' | 'deepseek-coder-v2-lite';
 export type LMStudioConfig = {
     provider: 'LM_STUDIO';
     name: LMStudioModel | (string & {});
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
     baseURL: string;
 };
 export type BasetenModel = 'llama-3.1-70b-instruct' | 'qwen2.5-7b-math-instruct' | 'qwen2.5-14b-instruct' | 'qwen2.5-32b-coder-instruct' | 'llama-3.1-8b-instruct' | 'llama-3.1-nemetron-70b' | 'llama-3.2-90b-vision-instruct' | 'llama-3.1-405b-instruct' | 'ultravox-v0.4' | 'llama-3.2-1b-vision-instruct' | 'llama-3-70b-instruct' | 'llama-3-8b-instruct' | 'mistral-7b-instruct' | 'qwen2.5-14b-coder-instruct' | 'qwen2.5-7b-coder-instruct' | 'qwen2.5-72b-math-instruct' | 'qwen2.5-72b-instruct' | 'qwen2.5-32b-instruct' | 'qwen2.5-7b-instruct' | 'qwen2.5-3b-instruct' | 'pixtral-12b' | 'phi-3.5-mini-instruct' | 'gemma-2-9b' | 'gemma-2-27b' | 'phi-3-mini-128k-instruct' | 'phi-3-mini-4k-instruct' | 'zephyr-7b-alpha' | 'mixtral-8x7b-instruct' | 'mixtral-8x22b';
@@ -91,7 +91,7 @@ export type BaseTenConfig = {
     provider: 'BASETEN';
     name: BasetenModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
     fetch?: typeof globalThis.fetch;
 };
 export type FireworksModel = 'llama-3.1-405b-instruct' | 'llama-3.1-70b-instruct' | 'llama-3.1-8b-instruct' | 'llama-3.2-3b-instruct';
@@ -99,55 +99,55 @@ export type FireworksConfig = {
     provider: 'FIREWORKS';
     name: FireworksModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type MistralModel = 'pixtral-large-latest' | 'mistral-large-latest' | 'mistral-small-latest' | 'ministral-3b-latest' | 'ministral-8b-latest' | 'pixtral-12b-2409';
 export type MistralConfig = {
     provider: 'MISTRAL';
     name: MistralModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type XGrokModel = 'grok-beta' | 'grok-vision-beta';
 export type XGrokConfig = {
     provider: 'X_GROK';
     name: XGrokModel | (string & {});
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
     apiKey?: string;
 };
 export type CustomModelConfig = {
     model: LanguageModelV1 | (() => Promise<LanguageModelV1>);
     provider: string;
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type CohereModel = 'command-r-plus';
 export type CohereConfig = {
     provider: 'COHERE';
     name: CohereModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type AzureModel = 'gpt-35-turbo-instruct';
 export type AzureConfig = {
     provider: 'AZURE';
     name: AzureModel & (string | {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type AmazonModel = 'amazon-titan-tg1-large' | 'amazon-titan-text-express-v1' | 'anthropic-claude-3-5-sonnet-20241022-v2:0' | 'anthropic-claude-3-5-sonnet-20240620-v1:0' | 'anthropic-claude-3-5-haiku-20241022-v1:0' | 'anthropic-claude-3-opus-20240229-v1:0' | 'anthropic-claude-3-sonnet-20240229-v1:0' | 'anthropic-claude-3-haiku-20240307-v1:0' | 'anthropic-claude-v2:1' | 'cohere-command-r-v1:0' | 'cohere-command-r-plus-v1:0' | 'meta-llama2-13b-chat-v1' | 'meta-llama2-70b-chat-v1' | 'meta-llama3-8b-instruct-v1:0' | 'meta-llama3-70b-instruct-v1:0' | 'meta-llama3-1-8b-instruct-v1:0' | 'meta-llama3-1-70b-instruct-v1:0' | 'meta-llama3-1-405b-instruct-v1:0' | 'meta-llama3-2-1b-instruct-v1:0' | 'meta-llama3-2-3b-instruct-v1:0' | 'meta-llama3-2-11b-instruct-v1:0' | 'meta-llama3-2-90b-instruct-v1:0' | 'mistral-mistral-7b-instruct-v0:2' | 'mistral-mixtral-8x7b-instruct-v0:1' | 'mistral-mistral-large-2402-v1:0' | 'mistral-mistral-small-2402-v1:0';
 export type AmazonConfig = {
     provider: 'AMAZON';
     name: AmazonModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 export type AnthropicVertexModel = 'claude-3-5-sonnet@20240620' | 'claude-3-opus@20240229' | 'claude-3-sonnet@20240229' | 'claude-3-haiku@20240307';
 export type AnthropicVertexConfig = {
     provider: 'ANTHROPIC_VERTEX';
     name: AnthropicVertexModel | (string & {});
     apiKey?: string;
-    toolChoice: 'auto' | 'required';
+    toolChoice?: 'auto' | 'required';
 };
 type BuiltInModelConfig = OpenAIConfig | AnthropicConfig | GroqConfig | GoogleConfig | PerplexityConfig | TogetherAiConfig | LMStudioConfig | BaseTenConfig | FireworksConfig | MistralConfig | XGrokConfig | CohereConfig | AzureConfig | AmazonConfig | AnthropicVertexConfig;
 export type ModelConfig = BuiltInModelConfig | CustomModelConfig;

package/dist/mastra/index.d.ts

@@ -3,7 +3,9 @@ import { Agent } from '../agent';
 import { MastraEngine } from '../engine';
 import { Integration } from '../integration';
 import { LLM } from '../llm';
+import { ModelConfig } from '../llm/types';
 import { BaseLogger } from '../logger';
+import { MastraMemory } from '../memory';
 import { Run } from '../run/types';
 import { syncApi } from '../sync/types';
 import { Telemetry, OtelConfig } from '../telemetry';
@@ -15,13 +17,14 @@ export declare class Mastra<TIntegrations extends Integration[], MastraTools ext
     private vectors?;
     private tools;
     private agents;
-    llm: LLM<MastraTools, TIntegrations, keyof AllTools<MastraTools, TIntegrations>>;
     private integrations;
     private logger;
     private syncs;
     private telemetry?;
+    memory?: MastraMemory;
     constructor(config: {
         tools?: MastraTools;
+        memory?: MastraMemory;
         syncs?: TSyncs;
         agents?: Agent<MastraTools, TIntegrations>[];
         integrations?: TIntegrations;
@@ -30,12 +33,12 @@ export declare class Mastra<TIntegrations extends Integration[], MastraTools ext
         logger?: TLogger;
         telemetry?: OtelConfig;
     });
+    LLM(modelConfig: ModelConfig): LLM<MastraTools, TIntegrations, keyof (MastraTools extends Record<string, ToolApi<any, any>> ? MastraTools : {}) | keyof (TIntegrations extends Integration[] ? (import("..").IntegrationTools<StripUndefined<TIntegrations>[number]> extends infer T ? T extends import("..").IntegrationTools<StripUndefined<TIntegrations>[number]> ? T extends any ? (k: T) => void : never : never : never) extends (k: infer I) => void ? I : never : {})>;
     sync<K extends keyof TSyncs>(key: K, params: TSyncs[K]['schema']['_input'], runId?: Run['runId']): Promise<StripUndefined<TSyncs[K]['outputShema']>['_input']>;
     getAgent(name: string): Agent<MastraTools, TIntegrations, keyof (MastraTools extends Record<string, ToolApi<any, any>> ? MastraTools : {}) | keyof (TIntegrations extends Integration[] ? (import("..").IntegrationTools<StripUndefined<TIntegrations>[number]> extends infer T ? T extends import("..").IntegrationTools<StripUndefined<TIntegrations>[number]> ? T extends any ? (k: T) => void : never : never : never) extends (k: infer I) => void ? I : never : {})>;
     getIntegration<I extends TIntegrations[number]['name']>(name: I): Extract<TIntegrations[number], {
         name: I;
     }>;
-    getLLM(): LLM<MastraTools, TIntegrations, keyof (MastraTools extends Record<string, ToolApi<any, any>> ? MastraTools : {}) | keyof (TIntegrations extends Integration[] ? (import("..").IntegrationTools<StripUndefined<TIntegrations>[number]> extends infer T ? T extends import("..").IntegrationTools<StripUndefined<TIntegrations>[number]> ? T extends any ? (k: T) => void : never : never : never) extends (k: infer I) => void ? I : never : {})>;
     getTool<T extends keyof MastraTools>(name: T): MastraTools[T] & {
         execute: <IN extends MastraTools[T]["schema"], OUT extends StripUndefined<MastraTools[T]["outputSchema"]>>(params: z.infer<IN>, runId?: Run["runId"]) => Promise<z.infer<OUT>>;
     };

package/dist/memory/index.d.ts

@@ -1,13 +1,19 @@
+import { AssistantContent, ToolContent, ToolResultPart, UserContent, Message as AiMessage } from 'ai';
 export type MessageType = {
     id: string;
-    content: string;
-    role: 'user' | 'assistant';
+    content: UserContent | AssistantContent | ToolContent;
+    role: 'user' | 'assistant' | 'tool';
     createdAt: Date;
     threadId: string;
+    toolCallIds?: string[];
+    toolCallArgs?: Record<string, unknown>[];
+    toolNames?: string[];
+    type: 'text' | 'tool-call' | 'tool-result';
 };
 export type ThreadType = {
     id: string;
     title?: string;
+    resourceid: string;
     createdAt: Date;
     updatedAt: Date;
     metadata?: Record<string, unknown>;
@@ -22,43 +28,111 @@ export declare abstract class MastraMemory {
      * @param threadId - The unique identifier of the thread
      * @returns Promise resolving to the thread or null if not found
      */
-    abstract getThreadById(threadId: string): Promise<ThreadType | null>;
+    abstract getThreadById({ threadId }: {
+        threadId: string;
+    }): Promise<ThreadType | null>;
+    abstract getThreadsByResourceId({ resourceid }: {
+        resourceid: string;
+    }): Promise<ThreadType[]>;
     /**
      * Saves or updates a thread
      * @param thread - The thread data to save
      * @returns Promise resolving to the saved thread
      */
-    abstract saveThread(thread: ThreadType): Promise<ThreadType>;
+    abstract saveThread({ thread }: {
+        thread: ThreadType;
+    }): Promise<ThreadType>;
     /**
      * Saves messages to a thread
      * @param messages - Array of messages to save
      * @returns Promise resolving to the saved messages
      */
-    abstract saveMessages(messages: MessageType[]): Promise<MessageType[]>;
+    abstract saveMessages({ messages }: {
+        messages: MessageType[];
+    }): Promise<MessageType[]>;
     /**
      * Retrieves all messages for a specific thread
      * @param threadId - The unique identifier of the thread
+     * @returns Promise resolving to array of messages and uiMessages
+     */
+    abstract getMessages({ threadId, }: {
+        threadId: string;
+    }): Promise<{
+        messages: MessageType[];
+        uiMessages: AiMessage[];
+    }>;
+    /**
+     * Retrieves all messages for a specific thread within a context window
+     * @param threadId - The unique identifier of the thread
+     * @param startDate - Optional start date to filter the context window
+     * @param endDate - Optional end date to filter the context window
      * @returns Promise resolving to an array of messages
      */
-    abstract getMessages(threadId: string): Promise<MessageType[]>;
+    abstract getContextWindow({ threadId, startDate, endDate, }: {
+        threadId: string;
+        startDate?: Date;
+        endDate?: Date;
+    }): Promise<MessageType[]>;
+    /**
+     * Retrieves cached tool result for a specific arg in a thread
+     * @param threadId - The unique identifier of the thread
+     * @param toolArgs - The tool arguments to retrieve the cached result for
+     * @param toolName - The name of the tool that was called
+     * @returns Promise resolving to the cached tool result or null if not found
+     */
+    abstract getCachedToolResult({ threadId, toolArgs, toolName, }: {
+        threadId: string;
+        toolArgs: Record<string, unknown>;
+        toolName: string;
+    }): Promise<ToolResultPart['result'] | null>;
+    /**
+     * Checks if an un-expired tool call arg exists in a thread
+     * @param hashedToolCallArgs - The hashed tool call information (args, threadId, toolName) to check for
+     * @returns Promise resolving to true if the un-expired tool call arg exists, false otherwise
+     */
+    abstract checkIfValidArgExists({ hashedToolCallArgs }: {
+        hashedToolCallArgs: string;
+    }): Promise<boolean>;
     /**
      * Helper method to create a new thread
      * @param title - Optional title for the thread
      * @param metadata - Optional metadata for the thread
      * @returns Promise resolving to the created thread
      */
-    createThread(title?: string, metadata?: Record<string, unknown>): Promise<ThreadType>;
+    createThread({ threadId, resourceid, title, metadata, }: {
+        resourceid: string;
+        threadId?: string;
+        title?: string;
+        metadata?: Record<string, unknown>;
+    }): Promise<ThreadType>;
+    /**
+     * Helper method to delete a thread
+     * @param threadId - the id of the thread to delete
+     */
+    abstract deleteThread(threadId: string): Promise<void>;
     /**
      * Helper method to add a single message to a thread
      * @param threadId - The thread to add the message to
      * @param content - The message content
      * @param role - The role of the message sender
+     * @param type - The type of the message
+     * @param toolNames - Optional array of tool names that were called
+     * @param toolCallArgs - Optional array of tool call arguments
+     * @param toolCallIds - Optional array of tool call ids
      * @returns Promise resolving to the saved message
      */
-    addMessage(threadId: string, content: string, role: 'user' | 'assistant'): Promise<MessageType>;
+    addMessage({ threadId, content, role, type, toolNames, toolCallArgs, toolCallIds, }: {
+        threadId: string;
+        content: UserContent | AssistantContent;
+        role: 'user' | 'assistant';
+        type: 'text' | 'tool-call' | 'tool-result';
+        toolNames?: string[];
+        toolCallArgs?: Record<string, unknown>[];
+        toolCallIds?: string[];
+    }): Promise<MessageType>;
     /**
      * Generates a unique identifier
      * @returns A unique string ID
      */
-    protected generateId(): string;
+    generateId(): string;
 }

package/dist/sync/types.d.ts

@@ -3,6 +3,7 @@ import { Agent } from '../agent';
 import { MastraEngine } from '../engine';
 import { Integration } from '../integration';
 import { LLM } from '../llm';
+import { ModelConfig } from '../llm/types';
 import { Run } from '../run/types';
 import { AllTools, ToolApi } from '../tools/types';
 import { MastraVector } from '../vector';
@@ -25,7 +26,7 @@ export interface syncApi<IN extends Record<string, unknown>, OUT extends Record<
         engine: MastraEngine;
         agents: Map<string, Agent<Integration[], any>>;
         vectors: Record<string, MastraVector> | undefined;
-        llm: LLM<AllTools<any, Integration[]>, Integration[], any>;
+        llm: (model: ModelConfig) => LLM<AllTools<any, Integration[]>, Integration[], any>;
         integrationsRegistry: <I extends Integration[]>() => SyncIntegrationRegistry<I>;
         toolsRegistry: <T extends Record<string, ToolApi<any, any>>>() => SyncToolRegistry<T>;
     }) => Promise<OUT>;

package/dist/tools/types.d.ts

@@ -3,6 +3,7 @@ import { Agent } from '../agent';
 import { MastraEngine } from '../engine';
 import { Integration } from '../integration';
 import { LLM } from '../llm';
+import { ModelConfig } from '../llm/types';
 import { StripUndefined } from '../mastra/types';
 import { Run } from '../run/types';
 export type CoreTool = {
@@ -15,14 +16,6 @@ interface ToolIntegrations<I extends Integration[]> {
         name: N;
     }>;
 }
-export interface IntegrationApiExcutorParams<T extends Record<string, unknown>> {
-    data: T;
-    runId?: Run['runId'];
-    integrationsRegistry: <I extends Integration[]>() => ToolIntegrations<I>;
-    llm: LLM<any>;
-    engine?: MastraEngine | undefined;
-    agents: Map<string, Agent<any>>;
-}
 export type ToolApi<IN extends Record<string, unknown> = Record<string, unknown>, OUT extends Record<string, unknown> = Record<string, unknown>> = {
     schema: ZodSchema<IN>;
     label: string;
@@ -30,9 +23,18 @@ export type ToolApi<IN extends Record<string, unknown> = Record<string, unknown>
     documentation?: string;
     outputSchema?: ZodSchema<OUT>;
     executor: (params: IntegrationApiExcutorParams<IN>) => Promise<OUT>;
+    enableCache?: boolean;
 };
 export type IntegrationTools<T extends Integration> = T['tools'];
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 export type MergeIntegrationTools<T extends Integration[]> = UnionToIntersection<IntegrationTools<T[number]>>;
 export type AllTools<TTools, TIntegrations extends Integration[] | undefined = undefined> = (TTools extends Record<string, ToolApi<any, any>> ? TTools : {}) & (TIntegrations extends Integration[] ? MergeIntegrationTools<StripUndefined<TIntegrations>> : {});
+export interface IntegrationApiExcutorParams<T extends Record<string, unknown>> {
+    data: T;
+    runId?: Run['runId'];
+    integrationsRegistry: <I extends Integration[]>() => ToolIntegrations<I>;
+    llm: (model: ModelConfig) => LLM<AllTools<any, Integration[]>, Integration[], any>;
+    engine?: MastraEngine | undefined;
+    agents: Map<string, Agent<any>>;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/core",
-  "version": "0.1.27-alpha.21",
+  "version": "0.1.27-alpha.23",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",