From bf3512af90c64c39c02f6704ff97e2966ff510fa Mon Sep 17 00:00:00 2001 From: babayaga Date: Tue, 3 Jun 2025 20:54:47 +0200 Subject: [PATCH] ai tools : fs : remove base64 --- packages/ai-tools/dist/lib/tools/fs.js | 16 ++-- packages/ai-tools/dist/types_kbot.d.ts | 101 +++++++++++++++--------- packages/ai-tools/dist/zod_schemas.d.ts | 4 +- packages/ai-tools/src/lib/tools/fs.ts | 16 ++-- packages/ai-tools/src/types_kbot.ts | 101 +++++++++++++++--------- 5 files changed, 143 insertions(+), 95 deletions(-) diff --git a/packages/ai-tools/dist/lib/tools/fs.js b/packages/ai-tools/dist/lib/tools/fs.js index 5c40a8fd..fd4c8d19 100644 --- a/packages/ai-tools/dist/lib/tools/fs.js +++ b/packages/ai-tools/dist/lib/tools/fs.js @@ -240,7 +240,7 @@ export const tools = (target, options) => { type: "object", properties: { path: { type: "string" }, - content: { type: "string", description: "base64 encoded string" } + content: { type: "string", description: "new file content (Part of JSON payload)" } }, required: ["path", "content"] } @@ -271,9 +271,9 @@ export const tools = (target, options) => { const filePath = path.join(target, sanitizedPath); logger.debug(`Tool:modify_project_files writing file ${filePath}`); try { - const contentToWrite = decodeContentSmart(file.content, logger, sanitizedPath); + // const contentToWrite = decodeContentSmart(file.content, logger, sanitizedPath); try { - await write(filePath, contentToWrite); + await write(filePath, file.content); } catch (writeError) { logger.error(`Tool:modify_project_files Error writing file ${filePath}`, writeError); @@ -295,7 +295,7 @@ export const tools = (target, options) => { type: 'function', function: { name: "write_file", - description: "Writes to a file, given a path and content (base64). No directory or file exists check needed!", + description: "Writes to a file, given a path and content (Part of JSON payload). No directory or file exists check needed!", parameters: { type: "object", properties: { @@ -303,7 +303,7 @@ export const tools = (target, options) => { type: "object", properties: { path: { type: "string" }, - content: { type: "string", description: "base64 encoded string" } + content: { type: "string", description: "new file content (Part of JSON payload)" } } } }, @@ -331,8 +331,8 @@ export const tools = (target, options) => { logger.debug(`Tool::write_file Writing file ${filePath}`); try { // Use the smart decoding helper function - const contentToWrite = decodeContentSmart(fileInfo.content, logger, sanitizedPath); - await write(filePath, contentToWrite); + // const contentToWrite = decodeContentSmart(fileInfo.content, logger, sanitizedPath); + await write(filePath, fileInfo.content); return true; } catch (error) { @@ -430,4 +430,4 @@ export const tools = (target, options) => { } ]; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/lib/tools/fs.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/lib/tools/fs.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/ai-tools/dist/types_kbot.d.ts b/packages/ai-tools/dist/types_kbot.d.ts index eae5ebcd..514384f7 100644 --- a/packages/ai-tools/dist/types_kbot.d.ts +++ b/packages/ai-tools/dist/types_kbot.d.ts @@ -9,6 +9,8 @@ export interface IKBotOptions { dst?: string | undefined; /** How to handle output if --dst file already exists: "concat" (append) or "merge" (try to merge structures if possible, otherwise append). Only used if --dst is specified. */ append?: ("concat" | "merge") | undefined; + /** Specify how to wrap the output, "meta (file name, absolute path, cwd)" or "none". */ + wrap?: "meta" | "none"; /** Iterate over items, supported: GLOB | Path to JSON File | array of strings (comma separated). To test different models, use --each="gpt-3.5-turbo,gpt-4o", the actual string will exposed as variable `ITEM`, eg: --dst="${ITEM}-output.md" */ each?: string | undefined; /** Disable tools categories, eg: --disable=fs,git,interact,terminal,search,web,email,user */ @@ -19,6 +21,8 @@ export interface IKBotOptions { tools?: (string[] | string); /** Comma separated glob patterns or paths, eg --include=src/*.tsx,src/*.ts --include=package.json */ include?: string[] | undefined; + /** Comma separated glob patterns or paths, eg --exclude=src/*.tsx,src/*.ts --exclude=package.json */ + exclude?: string[] | undefined; /** Explicit API key to use */ api_key?: string | undefined; /** AI model to use for processing. Available models: @@ -28,17 +32,12 @@ export interface IKBotOptions { 01-ai/yi-large | paid aetherwiing/mn-starcannon-12b | paid agentica-org/deepcoder-14b-preview:free | free - ai21/jamba-1-5-large | paid - ai21/jamba-1-5-mini | paid ai21/jamba-1.6-large | paid - ai21/jamba-instruct | paid ai21/jamba-1.6-mini | paid aion-labs/aion-1.0 | paid aion-labs/aion-1.0-mini | paid aion-labs/aion-rp-llama-3.1-8b | paid - jondurbin/airoboros-l2-70b | paid alfredpros/codellama-7b-instruct-solidity | paid - allenai/molmo-7b-d:free | free amazon/nova-lite-v1 | paid amazon/nova-micro-v1 | paid amazon/nova-pro-v1 | paid @@ -59,15 +58,23 @@ export interface IKBotOptions { anthropic/claude-3.7-sonnet | paid anthropic/claude-3.7-sonnet:beta | paid anthropic/claude-3.7-sonnet:thinking | paid + anthropic/claude-opus-4 | paid + anthropic/claude-sonnet-4 | paid anthropic/claude-2 | paid anthropic/claude-2:beta | paid anthropic/claude-2.0 | paid anthropic/claude-2.0:beta | paid anthropic/claude-2.1 | paid anthropic/claude-2.1:beta | paid + arcee-ai/arcee-blitz | paid + arcee-ai/caller-large | paid + arcee-ai/coder-large | paid + arcee-ai/maestro-reasoning | paid + arcee-ai/spotlight | paid + arcee-ai/virtuoso-large | paid + arcee-ai/virtuoso-medium-v2 | paid arliai/qwq-32b-arliai-rpr-v1:free | free openrouter/auto | paid - bytedance-research/ui-tars-72b:free | free cohere/command | paid cohere/command-a | paid cohere/command-r | paid @@ -77,6 +84,10 @@ export interface IKBotOptions { cohere/command-r-plus-04-2024 | paid cohere/command-r-plus-08-2024 | paid cohere/command-r7b-12-2024 | paid + deepseek/deepseek-prover-v2 | paid + deepseek/deepseek-prover-v2:free | free + deepseek/deepseek-r1-0528-qwen3-8b | paid + deepseek/deepseek-r1-0528-qwen3-8b:free | free deepseek/deepseek-r1-zero:free | free deepseek/deepseek-chat | paid deepseek/deepseek-chat:free | free @@ -85,6 +96,8 @@ export interface IKBotOptions { deepseek/deepseek-v3-base:free | free deepseek/deepseek-r1 | paid deepseek/deepseek-r1:free | free + deepseek/deepseek-r1-0528 | paid + deepseek/deepseek-r1-0528:free | free deepseek/deepseek-r1-distill-llama-70b | paid deepseek/deepseek-r1-distill-llama-70b:free | free deepseek/deepseek-r1-distill-llama-8b | paid @@ -93,7 +106,7 @@ export interface IKBotOptions { deepseek/deepseek-r1-distill-qwen-14b:free | free deepseek/deepseek-r1-distill-qwen-32b | paid deepseek/deepseek-r1-distill-qwen-32b:free | free - cognitivecomputations/dolphin-mixtral-8x7b | paid + deepseek/deepseek-r1-distill-qwen-7b | paid cognitivecomputations/dolphin-mixtral-8x22b | paid cognitivecomputations/dolphin3.0-mistral-24b:free | free cognitivecomputations/dolphin3.0-r1-mistral-24b:free | free @@ -105,20 +118,18 @@ export interface IKBotOptions { alpindale/goliath-120b | paid google/gemini-flash-1.5 | paid google/gemini-flash-1.5-8b | paid - google/gemini-flash-1.5-8b-exp | paid google/gemini-pro-1.5 | paid google/gemini-2.0-flash-001 | paid google/gemini-2.0-flash-exp:free | free google/gemini-2.0-flash-lite-001 | paid - google/gemini-2.0-flash-thinking-exp-1219:free | free - google/gemini-2.0-flash-thinking-exp:free | free google/gemini-2.5-flash-preview | paid google/gemini-2.5-flash-preview:thinking | paid - google/gemini-2.5-pro-exp-03-25:free | free - google/gemini-2.5-pro-preview-03-25 | paid - google/gemini-pro | paid - google/gemini-pro-vision | paid + google/gemini-2.5-flash-preview-05-20 | paid + google/gemini-2.5-flash-preview-05-20:thinking | paid + google/gemini-2.5-pro-exp-03-25 | paid + google/gemini-2.5-pro-preview | paid google/gemma-2-27b-it | paid + google/gemma-2b-it | paid google/gemma-2-9b-it | paid google/gemma-2-9b-it:free | free google/gemma-3-12b-it | paid @@ -128,16 +139,11 @@ export interface IKBotOptions { google/gemma-3-27b-it:free | free google/gemma-3-4b-it | paid google/gemma-3-4b-it:free | free - google/learnlm-1.5-pro-experimental:free | free - google/palm-2-chat-bison | paid - google/palm-2-chat-bison-32k | paid - google/palm-2-codechat-bison | paid - google/palm-2-codechat-bison-32k | paid - huggingfaceh4/zephyr-7b-beta:free | free + google/gemma-3n-e4b-it:free | free + inception/mercury-coder-small-beta | paid infermatic/mn-inferor-12b | paid inflection/inflection-3-pi | paid inflection/inflection-3-productivity | paid - latitudegames/wayfarer-large-70b-llama-3.3 | paid liquid/lfm-3b | paid liquid/lfm-40b | paid liquid/lfm-7b | paid @@ -146,7 +152,6 @@ export interface IKBotOptions { anthracite-org/magnum-v2-72b | paid anthracite-org/magnum-v4-72b | paid mancer/weaver | paid - meta-llama/llama-2-13b-chat | paid meta-llama/llama-2-70b-chat | paid meta-llama/llama-3-70b-instruct | paid meta-llama/llama-3-8b-instruct | paid @@ -165,13 +170,19 @@ export interface IKBotOptions { meta-llama/llama-3.2-90b-vision-instruct | paid meta-llama/llama-3.3-70b-instruct | paid meta-llama/llama-3.3-70b-instruct:free | free + meta-llama/llama-3.3-8b-instruct:free | free meta-llama/llama-4-maverick | paid meta-llama/llama-4-maverick:free | free meta-llama/llama-4-scout | paid meta-llama/llama-4-scout:free | free + meta-llama/llama-guard-4-12b | paid meta-llama/llama-guard-2-8b | paid + microsoft/mai-ds-r1:free | free microsoft/phi-4 | paid microsoft/phi-4-multimodal-instruct | paid + microsoft/phi-4-reasoning:free | free + microsoft/phi-4-reasoning-plus | paid + microsoft/phi-4-reasoning-plus:free | free microsoft/phi-3-medium-128k-instruct | paid microsoft/phi-3-mini-128k-instruct | paid microsoft/phi-3.5-mini-128k-instruct | paid @@ -185,15 +196,16 @@ export interface IKBotOptions { mistralai/mistral-small | paid mistralai/mistral-tiny | paid mistralai/codestral-2501 | paid - mistralai/codestral-mamba | paid + mistralai/devstral-small | paid + mistralai/devstral-small:free | free mistralai/ministral-3b | paid - mistral/ministral-8b | paid mistralai/ministral-8b | paid mistralai/mistral-7b-instruct | paid mistralai/mistral-7b-instruct:free | free mistralai/mistral-7b-instruct-v0.1 | paid mistralai/mistral-7b-instruct-v0.2 | paid mistralai/mistral-7b-instruct-v0.3 | paid + mistralai/mistral-medium-3 | paid mistralai/mistral-nemo | paid mistralai/mistral-nemo:free | free mistralai/mistral-small-24b-instruct-2501 | paid @@ -210,24 +222,23 @@ export interface IKBotOptions { gryphe/mythomax-l2-13b | paid neversleep/llama-3-lumimaid-70b | paid neversleep/llama-3-lumimaid-8b | paid - neversleep/llama-3-lumimaid-8b:extended | paid neversleep/llama-3.1-lumimaid-70b | paid neversleep/llama-3.1-lumimaid-8b | paid neversleep/noromaid-20b | paid nousresearch/deephermes-3-llama-3-8b-preview:free | free - nousresearch/nous-hermes-llama2-13b | paid + nousresearch/deephermes-3-mistral-24b-preview:free | free nousresearch/nous-hermes-2-mixtral-8x7b-dpo | paid nousresearch/hermes-3-llama-3.1-405b | paid nousresearch/hermes-3-llama-3.1-70b | paid nousresearch/hermes-2-pro-llama-3-8b | paid nvidia/llama-3.1-nemotron-70b-instruct | paid - nvidia/llama-3.1-nemotron-70b-instruct:free | free - nvidia/llama-3.1-nemotron-nano-8b-v1:free | free + nvidia/llama-3.1-nemotron-ultra-253b-v1 | paid nvidia/llama-3.1-nemotron-ultra-253b-v1:free | free + nvidia/llama-3.3-nemotron-super-49b-v1 | paid nvidia/llama-3.3-nemotron-super-49b-v1:free | free open-r1/olympiccoder-32b:free | free - open-r1/olympiccoder-7b:free | free openai/chatgpt-4o-latest | paid + openai/codex-mini | paid openai/gpt-3.5-turbo | paid openai/gpt-3.5-turbo-0613 | paid openai/gpt-3.5-turbo-16k | paid @@ -265,7 +276,8 @@ export interface IKBotOptions { openai/o3-mini-high | paid openai/o4-mini | paid openai/o4-mini-high | paid - openchat/openchat-7b | paid + opengvlab/internvl3-14b:free | free + opengvlab/internvl3-2b:free | free all-hands/openhands-lm-32b-v0.1 | paid perplexity/llama-3.1-sonar-large-128k-online | paid perplexity/llama-3.1-sonar-small-128k-online | paid @@ -282,19 +294,26 @@ export interface IKBotOptions { qwen/qwen-max | paid qwen/qwen-plus | paid qwen/qwen-turbo | paid - qwen/qwen2.5-coder-7b-instruct | paid qwen/qwen2.5-vl-32b-instruct | paid qwen/qwen2.5-vl-32b-instruct:free | free qwen/qwen2.5-vl-3b-instruct:free | free qwen/qwen2.5-vl-72b-instruct | paid qwen/qwen2.5-vl-72b-instruct:free | free - qwen/qwen-2.5-vl-72b-instruct | paid qwen/qwen-2.5-vl-7b-instruct | paid qwen/qwen-2.5-vl-7b-instruct:free | free + qwen/qwen3-14b | paid + qwen/qwen3-14b:free | free + qwen/qwen3-235b-a22b | paid + qwen/qwen3-235b-a22b:free | free + qwen/qwen3-30b-a3b | paid + qwen/qwen3-30b-a3b:free | free + qwen/qwen3-32b | paid + qwen/qwen3-32b:free | free + qwen/qwen3-8b | paid + qwen/qwen3-8b:free | free qwen/qwq-32b | paid qwen/qwq-32b:free | free qwen/qwq-32b-preview | paid - qwen/qwq-32b-preview:free | free qwen/qwen-2.5-72b-instruct | paid qwen/qwen-2.5-72b-instruct:free | free qwen/qwen-2.5-7b-instruct | paid @@ -304,24 +323,28 @@ export interface IKBotOptions { featherless/qwerky-72b:free | free rekaai/reka-flash-3:free | free undi95/remm-slerp-l2-13b | paid - thedrummer/rocinante-12b | paid - sophosympatheia/rogue-rose-103b-v0.2:free | free sao10k/l3-lunaris-8b | paid sao10k/l3-euryale-70b | paid sao10k/l3.1-euryale-70b | paid sao10k/l3.3-euryale-70b | paid + sarvamai/sarvam-m | paid + sarvamai/sarvam-m:free | free shisa-ai/shisa-v2-llama3.3-70b:free | free raifle/sorcererlm-8x22b | paid - steelskull/l3.3-electra-r1-70b | paid thedrummer/anubis-pro-105b-v1 | paid + thedrummer/rocinante-12b | paid thedrummer/skyfall-36b-v2 | paid + thedrummer/unslopnemo-12b | paid + thedrummer/valkyrie-49b-v1 | paid + thudm/glm-4-32b | paid thudm/glm-4-32b:free | free + thudm/glm-z1-32b | paid thudm/glm-z1-32b:free | free + thudm/glm-z1-rumination-32b | paid + tngtech/deepseek-r1t-chimera:free | free undi95/toppy-m-7b | paid scb10x/llama3.1-typhoon2-70b-instruct | paid scb10x/llama3.1-typhoon2-8b-instruct | paid - thedrummer/unslopnemo-12b | paid - microsoft/wizardlm-2-7b | paid microsoft/wizardlm-2-8x22b | paid x-ai/grok-2-1212 | paid x-ai/grok-2-vision-1212 | paid @@ -334,6 +357,7 @@ export interface IKBotOptions {  babbage-002 chatgpt-4o-latest + codex-mini-latest dall-e-2 dall-e-3 davinci-002 @@ -381,6 +405,7 @@ export interface IKBotOptions { gpt-4o-search-preview gpt-4o-search-preview-2025-03-11 gpt-4o-transcribe + gpt-image-1 o1 o1-2024-12-17 o1-mini diff --git a/packages/ai-tools/dist/zod_schemas.d.ts b/packages/ai-tools/dist/zod_schemas.d.ts index 13a710e7..2d9f3111 100644 --- a/packages/ai-tools/dist/zod_schemas.d.ts +++ b/packages/ai-tools/dist/zod_schemas.d.ts @@ -114,15 +114,15 @@ export declare const InvokeToolSchema: z.ZodObject<{ env_key: z.ZodOptional; }, "strip", z.ZodTypeAny, { function?: string; - params?: string; tools?: string; + params?: string; target?: string; output?: string; env_key?: string; }, { function?: string; - params?: string; tools?: string; + params?: string; target?: string; output?: string; env_key?: string; diff --git a/packages/ai-tools/src/lib/tools/fs.ts b/packages/ai-tools/src/lib/tools/fs.ts index eac70c13..eae5f9c4 100644 --- a/packages/ai-tools/src/lib/tools/fs.ts +++ b/packages/ai-tools/src/lib/tools/fs.ts @@ -249,7 +249,7 @@ export const tools = (target: string, options: IKBotTask): Array => { type: "object", properties: { path: { type: "string" }, - content: { type: "string", description: "base64 encoded string" } + content: { type: "string", description: "new file content (Part of JSON payload)" } }, required: ["path", "content"] } @@ -279,9 +279,9 @@ export const tools = (target: string, options: IKBotTask): Array => { const filePath = path.join(target, sanitizedPath); logger.debug(`Tool:modify_project_files writing file ${filePath}`) try { - const contentToWrite = decodeContentSmart(file.content, logger, sanitizedPath); + // const contentToWrite = decodeContentSmart(file.content, logger, sanitizedPath); try { - await write(filePath, contentToWrite) + await write(filePath, file.content) } catch (writeError) { logger.error(`Tool:modify_project_files Error writing file ${filePath}`, writeError) } @@ -301,7 +301,7 @@ export const tools = (target: string, options: IKBotTask): Array => { type: 'function', function: { name: "write_file", - description: "Writes to a file, given a path and content (base64). No directory or file exists check needed!", + description: "Writes to a file, given a path and content (Part of JSON payload). No directory or file exists check needed!", parameters: { type: "object", properties: { @@ -309,7 +309,7 @@ export const tools = (target: string, options: IKBotTask): Array => { type: "object", properties: { path: { type: "string" }, - content: { type: "string", description: "base64 encoded string" } + content: { type: "string", description: "new file content (Part of JSON payload)" } } } }, @@ -337,12 +337,10 @@ export const tools = (target: string, options: IKBotTask): Array => { const sanitizedPath = sanitize(fileInfo.path); const filePath = path.join(target, sanitizedPath) logger.debug(`Tool::write_file Writing file ${filePath}`) - try { // Use the smart decoding helper function - const contentToWrite = decodeContentSmart(fileInfo.content, logger, sanitizedPath); - - await write(filePath, contentToWrite) + // const contentToWrite = decodeContentSmart(fileInfo.content, logger, sanitizedPath); + await write(filePath, fileInfo.content) return true } catch (error) { // Log error related to processing or writing the file diff --git a/packages/ai-tools/src/types_kbot.ts b/packages/ai-tools/src/types_kbot.ts index d9338573..f3e5cb72 100644 --- a/packages/ai-tools/src/types_kbot.ts +++ b/packages/ai-tools/src/types_kbot.ts @@ -9,6 +9,8 @@ export interface IKBotOptions { dst?: string | undefined; /** How to handle output if --dst file already exists: "concat" (append) or "merge" (try to merge structures if possible, otherwise append). Only used if --dst is specified. */ append?: ("concat" | "merge") | undefined; + /** Specify how to wrap the output, "meta (file name, absolute path, cwd)" or "none". */ + wrap?: "meta" | "none"; /** Iterate over items, supported: GLOB | Path to JSON File | array of strings (comma separated). To test different models, use --each="gpt-3.5-turbo,gpt-4o", the actual string will exposed as variable `ITEM`, eg: --dst="${ITEM}-output.md" */ each?: string | undefined; /** Disable tools categories, eg: --disable=fs,git,interact,terminal,search,web,email,user */ @@ -19,6 +21,8 @@ export interface IKBotOptions { tools?: (string[] | string); /** Comma separated glob patterns or paths, eg --include=src/*.tsx,src/*.ts --include=package.json */ include?: string[] | undefined; + /** Comma separated glob patterns or paths, eg --exclude=src/*.tsx,src/*.ts --exclude=package.json */ + exclude?: string[] | undefined; /** Explicit API key to use */ api_key?: string | undefined; /** AI model to use for processing. Available models: @@ -28,17 +32,12 @@ export interface IKBotOptions { 01-ai/yi-large | paid aetherwiing/mn-starcannon-12b | paid agentica-org/deepcoder-14b-preview:free | free - ai21/jamba-1-5-large | paid - ai21/jamba-1-5-mini | paid ai21/jamba-1.6-large | paid - ai21/jamba-instruct | paid ai21/jamba-1.6-mini | paid aion-labs/aion-1.0 | paid aion-labs/aion-1.0-mini | paid aion-labs/aion-rp-llama-3.1-8b | paid - jondurbin/airoboros-l2-70b | paid alfredpros/codellama-7b-instruct-solidity | paid - allenai/molmo-7b-d:free | free amazon/nova-lite-v1 | paid amazon/nova-micro-v1 | paid amazon/nova-pro-v1 | paid @@ -59,15 +58,23 @@ export interface IKBotOptions { anthropic/claude-3.7-sonnet | paid anthropic/claude-3.7-sonnet:beta | paid anthropic/claude-3.7-sonnet:thinking | paid + anthropic/claude-opus-4 | paid + anthropic/claude-sonnet-4 | paid anthropic/claude-2 | paid anthropic/claude-2:beta | paid anthropic/claude-2.0 | paid anthropic/claude-2.0:beta | paid anthropic/claude-2.1 | paid anthropic/claude-2.1:beta | paid + arcee-ai/arcee-blitz | paid + arcee-ai/caller-large | paid + arcee-ai/coder-large | paid + arcee-ai/maestro-reasoning | paid + arcee-ai/spotlight | paid + arcee-ai/virtuoso-large | paid + arcee-ai/virtuoso-medium-v2 | paid arliai/qwq-32b-arliai-rpr-v1:free | free openrouter/auto | paid - bytedance-research/ui-tars-72b:free | free cohere/command | paid cohere/command-a | paid cohere/command-r | paid @@ -77,6 +84,10 @@ export interface IKBotOptions { cohere/command-r-plus-04-2024 | paid cohere/command-r-plus-08-2024 | paid cohere/command-r7b-12-2024 | paid + deepseek/deepseek-prover-v2 | paid + deepseek/deepseek-prover-v2:free | free + deepseek/deepseek-r1-0528-qwen3-8b | paid + deepseek/deepseek-r1-0528-qwen3-8b:free | free deepseek/deepseek-r1-zero:free | free deepseek/deepseek-chat | paid deepseek/deepseek-chat:free | free @@ -85,6 +96,8 @@ export interface IKBotOptions { deepseek/deepseek-v3-base:free | free deepseek/deepseek-r1 | paid deepseek/deepseek-r1:free | free + deepseek/deepseek-r1-0528 | paid + deepseek/deepseek-r1-0528:free | free deepseek/deepseek-r1-distill-llama-70b | paid deepseek/deepseek-r1-distill-llama-70b:free | free deepseek/deepseek-r1-distill-llama-8b | paid @@ -93,7 +106,7 @@ export interface IKBotOptions { deepseek/deepseek-r1-distill-qwen-14b:free | free deepseek/deepseek-r1-distill-qwen-32b | paid deepseek/deepseek-r1-distill-qwen-32b:free | free - cognitivecomputations/dolphin-mixtral-8x7b | paid + deepseek/deepseek-r1-distill-qwen-7b | paid cognitivecomputations/dolphin-mixtral-8x22b | paid cognitivecomputations/dolphin3.0-mistral-24b:free | free cognitivecomputations/dolphin3.0-r1-mistral-24b:free | free @@ -105,20 +118,18 @@ export interface IKBotOptions { alpindale/goliath-120b | paid google/gemini-flash-1.5 | paid google/gemini-flash-1.5-8b | paid - google/gemini-flash-1.5-8b-exp | paid google/gemini-pro-1.5 | paid google/gemini-2.0-flash-001 | paid google/gemini-2.0-flash-exp:free | free google/gemini-2.0-flash-lite-001 | paid - google/gemini-2.0-flash-thinking-exp-1219:free | free - google/gemini-2.0-flash-thinking-exp:free | free google/gemini-2.5-flash-preview | paid google/gemini-2.5-flash-preview:thinking | paid - google/gemini-2.5-pro-exp-03-25:free | free - google/gemini-2.5-pro-preview-03-25 | paid - google/gemini-pro | paid - google/gemini-pro-vision | paid + google/gemini-2.5-flash-preview-05-20 | paid + google/gemini-2.5-flash-preview-05-20:thinking | paid + google/gemini-2.5-pro-exp-03-25 | paid + google/gemini-2.5-pro-preview | paid google/gemma-2-27b-it | paid + google/gemma-2b-it | paid google/gemma-2-9b-it | paid google/gemma-2-9b-it:free | free google/gemma-3-12b-it | paid @@ -128,16 +139,11 @@ export interface IKBotOptions { google/gemma-3-27b-it:free | free google/gemma-3-4b-it | paid google/gemma-3-4b-it:free | free - google/learnlm-1.5-pro-experimental:free | free - google/palm-2-chat-bison | paid - google/palm-2-chat-bison-32k | paid - google/palm-2-codechat-bison | paid - google/palm-2-codechat-bison-32k | paid - huggingfaceh4/zephyr-7b-beta:free | free + google/gemma-3n-e4b-it:free | free + inception/mercury-coder-small-beta | paid infermatic/mn-inferor-12b | paid inflection/inflection-3-pi | paid inflection/inflection-3-productivity | paid - latitudegames/wayfarer-large-70b-llama-3.3 | paid liquid/lfm-3b | paid liquid/lfm-40b | paid liquid/lfm-7b | paid @@ -146,7 +152,6 @@ export interface IKBotOptions { anthracite-org/magnum-v2-72b | paid anthracite-org/magnum-v4-72b | paid mancer/weaver | paid - meta-llama/llama-2-13b-chat | paid meta-llama/llama-2-70b-chat | paid meta-llama/llama-3-70b-instruct | paid meta-llama/llama-3-8b-instruct | paid @@ -165,13 +170,19 @@ export interface IKBotOptions { meta-llama/llama-3.2-90b-vision-instruct | paid meta-llama/llama-3.3-70b-instruct | paid meta-llama/llama-3.3-70b-instruct:free | free + meta-llama/llama-3.3-8b-instruct:free | free meta-llama/llama-4-maverick | paid meta-llama/llama-4-maverick:free | free meta-llama/llama-4-scout | paid meta-llama/llama-4-scout:free | free + meta-llama/llama-guard-4-12b | paid meta-llama/llama-guard-2-8b | paid + microsoft/mai-ds-r1:free | free microsoft/phi-4 | paid microsoft/phi-4-multimodal-instruct | paid + microsoft/phi-4-reasoning:free | free + microsoft/phi-4-reasoning-plus | paid + microsoft/phi-4-reasoning-plus:free | free microsoft/phi-3-medium-128k-instruct | paid microsoft/phi-3-mini-128k-instruct | paid microsoft/phi-3.5-mini-128k-instruct | paid @@ -185,15 +196,16 @@ export interface IKBotOptions { mistralai/mistral-small | paid mistralai/mistral-tiny | paid mistralai/codestral-2501 | paid - mistralai/codestral-mamba | paid + mistralai/devstral-small | paid + mistralai/devstral-small:free | free mistralai/ministral-3b | paid - mistral/ministral-8b | paid mistralai/ministral-8b | paid mistralai/mistral-7b-instruct | paid mistralai/mistral-7b-instruct:free | free mistralai/mistral-7b-instruct-v0.1 | paid mistralai/mistral-7b-instruct-v0.2 | paid mistralai/mistral-7b-instruct-v0.3 | paid + mistralai/mistral-medium-3 | paid mistralai/mistral-nemo | paid mistralai/mistral-nemo:free | free mistralai/mistral-small-24b-instruct-2501 | paid @@ -210,24 +222,23 @@ export interface IKBotOptions { gryphe/mythomax-l2-13b | paid neversleep/llama-3-lumimaid-70b | paid neversleep/llama-3-lumimaid-8b | paid - neversleep/llama-3-lumimaid-8b:extended | paid neversleep/llama-3.1-lumimaid-70b | paid neversleep/llama-3.1-lumimaid-8b | paid neversleep/noromaid-20b | paid nousresearch/deephermes-3-llama-3-8b-preview:free | free - nousresearch/nous-hermes-llama2-13b | paid + nousresearch/deephermes-3-mistral-24b-preview:free | free nousresearch/nous-hermes-2-mixtral-8x7b-dpo | paid nousresearch/hermes-3-llama-3.1-405b | paid nousresearch/hermes-3-llama-3.1-70b | paid nousresearch/hermes-2-pro-llama-3-8b | paid nvidia/llama-3.1-nemotron-70b-instruct | paid - nvidia/llama-3.1-nemotron-70b-instruct:free | free - nvidia/llama-3.1-nemotron-nano-8b-v1:free | free + nvidia/llama-3.1-nemotron-ultra-253b-v1 | paid nvidia/llama-3.1-nemotron-ultra-253b-v1:free | free + nvidia/llama-3.3-nemotron-super-49b-v1 | paid nvidia/llama-3.3-nemotron-super-49b-v1:free | free open-r1/olympiccoder-32b:free | free - open-r1/olympiccoder-7b:free | free openai/chatgpt-4o-latest | paid + openai/codex-mini | paid openai/gpt-3.5-turbo | paid openai/gpt-3.5-turbo-0613 | paid openai/gpt-3.5-turbo-16k | paid @@ -265,7 +276,8 @@ export interface IKBotOptions { openai/o3-mini-high | paid openai/o4-mini | paid openai/o4-mini-high | paid - openchat/openchat-7b | paid + opengvlab/internvl3-14b:free | free + opengvlab/internvl3-2b:free | free all-hands/openhands-lm-32b-v0.1 | paid perplexity/llama-3.1-sonar-large-128k-online | paid perplexity/llama-3.1-sonar-small-128k-online | paid @@ -282,19 +294,26 @@ export interface IKBotOptions { qwen/qwen-max | paid qwen/qwen-plus | paid qwen/qwen-turbo | paid - qwen/qwen2.5-coder-7b-instruct | paid qwen/qwen2.5-vl-32b-instruct | paid qwen/qwen2.5-vl-32b-instruct:free | free qwen/qwen2.5-vl-3b-instruct:free | free qwen/qwen2.5-vl-72b-instruct | paid qwen/qwen2.5-vl-72b-instruct:free | free - qwen/qwen-2.5-vl-72b-instruct | paid qwen/qwen-2.5-vl-7b-instruct | paid qwen/qwen-2.5-vl-7b-instruct:free | free + qwen/qwen3-14b | paid + qwen/qwen3-14b:free | free + qwen/qwen3-235b-a22b | paid + qwen/qwen3-235b-a22b:free | free + qwen/qwen3-30b-a3b | paid + qwen/qwen3-30b-a3b:free | free + qwen/qwen3-32b | paid + qwen/qwen3-32b:free | free + qwen/qwen3-8b | paid + qwen/qwen3-8b:free | free qwen/qwq-32b | paid qwen/qwq-32b:free | free qwen/qwq-32b-preview | paid - qwen/qwq-32b-preview:free | free qwen/qwen-2.5-72b-instruct | paid qwen/qwen-2.5-72b-instruct:free | free qwen/qwen-2.5-7b-instruct | paid @@ -304,24 +323,28 @@ export interface IKBotOptions { featherless/qwerky-72b:free | free rekaai/reka-flash-3:free | free undi95/remm-slerp-l2-13b | paid - thedrummer/rocinante-12b | paid - sophosympatheia/rogue-rose-103b-v0.2:free | free sao10k/l3-lunaris-8b | paid sao10k/l3-euryale-70b | paid sao10k/l3.1-euryale-70b | paid sao10k/l3.3-euryale-70b | paid + sarvamai/sarvam-m | paid + sarvamai/sarvam-m:free | free shisa-ai/shisa-v2-llama3.3-70b:free | free raifle/sorcererlm-8x22b | paid - steelskull/l3.3-electra-r1-70b | paid thedrummer/anubis-pro-105b-v1 | paid + thedrummer/rocinante-12b | paid thedrummer/skyfall-36b-v2 | paid + thedrummer/unslopnemo-12b | paid + thedrummer/valkyrie-49b-v1 | paid + thudm/glm-4-32b | paid thudm/glm-4-32b:free | free + thudm/glm-z1-32b | paid thudm/glm-z1-32b:free | free + thudm/glm-z1-rumination-32b | paid + tngtech/deepseek-r1t-chimera:free | free undi95/toppy-m-7b | paid scb10x/llama3.1-typhoon2-70b-instruct | paid scb10x/llama3.1-typhoon2-8b-instruct | paid - thedrummer/unslopnemo-12b | paid - microsoft/wizardlm-2-7b | paid microsoft/wizardlm-2-8x22b | paid x-ai/grok-2-1212 | paid x-ai/grok-2-vision-1212 | paid @@ -334,6 +357,7 @@ export interface IKBotOptions {  babbage-002 chatgpt-4o-latest + codex-mini-latest dall-e-2 dall-e-3 davinci-002 @@ -381,6 +405,7 @@ export interface IKBotOptions { gpt-4o-search-preview gpt-4o-search-preview-2025-03-11 gpt-4o-transcribe + gpt-image-1 o1 o1-2024-12-17 o1-mini