diff --git a/agent/src/index.ts b/agent/src/index.ts index 2a4cc1c0a58..262efa11bda 100644 --- a/agent/src/index.ts +++ b/agent/src/index.ts @@ -42,7 +42,6 @@ import { type ICacheManager, type IDatabaseAdapter, type IDatabaseCacheAdapter, - ModelProviderName, parseBooleanFromText, settings, stringToUuid, @@ -518,165 +517,6 @@ async function handlePluginImporting(plugins: string[]) { } } -export function getTokenForProvider( - provider: ModelProviderName, - character: Character -): string | undefined { - switch (provider) { - // no key needed for llama_local or gaianet - case ModelProviderName.LLAMALOCAL: - return ""; - case ModelProviderName.OLLAMA: - return ""; - case ModelProviderName.GAIANET: - return ""; - case ModelProviderName.BEDROCK: - return ""; - case ModelProviderName.OPENAI: - return ( - character.settings?.secrets?.OPENAI_API_KEY || - settings.OPENAI_API_KEY - ); - case ModelProviderName.ETERNALAI: - return ( - character.settings?.secrets?.ETERNALAI_API_KEY || - settings.ETERNALAI_API_KEY - ); - case ModelProviderName.NINETEEN_AI: - return ( - character.settings?.secrets?.NINETEEN_AI_API_KEY || - settings.NINETEEN_AI_API_KEY - ); - case ModelProviderName.LLAMACLOUD: - case ModelProviderName.TOGETHER: - return ( - character.settings?.secrets?.LLAMACLOUD_API_KEY || - settings.LLAMACLOUD_API_KEY || - character.settings?.secrets?.TOGETHER_API_KEY || - settings.TOGETHER_API_KEY || - character.settings?.secrets?.OPENAI_API_KEY || - settings.OPENAI_API_KEY - ); - case ModelProviderName.CLAUDE_VERTEX: - case ModelProviderName.ANTHROPIC: - return ( - character.settings?.secrets?.ANTHROPIC_API_KEY || - character.settings?.secrets?.CLAUDE_API_KEY || - settings.ANTHROPIC_API_KEY || - settings.CLAUDE_API_KEY - ); - case ModelProviderName.REDPILL: - return ( - character.settings?.secrets?.REDPILL_API_KEY || - settings.REDPILL_API_KEY - ); - case ModelProviderName.OPENROUTER: - return ( - character.settings?.secrets?.OPENROUTER_API_KEY || - settings.OPENROUTER_API_KEY - ); - case ModelProviderName.GROK: - return ( - character.settings?.secrets?.GROK_API_KEY || - settings.GROK_API_KEY - ); - case ModelProviderName.HEURIST: - return ( - character.settings?.secrets?.HEURIST_API_KEY || - settings.HEURIST_API_KEY - ); - case ModelProviderName.GROQ: - return ( - character.settings?.secrets?.GROQ_API_KEY || - settings.GROQ_API_KEY - ); - case ModelProviderName.GALADRIEL: - return ( - character.settings?.secrets?.GALADRIEL_API_KEY || - settings.GALADRIEL_API_KEY - ); - case ModelProviderName.FAL: - return ( - character.settings?.secrets?.FAL_API_KEY || settings.FAL_API_KEY - ); - case ModelProviderName.ALI_BAILIAN: - return ( - character.settings?.secrets?.ALI_BAILIAN_API_KEY || - settings.ALI_BAILIAN_API_KEY - ); - case ModelProviderName.VOLENGINE: - return ( - character.settings?.secrets?.VOLENGINE_API_KEY || - settings.VOLENGINE_API_KEY - ); - case ModelProviderName.NANOGPT: - return ( - character.settings?.secrets?.NANOGPT_API_KEY || - settings.NANOGPT_API_KEY - ); - case ModelProviderName.HYPERBOLIC: - return ( - character.settings?.secrets?.HYPERBOLIC_API_KEY || - settings.HYPERBOLIC_API_KEY - ); - - case ModelProviderName.VENICE: - return ( - character.settings?.secrets?.VENICE_API_KEY || - settings.VENICE_API_KEY - ); - case ModelProviderName.ATOMA: - return ( - character.settings?.secrets?.ATOMASDK_BEARER_AUTH || - settings.ATOMASDK_BEARER_AUTH - ); - case ModelProviderName.NVIDIA: - return ( - character.settings?.secrets?.NVIDIA_API_KEY || - settings.NVIDIA_API_KEY - ); - case ModelProviderName.AKASH_CHAT_API: - return ( - character.settings?.secrets?.AKASH_CHAT_API_KEY || - settings.AKASH_CHAT_API_KEY - ); - case ModelProviderName.GOOGLE: - return ( - character.settings?.secrets?.GOOGLE_GENERATIVE_AI_API_KEY || - settings.GOOGLE_GENERATIVE_AI_API_KEY - ); - case ModelProviderName.MISTRAL: - return ( - character.settings?.secrets?.MISTRAL_API_KEY || - settings.MISTRAL_API_KEY - ); - case ModelProviderName.LETZAI: - return ( - character.settings?.secrets?.LETZAI_API_KEY || - settings.LETZAI_API_KEY - ); - case ModelProviderName.INFERA: - return ( - character.settings?.secrets?.INFERA_API_KEY || - settings.INFERA_API_KEY - ); - case ModelProviderName.DEEPSEEK: - return ( - character.settings?.secrets?.DEEPSEEK_API_KEY || - settings.DEEPSEEK_API_KEY - ); - case ModelProviderName.LIVEPEER: - return ( - character.settings?.secrets?.LIVEPEER_GATEWAY_URL || - settings.LIVEPEER_GATEWAY_URL - ); - default: - const errorMessage = `Failed to get token - unsupported model provider: ${provider}`; - elizaLogger.error(errorMessage); - throw new Error(errorMessage); - } -} - function initializeDatabase(dataDir: string) { if (process.env.MONGODB_CONNECTION_STRING) { elizaLogger.log("Initializing database on MongoDB Atlas"); @@ -955,62 +795,8 @@ export async function createAgent( ); } - // Initialize Reclaim adapter if environment variables are present - // let verifiableInferenceAdapter; - // if ( - // process.env.RECLAIM_APP_ID && - // process.env.RECLAIM_APP_SECRET && - // process.env.VERIFIABLE_INFERENCE_ENABLED === "true" - // ) { - // verifiableInferenceAdapter = new ReclaimAdapter({ - // appId: process.env.RECLAIM_APP_ID, - // appSecret: process.env.RECLAIM_APP_SECRET, - // modelProvider: character.modelProvider, - // token, - // }); - // elizaLogger.log("Verifiable inference adapter initialized"); - // } - // Initialize Opacity adapter if environment variables are present - let verifiableInferenceAdapter; - if ( - process.env.OPACITY_TEAM_ID && - process.env.OPACITY_CLOUDFLARE_NAME && - process.env.OPACITY_PROVER_URL && - process.env.VERIFIABLE_INFERENCE_ENABLED === "true" - ) { - verifiableInferenceAdapter = new OpacityAdapter({ - teamId: process.env.OPACITY_TEAM_ID, - teamName: process.env.OPACITY_CLOUDFLARE_NAME, - opacityProverUrl: process.env.OPACITY_PROVER_URL, - modelProvider: character.modelProvider, - token: token, - }); - elizaLogger.log("Verifiable inference adapter initialized"); - elizaLogger.log("teamId", process.env.OPACITY_TEAM_ID); - elizaLogger.log("teamName", process.env.OPACITY_CLOUDFLARE_NAME); - elizaLogger.log("opacityProverUrl", process.env.OPACITY_PROVER_URL); - elizaLogger.log("modelProvider", character.modelProvider); - elizaLogger.log("token", token); - } - if ( - process.env.PRIMUS_APP_ID && - process.env.PRIMUS_APP_SECRET && - process.env.VERIFIABLE_INFERENCE_ENABLED === "true" - ) { - verifiableInferenceAdapter = new PrimusAdapter({ - appId: process.env.PRIMUS_APP_ID, - appSecret: process.env.PRIMUS_APP_SECRET, - attMode: "proxytls", - modelProvider: character.modelProvider, - token, - }); - elizaLogger.log("Verifiable inference primus adapter initialized"); - } - return new AgentRuntime({ databaseAdapter: db, - token, - modelProvider: character.modelProvider, evaluators: [], character, // character.plugins are handled when clients are added @@ -1301,7 +1087,6 @@ export async function createAgent( managers: [], cacheManager: cache, fetch: logFetch, - verifiableInferenceAdapter, }); } diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts index 75e9e035c90..3988d2e3ccb 100644 --- a/packages/core/src/generation.ts +++ b/packages/core/src/generation.ts @@ -1,57 +1,21 @@ -import { createAnthropic } from "@ai-sdk/anthropic"; -import { createGoogleGenerativeAI } from "@ai-sdk/google"; -import { createMistral } from "@ai-sdk/mistral"; -import { createGroq } from "@ai-sdk/groq"; -import { createOpenAI } from "@ai-sdk/openai"; -import { bedrock } from "@ai-sdk/amazon-bedrock"; -import { RecursiveCharacterTextSplitter } from "langchain/text_splitter"; -import { - generateObject as aiGenerateObject, - generateText as aiGenerateText, - type CoreTool, - type GenerateObjectResult, - type StepResult as AIStepResult, -} from "ai"; -import { Buffer } from "buffer"; -import { createOllama } from "ollama-ai-provider"; -import OpenAI from "openai"; -import { encodingForModel, type TiktokenModel } from "js-tiktoken"; import { AutoTokenizer } from "@huggingface/transformers"; -import Together from "together-ai"; -import type { ZodSchema } from "zod"; +import { encodingForModel, type TiktokenModel } from "js-tiktoken"; +import { RecursiveCharacterTextSplitter } from "langchain/text_splitter"; import { elizaLogger } from "./index.ts"; -import { - models, - getModelSettings, - getImageModelSettings, - getEndpoint, -} from "./models.ts"; import { parseBooleanFromText, parseJsonArrayFromText, parseJSONObjectFromText, - parseShouldRespondFromText, - parseActionResponseFromText, + parseShouldRespondFromText } from "./parsing.ts"; import { type Content, type IAgentRuntime, type IImageDescriptionService, - type ITextGenerationService, ModelClass, - ModelProviderName, ServiceType, - type ActionResponse, - type TelemetrySettings, - TokenizerType, + TokenizerType } from "./types.ts"; -import { fal } from "@fal-ai/client"; - -import BigNumber from "bignumber.js"; -import { createPublicClient, http } from "viem"; - -type Tool = CoreTool; -type StepResult = AIStepResult; /** * Trims the provided text context to a specified token limit using a tokenizer model and type. @@ -161,165 +125,6 @@ async function truncateTiktoken( } } -/** - * Get OnChain EternalAI System Prompt - * @returns System Prompt - */ -async function getOnChainEternalAISystemPrompt( - runtime: IAgentRuntime -): Promise | undefined { - const agentId = runtime.getSetting("ETERNALAI_AGENT_ID"); - const providerUrl = runtime.getSetting("ETERNALAI_RPC_URL"); - const contractAddress = runtime.getSetting( - "ETERNALAI_AGENT_CONTRACT_ADDRESS" - ); - if (agentId && providerUrl && contractAddress) { - // get on-chain system-prompt - const contractABI = [ - { - inputs: [ - { - internalType: "uint256", - name: "_agentId", - type: "uint256", - }, - ], - name: "getAgentSystemPrompt", - outputs: [ - { internalType: "bytes[]", name: "", type: "bytes[]" }, - ], - stateMutability: "view", - type: "function", - }, - ]; - - const publicClient = createPublicClient({ - transport: http(providerUrl), - }); - - try { - const validAddress: `0x${string}` = - contractAddress as `0x${string}`; - const result = await publicClient.readContract({ - address: validAddress, - abi: contractABI, - functionName: "getAgentSystemPrompt", - args: [new BigNumber(agentId)], - }); - if (result) { - elizaLogger.info("on-chain system-prompt response", result[0]); - const value = result[0].toString().replace("0x", ""); - const content = Buffer.from(value, "hex").toString("utf-8"); - elizaLogger.info("on-chain system-prompt", content); - return await fetchEternalAISystemPrompt(runtime, content); - } else { - return undefined; - } - } catch (error) { - elizaLogger.error(error); - elizaLogger.error("err", error); - } - } - return undefined; -} - -/** - * Fetch EternalAI System Prompt - * @returns System Prompt - */ -async function fetchEternalAISystemPrompt( - runtime: IAgentRuntime, - content: string -): Promise | undefined { - const IPFS = "ipfs://"; - const containsSubstring: boolean = content.includes(IPFS); - if (containsSubstring) { - const lightHouse = content.replace( - IPFS, - "https://gateway.lighthouse.storage/ipfs/" - ); - elizaLogger.info("fetch lightHouse", lightHouse); - const responseLH = await fetch(lightHouse, { - method: "GET", - }); - elizaLogger.info("fetch lightHouse resp", responseLH); - if (responseLH.ok) { - const data = await responseLH.text(); - return data; - } else { - const gcs = content.replace( - IPFS, - "https://cdn.eternalai.org/upload/" - ); - elizaLogger.info("fetch gcs", gcs); - const responseGCS = await fetch(gcs, { - method: "GET", - }); - elizaLogger.info("fetch lightHouse gcs", responseGCS); - if (responseGCS.ok) { - const data = await responseGCS.text(); - return data; - } else { - throw new Error("invalid on-chain system prompt"); - } - } - } else { - return content; - } -} - -/** - * Gets the Cloudflare Gateway base URL for a specific provider if enabled - * @param runtime The runtime environment - * @param provider The model provider name - * @returns The Cloudflare Gateway base URL if enabled, undefined otherwise - */ -function getCloudflareGatewayBaseURL( - runtime: IAgentRuntime, - provider: string -): string | undefined { - const isCloudflareEnabled = - runtime.getSetting("CLOUDFLARE_GW_ENABLED") === "true"; - const cloudflareAccountId = runtime.getSetting("CLOUDFLARE_AI_ACCOUNT_ID"); - const cloudflareGatewayId = runtime.getSetting("CLOUDFLARE_AI_GATEWAY_ID"); - - elizaLogger.debug("Cloudflare Gateway Configuration:", { - isEnabled: isCloudflareEnabled, - hasAccountId: !!cloudflareAccountId, - hasGatewayId: !!cloudflareGatewayId, - provider: provider, - }); - - if (!isCloudflareEnabled) { - elizaLogger.debug("Cloudflare Gateway is not enabled"); - return undefined; - } - - if (!cloudflareAccountId) { - elizaLogger.warn( - "Cloudflare Gateway is enabled but CLOUDFLARE_AI_ACCOUNT_ID is not set" - ); - return undefined; - } - - if (!cloudflareGatewayId) { - elizaLogger.warn( - "Cloudflare Gateway is enabled but CLOUDFLARE_AI_GATEWAY_ID is not set" - ); - return undefined; - } - - const baseURL = `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareGatewayId}/${provider.toLowerCase()}`; - elizaLogger.info("Using Cloudflare Gateway:", { - provider, - baseURL, - accountId: cloudflareAccountId, - gatewayId: cloudflareGatewayId, - }); - - return baseURL; -} - /** * Send a message to the model for a text generateText - receive a string back and parse how you'd like * @param opts - The options for the generateText request. @@ -474,21 +279,22 @@ export async function generateTrueOrFalse({ runtime, context = "", modelClass, + stop }: { runtime: IAgentRuntime; context: string; modelClass: ModelClass; + stop?: string[]; }): Promise { let retryDelay = 1000; - const modelSettings = getModelSettings(runtime.modelProvider, modelClass); - const stop = Array.from( - new Set([...(modelSettings.stop || []), ["\n"]]) + const _stop = Array.from( + new Set([...(stop || []), ["\n"]]) ) as string[]; while (true) { try { const response = await generateText({ - stop, + stop: _stop, runtime, context, modelClass, @@ -558,7 +364,7 @@ export async function generateTextArray({ } } -export async function generateObjectDeprecated({ +export async function generateObject({ runtime, context, modelClass, @@ -568,7 +374,7 @@ export async function generateObjectDeprecated({ modelClass: ModelClass; }): Promise { if (!context) { - elizaLogger.error("generateObjectDeprecated context is empty"); + elizaLogger.error("generateObject context is empty"); return null; } let retryDelay = 1000; @@ -651,12 +457,9 @@ export async function generateMessageResponse({ context: string; modelClass: ModelClass; }): Promise { - const modelSettings = getModelSettings(runtime.modelProvider, modelClass); - const max_context_length = modelSettings.maxInputTokens; - - context = await trimTokens(context, max_context_length, runtime); elizaLogger.debug("Context:", context); let retryLength = 1000; // exponential backoff + // TODO: Do we need to do retry here? Can we handle retry inside the generation call? while (true) { try { elizaLogger.log("Generating message response.."); @@ -686,6 +489,7 @@ export async function generateMessageResponse({ } export const generateImage = async ( + // TODO: Simplify the data and move to indivudal plugins data: { prompt: string; width: number; @@ -708,361 +512,12 @@ export const generateImage = async ( data?: string[]; error?: any; }> => { - const modelSettings = getImageModelSettings(runtime.imageModelProvider); - const model = modelSettings.name; - elizaLogger.info("Generating image with options:", { - imageModelProvider: model, - }); - - const apiKey = - runtime.imageModelProvider === runtime.modelProvider - ? runtime.token - : (() => { - // First try to match the specific provider - switch (runtime.imageModelProvider) { - case ModelProviderName.HEURIST: - return runtime.getSetting("HEURIST_API_KEY"); - case ModelProviderName.TOGETHER: - return runtime.getSetting("TOGETHER_API_KEY"); - case ModelProviderName.FAL: - return runtime.getSetting("FAL_API_KEY"); - case ModelProviderName.OPENAI: - return runtime.getSetting("OPENAI_API_KEY"); - case ModelProviderName.VENICE: - return runtime.getSetting("VENICE_API_KEY"); - case ModelProviderName.LIVEPEER: - return runtime.getSetting("LIVEPEER_GATEWAY_URL"); - default: - // If no specific match, try the fallback chain - return ( - runtime.getSetting("HEURIST_API_KEY") ?? - runtime.getSetting("NINETEEN_AI_API_KEY") ?? - runtime.getSetting("TOGETHER_API_KEY") ?? - runtime.getSetting("FAL_API_KEY") ?? - runtime.getSetting("OPENAI_API_KEY") ?? - runtime.getSetting("VENICE_API_KEY") ?? - runtime.getSetting("LIVEPEER_GATEWAY_URL") - ); - } - })(); try { - if (runtime.imageModelProvider === ModelProviderName.HEURIST) { - const response = await fetch( - "http://sequencer.heurist.xyz/submit_job", - { - method: "POST", - headers: { - Authorization: `Bearer ${apiKey}`, - "Content-Type": "application/json", - }, - body: JSON.stringify({ - job_id: data.jobId || crypto.randomUUID(), - model_input: { - SD: { - prompt: data.prompt, - neg_prompt: data.negativePrompt, - num_iterations: data.numIterations || 20, - width: data.width || 512, - height: data.height || 512, - guidance_scale: data.guidanceScale || 3, - seed: data.seed || -1, - }, - }, - model_id: model, - deadline: 60, - priority: 1, - }), - } - ); - - if (!response.ok) { - throw new Error( - `Heurist image generation failed: ${response.statusText}` - ); - } - - const imageURL = await response.json(); - return { success: true, data: [imageURL] }; - } else if ( - runtime.imageModelProvider === ModelProviderName.TOGETHER || - // for backwards compat - runtime.imageModelProvider === ModelProviderName.LLAMACLOUD - ) { - const together = new Together({ apiKey: apiKey as string }); - const response = await together.images.create({ - model: model, - prompt: data.prompt, - width: data.width, - height: data.height, - steps: modelSettings?.steps ?? 4, - n: data.count, - }); - - // Add type assertion to handle the response properly - const togetherResponse = - response as unknown as TogetherAIImageResponse; - - if ( - !togetherResponse.data || - !Array.isArray(togetherResponse.data) - ) { - throw new Error("Invalid response format from Together AI"); - } - - // Rest of the code remains the same... - const base64s = await Promise.all( - togetherResponse.data.map(async (image) => { - if (!image.url) { - elizaLogger.error("Missing URL in image data:", image); - throw new Error("Missing URL in Together AI response"); - } - - // Fetch the image from the URL - const imageResponse = await fetch(image.url); - if (!imageResponse.ok) { - throw new Error( - `Failed to fetch image: ${imageResponse.statusText}` - ); - } - - // Convert to blob and then to base64 - const blob = await imageResponse.blob(); - const arrayBuffer = await blob.arrayBuffer(); - const base64 = Buffer.from(arrayBuffer).toString("base64"); - - // Return with proper MIME type - return `data:image/jpeg;base64,${base64}`; - }) - ); - - if (base64s.length === 0) { - throw new Error("No images generated by Together AI"); - } - - elizaLogger.debug(`Generated ${base64s.length} images`); - return { success: true, data: base64s }; - } else if (runtime.imageModelProvider === ModelProviderName.FAL) { - fal.config({ - credentials: apiKey as string, - }); - - // Prepare the input parameters according to their schema - const input = { - prompt: data.prompt, - image_size: "square" as const, - num_inference_steps: modelSettings?.steps ?? 50, - guidance_scale: data.guidanceScale || 3.5, - num_images: data.count, - enable_safety_checker: - runtime.getSetting("FAL_AI_ENABLE_SAFETY_CHECKER") === - "true", - safety_tolerance: Number( - runtime.getSetting("FAL_AI_SAFETY_TOLERANCE") || "2" - ), - output_format: "png" as const, - seed: data.seed ?? 6252023, - ...(runtime.getSetting("FAL_AI_LORA_PATH") - ? { - loras: [ - { - path: runtime.getSetting("FAL_AI_LORA_PATH"), - scale: 1, - }, - ], - } - : {}), - }; - - // Subscribe to the model - const result = await fal.subscribe(model, { - input, - logs: true, - onQueueUpdate: (update) => { - if (update.status === "IN_PROGRESS") { - elizaLogger.info(update.logs.map((log) => log.message)); - } - }, - }); - // Convert the returned image URLs to base64 to match existing functionality - const base64Promises = result.data.images.map(async (image) => { - const response = await fetch(image.url); - const blob = await response.blob(); - const buffer = await blob.arrayBuffer(); - const base64 = Buffer.from(buffer).toString("base64"); - return `data:${image.content_type};base64,${base64}`; - }); - - const base64s = await Promise.all(base64Promises); - return { success: true, data: base64s }; - } else if (runtime.imageModelProvider === ModelProviderName.VENICE) { - const response = await fetch( - "https://api.venice.ai/api/v1/image/generate", - { - method: "POST", - headers: { - Authorization: `Bearer ${apiKey}`, - "Content-Type": "application/json", - }, - body: JSON.stringify({ - model: model, - prompt: data.prompt, - cfg_scale: data.guidanceScale, - negative_prompt: data.negativePrompt, - width: data.width, - height: data.height, - steps: data.numIterations, - safe_mode: data.safeMode, - seed: data.seed, - style_preset: data.stylePreset, - hide_watermark: data.hideWatermark, - }), - } - ); - - const result = await response.json(); - - if (!result.images || !Array.isArray(result.images)) { - throw new Error("Invalid response format from Venice AI"); - } - - const base64s = result.images.map((base64String) => { - if (!base64String) { - throw new Error( - "Empty base64 string in Venice AI response" - ); - } - return `data:image/png;base64,${base64String}`; - }); - - return { success: true, data: base64s }; - } else if ( - runtime.imageModelProvider === ModelProviderName.NINETEEN_AI - ) { - const response = await fetch( - "https://api.nineteen.ai/v1/text-to-image", - { - method: "POST", - headers: { - Authorization: `Bearer ${apiKey}`, - "Content-Type": "application/json", - }, - body: JSON.stringify({ - model: model, - prompt: data.prompt, - negative_prompt: data.negativePrompt, - width: data.width, - height: data.height, - steps: data.numIterations, - cfg_scale: data.guidanceScale || 3, - }), - } - ); - - const result = await response.json(); - - if (!result.images || !Array.isArray(result.images)) { - throw new Error("Invalid response format from Nineteen AI"); - } - - const base64s = result.images.map((base64String) => { - if (!base64String) { - throw new Error( - "Empty base64 string in Nineteen AI response" - ); - } - return `data:image/png;base64,${base64String}`; - }); - - return { success: true, data: base64s }; - } else if (runtime.imageModelProvider === ModelProviderName.LIVEPEER) { - if (!apiKey) { - throw new Error("Livepeer Gateway is not defined"); - } - try { - const baseUrl = new URL(apiKey); - if (!baseUrl.protocol.startsWith("http")) { - throw new Error("Invalid Livepeer Gateway URL protocol"); - } - - const response = await fetch( - `${baseUrl.toString()}text-to-image`, - { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer eliza-app-img", - }, - body: JSON.stringify({ - model_id: - data.modelId || "ByteDance/SDXL-Lightning", - prompt: data.prompt, - width: data.width || 1024, - height: data.height || 1024, - }), - } - ); - const result = await response.json(); - if (!result.images?.length) { - throw new Error("No images generated"); - } - const base64Images = await Promise.all( - result.images.map(async (image) => { - console.log("imageUrl console log", image.url); - let imageUrl; - if (image.url.includes("http")) { - imageUrl = image.url; - } else { - imageUrl = `${apiKey}${image.url}`; - } - const imageResponse = await fetch(imageUrl); - if (!imageResponse.ok) { - throw new Error( - `Failed to fetch image: ${imageResponse.statusText}` - ); - } - const blob = await imageResponse.blob(); - const arrayBuffer = await blob.arrayBuffer(); - const base64 = - Buffer.from(arrayBuffer).toString("base64"); - return `data:image/jpeg;base64,${base64}`; - }) - ); - return { - success: true, - data: base64Images, - }; - } catch (error) { - console.error(error); - return { success: false, error: error }; - } - } else { - let targetSize = `${data.width}x${data.height}`; - if ( - targetSize !== "1024x1024" && - targetSize !== "1792x1024" && - targetSize !== "1024x1792" - ) { - targetSize = "1024x1024"; - } - const openaiApiKey = runtime.getSetting("OPENAI_API_KEY") as string; - if (!openaiApiKey) { - throw new Error("OPENAI_API_KEY is not set"); - } - const openai = new OpenAI({ - apiKey: openaiApiKey as string, - }); - const response = await openai.images.generate({ - model, - prompt: data.prompt, - size: targetSize as "1024x1024" | "1792x1024" | "1024x1792", - n: data.count, - response_format: "b64_json", - }); - const base64s = response.data.map( - (image) => `data:image/png;base64,${image.b64_json}` - ); - return { success: true, data: base64s }; - } + const response = await runtime.call("generate::image", data) + return { + data: response.data, + success: true, + }; } catch (error) { console.error(error); return { success: false, error: error }; @@ -1091,576 +546,4 @@ export const generateCaption = async ( title: resp.title.trim(), description: resp.description.trim(), }; -}; - -/** - * Configuration options for generating objects with a model. - */ -export interface GenerationOptions { - runtime: IAgentRuntime; - context: string; - modelClass: ModelClass; - schema?: ZodSchema; - schemaName?: string; - schemaDescription?: string; - stop?: string[]; - mode?: "auto" | "json" | "tool"; - experimental_providerMetadata?: Record; -} - -/** - * Base settings for model generation. - */ -interface ModelSettings { - prompt: string; - temperature: number; - maxTokens: number; - frequencyPenalty: number; - presencePenalty: number; - stop?: string[]; - experimental_telemetry?: TelemetrySettings; -} - -/** - * Generates structured objects from a prompt using specified AI models and configuration options. - * - * @param {GenerationOptions} options - Configuration options for generating objects. - * @returns {Promise} - A promise that resolves to an array of generated objects. - * @throws {Error} - Throws an error if the provider is unsupported or if generation fails. - */ -export const generateObject = async ({ - runtime, - context, - modelClass, - schema, - schemaName, - schemaDescription, - stop, - mode = "json", - verifiableInference = false, - verifiableInferenceAdapter, - verifiableInferenceOptions, -}: GenerationOptions): Promise> => { - if (!context) { - const errorMessage = "generateObject context is empty"; - console.error(errorMessage); - throw new Error(errorMessage); - } - - const provider = runtime.modelProvider; - const modelSettings = getModelSettings(runtime.modelProvider, modelClass); - const model = modelSettings.name; - const temperature = modelSettings.temperature; - const frequency_penalty = modelSettings.frequency_penalty; - const presence_penalty = modelSettings.presence_penalty; - const max_context_length = modelSettings.maxInputTokens; - const max_response_length = modelSettings.maxOutputTokens; - const experimental_telemetry = modelSettings.experimental_telemetry; - const apiKey = runtime.token; - - try { - context = await trimTokens(context, max_context_length, runtime); - - const modelOptions: ModelSettings = { - prompt: context, - temperature, - maxTokens: max_response_length, - frequencyPenalty: frequency_penalty, - presencePenalty: presence_penalty, - stop: stop || modelSettings.stop, - experimental_telemetry: experimental_telemetry, - }; - - const response = await handleProvider({ - provider, - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode, - modelOptions, - runtime, - context, - modelClass, - verifiableInference, - verifiableInferenceAdapter, - verifiableInferenceOptions, - }); - - return response; - } catch (error) { - console.error("Error in generateObject:", error); - throw error; - } -}; - -/** - * Interface for provider-specific generation options. - */ -interface ProviderOptions { - runtime: IAgentRuntime; - provider: ModelProviderName; - model: any; - apiKey: string; - schema?: ZodSchema; - schemaName?: string; - schemaDescription?: string; - mode?: "auto" | "json" | "tool"; - experimental_providerMetadata?: Record; - modelOptions: ModelSettings; - modelClass: ModelClass; - context: string; -} - -/** - * Handles AI generation based on the specified provider. - * - * @param {ProviderOptions} options - Configuration options specific to the provider. - * @returns {Promise} - A promise that resolves to an array of generated objects. - */ -export async function handleProvider( - options: ProviderOptions -): Promise> { - const { - provider, - runtime, - context, - modelClass, - //verifiableInference, - //verifiableInferenceAdapter, - //verifiableInferenceOptions, - } = options; - switch (provider) { - case ModelProviderName.OPENAI: - case ModelProviderName.ETERNALAI: - case ModelProviderName.ALI_BAILIAN: - case ModelProviderName.VOLENGINE: - case ModelProviderName.LLAMACLOUD: - case ModelProviderName.TOGETHER: - case ModelProviderName.NANOGPT: - case ModelProviderName.AKASH_CHAT_API: - return await handleOpenAI(options); - case ModelProviderName.ANTHROPIC: - case ModelProviderName.CLAUDE_VERTEX: - return await handleAnthropic(options); - case ModelProviderName.GROK: - return await handleGrok(options); - case ModelProviderName.GROQ: - return await handleGroq(options); - case ModelProviderName.LLAMALOCAL: - return await generateObjectDeprecated({ - runtime, - context, - modelClass, - }); - case ModelProviderName.GOOGLE: - return await handleGoogle(options); - case ModelProviderName.MISTRAL: - return await handleMistral(options); - case ModelProviderName.REDPILL: - return await handleRedPill(options); - case ModelProviderName.OPENROUTER: - return await handleOpenRouter(options); - case ModelProviderName.OLLAMA: - return await handleOllama(options); - case ModelProviderName.DEEPSEEK: - return await handleDeepSeek(options); - case ModelProviderName.LIVEPEER: - return await handleLivepeer(options); - default: { - const errorMessage = `Unsupported provider: ${provider}`; - elizaLogger.error(errorMessage); - throw new Error(errorMessage); - } - } -} -/** - * Handles object generation for OpenAI. - * - * @param {ProviderOptions} options - Options specific to OpenAI. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleOpenAI({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, - provider: _provider, - runtime, -}: ProviderOptions): Promise> { - const baseURL = - getCloudflareGatewayBaseURL(runtime, "openai") || - models.openai.endpoint; - const openai = createOpenAI({ apiKey, baseURL }); - return await aiGenerateObject({ - model: openai.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Anthropic models. - * - * @param {ProviderOptions} options - Options specific to Anthropic. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleAnthropic({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, - runtime, -}: ProviderOptions): Promise> { - elizaLogger.debug("Handling Anthropic request with Cloudflare check"); - const baseURL = getCloudflareGatewayBaseURL(runtime, "anthropic"); - elizaLogger.debug("Anthropic handleAnthropic baseURL:", { baseURL }); - - const anthropic = createAnthropic({ apiKey, baseURL }); - return await aiGenerateObject({ - model: anthropic.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Grok models. - * - * @param {ProviderOptions} options - Options specific to Grok. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleGrok({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, -}: ProviderOptions): Promise> { - const grok = createOpenAI({ apiKey, baseURL: models.grok.endpoint }); - return await aiGenerateObject({ - model: grok.languageModel(model, { parallelToolCalls: false }), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Groq models. - * - * @param {ProviderOptions} options - Options specific to Groq. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleGroq({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, - runtime, -}: ProviderOptions): Promise> { - elizaLogger.debug("Handling Groq request with Cloudflare check"); - const baseURL = getCloudflareGatewayBaseURL(runtime, "groq"); - elizaLogger.debug("Groq handleGroq baseURL:", { baseURL }); - - const groq = createGroq({ apiKey, baseURL }); - return await aiGenerateObject({ - model: groq.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Google models. - * - * @param {ProviderOptions} options - Options specific to Google. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleGoogle({ - model, - apiKey: _apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, -}: ProviderOptions): Promise> { - const google = createGoogleGenerativeAI(); - return await aiGenerateObject({ - model: google(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Mistral models. - * - * @param {ProviderOptions} options - Options specific to Mistral. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleMistral({ - model, - schema, - schemaName, - schemaDescription, - mode, - modelOptions, -}: ProviderOptions): Promise> { - const mistral = createMistral(); - return await aiGenerateObject({ - model: mistral(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Redpill models. - * - * @param {ProviderOptions} options - Options specific to Redpill. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleRedPill({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, -}: ProviderOptions): Promise> { - const redPill = createOpenAI({ apiKey, baseURL: models.redpill.endpoint }); - return await aiGenerateObject({ - model: redPill.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for OpenRouter models. - * - * @param {ProviderOptions} options - Options specific to OpenRouter. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleOpenRouter({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, -}: ProviderOptions): Promise> { - const openRouter = createOpenAI({ - apiKey, - baseURL: models.openrouter.endpoint, - }); - return await aiGenerateObject({ - model: openRouter.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Ollama models. - * - * @param {ProviderOptions} options - Options specific to Ollama. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleOllama({ - model, - schema, - schemaName, - schemaDescription, - mode = "json", - modelOptions, - provider, -}: ProviderOptions): Promise> { - const ollamaProvider = createOllama({ - baseURL: getEndpoint(provider) + "/api", - }); - const ollama = ollamaProvider(model); - return await aiGenerateObject({ - model: ollama, - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for DeepSeek models. - * - * @param {ProviderOptions} options - Options specific to DeepSeek. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleDeepSeek({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode, - modelOptions, -}: ProviderOptions): Promise> { - const openai = createOpenAI({ apiKey, baseURL: models.deepseek.endpoint }); - return await aiGenerateObject({ - model: openai.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -/** - * Handles object generation for Amazon Bedrock models. - * - * @param {ProviderOptions} options - Options specific to Amazon Bedrock. - * @returns {Promise>} - A promise that resolves to generated objects. - */ -async function handleBedrock({ - model, - schema, - schemaName, - schemaDescription, - mode, - modelOptions, - provider, -}: ProviderOptions): Promise> { - return await aiGenerateObject({ - model: bedrock(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -async function handleLivepeer({ - model, - apiKey, - schema, - schemaName, - schemaDescription, - mode, - modelOptions, -}: ProviderOptions): Promise> { - console.log("Livepeer provider api key:", apiKey); - if (!apiKey) { - throw new Error( - "Livepeer provider requires LIVEPEER_GATEWAY_URL to be configured" - ); - } - - const livepeerClient = createOpenAI({ - apiKey, - baseURL: apiKey, // Use the apiKey as the baseURL since it contains the gateway URL - }); - - return await aiGenerateObject({ - model: livepeerClient.languageModel(model), - schema, - schemaName, - schemaDescription, - mode, - ...modelOptions, - }); -} - -// Add type definition for Together AI response -interface TogetherAIImageResponse { - data: Array<{ - url: string; - content_type?: string; - image_type?: string; - }>; -} - -export async function generateTweetActions({ - runtime, - context, - modelClass, -}: { - runtime: IAgentRuntime; - context: string; - modelClass: ModelClass; -}): Promise { - let retryDelay = 1000; - while (true) { - try { - const response = await generateText({ - runtime, - context, - modelClass, - }); - elizaLogger.debug( - "Received response from generateText for tweet actions:", - response - ); - const { actions } = parseActionResponseFromText(response.trim()); - if (actions) { - elizaLogger.debug("Parsed tweet actions:", actions); - return actions; - } else { - elizaLogger.debug("generateTweetActions no valid response"); - } - } catch (error) { - elizaLogger.error("Error in generateTweetActions:", error); - if ( - error instanceof TypeError && - error.message.includes("queueTextCompletion") - ) { - elizaLogger.error( - "TypeError: Cannot read properties of null (reading 'queueTextCompletion')" - ); - } - } - elizaLogger.log(`Retrying in ${retryDelay}ms...`); - await new Promise((resolve) => setTimeout(resolve, retryDelay)); - retryDelay *= 2; - } -} +}; \ No newline at end of file diff --git a/packages/core/src/runtime.ts b/packages/core/src/runtime.ts index 3974be2c6cf..000faafef7f 100644 --- a/packages/core/src/runtime.ts +++ b/packages/core/src/runtime.ts @@ -396,8 +396,6 @@ export class AgentRuntime implements IAgentRuntime { (opts.evaluators ?? []).forEach((evaluator: Evaluator) => { this.registerEvaluator(evaluator); }); - - this.verifiableInferenceAdapter = opts.verifiableInferenceAdapter; } async initialize() { diff --git a/packages/plugin-aptos/src/actions/transfer.ts b/packages/plugin-aptos/src/actions/transfer.ts index 111ea17892a..1ed27a8a8b6 100644 --- a/packages/plugin-aptos/src/actions/transfer.ts +++ b/packages/plugin-aptos/src/actions/transfer.ts @@ -10,7 +10,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { Account, Aptos, @@ -111,7 +111,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-arthera/src/actions/transfer.ts b/packages/plugin-arthera/src/actions/transfer.ts index 807a2d6b7e3..93cf39b1065 100644 --- a/packages/plugin-arthera/src/actions/transfer.ts +++ b/packages/plugin-arthera/src/actions/transfer.ts @@ -1,7 +1,7 @@ import { type ByteArray, formatEther, parseEther, type Hex } from "viem"; import { composeContext, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -82,7 +82,7 @@ const buildTransferDetails = async ( chains.map((item) => `"${item}"`).join("|") ); - const transferDetails = (await generateObjectDeprecated({ + const transferDetails = (await generateObject({ runtime, context: contextWithChains, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-autonome/src/actions/launchAgent.ts b/packages/plugin-autonome/src/actions/launchAgent.ts index 08e34ce6baf..69063e8ced6 100644 --- a/packages/plugin-autonome/src/actions/launchAgent.ts +++ b/packages/plugin-autonome/src/actions/launchAgent.ts @@ -4,7 +4,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -68,7 +68,7 @@ export default { }); // Generate launch content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: launchContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-avail/src/actions/submitData.ts b/packages/plugin-avail/src/actions/submitData.ts index 2eead848c16..fd5a9a926c7 100644 --- a/packages/plugin-avail/src/actions/submitData.ts +++ b/packages/plugin-avail/src/actions/submitData.ts @@ -9,7 +9,7 @@ import { type Action, elizaLogger, composeContext, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { validateAvailConfig } from "../environment"; import { @@ -92,7 +92,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: submitDataContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-avail/src/actions/transfer.ts b/packages/plugin-avail/src/actions/transfer.ts index d5deeb4491d..f71ae9bc743 100644 --- a/packages/plugin-avail/src/actions/transfer.ts +++ b/packages/plugin-avail/src/actions/transfer.ts @@ -9,7 +9,7 @@ import { type Action, elizaLogger, composeContext, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { validateAvailConfig } from "../environment"; import { @@ -105,7 +105,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-b2/src/actions/stake.ts b/packages/plugin-b2/src/actions/stake.ts index 1d605c874ed..6b5471986a1 100644 --- a/packages/plugin-b2/src/actions/stake.ts +++ b/packages/plugin-b2/src/actions/stake.ts @@ -2,7 +2,7 @@ import { type Action, type ActionExample, type IAgentRuntime, - generateObjectDeprecated, + generateObject, type Memory, type State, type HandlerCallback, @@ -60,7 +60,7 @@ export class StakeAction { template: stakeTemplate, }); - const stakeDetails = (await generateObjectDeprecated({ + const stakeDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-b2/src/actions/transfer.ts b/packages/plugin-b2/src/actions/transfer.ts index 27a1f5bce7a..348e6832d2f 100644 --- a/packages/plugin-b2/src/actions/transfer.ts +++ b/packages/plugin-b2/src/actions/transfer.ts @@ -2,7 +2,7 @@ import { type Action, type ActionExample, type IAgentRuntime, - generateObjectDeprecated, + generateObject, type Memory, type State, type HandlerCallback, @@ -71,7 +71,7 @@ export class TransferAction { template: transferTemplate, }); - const transferDetails = (await generateObjectDeprecated({ + const transferDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-b2/src/actions/unstake.ts b/packages/plugin-b2/src/actions/unstake.ts index 10876f77591..dee39e2d426 100644 --- a/packages/plugin-b2/src/actions/unstake.ts +++ b/packages/plugin-b2/src/actions/unstake.ts @@ -2,7 +2,7 @@ import { type Action, type ActionExample, type IAgentRuntime, - generateObjectDeprecated, + generateObject, type Memory, type State, type HandlerCallback, @@ -60,7 +60,7 @@ export class UnstakeAction { template: unstakeTemplate, }); - const unstakeDetails = (await generateObjectDeprecated({ + const unstakeDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-b2/src/actions/withdraw.ts b/packages/plugin-b2/src/actions/withdraw.ts index 2e40e4cd8d0..6b035554079 100644 --- a/packages/plugin-b2/src/actions/withdraw.ts +++ b/packages/plugin-b2/src/actions/withdraw.ts @@ -2,7 +2,7 @@ import { type Action, type ActionExample, type IAgentRuntime, - generateObjectDeprecated, + generateObject, type Memory, type State, type HandlerCallback, @@ -59,7 +59,7 @@ export class WithdrawAction { template: withdrawTemplate, }); - const withdrawDetails = (await generateObjectDeprecated({ + const withdrawDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-binance/src/actions/priceCheck.ts b/packages/plugin-binance/src/actions/priceCheck.ts index b1ab87d1bed..5258743aa7f 100644 --- a/packages/plugin-binance/src/actions/priceCheck.ts +++ b/packages/plugin-binance/src/actions/priceCheck.ts @@ -2,7 +2,7 @@ import { type ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -61,7 +61,7 @@ export const priceCheck: Action = { template: priceCheckTemplate, }); - const rawContent = await generateObjectDeprecated({ + const rawContent = await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-binance/src/actions/spotBalance.ts b/packages/plugin-binance/src/actions/spotBalance.ts index b7f8f42b21e..79f8fb91f44 100644 --- a/packages/plugin-binance/src/actions/spotBalance.ts +++ b/packages/plugin-binance/src/actions/spotBalance.ts @@ -2,7 +2,7 @@ import { type ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -69,7 +69,7 @@ export const spotBalance: Action = { template: spotBalanceTemplate, }); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: balanceContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-binance/src/actions/spotTrade.ts b/packages/plugin-binance/src/actions/spotTrade.ts index c7ea860b9d0..06f32bc684e 100644 --- a/packages/plugin-binance/src/actions/spotTrade.ts +++ b/packages/plugin-binance/src/actions/spotTrade.ts @@ -2,7 +2,7 @@ import { type ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -68,7 +68,7 @@ export const spotTrade: Action = { template: spotTradeTemplate, }); - content = await generateObjectDeprecated({ + content = await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-bnb/src/actions/bridge.ts b/packages/plugin-bnb/src/actions/bridge.ts index 2fc9d509d54..dca2d4c9055 100644 --- a/packages/plugin-bnb/src/actions/bridge.ts +++ b/packages/plugin-bnb/src/actions/bridge.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -330,7 +330,7 @@ export const bridgeAction = { state, template: bridgeTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: bridgeContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-bnb/src/actions/deploy.ts b/packages/plugin-bnb/src/actions/deploy.ts index 02504411d82..e686973916c 100644 --- a/packages/plugin-bnb/src/actions/deploy.ts +++ b/packages/plugin-bnb/src/actions/deploy.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -226,7 +226,7 @@ export const deployAction = { state, template: ercContractTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: context, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-bnb/src/actions/faucet.ts b/packages/plugin-bnb/src/actions/faucet.ts index e949cc31071..9a77aaeacb3 100644 --- a/packages/plugin-bnb/src/actions/faucet.ts +++ b/packages/plugin-bnb/src/actions/faucet.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -160,7 +160,7 @@ export const faucetAction = { state, template: faucetTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: faucetContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-bnb/src/actions/getBalance.ts b/packages/plugin-bnb/src/actions/getBalance.ts index c0eae2802c5..5bad5a7c216 100644 --- a/packages/plugin-bnb/src/actions/getBalance.ts +++ b/packages/plugin-bnb/src/actions/getBalance.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -154,7 +154,7 @@ export const getBalanceAction = { state, template: getBalanceTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: getBalanceContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-bnb/src/actions/stake.ts b/packages/plugin-bnb/src/actions/stake.ts index e6de51a74c1..6e78844fb3a 100644 --- a/packages/plugin-bnb/src/actions/stake.ts +++ b/packages/plugin-bnb/src/actions/stake.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -225,7 +225,7 @@ export const stakeAction = { state, template: stakeTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: stakeContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-bnb/src/actions/swap.ts b/packages/plugin-bnb/src/actions/swap.ts index bba922a4979..cb943893963 100644 --- a/packages/plugin-bnb/src/actions/swap.ts +++ b/packages/plugin-bnb/src/actions/swap.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -107,7 +107,7 @@ export const swapAction = { state, template: swapTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-bnb/src/actions/transfer.ts b/packages/plugin-bnb/src/actions/transfer.ts index c32534bad31..cca3e9e2646 100644 --- a/packages/plugin-bnb/src/actions/transfer.ts +++ b/packages/plugin-bnb/src/actions/transfer.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -180,7 +180,7 @@ export const transferAction = { state, template: transferTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-coinmarketcap/src/actions/getPrice/index.ts b/packages/plugin-coinmarketcap/src/actions/getPrice/index.ts index 93bea40513a..e6a082e0fea 100644 --- a/packages/plugin-coinmarketcap/src/actions/getPrice/index.ts +++ b/packages/plugin-coinmarketcap/src/actions/getPrice/index.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -55,7 +55,7 @@ export default { template: getPriceTemplate, }); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: priceContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-cosmos/src/actions/ibc-swap/index.ts b/packages/plugin-cosmos/src/actions/ibc-swap/index.ts index e89547afb17..659c91379be 100644 --- a/packages/plugin-cosmos/src/actions/ibc-swap/index.ts +++ b/packages/plugin-cosmos/src/actions/ibc-swap/index.ts @@ -1,6 +1,6 @@ import { composeContext, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -34,7 +34,7 @@ export const createIBCSwapAction = (pluginOptions: ICosmosPluginOptions) => ({ templatingEngine: "handlebars", }); - const cosmosIBCSwapContent = await generateObjectDeprecated({ + const cosmosIBCSwapContent = await generateObject({ runtime: _runtime, context: cosmosIBCSwapContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-cosmos/src/actions/ibc-transfer/index.ts b/packages/plugin-cosmos/src/actions/ibc-transfer/index.ts index f4c61d3ee4c..c13def1790e 100644 --- a/packages/plugin-cosmos/src/actions/ibc-transfer/index.ts +++ b/packages/plugin-cosmos/src/actions/ibc-transfer/index.ts @@ -1,6 +1,6 @@ import { composeContext, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -38,7 +38,7 @@ export const createIBCTransferAction = ( templatingEngine: "handlebars", }); - const cosmosIBCTransferContent = await generateObjectDeprecated({ + const cosmosIBCTransferContent = await generateObject({ runtime: _runtime, context: cosmosIBCTransferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-cosmos/src/actions/transfer/index.ts b/packages/plugin-cosmos/src/actions/transfer/index.ts index 67db6333f80..fbd50b5634e 100644 --- a/packages/plugin-cosmos/src/actions/transfer/index.ts +++ b/packages/plugin-cosmos/src/actions/transfer/index.ts @@ -1,6 +1,6 @@ import { composeContext, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -32,7 +32,7 @@ export const createTransferAction = (pluginOptions: ICosmosPluginOptions) => ({ templatingEngine: "handlebars", }); - const cosmosTransferContent = await generateObjectDeprecated({ + const cosmosTransferContent = await generateObject({ runtime: _runtime, context: cosmosTransferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-ethstorage/src/actions/submitData.ts b/packages/plugin-ethstorage/src/actions/submitData.ts index 92d068d4f30..0fa8074065c 100644 --- a/packages/plugin-ethstorage/src/actions/submitData.ts +++ b/packages/plugin-ethstorage/src/actions/submitData.ts @@ -8,7 +8,7 @@ import { type Action, elizaLogger, composeContext, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { ethers } from "ethers"; import { ethstorageConfig } from "../environment"; @@ -114,7 +114,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: submitDataContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-ethstorage/src/actions/transfer.ts b/packages/plugin-ethstorage/src/actions/transfer.ts index 7d5c6ed564d..674c0df669f 100644 --- a/packages/plugin-ethstorage/src/actions/transfer.ts +++ b/packages/plugin-ethstorage/src/actions/transfer.ts @@ -9,7 +9,7 @@ import { type Action, elizaLogger, composeContext, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { ethstorageConfig } from "../environment"; import { ethers } from "ethers"; @@ -93,7 +93,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-evm/src/actions/bridge.ts b/packages/plugin-evm/src/actions/bridge.ts index 9d5215bd045..8175b19bf6a 100644 --- a/packages/plugin-evm/src/actions/bridge.ts +++ b/packages/plugin-evm/src/actions/bridge.ts @@ -1,7 +1,7 @@ import type { IAgentRuntime, Memory, State } from "@elizaos/core"; import { composeContext, - generateObjectDeprecated, + generateObject, ModelClass, } from "@elizaos/core"; import { @@ -105,7 +105,7 @@ export const bridgeAction = { state, template: bridgeTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: bridgeContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-evm/src/actions/swap.ts b/packages/plugin-evm/src/actions/swap.ts index 33dd4c67c55..61e85b790c6 100644 --- a/packages/plugin-evm/src/actions/swap.ts +++ b/packages/plugin-evm/src/actions/swap.ts @@ -1,7 +1,7 @@ import type { IAgentRuntime, Memory, State } from "@elizaos/core"; import { composeContext, - generateObjectDeprecated, + generateObject, ModelClass, elizaLogger, } from "@elizaos/core"; @@ -364,7 +364,7 @@ export const swapAction = { state, template: swapTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-evm/src/actions/transfer.ts b/packages/plugin-evm/src/actions/transfer.ts index 67237d0d8a6..5918f5c5911 100644 --- a/packages/plugin-evm/src/actions/transfer.ts +++ b/packages/plugin-evm/src/actions/transfer.ts @@ -2,7 +2,7 @@ import { type ByteArray, formatEther, parseEther, type Hex } from "viem"; import { type Action, composeContext, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -79,7 +79,7 @@ const buildTransferDetails = async ( template: transferTemplate, }); - const transferDetails = (await generateObjectDeprecated({ + const transferDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-form/src/actions/buyCurves.ts b/packages/plugin-form/src/actions/buyCurves.ts index 5e78ea879f9..cbee574b429 100644 --- a/packages/plugin-form/src/actions/buyCurves.ts +++ b/packages/plugin-form/src/actions/buyCurves.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -76,7 +76,7 @@ const buildBuyCurvesDetails = async ( template: buyCurvesTemplate, }); - const buyDetails = (await generateObjectDeprecated({ + const buyDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-form/src/actions/depositCurves.ts b/packages/plugin-form/src/actions/depositCurves.ts index 3a40df7e4f6..4fe84b55fe1 100644 --- a/packages/plugin-form/src/actions/depositCurves.ts +++ b/packages/plugin-form/src/actions/depositCurves.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -98,7 +98,7 @@ export const depositCurvesTokenAction: Action = { const action = new DepositCurvesTokenAction(wallet); try { - const depositParams = (await generateObjectDeprecated({ + const depositParams = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-form/src/actions/getCurvesBalance.ts b/packages/plugin-form/src/actions/getCurvesBalance.ts index 2161498e067..acdbdd6f6c0 100644 --- a/packages/plugin-form/src/actions/getCurvesBalance.ts +++ b/packages/plugin-form/src/actions/getCurvesBalance.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -89,7 +89,7 @@ export const getCurvesBalanceAction: Action = { const action = new GetCurvesBalanceAction(wallet); try { - const params = (await generateObjectDeprecated({ + const params = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-form/src/actions/getCurvesBuyPrice.ts b/packages/plugin-form/src/actions/getCurvesBuyPrice.ts index 48d846a22fa..37edcd0edec 100644 --- a/packages/plugin-form/src/actions/getCurvesBuyPrice.ts +++ b/packages/plugin-form/src/actions/getCurvesBuyPrice.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -88,7 +88,7 @@ export const getCurvesBuyPriceAction: Action = { const action = new GetCurvesBuyPriceAction(wallet); try { - const params = (await generateObjectDeprecated({ + const params = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-form/src/actions/getCurvesContract.ts b/packages/plugin-form/src/actions/getCurvesContract.ts index 9825635d1e8..e054e6de833 100644 --- a/packages/plugin-form/src/actions/getCurvesContract.ts +++ b/packages/plugin-form/src/actions/getCurvesContract.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -50,7 +50,7 @@ const buildGetCurvesAddressDetails = async ( template: getCurvesFormulaTemplate, }); - return (await generateObjectDeprecated({ + return (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-form/src/actions/getCurvesERC20.ts b/packages/plugin-form/src/actions/getCurvesERC20.ts index e80eb6462ea..fd10a1162e3 100644 --- a/packages/plugin-form/src/actions/getCurvesERC20.ts +++ b/packages/plugin-form/src/actions/getCurvesERC20.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -86,7 +86,7 @@ export const getCurvesERC20DetailsAction: Action = { const action = new GetCurvesERC20DetailsAction(wallet); try { - const params = (await generateObjectDeprecated({ + const params = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-form/src/actions/getCurvesSellPrice.ts b/packages/plugin-form/src/actions/getCurvesSellPrice.ts index c05e801d1b5..7a1ef01b2d9 100644 --- a/packages/plugin-form/src/actions/getCurvesSellPrice.ts +++ b/packages/plugin-form/src/actions/getCurvesSellPrice.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -102,7 +102,7 @@ export const getCurvesSellPriceAction: Action = { const action = new GetCurvesSellPriceAction(wallet); try { - const params = (await generateObjectDeprecated({ + const params = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-form/src/actions/mintCurvesERC20.ts b/packages/plugin-form/src/actions/mintCurvesERC20.ts index 83e20ea1c78..133d427bd0b 100644 --- a/packages/plugin-form/src/actions/mintCurvesERC20.ts +++ b/packages/plugin-form/src/actions/mintCurvesERC20.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -92,7 +92,7 @@ export const mintCurvesERC20TokenAction: Action = { const action = new MintCurvesERC20TokenAction(wallet); try { - const mintParams = (await generateObjectDeprecated({ + const mintParams = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-form/src/actions/sellCurves.ts b/packages/plugin-form/src/actions/sellCurves.ts index 7d088e28d16..5bf30a51f09 100644 --- a/packages/plugin-form/src/actions/sellCurves.ts +++ b/packages/plugin-form/src/actions/sellCurves.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -73,7 +73,7 @@ const buildSellCurvesDetails = async ( template: sellCurvesTemplate, }); - const sellDetails = (await generateObjectDeprecated({ + const sellDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-form/src/actions/withdrawCurves.ts b/packages/plugin-form/src/actions/withdrawCurves.ts index 621b70d4add..d14d8aa5759 100644 --- a/packages/plugin-form/src/actions/withdrawCurves.ts +++ b/packages/plugin-form/src/actions/withdrawCurves.ts @@ -2,7 +2,7 @@ import { Action, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -95,7 +95,7 @@ export const withdrawCurvesTokenAction: Action = { try { // First determine the formula being used - const withdrawParams = (await generateObjectDeprecated({ + const withdrawParams = (await generateObject({ runtime, context: composeContext({ state, diff --git a/packages/plugin-fuel/src/actions/transfer.ts b/packages/plugin-fuel/src/actions/transfer.ts index bafea9dd812..facbed9cecf 100644 --- a/packages/plugin-fuel/src/actions/transfer.ts +++ b/packages/plugin-fuel/src/actions/transfer.ts @@ -1,7 +1,7 @@ import { type Action, composeContext, - generateObjectDeprecated, + generateObject, type IAgentRuntime, ModelClass, type State, @@ -39,7 +39,7 @@ const buildTransferDetails = async (state: State, runtime: IAgentRuntime) => { template: transferTemplate, }); - const transferDetails = (await generateObjectDeprecated({ + const transferDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-giphy/src/actions/sendGif.ts b/packages/plugin-giphy/src/actions/sendGif.ts index ee406dd741c..bf4c9e01f17 100644 --- a/packages/plugin-giphy/src/actions/sendGif.ts +++ b/packages/plugin-giphy/src/actions/sendGif.ts @@ -4,7 +4,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -85,7 +85,7 @@ export default { }); elizaLogger.log("Generating content from context..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: gifContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-goplus/src/services/GoplusSecurityService.ts b/packages/plugin-goplus/src/services/GoplusSecurityService.ts index 9a72014942d..3ddb9b6e138 100644 --- a/packages/plugin-goplus/src/services/GoplusSecurityService.ts +++ b/packages/plugin-goplus/src/services/GoplusSecurityService.ts @@ -1,4 +1,4 @@ -import { type IAgentRuntime, ModelClass, Service, ServiceType, elizaLogger, generateObjectDeprecated, generateText } from "@elizaos/core"; +import { type IAgentRuntime, ModelClass, Service, ServiceType, elizaLogger, generateObject, generateText } from "@elizaos/core"; import { GoPlusManage, type GoPlusParamType, GoPlusType } from "../lib/GoPlusManage"; import { requestPrompt, responsePrompt } from "../templates"; @@ -29,13 +29,13 @@ export class GoplusSecurityService extends Service implements IGoplusSecuritySer async check(text: string): Promise { try { elizaLogger.log("check input text", text); - const obj = await generateObjectDeprecated({ + const obj = await generateObject({ runtime: this.runtime, context: requestPrompt(text), modelClass: ModelClass.SMALL, // gpt-4o-mini }) as GoPlusParamType; - elizaLogger.log("check generateObjectDeprecated text", obj); + elizaLogger.log("check generateObject text", obj); const goPlusManage = new GoPlusManage(this.apiKey) let checkResult: any; diff --git a/packages/plugin-holdstation/src/actions/swapAction.ts b/packages/plugin-holdstation/src/actions/swapAction.ts index 129473a358a..3c3232a2948 100644 --- a/packages/plugin-holdstation/src/actions/swapAction.ts +++ b/packages/plugin-holdstation/src/actions/swapAction.ts @@ -8,7 +8,7 @@ import { ModelClass, elizaLogger, ActionExample, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { swapTemplate } from "../templates"; @@ -168,7 +168,7 @@ export const swapAction: Action = { }); // generate swap content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-hyperliquid/src/actions/priceCheck.ts b/packages/plugin-hyperliquid/src/actions/priceCheck.ts index 1142f9ce70b..7a2d9c10e30 100644 --- a/packages/plugin-hyperliquid/src/actions/priceCheck.ts +++ b/packages/plugin-hyperliquid/src/actions/priceCheck.ts @@ -7,7 +7,7 @@ import { type HandlerCallback, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, ModelClass, } from "@elizaos/core"; import { Hyperliquid } from "hyperliquid"; @@ -37,7 +37,7 @@ export const priceCheck: Action = { template: priceCheckTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-hyperliquid/src/actions/spotTrade.ts b/packages/plugin-hyperliquid/src/actions/spotTrade.ts index a3af5711150..76245868bb0 100644 --- a/packages/plugin-hyperliquid/src/actions/spotTrade.ts +++ b/packages/plugin-hyperliquid/src/actions/spotTrade.ts @@ -7,7 +7,7 @@ import { type HandlerCallback, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, ModelClass, } from "@elizaos/core"; import { Hyperliquid } from "hyperliquid"; @@ -43,7 +43,7 @@ export const spotTrade: Action = { template: spotTradeTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-icp/src/actions/createToken.ts b/packages/plugin-icp/src/actions/createToken.ts index bc927ec1291..434c546c9e0 100644 --- a/packages/plugin-icp/src/actions/createToken.ts +++ b/packages/plugin-icp/src/actions/createToken.ts @@ -2,7 +2,7 @@ import { composeContext, generateImage, generateText, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { type ActionExample, @@ -148,7 +148,7 @@ export const executeCreateToken: Action = { template: createTokenTemplate, }); - const response = await generateObjectDeprecated({ + const response = await generateObject({ runtime, context: createTokenContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-initia/src/actions/transfer.ts b/packages/plugin-initia/src/actions/transfer.ts index 5de193b04e5..6e5806e9582 100644 --- a/packages/plugin-initia/src/actions/transfer.ts +++ b/packages/plugin-initia/src/actions/transfer.ts @@ -2,7 +2,7 @@ import { Action, ActionExample, composeContext, - Content, elizaLogger, generateObjectDeprecated, + Content, elizaLogger, generateObject, HandlerCallback, IAgentRuntime, Memory, ModelClass, @@ -75,7 +75,7 @@ export default { template: transferTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-injective/src/action/base.ts b/packages/plugin-injective/src/action/base.ts index 077de8c9d4f..94a1660d26a 100644 --- a/packages/plugin-injective/src/action/base.ts +++ b/packages/plugin-injective/src/action/base.ts @@ -9,7 +9,7 @@ import { elizaLogger, composeContext, type Action, - generateObjectDeprecated, + generateObject, generateText, } from "@elizaos/core"; import { InjectiveGrpcClient } from "@injective/modules"; @@ -75,7 +75,7 @@ export function createGenericAction({ }); // 3. Use the AI model to generate content based on the context - const params = await generateObjectDeprecated({ + const params = await generateObject({ runtime, context, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-lightning/src/actions/createInvoice.ts b/packages/plugin-lightning/src/actions/createInvoice.ts index e51417f99b6..e95fb3d3620 100644 --- a/packages/plugin-lightning/src/actions/createInvoice.ts +++ b/packages/plugin-lightning/src/actions/createInvoice.ts @@ -1,7 +1,7 @@ import type { IAgentRuntime, Memory, State } from "@elizaos/core"; import { composeContext, - generateObjectDeprecated, + generateObject, ModelClass, elizaLogger, } from "@elizaos/core"; @@ -55,7 +55,7 @@ export const createInvoiceAction = { state, template: createInvoiceTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: createInvoiceContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-massa/src/actions/transfer.ts b/packages/plugin-massa/src/actions/transfer.ts index eaada0fbe56..69a10a5c081 100644 --- a/packages/plugin-massa/src/actions/transfer.ts +++ b/packages/plugin-massa/src/actions/transfer.ts @@ -6,7 +6,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -148,7 +148,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.MEDIUM, diff --git a/packages/plugin-moralis/src/actions/solana/getPairOHLCV.ts b/packages/plugin-moralis/src/actions/solana/getPairOHLCV.ts index 6acd1fe9f59..5fac91a857e 100644 --- a/packages/plugin-moralis/src/actions/solana/getPairOHLCV.ts +++ b/packages/plugin-moralis/src/actions/solana/getPairOHLCV.ts @@ -2,7 +2,7 @@ import { ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -53,7 +53,7 @@ export default { }); elizaLogger.log("Extracting OHLCV parameters..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: ohlcvContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-moralis/src/actions/solana/getPairStats.ts b/packages/plugin-moralis/src/actions/solana/getPairStats.ts index d77b1ba5552..fe478d3793c 100644 --- a/packages/plugin-moralis/src/actions/solana/getPairStats.ts +++ b/packages/plugin-moralis/src/actions/solana/getPairStats.ts @@ -2,7 +2,7 @@ import { ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -53,7 +53,7 @@ export default { }); elizaLogger.log("Extracting pair address..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: statsContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-moralis/src/actions/solana/getTokenMetadata.ts b/packages/plugin-moralis/src/actions/solana/getTokenMetadata.ts index e9f59b2fc16..707d18f2dbc 100644 --- a/packages/plugin-moralis/src/actions/solana/getTokenMetadata.ts +++ b/packages/plugin-moralis/src/actions/solana/getTokenMetadata.ts @@ -2,7 +2,7 @@ import { ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -55,7 +55,7 @@ export default { }); elizaLogger.log("Extracting token address..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: metadataContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-moralis/src/actions/solana/getTokenPairs.ts b/packages/plugin-moralis/src/actions/solana/getTokenPairs.ts index 6466ad6e94a..f13264a4463 100644 --- a/packages/plugin-moralis/src/actions/solana/getTokenPairs.ts +++ b/packages/plugin-moralis/src/actions/solana/getTokenPairs.ts @@ -2,7 +2,7 @@ import { ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -52,7 +52,7 @@ export default { }); elizaLogger.log("Extracting token address..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: pairsContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-moralis/src/actions/solana/getTokenPrice.ts b/packages/plugin-moralis/src/actions/solana/getTokenPrice.ts index 587c53284a0..b6a8a817909 100644 --- a/packages/plugin-moralis/src/actions/solana/getTokenPrice.ts +++ b/packages/plugin-moralis/src/actions/solana/getTokenPrice.ts @@ -2,7 +2,7 @@ import { ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -51,7 +51,7 @@ export default { }); elizaLogger.log("Extracting token address..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: priceContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-moralis/src/actions/solana/getTokenStats.ts b/packages/plugin-moralis/src/actions/solana/getTokenStats.ts index 97436b72f11..1bb77c7df3b 100644 --- a/packages/plugin-moralis/src/actions/solana/getTokenStats.ts +++ b/packages/plugin-moralis/src/actions/solana/getTokenStats.ts @@ -2,7 +2,7 @@ import { ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -53,7 +53,7 @@ export default { }); elizaLogger.log("Extracting token address..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: statsContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-movement/src/actions/transfer.ts b/packages/plugin-movement/src/actions/transfer.ts index 470086cfd88..d64540c8b42 100644 --- a/packages/plugin-movement/src/actions/transfer.ts +++ b/packages/plugin-movement/src/actions/transfer.ts @@ -10,7 +10,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { Account, Aptos, @@ -150,7 +150,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-omniflix/src/actions/bank/send_tokens.ts b/packages/plugin-omniflix/src/actions/bank/send_tokens.ts index 9f162f590ef..0d498792134 100644 --- a/packages/plugin-omniflix/src/actions/bank/send_tokens.ts +++ b/packages/plugin-omniflix/src/actions/bank/send_tokens.ts @@ -6,7 +6,7 @@ import { ModelClass, type Memory, type State, - generateObjectDeprecated, + generateObject, ActionExample, Action, IAgentRuntime, @@ -146,7 +146,7 @@ const buildTransferDetails = async ( template: sendTokensTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-omniflix/src/actions/staking/cancel_unbonding.ts b/packages/plugin-omniflix/src/actions/staking/cancel_unbonding.ts index 3d45403b401..6fcd9b26ebb 100644 --- a/packages/plugin-omniflix/src/actions/staking/cancel_unbonding.ts +++ b/packages/plugin-omniflix/src/actions/staking/cancel_unbonding.ts @@ -6,7 +6,7 @@ import { ModelClass, type Memory, type State, - generateObjectDeprecated, + generateObject, ActionExample, Action, IAgentRuntime, @@ -152,7 +152,7 @@ const buildCancelUnbondingContent = async ( template: cancelUnbondingTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: cancelUnbondingContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-omniflix/src/actions/staking/delegate_token.ts b/packages/plugin-omniflix/src/actions/staking/delegate_token.ts index ff00f98f54d..5a64d98b05f 100644 --- a/packages/plugin-omniflix/src/actions/staking/delegate_token.ts +++ b/packages/plugin-omniflix/src/actions/staking/delegate_token.ts @@ -6,7 +6,7 @@ import { ModelClass, type Memory, type State, - generateObjectDeprecated, + generateObject, ActionExample, Action, IAgentRuntime, @@ -146,7 +146,7 @@ const buildDelegateTokensContent = async ( template: delegateTokensTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: delegateContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-omniflix/src/actions/staking/redelegate.ts b/packages/plugin-omniflix/src/actions/staking/redelegate.ts index 7ef7dc96c4f..3c2f195aef2 100644 --- a/packages/plugin-omniflix/src/actions/staking/redelegate.ts +++ b/packages/plugin-omniflix/src/actions/staking/redelegate.ts @@ -6,7 +6,7 @@ import { ModelClass, type Memory, type State, - generateObjectDeprecated, + generateObject, ActionExample, Action, IAgentRuntime, @@ -166,7 +166,7 @@ const buildRedelegateDetails = async ( template: redelegateTokensTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: redelegateContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-omniflix/src/actions/staking/undelegate_token.ts b/packages/plugin-omniflix/src/actions/staking/undelegate_token.ts index 6642317e070..2b3aa22a468 100644 --- a/packages/plugin-omniflix/src/actions/staking/undelegate_token.ts +++ b/packages/plugin-omniflix/src/actions/staking/undelegate_token.ts @@ -6,7 +6,7 @@ import { ModelClass, type Memory, type State, - generateObjectDeprecated, + generateObject, ActionExample, Action, IAgentRuntime, @@ -145,7 +145,7 @@ const buildUndelegateTokensContent = async ( template: undelegateTokensTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: undelegateContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-router-nitro/src/actions/executeSwap.ts b/packages/plugin-router-nitro/src/actions/executeSwap.ts index 6d94c32ad13..b056ca4be2b 100644 --- a/packages/plugin-router-nitro/src/actions/executeSwap.ts +++ b/packages/plugin-router-nitro/src/actions/executeSwap.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, HandlerCallback, IAgentRuntime, Memory, @@ -44,7 +44,7 @@ export const executeSwapAction = { template: swapTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-sei/src/actions/transfer.ts b/packages/plugin-sei/src/actions/transfer.ts index 954d891e5f0..f1174876b8e 100644 --- a/packages/plugin-sei/src/actions/transfer.ts +++ b/packages/plugin-sei/src/actions/transfer.ts @@ -3,7 +3,7 @@ import { elizaLogger, Action, composeContext, - generateObjectDeprecated, + generateObject, HandlerCallback, ModelClass, type IAgentRuntime, @@ -156,7 +156,7 @@ const buildTransferDetails = async ( template: transferTemplate, }); - const transferDetails = (await generateObjectDeprecated({ + const transferDetails = (await generateObject({ runtime, context, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-solana-agent-kit/src/actions/createToken.ts b/packages/plugin-solana-agent-kit/src/actions/createToken.ts index 4297b5a8bf8..36f7151f224 100644 --- a/packages/plugin-solana-agent-kit/src/actions/createToken.ts +++ b/packages/plugin-solana-agent-kit/src/actions/createToken.ts @@ -3,7 +3,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -82,7 +82,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana-agent-kit/src/actions/getTokenInfo.ts b/packages/plugin-solana-agent-kit/src/actions/getTokenInfo.ts index 33ee4274829..871d08a0720 100644 --- a/packages/plugin-solana-agent-kit/src/actions/getTokenInfo.ts +++ b/packages/plugin-solana-agent-kit/src/actions/getTokenInfo.ts @@ -11,7 +11,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { ACTIONS } from "solana-agent-kit"; import { getSAK } from "../client"; @@ -80,7 +80,7 @@ export default { }); // Generate get token info content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: getTokenInfoContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana-agent-kit/src/actions/gibwork.ts b/packages/plugin-solana-agent-kit/src/actions/gibwork.ts index 4668b66466f..e2b10101299 100644 --- a/packages/plugin-solana-agent-kit/src/actions/gibwork.ts +++ b/packages/plugin-solana-agent-kit/src/actions/gibwork.ts @@ -10,7 +10,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { ACTIONS } from "solana-agent-kit"; import { getSAK } from "../client"; @@ -98,7 +98,7 @@ export default { }); // Generate gibwork content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: gibworkContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana-agent-kit/src/actions/lend.ts b/packages/plugin-solana-agent-kit/src/actions/lend.ts index 6133cee44fe..b5ac6e1c34c 100644 --- a/packages/plugin-solana-agent-kit/src/actions/lend.ts +++ b/packages/plugin-solana-agent-kit/src/actions/lend.ts @@ -10,7 +10,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { ACTIONS } from "solana-agent-kit"; import { getSAK } from "../client"; @@ -78,7 +78,7 @@ export default { }); // Generate lend content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: lendContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana-agent-kit/src/actions/stake.ts b/packages/plugin-solana-agent-kit/src/actions/stake.ts index 033b00e067f..e3f48576d39 100644 --- a/packages/plugin-solana-agent-kit/src/actions/stake.ts +++ b/packages/plugin-solana-agent-kit/src/actions/stake.ts @@ -10,7 +10,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { ACTIONS } from "solana-agent-kit"; import { getSAK } from "../client"; @@ -78,7 +78,7 @@ export default { }); // Generate stake content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: stakeContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana-agent-kit/src/actions/swap.ts b/packages/plugin-solana-agent-kit/src/actions/swap.ts index 1aaf77c8cfa..800dd0a51f2 100644 --- a/packages/plugin-solana-agent-kit/src/actions/swap.ts +++ b/packages/plugin-solana-agent-kit/src/actions/swap.ts @@ -1,7 +1,7 @@ import { type ActionExample, composeContext, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -85,7 +85,7 @@ export default { template: swapTemplate, }); - const response = await generateObjectDeprecated({ + const response = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana-agent-kit/src/actions/transfer.ts b/packages/plugin-solana-agent-kit/src/actions/transfer.ts index 298e6dfe81e..32e47363d70 100644 --- a/packages/plugin-solana-agent-kit/src/actions/transfer.ts +++ b/packages/plugin-solana-agent-kit/src/actions/transfer.ts @@ -17,7 +17,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; import { ACTIONS } from "solana-agent-kit"; import { getSAK } from "../client"; @@ -111,7 +111,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana/src/actions/swap.ts b/packages/plugin-solana/src/actions/swap.ts index aa0123aba9f..f49dbe67089 100644 --- a/packages/plugin-solana/src/actions/swap.ts +++ b/packages/plugin-solana/src/actions/swap.ts @@ -1,7 +1,7 @@ import { type ActionExample, composeContext, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -202,7 +202,7 @@ export const executeSwap: Action = { template: swapTemplate, }); - const response = await generateObjectDeprecated({ + const response = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana/src/actions/transfer.ts b/packages/plugin-solana/src/actions/transfer.ts index 2da6952b756..848b10f70aa 100644 --- a/packages/plugin-solana/src/actions/transfer.ts +++ b/packages/plugin-solana/src/actions/transfer.ts @@ -21,7 +21,7 @@ import { } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; import { getWalletKey } from "../keypairUtils"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; export interface TransferContent extends Content { tokenAddress: string; @@ -92,7 +92,7 @@ export default { template: transferTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-solana/src/actions/transfer_sol.ts b/packages/plugin-solana/src/actions/transfer_sol.ts index 1021e80424f..d3559abfbf0 100644 --- a/packages/plugin-solana/src/actions/transfer_sol.ts +++ b/packages/plugin-solana/src/actions/transfer_sol.ts @@ -18,7 +18,7 @@ import { } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; import { getWalletKey } from "../keypairUtils"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; interface SolTransferContent extends Content { recipient: string; @@ -80,7 +80,7 @@ export default { template: solTransferTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-spheron/src/actions/deployment.ts b/packages/plugin-spheron/src/actions/deployment.ts index 743f72a48d2..3d6c022fd57 100644 --- a/packages/plugin-spheron/src/actions/deployment.ts +++ b/packages/plugin-spheron/src/actions/deployment.ts @@ -8,7 +8,7 @@ import { elizaLogger, composeContext, ModelClass, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { validateSpheronConfig } from "../environment.ts"; import { @@ -219,7 +219,7 @@ export default { }); // Generate deployment content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: deploymentContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-spheron/src/actions/escrow.ts b/packages/plugin-spheron/src/actions/escrow.ts index 827b3898bad..62410cef97e 100644 --- a/packages/plugin-spheron/src/actions/escrow.ts +++ b/packages/plugin-spheron/src/actions/escrow.ts @@ -8,7 +8,7 @@ import { elizaLogger, composeContext, ModelClass, - generateObjectDeprecated, + generateObject, } from "@elizaos/core"; import { validateSpheronConfig } from "../environment.ts"; import { @@ -155,7 +155,7 @@ export default { }); // Generate escrow content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: escrowContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-squid-router/src/actions/xChainSwap.ts b/packages/plugin-squid-router/src/actions/xChainSwap.ts index b5db03b2911..0d859567a62 100644 --- a/packages/plugin-squid-router/src/actions/xChainSwap.ts +++ b/packages/plugin-squid-router/src/actions/xChainSwap.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -60,7 +60,7 @@ export const xChainSwapAction = { }); // Generate X chain swap content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: xChainSwapContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-stargaze/src/actions/getCollectionStats.ts b/packages/plugin-stargaze/src/actions/getCollectionStats.ts index cb6d692a38f..b6766e54274 100644 --- a/packages/plugin-stargaze/src/actions/getCollectionStats.ts +++ b/packages/plugin-stargaze/src/actions/getCollectionStats.ts @@ -2,7 +2,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -105,7 +105,7 @@ export default { }); elizaLogger.log("Generating content from context..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: statsContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-stargaze/src/actions/getLatestNFT.ts b/packages/plugin-stargaze/src/actions/getLatestNFT.ts index d015176dc2a..f2747a5a126 100644 --- a/packages/plugin-stargaze/src/actions/getLatestNFT.ts +++ b/packages/plugin-stargaze/src/actions/getLatestNFT.ts @@ -2,7 +2,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -114,7 +114,7 @@ export default { }); elizaLogger.log("Generating content from context..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: nftContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-stargaze/src/actions/getTokenSales.ts b/packages/plugin-stargaze/src/actions/getTokenSales.ts index a9275b7f3ae..9a2b9d5c33e 100644 --- a/packages/plugin-stargaze/src/actions/getTokenSales.ts +++ b/packages/plugin-stargaze/src/actions/getTokenSales.ts @@ -2,7 +2,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -109,7 +109,7 @@ export default { }); elizaLogger.log("Generating content from context..."); - const content = (await generateObjectDeprecated({ + const content = (await generateObject({ runtime, context: salesContext, modelClass: ModelClass.LARGE, diff --git a/packages/plugin-starknet/src/actions/subdomain.ts b/packages/plugin-starknet/src/actions/subdomain.ts index 84d3a0d7eb9..b19a686d0df 100644 --- a/packages/plugin-starknet/src/actions/subdomain.ts +++ b/packages/plugin-starknet/src/actions/subdomain.ts @@ -9,7 +9,7 @@ import { type State, type Action, composeContext, - generateObjectDeprecated, + generateObject, type Content, elizaLogger, } from "@elizaos/core"; @@ -108,7 +108,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.MEDIUM, diff --git a/packages/plugin-starknet/src/actions/swap.ts b/packages/plugin-starknet/src/actions/swap.ts index c0b1d8c12d3..fd77f9d23af 100644 --- a/packages/plugin-starknet/src/actions/swap.ts +++ b/packages/plugin-starknet/src/actions/swap.ts @@ -3,7 +3,7 @@ import { type ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -108,7 +108,7 @@ export const executeSwap: Action = { template: swapTemplate, }); - const response = await generateObjectDeprecated({ + const response = await generateObject({ runtime, context: swapContext, modelClass: ModelClass.MEDIUM, diff --git a/packages/plugin-starknet/src/actions/transfer.ts b/packages/plugin-starknet/src/actions/transfer.ts index 523b0e98c38..26a81c676c2 100644 --- a/packages/plugin-starknet/src/actions/transfer.ts +++ b/packages/plugin-starknet/src/actions/transfer.ts @@ -7,7 +7,7 @@ import { composeContext, type Content, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -137,7 +137,7 @@ export default { }); // Generate transfer content - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.MEDIUM, diff --git a/packages/plugin-starknet/src/actions/unruggable.ts b/packages/plugin-starknet/src/actions/unruggable.ts index 2637ac49042..fafe86421c9 100644 --- a/packages/plugin-starknet/src/actions/unruggable.ts +++ b/packages/plugin-starknet/src/actions/unruggable.ts @@ -3,7 +3,7 @@ import { type ActionExample, composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, type IAgentRuntime, type Memory, @@ -112,7 +112,7 @@ export const deployToken: Action = { template: deployTemplate, }); - const response = await generateObjectDeprecated({ + const response = await generateObject({ runtime, context: deployContext, modelClass: ModelClass.MEDIUM, diff --git a/packages/plugin-story/src/actions/attachTerms.ts b/packages/plugin-story/src/actions/attachTerms.ts index 93a7e9276d7..68798d6d652 100644 --- a/packages/plugin-story/src/actions/attachTerms.ts +++ b/packages/plugin-story/src/actions/attachTerms.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -99,7 +99,7 @@ export const attachTermsAction = { template: attachTermsTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: attachTermsContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-story/src/actions/getAvailableLicenses.ts b/packages/plugin-story/src/actions/getAvailableLicenses.ts index dceeea3397a..ed76337d3a5 100644 --- a/packages/plugin-story/src/actions/getAvailableLicenses.ts +++ b/packages/plugin-story/src/actions/getAvailableLicenses.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -116,7 +116,7 @@ export const getAvailableLicensesAction = { } // Generate parameters from context - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: composeContext({ state: currentState, diff --git a/packages/plugin-story/src/actions/getIPDetails.ts b/packages/plugin-story/src/actions/getIPDetails.ts index 9c5406784b0..9bee2c8acea 100644 --- a/packages/plugin-story/src/actions/getIPDetails.ts +++ b/packages/plugin-story/src/actions/getIPDetails.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -84,7 +84,7 @@ export const getIPDetailsAction = { } // Generate content using template - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: composeContext({ state: currentState, template: getIPDetailsTemplate }), modelClass: ModelClass.SMALL, diff --git a/packages/plugin-story/src/actions/licenseIP.ts b/packages/plugin-story/src/actions/licenseIP.ts index e078b0263ec..72e371f6662 100644 --- a/packages/plugin-story/src/actions/licenseIP.ts +++ b/packages/plugin-story/src/actions/licenseIP.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -70,7 +70,7 @@ export const licenseIPAction = { template: licenseIPTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: licenseIPContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-story/src/actions/registerIP.ts b/packages/plugin-story/src/actions/registerIP.ts index 84bc2a89dba..5b9b12d16d7 100644 --- a/packages/plugin-story/src/actions/registerIP.ts +++ b/packages/plugin-story/src/actions/registerIP.ts @@ -1,7 +1,7 @@ import { composeContext, elizaLogger, - generateObjectDeprecated, + generateObject, type HandlerCallback, ModelClass, type IAgentRuntime, @@ -97,7 +97,7 @@ export const registerIPAction = { template: registerIPTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: registerIPContext, modelClass: ModelClass.SMALL, diff --git a/packages/plugin-trikon/src/actions/trikon.ts b/packages/plugin-trikon/src/actions/trikon.ts index 7246ecdd512..77aad899cce 100644 --- a/packages/plugin-trikon/src/actions/trikon.ts +++ b/packages/plugin-trikon/src/actions/trikon.ts @@ -10,7 +10,7 @@ import { type Action, } from "@elizaos/core"; import { composeContext } from "@elizaos/core"; -import { generateObjectDeprecated } from "@elizaos/core"; +import { generateObject } from "@elizaos/core"; class TransferValidationError extends Error { constructor(message: string) { @@ -100,7 +100,7 @@ export default { template: transferTemplate, }); - const content = await generateObjectDeprecated({ + const content = await generateObject({ runtime, context: transferContext, modelClass: ModelClass.SMALL, diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.ts index 7dc7838cdce..07e05cce547 100644 --- a/packages/runtime/src/types.ts +++ b/packages/runtime/src/types.ts @@ -180,98 +180,6 @@ export type EmbeddingModelSettings = { dimensions?: number; }; -/** - * Configuration for an AI model - */ -export type Model = { - /** Optional API endpoint */ - endpoint?: string; - - /** Model names by size class */ - model: { - [ModelClass.SMALL]?: ModelSettings; - [ModelClass.MEDIUM]?: ModelSettings; - [ModelClass.LARGE]?: ModelSettings; - [ModelClass.EMBEDDING]?: EmbeddingModelSettings; - [ModelClass.IMAGE]?: ImageModelSettings; - }; -}; - -/** - * Model configurations by provider - */ -export type Models = { - [ModelProviderName.OPENAI]: Model; - [ModelProviderName.ETERNALAI]: Model; - [ModelProviderName.ANTHROPIC]: Model; - [ModelProviderName.GROK]: Model; - [ModelProviderName.GROQ]: Model; - [ModelProviderName.LLAMACLOUD]: Model; - [ModelProviderName.TOGETHER]: Model; - [ModelProviderName.LLAMALOCAL]: Model; - [ModelProviderName.GOOGLE]: Model; - [ModelProviderName.MISTRAL]: Model; - [ModelProviderName.CLAUDE_VERTEX]: Model; - [ModelProviderName.REDPILL]: Model; - [ModelProviderName.OPENROUTER]: Model; - [ModelProviderName.OLLAMA]: Model; - [ModelProviderName.HEURIST]: Model; - [ModelProviderName.GALADRIEL]: Model; - [ModelProviderName.FAL]: Model; - [ModelProviderName.GAIANET]: Model; - [ModelProviderName.ALI_BAILIAN]: Model; - [ModelProviderName.VOLENGINE]: Model; - [ModelProviderName.NANOGPT]: Model; - [ModelProviderName.HYPERBOLIC]: Model; - [ModelProviderName.VENICE]: Model; - [ModelProviderName.NVIDIA]: Model; - [ModelProviderName.NINETEEN_AI]: Model; - [ModelProviderName.AKASH_CHAT_API]: Model; - [ModelProviderName.LIVEPEER]: Model; - [ModelProviderName.DEEPSEEK]: Model; - [ModelProviderName.INFERA]: Model; - [ModelProviderName.BEDROCK]: Model; - [ModelProviderName.ATOMA]: Model; -}; - -/** - * Available model providers - */ -export enum ModelProviderName { - OPENAI = "openai", - ETERNALAI = "eternalai", - ANTHROPIC = "anthropic", - GROK = "grok", - GROQ = "groq", - LLAMACLOUD = "llama_cloud", - TOGETHER = "together", - LLAMALOCAL = "llama_local", - GOOGLE = "google", - MISTRAL = "mistral", - CLAUDE_VERTEX = "claude_vertex", - REDPILL = "redpill", - OPENROUTER = "openrouter", - OLLAMA = "ollama", - HEURIST = "heurist", - GALADRIEL = "galadriel", - FAL = "falai", - GAIANET = "gaianet", - ALI_BAILIAN = "ali_bailian", - VOLENGINE = "volengine", - NANOGPT = "nanogpt", - HYPERBOLIC = "hyperbolic", - VENICE = "venice", - NVIDIA = "nvidia", - NINETEEN_AI = "nineteen_ai", - AKASH_CHAT_API = "akash_chat_api", - LIVEPEER = "livepeer", - LETZAI = "letzai", - DEEPSEEK = "deepseek", - INFERA = "infera", - BEDROCK = "bedrock", - ATOMA = "atoma", -} - /** * Represents the current state/context of a conversation */ diff --git a/scripts/generatecharacter.js b/scripts/generatecharacter.js index 112f42c14b4..db1ab437ee7 100644 --- a/scripts/generatecharacter.js +++ b/scripts/generatecharacter.js @@ -259,7 +259,6 @@ const newData = { name: agentName, system: systemPromptOneLine, /* - modelProvider: "", clients: [""], plugins: [""], settings: { diff --git a/scripts/start.sh b/scripts/start.sh index 407bcc477ef..4d882d50391 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -245,7 +245,6 @@ create_character_template() { { "name": "$name", "clients": [], - "modelProvider": "anthropic", "settings": { "voice": { "model": "en_GB-alan-medium"