Fix types for mypy

Author: KoolADE85

dash/mcp/__init__.py

@@ -3,5 +3,5 @@
 from dash.mcp._server import enable_mcp_server
 
 __all__ = [
-    enable_mcp_server,
+    "enable_mcp_server",
 ]

dash/mcp/_server.py

@@ -204,7 +204,8 @@ def _process_mcp_message(data: dict[str, Any]) -> dict[str, Any] | None:
     """
     method = data.get("method", "")
     params = data.get("params", {}) or {}
-    request_id = data.get("id")
+    _id = data.get("id")
+    request_id: str | int = _id if isinstance(_id, (str, int)) else ""
 
     app = get_app()
     if not hasattr(app, "mcp_callback_map"):

dash/mcp/primitives/__init__.py

@@ -9,9 +9,9 @@
 )
 
 __all__ = [
-    call_tool,
-    list_resources,
-    list_resource_templates,
-    list_tools,
-    read_resource,
+    "call_tool",
+    "list_resources",
+    "list_resource_templates",
+    "list_tools",
+    "read_resource",
 ]

dash/mcp/primitives/resources/resource_clientside_callbacks.py

@@ -10,6 +10,7 @@
     Resource,
     TextResourceContents,
 )
+from pydantic import AnyUrl
 
 from dash import get_app
 from dash._utils import clean_property_name, split_callback_id
@@ -25,7 +26,7 @@ def get_resource(cls) -> Resource | None:
         if not _get_clientside_callbacks():
             return None
         return Resource(
-            uri=cls.uri,
+            uri=AnyUrl(cls.uri),
             name="dash_clientside_callbacks",
             description=(
                 "Actions the user can take manually in the browser "
@@ -52,7 +53,7 @@ def read_resource(cls, uri: str = "") -> ReadResourceResult:
         return ReadResourceResult(
             contents=[
                 TextResourceContents(
-                    uri=cls.uri,
+                    uri=AnyUrl(cls.uri),
                     mimeType="application/json",
                     text=json.dumps(data, default=str),
                 )

dash/mcp/primitives/resources/resource_components.py

@@ -9,6 +9,7 @@
     Resource,
     TextResourceContents,
 )
+from pydantic import AnyUrl
 
 from dash import get_app
 from dash._layout_utils import traverse
@@ -22,7 +23,7 @@ class ComponentsResource(MCPResourceProvider):
     @classmethod
     def get_resource(cls) -> Resource | None:
         return Resource(
-            uri=cls.uri,
+            uri=AnyUrl(cls.uri),
             name="dash_components",
             description=(
                 "All components with IDs in the app layout. "
@@ -41,7 +42,7 @@ def read_resource(cls, uri: str = "") -> ReadResourceResult:
         components = sorted(
             [
                 {
-                    "id": str(comp.id),
+                    "id": str(getattr(comp, "id", None)),
                     "type": getattr(comp, "_type", type(comp).__name__),
                 }
                 for comp, _ in traverse(layout)
@@ -53,7 +54,7 @@ def read_resource(cls, uri: str = "") -> ReadResourceResult:
         return ReadResourceResult(
             contents=[
                 TextResourceContents(
-                    uri=cls.uri,
+                    uri=AnyUrl(cls.uri),
                     mimeType="application/json",
                     text=json.dumps(components),
                 )

dash/mcp/primitives/resources/resource_layout.py

@@ -7,6 +7,7 @@
     Resource,
     TextResourceContents,
 )
+from pydantic import AnyUrl
 
 from dash import get_app
 from dash._utils import to_json
@@ -20,7 +21,7 @@ class LayoutResource(MCPResourceProvider):
     @classmethod
     def get_resource(cls) -> Resource | None:
         return Resource(
-            uri=cls.uri,
+            uri=AnyUrl(cls.uri),
             name="dash_app_layout",
             description=(
                 "Full component tree of the Dash app. "
@@ -35,7 +36,7 @@ def read_resource(cls, uri: str = "") -> ReadResourceResult:
         return ReadResourceResult(
             contents=[
                 TextResourceContents(
-                    uri=cls.uri,
+                    uri=AnyUrl(cls.uri),
                     mimeType="application/json",
                     text=to_json(app.get_layout()),
                 )

dash/mcp/primitives/resources/resource_page_layout.py

@@ -7,6 +7,7 @@
     ResourceTemplate,
     TextResourceContents,
 )
+from pydantic import AnyUrl
 
 from dash._pages import PAGE_REGISTRY
 from dash._utils import to_json
@@ -56,7 +57,7 @@ def read_resource(cls, uri: str) -> ReadResourceResult:
         return ReadResourceResult(
             contents=[
                 TextResourceContents(
-                    uri=uri,
+                    uri=AnyUrl(uri),
                     mimeType="application/json",
                     text=to_json(page_layout),
                 )

dash/mcp/primitives/resources/resource_pages.py

@@ -9,6 +9,7 @@
     Resource,
     TextResourceContents,
 )
+from pydantic import AnyUrl
 
 from dash._pages import PAGE_REGISTRY
 
@@ -23,7 +24,7 @@ def get_resource(cls) -> Resource | None:
         if not PAGE_REGISTRY:
             return None
         return Resource(
-            uri=cls.uri,
+            uri=AnyUrl(cls.uri),
             name="dash_app_pages",
             description=(
                 "List of all pages in this multi-page Dash app "
@@ -51,7 +52,7 @@ def read_resource(cls, uri: str = "") -> ReadResourceResult:
         return ReadResourceResult(
             contents=[
                 TextResourceContents(
-                    uri=cls.uri,
+                    uri=AnyUrl(cls.uri),
                     mimeType="application/json",
                     text=json.dumps(pages, default=str),
                 )

dash/mcp/primitives/tools/callback_adapter.py

@@ -10,7 +10,7 @@
 import json
 import typing
 from functools import cached_property
-from typing import Any
+from typing import Any, cast
 
 from mcp.types import Tool
 
@@ -27,6 +27,7 @@
     CallbackDependency,
     CallbackExecutionBody,
     CallbackInput,
+    CallbackInputs,
     CallbackOutput,
     CallbackOutputTarget,
     WildcardId,
@@ -360,9 +361,7 @@ def _param_annotations(self) -> list[Any | None]:
         return [hints.get(func_name) for func_name, _ in self._dep_param_map]
 
 
-def _expand_dep(
-    dep: CallbackDependency, value: Any
-) -> CallbackInput | list[CallbackInput]:
+def _expand_dep(dep: CallbackDependency, value: Any) -> CallbackInputs:
     """Attach a concrete value to a callback dependency to produce a valid callback input.
 
     For regular deps, returns ``{id, property, value}``.
