remove unused llmconfig

Author: asamal4

src/lightspeed_evaluation/__init__.py

@@ -28,6 +28,7 @@
     EvaluationResult,
     DataValidator,
 )
+from .core.config import LLMConfig
 from .core.metrics import RagasMetrics, DeepEvalMetrics, CustomMetrics
 
 # Output handling
@@ -43,6 +44,7 @@
     "TurnData",
     "EvaluationResult",
     "DataValidator",
+    "LLMConfig",
     # Metrics
     "RagasMetrics",
     "DeepEvalMetrics",

src/lightspeed_evaluation/core/__init__.py

@@ -8,7 +8,7 @@
     setup_environment_variables,
     DataValidator,
 )
-from .config.models import EvaluationResult, TurnData
+from .config import EvaluationResult, TurnData, LLMConfig
 
 # LLM management
 from .llm import LLMManager
@@ -22,6 +22,7 @@
     "DataValidator",
     "EvaluationResult",
     "TurnData",
+    "LLMConfig",
     # LLM management
     "LLMManager",
 ]

src/lightspeed_evaluation/core/config/__init__.py

@@ -1,7 +1,7 @@
 """Configuration loading and models for Evaluation Framework."""
 
 from .loader import ConfigLoader, setup_environment_variables, SystemConfig
-from .models import EvaluationData, EvaluationResult, TurnData
+from .models import EvaluationData, EvaluationResult, TurnData, LLMConfig
 from .validator import DataValidator
 
 __all__ = [
@@ -11,5 +11,6 @@
     "EvaluationData",
     "EvaluationResult",
     "TurnData",
+    "LLMConfig",
     "DataValidator",
 ]

src/lightspeed_evaluation/core/config/models.py

@@ -170,30 +170,37 @@ def validate_execution_time(cls, v: float) -> float:
 
 
 class LLMConfig(BaseModel):
-    """LLM Configuration with validation."""
+    """LLM configuration from system configuration."""
 
-    model_name: str = Field(..., description="The model name to use")
-    api_base: Optional[str] = Field(None, description="Custom API base URL")
-    api_key: Optional[str] = Field(None, description="API key for the model")
-    temperature: float = Field(
-        0.0, ge=0.0, le=2.0, description="Temperature for sampling"
-    )
-    max_tokens: Optional[int] = Field(
-        None, ge=1, description="Maximum tokens to generate"
-    )
-    timeout: Optional[int] = Field(None, ge=1, description="Request timeout in seconds")
-    num_retries: int = Field(
-        3, ge=0, description="Number of retries for failed requests"
+    provider: str = Field(
+        ..., description="Provider name, e.g., openai, azure, watsonx"
     )
+    model: str = Field(..., description="Model identifier or deployment name")
+    temperature: float = Field(0.0, ge=0.0, le=2.0, description="Sampling temperature")
+    max_tokens: int = Field(512, ge=1, description="Maximum tokens in response")
+    timeout: int = Field(300, ge=1, description="Request timeout in seconds")
+    num_retries: int = Field(3, ge=0, description="Retry attempts for failed requests")
 
-    @field_validator("model_name")
+    @field_validator("provider", "model")
     @classmethod
-    def validate_model_name(cls, v: str) -> str:
-        """Validate model name is non-empty."""
-        if not v or not v.strip():
-            raise ValueError("Model name cannot be empty")
+    def _validate_non_empty(cls, v: str) -> str:
+        """Validate provider and model are non-empty strings."""
+        if not v or not isinstance(v, str) or not v.strip():
+            raise ValueError("Value cannot be empty")
         return v.strip()
 
+    @classmethod
+    def from_dict(cls, config_dict: Dict[str, Any]) -> "LLMConfig":
+        """Create LLMConfig from a plain dictionary."""
+        return cls(
+            provider=config_dict.get("provider", "openai"),
+            model=config_dict.get("model", "gpt-4o-mini"),
+            temperature=config_dict.get("temperature", 0.0),
+            max_tokens=config_dict.get("max_tokens", 512),
+            timeout=config_dict.get("timeout", 300),
+            num_retries=config_dict.get("num_retries", 3),
+        )
+
 
 # System configuration models
 class EvaluationSystemConfig(BaseModel):

src/lightspeed_evaluation/core/llm/__init__.py

@@ -1,8 +1,9 @@
 """LLM management for Evaluation Framework."""
 
-from .manager import LLMManager, LLMConfig, LLMError
+from .manager import LLMManager, LLMError
 from .deepeval import DeepEvalLLMManager
 from .ragas import RagasLLMManager
+from ..config import LLMConfig
 
 __all__ = [
     "LLMManager",

src/lightspeed_evaluation/core/llm/manager.py

@@ -1,38 +1,15 @@
 """LLM Manager - Generic LLM configuration, validation, and parameter provider."""
 
 import os
-from dataclasses import dataclass
 from typing import Any, Dict
 
+from ..config import LLMConfig
+
 
 class LLMError(Exception):
     """LLM configuration error."""
 
 
-@dataclass
-class LLMConfig:
-    """LLM configuration from system configuration."""
-
-    provider: str
-    model: str
-    temperature: float = 0.0
-    max_tokens: int = 512
-    timeout: int = 300
-    num_retries: int = 3
-
-    @classmethod
-    def from_dict(cls, config_dict: Dict[str, Any]) -> "LLMConfig":
-        """Create config from dictionary."""
-        return cls(
-            provider=config_dict.get("provider", "openai"),
-            model=config_dict.get("model", "gpt-4o-mini"),
-            temperature=config_dict.get("temperature", 0.0),
-            max_tokens=config_dict.get("max_tokens", 512),
-            timeout=config_dict.get("timeout", 300),
-            num_retries=config_dict.get("num_retries", 3),
-        )
-
-
 class LLMManager:
     """
     Generic LLM Manager for all use cases (Ragas, DeepEval, Custom metrics).

src/lightspeed_evaluation/core/metrics/custom.py

@@ -6,7 +6,7 @@
 import litellm
 from pydantic import BaseModel, Field
 
-from ..config.models import TurnData
+from ..config import TurnData
 from ..llm.manager import LLMManager
 from ..output.statistics import EvaluationScope
 

src/lightspeed_evaluation/core/metrics/deepeval.py

@@ -10,7 +10,7 @@
 from deepeval.test_case import ConversationalTestCase
 from deepeval.test_case import Turn as DeepEvalTurn
 
-from ..config.models import TurnData
+from ..config import TurnData
 from ..llm.deepeval import DeepEvalLLMManager
 from ..llm.manager import LLMManager
 from ..output.statistics import EvaluationScope

src/lightspeed_evaluation/core/metrics/ragas.py

@@ -13,7 +13,7 @@
     ResponseRelevancy,
 )
 
-from ..config.models import TurnData
+from ..config import TurnData
 from ..llm.manager import LLMManager
 from ..llm.ragas import RagasLLMManager
 from ..output.statistics import EvaluationScope

src/lightspeed_evaluation/core/output/generator.py

@@ -7,7 +7,7 @@
 from typing import Any, Dict, List, Optional
 
 from ..config.loader import DEFAULT_CSV_COLUMNS
-from ..config.models import EvaluationResult
+from ..config import EvaluationResult
 from .statistics import calculate_basic_stats, calculate_detailed_stats
 from .visualization import GraphGenerator