clean up duplicated code

Author: KoolADE85

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

@@ -7,22 +7,18 @@
 
 from __future__ import annotations
 
-import json
-
-from dash.dependencies import Wildcard
+from dash._layout_utils import _WILDCARD_VALUES, parse_wildcard_id
 from dash.mcp.types import MCPInput
 
 from .base import InputDescriptionSource
 
-_WILDCARD_VALUES = frozenset(w.value for w in Wildcard)
-
 
 class PatternMatchingDescription(InputDescriptionSource):
     """Describe pattern-matching behavior for wildcard inputs."""
 
     @classmethod
     def describe(cls, param: MCPInput) -> list[str]:
-        dep_id = _parse_dep_id(param["component_id"])
+        dep_id = parse_wildcard_id(param["component_id"])
         if dep_id is None:
             return []
 
@@ -56,15 +52,6 @@ def describe(cls, param: MCPInput) -> list[str]:
         return [desc] if desc else []
 
 
-def _parse_dep_id(component_id: str) -> dict | None:
-    if not component_id.startswith("{"):
-        return None
-    try:
-        return json.loads(component_id)
-    except (json.JSONDecodeError, ValueError):
-        return None
-
-
 def _find_wildcard(dep_id: dict) -> tuple[str | None, str | None]:
     """Return (key, wildcard_type) for the first wildcard found."""
     for key, value in dep_id.items():

dash/mcp/primitives/tools/input_schemas/schema_pattern_matching.py

@@ -8,10 +8,13 @@
 
 from __future__ import annotations
 
-import json
 from typing import Any
 
-from dash._layout_utils import find_matching_components, _WILDCARD_VALUES
+from dash._layout_utils import (
+    _WILDCARD_VALUES,
+    find_matching_components,
+    parse_wildcard_id,
+)
 from dash.mcp.types import MCPInput
 
 from .base import InputSchemaSource
@@ -26,7 +29,7 @@ class PatternMatchingSchema(InputSchemaSource):
 
     @classmethod
     def get_schema(cls, param: MCPInput) -> dict[str, Any] | None:
-        dep_id = _parse_dep_id(param["component_id"])
+        dep_id = parse_wildcard_id(param["component_id"])
         if dep_id is None:
             return None
 
@@ -52,15 +55,6 @@ def get_schema(cls, param: MCPInput) -> dict[str, Any] | None:
         return {"type": "array", "items": item_schema}
 
 
-def _parse_dep_id(component_id: str) -> dict | None:
-    if not component_id.startswith("{"):
-        return None
-    try:
-        return json.loads(component_id)
-    except (json.JSONDecodeError, ValueError):
-        return None
-
-
 def _get_wildcard_type(dep_id: dict) -> str | None:
     """Return the wildcard type (ALL, MATCH, ALLSMALLER) or None."""
     for value in dep_id.values():
@@ -72,10 +66,11 @@ def _get_wildcard_type(dep_id: dict) -> str | None:
 
 def _infer_value_schema(param: MCPInput) -> dict[str, Any] | None:
     """Infer the JSON Schema for the ``value`` field from a matching component."""
-    matches = find_matching_components(_parse_dep_id(param["component_id"]))
+    matches = find_matching_components(parse_wildcard_id(param["component_id"]))
     if not matches:
         return None
 
+    # pylint: disable-next=cyclic-import,import-outside-toplevel
     from . import get_input_schema
 
     concrete_param: MCPInput = {