torbjorn/my-pal-mcp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stronger wording around model name usage

Browse Source 
style: formatting
This commit is contained in:
Fahad
2025-10-02 14:54:05 +04:00
parent 8729951b9a
commit eb0afe1ab8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/shared/base_tool.py
View File

@@ -293,7 +293,10 @@ class BaseTool(ABC):
available_models = self._get_available_models() available_models = self._get_available_models()
if not available_models: if not available_models:
return "No models detected. Configure provider credentials or set DEFAULT_MODEL to a valid option." return (
"No models detected. Configure provider credentials or set DEFAULT_MODEL to a valid option. "
"If the user requested a specific model, respond with this notice instead of substituting another model."
)
return ", ".join(available_models) return ", ".join(available_models)
def _build_model_unavailable_message(self, model_name: str) -> str: def _build_model_unavailable_message(self, model_name: str) -> str:
@@ -307,7 +310,7 @@ class BaseTool(ABC):
f"Model '{model_name}' is not available with current API keys. " f"Model '{model_name}' is not available with current API keys. "
f"Available models: {available_models_text}. " f"Available models: {available_models_text}. "
f"Suggested model for {self.get_name()}: '{suggested_model}' " f"Suggested model for {self.get_name()}: '{suggested_model}' "
f"(category: {tool_category.value}). Select the strongest reasoning model that fits the task." f"(category: {tool_category.value}). If the user explicitly requested a model, you MUST use that exact name or report this error back—do not substitute another model."
) )
def _build_auto_mode_required_message(self) -> str: def _build_auto_mode_required_message(self) -> str:
@@ -321,7 +324,7 @@ class BaseTool(ABC):
"Model parameter is required in auto mode. " "Model parameter is required in auto mode. "
f"Available models: {available_models_text}. " f"Available models: {available_models_text}. "
f"Suggested model for {self.get_name()}: '{suggested_model}' " f"Suggested model for {self.get_name()}: '{suggested_model}' "
f"(category: {tool_category.value}). Select the strongest reasoning model that fits the task." f"(category: {tool_category.value}). When the user names a model, relay that exact name—never swap in another option."
) )
def get_model_field_schema(self) -> dict[str, Any]: def get_model_field_schema(self) -> dict[str, Any]:
@@ -340,8 +343,8 @@ class BaseTool(ABC):
# Use the centralized effective auto mode check # Use the centralized effective auto mode check
if self.is_effective_auto_mode(): if self.is_effective_auto_mode():
description = ( description = (
"Currently in auto model selection mode. IMPORTANT: Use the model specified by the user if provided, OR select the most suitable model by calling the " "Currently in auto model selection mode. CRITICAL: When the user names a model, you MUST use that exact name unless the server rejects it. "
"`listmodels` tool to obtain the full catalog with capabilities, aliases, and context window info." "If no model is provided, you may call the `listmodels` tool to review options and select an appropriate match."
) )
return { return {
"type": "string", "type": "string",
@@ -349,8 +352,8 @@ class BaseTool(ABC):
} }
description = ( description = (
f"The default model is '{DEFAULT_MODEL}'. Override by supplying another supported model name ONLY when requested by the user. " f"The default model is '{DEFAULT_MODEL}'. Override only when the user explicitly requests a different model, and use that exact name. "
"If needed, use the `listmodels` tool to obtain a full model catalog along with their capability details." "If the requested model fails validation, surface the server error instead of substituting another model. When unsure, call the `listmodels` tool for details."
) )
return { return {