format and simplify auth type

Signed-off-by: Anxhela Coba <acoba@redhat.com>

Author: Anxhela21

config/system.yaml

@@ -41,7 +41,7 @@ api:
   # API input configuration
   provider: "openai"                   # LLM provider for queries
   model: "gpt-4o-mini"                 # Model to use for queries
-  no_tools: null                       # Whether to bypass tools and MCP servers (optional)
+  no_tools: false                       # Whether to bypass tools and MCP servers (optional)
   system_prompt: null                  # System prompt (default None)
 
   cache_dir: ".caches/api_cache"  # Directory with lightspeed-stack cache
@@ -52,7 +52,7 @@ api:
     enabled: true                      # Enable MCP headers functionality
     servers:                          # MCP server configurations
       filesystem-tools:
-        auth_type: bearer              # Authentication type: bearer, api_key, custom
+        auth_type: bearer              # Authentication type: only bearer is supported
         env_var: API_KEY              # Environment variable containing the token/key
 
   # Legacy authentication (fallback when mcp_headers.enabled is false)

src/lightspeed_evaluation/core/api/client.py

@@ -127,30 +127,9 @@ def _build_mcp_headers(self) -> dict[str, dict[str, str]]:
                     )
                     continue
 
-                # Determine header name and value based on auth_type
-                if server_config.auth_type == "bearer":
-                    header_name = server_config.header_name or "Authorization"
-                    header_value = f"Bearer {token}"
-                elif server_config.auth_type == "api_key":
-                    header_name = server_config.header_name or "X-API-Key"
-                    header_value = token
-                elif server_config.auth_type == "custom":
-                    if not server_config.header_name:
-                        logger.warning(
-                            "Custom auth_type for server '%s' requires "
-                            "header_name to be specified. Skipping.",
-                            server_name,
-                        )
-                        continue
-                    header_name = server_config.header_name
-                    header_value = token
-                else:
-                    logger.warning(
-                        "Unknown auth_type '%s' for server '%s'. Skipping.",
-                        server_config.auth_type,
-                        server_name,
-                    )
-                    continue
+                # Set up bearer auth headers
+                header_name = server_config.header_name or "Authorization"
+                header_value = f"Bearer {token}"
 
                 mcp_headers[server_name] = {header_name: header_value}
 

src/lightspeed_evaluation/core/models/system.py

@@ -166,8 +166,8 @@ class MCPServerConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     auth_type: str = Field(
-        ...,
-        description="Authentication type: bearer, api_key",
+        default="bearer",
+        description="Authentication type: only bearer is supported",
     )
     env_var: str = Field(
         ...,
@@ -183,20 +183,10 @@ class MCPServerConfig(BaseModel):
     @classmethod
     def validate_auth_type(cls, v: str) -> str:
         """Validate auth_type is supported."""
-        allowed = {"bearer", "api_key", "custom"}
-        if v not in allowed:
-            raise ValueError(f"auth_type must be one of {allowed}")
+        if v != "bearer":
+            raise ValueError("auth_type must be 'bearer'")
         return v
 
-    @model_validator(mode="after")
-    def validate_custom_header_name(self) -> "MCPServerConfig":
-        """Validate custom auth has an explicit header name."""
-        if self.auth_type == "custom" and not self.header_name:
-            raise ConfigurationError(
-                "For auth_type='custom', 'header_name' must be provided."
-            )
-        return self
-
 
 class MCPHeadersConfig(BaseModel):
     """Configuration for MCP headers functionality."""