From 1926a8b7788ba9f85bd9c886f5ccc8a996509527 Mon Sep 17 00:00:00 2001
From: Sameer Kankute <sameer@berri.ai>
Date: Fri, 17 Apr 2026 08:45:11 +0530
Subject: [PATCH] Fix mypy issues

---
 .../advisor_interception/handler.py           |  2 +-
 .../messages/interceptors/advisor.py          | 61 +++----------------
 litellm/utils.py                              |  3 +
 3 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/litellm/integrations/advisor_interception/handler.py b/litellm/integrations/advisor_interception/handler.py
index a59dcee9d7e..619930a8b4b 100644
--- a/litellm/integrations/advisor_interception/handler.py
+++ b/litellm/integrations/advisor_interception/handler.py
@@ -169,7 +169,7 @@ class AdvisorInterceptionLogger(CustomLogger):
         converted_stream = (
             isinstance(call_id, str) and call_id in self._converted_stream_call_ids
         )
-        if converted_stream:
+        if converted_stream and isinstance(call_id, str):
             self._converted_stream_call_ids.discard(call_id)
 
         if isinstance(call_id, str) and call_id in self._skip_post_hook_call_ids:
diff --git a/litellm/llms/anthropic/experimental_pass_through/messages/interceptors/advisor.py b/litellm/llms/anthropic/experimental_pass_through/messages/interceptors/advisor.py
index f2276bcd9c8..e8f4f32e35c 100644
--- a/litellm/llms/anthropic/experimental_pass_through/messages/interceptors/advisor.py
+++ b/litellm/llms/anthropic/experimental_pass_through/messages/interceptors/advisor.py
@@ -15,7 +15,7 @@ How it works:
 """
 
 import uuid
-from typing import Any, AsyncIterator, Dict, List, Optional, Union
+from typing import Any, AsyncIterator, Dict, List, Optional, Union, cast
 
 import litellm.constants as _c
 from litellm._logging import verbose_logger
@@ -23,11 +23,8 @@ from litellm.llms.anthropic.common_utils import strip_advisor_blocks_from_messag
 from litellm.types.llms.anthropic_messages.anthropic_response import (
     AnthropicMessagesResponse,
 )
+from litellm.types.llms.openai import AllMessageValues
 from litellm.types.llms.anthropic import ANTHROPIC_ADVISOR_TOOL_TYPE
-from litellm.utils import (
-    resolve_proxy_model_alias_to_litellm_model,
-    supports_native_advisor_tool,
-)
 
 ADVISOR_MAX_USES: int = _c.ADVISOR_MAX_USES
 ADVISOR_TOOL_DESCRIPTION: str = _c.ADVISOR_TOOL_DESCRIPTION
@@ -52,8 +49,9 @@ class AdvisorOrchestrationHandler(MessagesInterceptor):
         has_advisor = any(t.get("type") == ANTHROPIC_ADVISOR_TOOL_TYPE for t in tools)
         if not has_advisor:
             return False
-        # Keep Anthropic-native advisor behavior for Claude Opus 4.6.
-        if _should_use_native_anthropic_advisor(tools, custom_llm_provider):
+        # Direct Anthropic /messages: the API handles advisor_20260301 natively;
+        # do not run the LiteLLM orchestration loop here.
+        if custom_llm_provider == "anthropic":
             return False
         return True
 
@@ -207,49 +205,6 @@ def _resolve_default_advisor_model() -> str:
     return params.get("default_advisor_model", "") or ""
 
 
-def _should_use_native_anthropic_advisor(
-    tools: List[Dict], custom_llm_provider: Optional[str]
-) -> bool:
-    """
-    Use Anthropic's native advisor path only when:
-    - executor provider is Anthropic, and
-    - advisor model supports the native advisor capability.
-    """
-    if custom_llm_provider != "anthropic":
-        return False
-
-    advisor_tool = next(
-        (t for t in tools if t.get("type") == ANTHROPIC_ADVISOR_TOOL_TYPE),
-        None,
-    )
-    if advisor_tool is None:
-        return False
-
-    advisor_model = (advisor_tool.get("model") or _resolve_default_advisor_model() or "").strip()
-    if not advisor_model:
-        return False
-
-    # Proxy requests commonly pass advisor model as a model_name alias.
-    resolved_proxy_model = resolve_proxy_model_alias_to_litellm_model(advisor_model)
-    model_to_check = resolved_proxy_model or advisor_model
-    if supports_native_advisor_tool(
-        model=model_to_check, custom_llm_provider="anthropic"
-    ):
-        return True
-
-    try:
-        import litellm
-
-        resolved_model, advisor_provider, _, _ = litellm.get_llm_provider(
-            model=advisor_model
-        )
-        return advisor_provider == "anthropic" and supports_native_advisor_tool(
-            model=resolved_model, custom_llm_provider=advisor_provider
-        )
-    except Exception:
-        return False
-
-
 _SYNTHETIC_ADVISOR_TOOL_NAME = "consult_advisor"
 
 
@@ -530,12 +485,14 @@ async def _call_advisor_with_router(
     if api_base is not None:
         kwargs["api_base"] = api_base
 
+    openai_messages: List[AllMessageValues] = cast(List[AllMessageValues], messages)
+
     openai_response = None
     if llm_router is not None:
         try:
             openai_response = await llm_router.acompletion(
                 model=model,
-                messages=messages,
+                messages=openai_messages,
                 tools=None,
                 max_tokens=max_tokens,
                 **kwargs,
@@ -550,7 +507,7 @@ async def _call_advisor_with_router(
     if openai_response is None:
         openai_response = await _litellm.acompletion(
             model=model,
-            messages=messages,
+            messages=openai_messages,
             tools=None,
             max_tokens=max_tokens,
             **kwargs,
diff --git a/litellm/utils.py b/litellm/utils.py
index f0fa51a2bec..36e87c5f012 100644
--- a/litellm/utils.py
+++ b/litellm/utils.py
@@ -2741,6 +2741,9 @@ def resolve_proxy_model_alias_to_litellm_model(model: str) -> str:
     except Exception:
         return ""
 
+    if llm_router is None:
+        return ""
+
     try:
         model_list = llm_router.get_model_list(model_name=model) or []
     except Exception: