fast-agent-mcp 0.1.11__py3-none-any.whl → 0.1.12__py3-none-any.whl

mcp_agent/workflows/router/router_base.py

@@ -265,16 +265,16 @@ class Router(ABC, ContextDependent):
         # Check if we have any content (description or tools)
         has_description = bool(category.description)
         has_tools = bool(category.tools)
-        
+
         # If no content at all, use self-closing tag
         if not has_description and not has_tools:
             return f'<fastagent:server-category name="{category.name}" />'
-            
+
         # Otherwise, build the content
         description_section = ""
         if has_description:
             description_section = f"\n<fastagent:description>{category.description}</fastagent:description>"
-            
+
         # Add tools section if we have tool information
         if has_tools:
             tools = self._format_tools(category.tools)
@@ -293,11 +293,11 @@ class Router(ABC, ContextDependent):
         # Check if we have any content (description or servers)
         has_description = bool(category.description)
         has_servers = bool(category.servers)
-        
+
         # If no content at all, use self-closing tag
         if not has_description and not has_servers:
             return f'<fastagent:agent-category name="{category.name}" />'
-            
+
         # Build description section if needed
         description_section = ""
         if has_description:
@@ -314,13 +314,13 @@ class Router(ABC, ContextDependent):
             # Check if this server has any content
             has_server_description = bool(server.description)
             has_server_tools = bool(server.tools)
-            
+
             # Use self-closing tag if server has no content
             if not has_server_description and not has_server_tools:
                 server_section = f'<fastagent:server name="{server.name}" />'
                 server_sections.append(server_section)
                 continue
-                
+
             # Build server description if needed
             server_desc_section = ""
             if has_server_description:
@@ -342,7 +342,7 @@ class Router(ABC, ContextDependent):
                 # Just description, no tools
                 server_section = f"""<fastagent:server name="{server.name}">{server_desc_section}
 </fastagent:server>"""
-            
+
             server_sections.append(server_section)
 
         servers = "\n".join(server_sections)
@@ -357,11 +357,11 @@ class Router(ABC, ContextDependent):
         """Format a function category into a readable string."""
         # Check if we have a description
         has_description = bool(category.description)
-        
+
         # If no description, use self-closing tag
         if not has_description:
             return f'<fastagent:function-category name="{category.name}" />'