@@ -371,20 +370,20 @@ def _expand_dep(
     """
     pattern = parse_wildcard_id(dep.get("id", ""))
     if pattern is None:
-        return {**dep, "value": value}
+        return CallbackInput(id=dep["id"], property=dep["property"], value=value)
 
     # LLM provides browser-like format
     if isinstance(value, list):
-        return value
+        return cast(list[CallbackInput], value)
     if isinstance(value, dict) and "id" in value:
-        return value
-    return {**dep, "value": value}
+        return cast(CallbackInput, value)
+    return CallbackInput(id=dep["id"], property=dep["property"], value=value)
 
 
 def _expand_output_spec(
     output_id: str,
     cb_info: dict,
-    resolved_inputs: list[CallbackInput],
+    resolved_inputs: list[CallbackInputs],
 ) -> CallbackOutputTarget | list[CallbackOutputTarget]:
     """Build the outputs spec, expanding wildcards to concrete IDs.
 
@@ -407,15 +406,19 @@ def _expand_output_spec(
         if pattern is not None:
             concrete_ids = _derive_output_ids(pattern, resolved_inputs)
             if not concrete_ids:
-                concrete_ids = [comp.id for comp in find_matching_components(pattern)]
-            expanded = [{"id": cid, "property": prop} for cid in concrete_ids]
+                concrete_ids = [
+                    getattr(comp, "id") for comp in find_matching_components(pattern)
+                ]
+            expanded: list[CallbackDependency] = [
+                CallbackDependency(id=cid, property=prop) for cid in concrete_ids
+            ]
             # ALL/ALLSMALLER → nested list; MATCH → single dict
             if len(expanded) == 1:
                 results.append(expanded[0])
             else:
                 results.append(expanded)
         else:
-            results.append({"id": pid, "property": prop})
+            results.append(CallbackDependency(id=pid, property=prop))
 
     # Mirror the Dash renderer: single-output callbacks send a bare dict,
     # multi-output callbacks send a list. The framework's output value
@@ -427,7 +430,7 @@ def _expand_output_spec(
 
 def _derive_output_ids(
     output_pattern: WildcardId,
-    resolved_inputs: list[CallbackInput],
+    resolved_inputs: list[CallbackInputs],
 ) -> list[WildcardId] | None:
     """Derive concrete output IDs from the resolved input entries.
 
@@ -456,15 +459,19 @@ def _substitute(item_id: WildcardId) -> WildcardId | None:
         if isinstance(entry, list) and entry:
             concrete_ids = []
             for item in entry:
-                out = _substitute(item.get("id"))
-                if out:
-                    concrete_ids.append(out)
+                item_id = item.get("id")
+                if isinstance(item_id, dict):
+                    out = _substitute(item_id)
+                    if out:
+                        concrete_ids.append(out)
             if concrete_ids:
                 return concrete_ids
         # MATCH: single {id, property, value} dict
-        elif isinstance(entry, dict) and isinstance(entry.get("id"), dict):
-            out = _substitute(entry["id"])
-            if out:
-                return [out]
+        elif isinstance(entry, dict):
+            entry_id = entry.get("id")
+            if isinstance(entry_id, dict):
+                out = _substitute(entry_id)
+                if out:
+                    return [out]
 
     return None

dash/mcp/primitives/tools/input_schemas/input_descriptions/description_pattern_matching.py

@@ -23,7 +23,7 @@ def describe(cls, param: MCPInput) -> list[str]:
             return []
 
         wildcard_key, wildcard_type = _find_wildcard(dep_id)
-        if wildcard_key is None:
+        if wildcard_key is None or wildcard_type is None:
             return []
 
         non_wildcard = {k: v for k, v in dep_id.items() if k != wildcard_key}