refactor: use dataclass instead of tuple

Author: drewdrewthis

python/scenario/config/model_config_resolver.py

@@ -5,11 +5,34 @@
 by merging explicit arguments with global default configurations.
 """
 
+from dataclasses import dataclass
 from typing import Optional
 
 from scenario.config import ModelConfig, ScenarioConfig
 
 
+@dataclass
+class ResolvedModelConfig:
+    """
+    Resolved model configuration with all parameters merged from explicit args and defaults.
+
+    Attributes:
+        model: The resolved model identifier
+        api_base: The resolved API base URL (if any)
+        api_key: The resolved API key (if any)
+        temperature: The resolved temperature value (if any)
+        max_tokens: The resolved max tokens value (if any)
+        extra_params: Additional parameters for the model provider
+    """
+
+    model: str
+    api_base: Optional[str]
+    api_key: Optional[str]
+    temperature: Optional[float]
+    max_tokens: Optional[int]
+    extra_params: dict
+
+
 def resolve_model_config(
     *,
     model: Optional[str] = None,
@@ -18,7 +41,7 @@ def resolve_model_config(
     temperature: Optional[float] = None,
     max_tokens: Optional[int] = None,
     **extra_kwargs,
-) -> tuple[str, Optional[str], Optional[str], Optional[float], Optional[int], dict]:
+) -> ResolvedModelConfig:
     """
     Resolve model configuration by merging explicit params with global config.
 
@@ -37,8 +60,7 @@ def resolve_model_config(
                         (e.g., timeout, headers, client, etc.)
 
     Returns:
-        Tuple of (model, api_base, api_key, temperature, max_tokens, extra_params)
-        with values resolved from explicit params and global config.
+        ResolvedModelConfig with all values resolved from explicit params and global config.
 
     Raises:
         ValueError: If no model is configured either explicitly or in global config
@@ -55,12 +77,19 @@ def resolve_model_config(
         )
 
         # Resolve with overrides
-        resolved = resolve_model_config(
+        config = resolve_model_config(
             model=None,  # Use config default
             temperature=0.0,  # Override (important: 0.0 is valid!)
             timeout=60  # Override extra param
         )
-        # Result: ("openai/gpt-4", None, None, 0.0, None, {"timeout": 60})
+        # Result: ResolvedModelConfig(
+        #   model="openai/gpt-4",
+        #   api_base=None,
+        #   api_key=None,
+        #   temperature=0.0,
+        #   max_tokens=None,
+        #   extra_params={"timeout": 60}
+        # )
         ```
 
     Note:
@@ -110,11 +139,11 @@ def resolve_model_config(
             "Model must be configured either explicitly or in ScenarioConfig.default_config"
         )
 
-    return (
-        resolved_model,
-        resolved_api_base,
-        resolved_api_key,
-        resolved_temp,
-        resolved_max_tokens,
-        resolved_extra,
+    return ResolvedModelConfig(
+        model=resolved_model,
+        api_base=resolved_api_base,
+        api_key=resolved_api_key,
+        temperature=resolved_temp,
+        max_tokens=resolved_max_tokens,
+        extra_params=resolved_extra,
     )

python/scenario/judge_agent.py

@@ -172,21 +172,20 @@ def __init__(
         self.system_prompt = system_prompt
 
         try:
-            (
-                self.model,
-                self.api_base,
-                self.api_key,
-                self.temperature,
-                self.max_tokens,
-                self._extra_params,
-            ) = resolve_model_config(
+            config = resolve_model_config(
                 model=model,
                 api_base=api_base,
                 api_key=api_key,
                 temperature=temperature,
                 max_tokens=max_tokens,
                 **extra_params,
             )
+            self.model = config.model
+            self.api_base = config.api_base
+            self.api_key = config.api_key
+            self.temperature = config.temperature
+            self.max_tokens = config.max_tokens
+            self._extra_params = config.extra_params
         except ValueError:
             raise Exception(agent_not_configured_error_message("JudgeAgent"))
 

python/scenario/user_simulator_agent.py

@@ -145,21 +145,20 @@ def __init__(
         self.system_prompt = system_prompt
 
         try:
-            (
-                self.model,
-                self.api_base,
-                self.api_key,
-                self.temperature,
-                self.max_tokens,
-                self._extra_params,
-            ) = resolve_model_config(
+            config = resolve_model_config(
                 model=model,
                 api_base=api_base,
                 api_key=api_key,
                 temperature=temperature,
                 max_tokens=max_tokens,
                 **extra_params,
             )
+            self.model = config.model
+            self.api_base = config.api_base
+            self.api_key = config.api_key
+            self.temperature = config.temperature
+            self.max_tokens = config.max_tokens
+            self._extra_params = config.extra_params
         except ValueError:
             raise Exception(agent_not_configured_error_message("UserSimulatorAgent"))