-            
+
         # Include description
         return f"""<fastagent:function-category name="{category.name}">
 <fastagent:description>{category.description}</fastagent:description>

mcp_agent/workflows/llm/llm_selector.py

@@ -1,345 +0,0 @@
-import json
-from difflib import SequenceMatcher
-from importlib import resources
-from typing import Dict, List
-
-from numpy import average
-from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
-
-from mcp.types import ModelHint, ModelPreferences
-
-
-class ModelBenchmarks(BaseModel):
-    """
-    Performance benchmarks for comparing different models.
-    """
-
-    __pydantic_extra__: dict[str, float] = Field(
-        init=False
-    )  # Enforces that extra fields are floats
-
-    quality_score: float | None = None
-    """A blended quality score for the model."""
-
-    mmlu_score: float | None = None
-    gsm8k_score: float | None = None
-    bbh_score: float | None = None
-
-    model_config = ConfigDict(extra="allow")
-
-
-class ModelLatency(BaseModel):
-    """
-    Latency benchmarks for comparing different models.
-    """
-
-    time_to_first_token_ms: float = Field(gt=0)
-    """ 
-    Median Time to first token in milliseconds.
-    """
-
-    tokens_per_second: float = Field(gt=0)
-    """
-    Median output tokens per second.
-    """
-
-
-class ModelCost(BaseModel):
-    """
-    Cost benchmarks for comparing different models.
-    """
-
-    blended_cost_per_1m: float | None = None
-    """
-    Blended cost mixing input/output cost per 1M tokens.
-    """
-
-    input_cost_per_1m: float | None = None
-    """
-    Cost per 1M input tokens.
-    """
-
-    output_cost_per_1m: float | None = None
-    """
-    Cost per 1M output tokens.
-    """
-
-
-class ModelMetrics(BaseModel):
-    """
-    Model metrics for comparing different models.
-    """
-
-    cost: ModelCost
-    speed: ModelLatency
-    intelligence: ModelBenchmarks
-
-
-class ModelInfo(BaseModel):
-    """
-    LLM metadata, including performance benchmarks.
-    """
-
-    name: str
-    description: str | None = None
-    provider: str
-    metrics: ModelMetrics
-
-
-class ModelSelector:
-    """
-    A heuristic-based selector to choose the best model from a list of models.
-
-    Because LLMs can vary along multiple dimensions, choosing the "best" model is
-    rarely straightforward.  Different models excel in different areas—some are
-    faster but less capable, others are more capable but more expensive, and so
-    on.
-
-    MCP's ModelPreferences interface allows servers to express their priorities across multiple
-    dimensions to help clients make an appropriate selection for their use case.
-    """
-
-    def __init__(
-        self,
-        models: List[ModelInfo] = None,
-        benchmark_weights: Dict[str, float] | None = None,
-    ):
-        if not models:
-            self.models = load_default_models()
-        else:
-            self.models = models
-
-        if benchmark_weights:
-            self.benchmark_weights = benchmark_weights
-        else:
-            # Defaults for how much to value each benchmark metric (must add to 1)
-            self.benchmark_weights = {"mmlu": 0.4, "gsm8k": 0.3, "bbh": 0.3}
-
-        if abs(sum(self.benchmark_weights.values()) - 1.0) > 1e-6:
-            raise ValueError("Benchmark weights must sum to 1.0")
-
-        self.max_values = self._calculate_max_scores(self.models)
-        self.models_by_provider = self._models_by_provider(self.models)
-
-    def select_best_model(
-        self, model_preferences: ModelPreferences, provider: str | None = None
-    ) -> ModelInfo:
-        """
-        Select the best model from a given list of models based on the given model preferences.
-        """
-
-        models: List[ModelInfo] = []
-        if provider:
-            models = self.models_by_provider[provider]
-        else:
-            models = self.models
-
-        if not models:
-            raise ValueError(f"No models available for selection. Provider={provider}")
-
-        candidate_models = models
-        # First check the model hints
-        if model_preferences.hints:
-            candidate_models = []
-            for model in models:
-                for hint in model_preferences.hints:
-                    if self._check_model_hint(model, hint):
-                        candidate_models.append(model)
-
-            if not candidate_models:
-                # If no hints match, we'll use all models and let the benchmark weights decide
-                candidate_models = models
-
-        scores = []
-
-        # Next, we'll use the benchmark weights to decide the best model
-        for model in candidate_models:
-            cost_score = self._calculate_cost_score(
-                model, model_preferences, max_cost=self.max_values["max_cost"]
-            )
-            speed_score = self._calculate_speed_score(
-                model,
-                max_tokens_per_second=self.max_values["max_tokens_per_second"],
-                max_time_to_first_token_ms=self.max_values[
-                    "max_time_to_first_token_ms"
-                ],
-            )
-            intelligence_score = self._calculate_intelligence_score(
-                model, self.max_values
-            )
-
-            model_score = (
-                (model_preferences.costPriority or 0) * cost_score
-                + (model_preferences.speedPriority or 0) * speed_score
-                + (model_preferences.intelligencePriority or 0) * intelligence_score
-            )
-            scores.append((model_score, model))
-
-        return max(scores, key=lambda x: x[0])[1]
-
-    def _models_by_provider(
-        self, models: List[ModelInfo]
-    ) -> Dict[str, List[ModelInfo]]:
-        """
-        Group models by provider.
-        """
-        provider_models: Dict[str, List[ModelInfo]] = {}
-        for model in models:
-            if model.provider not in provider_models:
-                provider_models[model.provider] = []
-            provider_models[model.provider].append(model)
-        return provider_models
-
-    def _check_model_hint(self, model: ModelInfo, hint: ModelHint) -> bool:
-        """
-        Check if a model matches a specific hint.
-        """
-
-        name_match = True
-        if hint.name:
-            name_match = _fuzzy_match(hint.name, model.name)
-
-        provider_match = True
-        provider: str | None = getattr(hint, "provider", None)
-        if provider:
-            provider_match = _fuzzy_match(provider, model.provider)
-
-        # This can be extended to check for more hints
-        return name_match and provider_match
-
-    def _calculate_total_cost(self, model: ModelInfo, io_ratio: float = 3.0) -> float:
-        """
-        Calculate a single cost metric of a model based on input/output token costs,
-        and a ratio of input to output tokens.
-
-        Args:
-            model: The model to calculate the cost for.
-            io_ratio: The estimated ratio of input to output tokens. Defaults to 3.0.
-        """
-
-        if model.metrics.cost.blended_cost_per_1m is not None:
-            return model.metrics.cost.blended_cost_per_1m
-
-        input_cost = model.metrics.cost.input_cost_per_1m
-        output_cost = model.metrics.cost.output_cost_per_1m
-
-        total_cost = (input_cost * io_ratio + output_cost) / (1 + io_ratio)
-        return total_cost
-
-    def _calculate_cost_score(
-        self,
-        model: ModelInfo,
-        model_preferences: ModelPreferences,
-        max_cost: float,
-    ) -> float:
-        """Normalized 0->1 cost score for a model."""
-        total_cost = self._calculate_total_cost(model, model_preferences)
-        return 1 - (total_cost / max_cost)
-
-    def _calculate_intelligence_score(
-        self, model: ModelInfo, max_values: Dict[str, float]
-    ) -> float:
-        """
-        Return a normalized 0->1 intelligence score for a model based on its benchmark metrics.
-        """
-        scores = []
-        weights = []
-
-        benchmark_dict: Dict[str, float] = model.metrics.intelligence.model_dump()
-        use_weights = True
-        for bench, score in benchmark_dict.items():
-            key = f"max_{bench}"
-            if score is not None and key in max_values:
-                scores.append(score / max_values[key])
-                if bench in self.benchmark_weights:
-                    weights.append(self.benchmark_weights[bench])
-                else:
-                    # If a benchmark doesn't have a weight, don't use weights at all, we'll just average the scores
-                    use_weights = False
-
-        if not scores:
-            return 0
-        elif use_weights:
-            return average(scores, weights=weights)
-        else:
-            return average(scores)
-
-    def _calculate_speed_score(
-        self,
-        model: ModelInfo,
-        max_tokens_per_second: float,
-        max_time_to_first_token_ms: float,
-    ) -> float:
-        """Normalized 0->1 cost score for a model."""
-
-        time_to_first_token_score = 1 - (
-            model.metrics.speed.time_to_first_token_ms / max_time_to_first_token_ms
-        )
-
-        tokens_per_second_score = (
-            model.metrics.speed.tokens_per_second / max_tokens_per_second
-        )
-
-        latency_score = average(
-            [time_to_first_token_score, tokens_per_second_score], weights=[0.4, 0.6]
-        )
-        return latency_score
-
-    def _calculate_max_scores(self, models: List[ModelInfo]) -> Dict[str, float]:
-        """
-        Of all the models, calculate the maximum value for each benchmark metric.
-        """
-        max_dict: Dict[str, float] = {}
-
-        max_dict["max_cost"] = max(self._calculate_total_cost(m) for m in models)
-        max_dict["max_tokens_per_second"] = max(
-            max(m.metrics.speed.tokens_per_second for m in models), 1e-6
-        )
-        max_dict["max_time_to_first_token_ms"] = max(
-            max(m.metrics.speed.time_to_first_token_ms for m in models), 1e-6
-        )
-
-        # Find the maximum value for each model performance benchmark
-        for model in models:
-            benchmark_dict: Dict[str, float] = model.metrics.intelligence.model_dump()
-            for bench, score in benchmark_dict.items():
-                if score is None:
-                    continue
-
-                key = f"max_{bench}"
-                if key in max_dict:
-                    max_dict[key] = max(max_dict[key], score)
-                else:
-                    max_dict[key] = score
-
-        return max_dict
-
-
-def load_default_models() -> List[ModelInfo]:
-    """
-    We use ArtificialAnalysis benchmarks for determining the best model.
-    """
-    with (
-        resources.files("mcp_agent.data")
-        .joinpath("artificial_analysis_llm_benchmarks.json")
-        .open() as file
-    ):
-        data = json.load(file)  # Array of ModelInfo objects
-        adapter = TypeAdapter(List[ModelInfo])
-        return adapter.validate_python(data)
-
-
-def _fuzzy_match(str1: str, str2: str, threshold: float = 0.8) -> bool:
-    """
-    Fuzzy match two strings
-
-    Args:
-        str1: First string to compare
-        str2: Second string to compare
-        threshold: Minimum similarity ratio to consider a match (0.0 to 1.0)
-
-    Returns:
-        bool: True if strings match above threshold, False otherwise
-    """
-    sequence_ratio = SequenceMatcher(None, str1.lower(), str2.lower()).ratio()
-    return sequence_ratio >= threshold