Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions shinkai-bin/shinkai-node/src/managers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ pub mod model_capabilities_manager;
pub mod sheet_manager;
pub mod token_counter_tests;
pub mod tool_router;
pub mod ollama_models_repository;
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use crate::llm_provider::{
error::LLMProviderError, providers::shared::{openai_api::openai_prepare_messages, shared_model_logic::llama_prepare_messages}
use crate::{
llm_provider::{
error::LLMProviderError, providers::shared::{openai_api::openai_prepare_messages, shared_model_logic::llama_prepare_messages}
}, managers::ollama_models_repository::OllamaModelsRepository
};
use shinkai_message_primitives::{
schemas::{
Expand Down Expand Up @@ -660,25 +662,7 @@ impl ModelCapabilitiesManager {
eprintln!("has tool capabilities model: {:?}", model);
match model {
LLMProviderInterface::OpenAI(_) => true,
LLMProviderInterface::Ollama(model) => {
// For Ollama, check model type and respect the passed stream parameter
model.model_type.starts_with("llama3.1")
|| model.model_type.starts_with("llama3.2")
|| model.model_type.starts_with("llama-3.1")
|| model.model_type.starts_with("llama-3.2")
|| model.model_type.starts_with("mistral-nemo")
|| model.model_type.starts_with("mistral-small")
|| model.model_type.starts_with("mistral-large")
|| model.model_type.starts_with("mistral-pixtral")
|| model.model_type.starts_with("qwen2.5-coder")
|| model.model_type.starts_with("qwq")
|| model.model_type.starts_with("deepseek-r1:14b")
|| model.model_type.starts_with("deepseek-r1:8b")
|| model.model_type.starts_with("deepseek-r1:70b")
|| model.model_type.starts_with("deepseek-v3")
|| model.model_type.starts_with("command-r7b")
|| model.model_type.starts_with("mistral-small")
}
LLMProviderInterface::Ollama(model) => OllamaModelsRepository::supports_tools(&model.model_type),
LLMProviderInterface::Groq(model) => {
model.model_type.starts_with("llama-3.3-70b-versatile")
|| model.model_type.starts_with("llama-3.1-8b-instant")
Expand Down
Loading