testmcpy 0.1.2__tar.gz → 0.1.4__tar.gz

{testmcpy-0.1.2 → testmcpy-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testmcpy
-Version: 0.1.2
+Version: 0.1.4
 Summary: A comprehensive testing framework for validating LLM tool calling capabilities with MCP services
 Author-email: Preset <amin@preset.io>
 License: Apache-2.0

{testmcpy-0.1.2 → testmcpy-0.1.4}/pyproject.toml

@@ -11,7 +11,7 @@ include = ["testmcpy*"]
 
 [project]
 name = "testmcpy"
-version = "0.1.2"
+version = "0.1.4"
 description = "A comprehensive testing framework for validating LLM tool calling capabilities with MCP services"
 authors = [{name = "Preset", email = "amin@preset.io"}]
 license = {text = "Apache-2.0"}

{testmcpy-0.1.2 → testmcpy-0.1.4}/testmcpy/config.py

@@ -192,26 +192,36 @@ class Config:
     def mcp_auth_token(self) -> Optional[str]:
         """
         Get MCP auth token with the following priority:
-        1. Static MCP_AUTH_TOKEN or SUPERSET_MCP_TOKEN
-        2. Dynamically generated JWT from MCP_AUTH_API_URL if configured
+        1. Dynamically generated JWT from MCP_AUTH_API_URL if configured
+        2. Static MCP_AUTH_TOKEN or SUPERSET_MCP_TOKEN
 
         For dynamic tokens, caches the JWT for 50 minutes to avoid excessive API calls.
         """
-        # Check for static token first
+        # Check if dynamic JWT credentials are configured
+        has_dynamic_config = all([
+            self.get("MCP_AUTH_API_URL"),
+            self.get("MCP_AUTH_API_TOKEN"),
+            self.get("MCP_AUTH_API_SECRET")
+        ])
+
+        # If dynamic JWT is configured, use it (with caching)
+        if has_dynamic_config:
+            # Check if we have a valid cached token
+            if self._cached_token and self._token_expiry:
+                if time.time() < self._token_expiry:
+                    return self._cached_token
+
+            # Try to fetch a new JWT token
+            jwt_token = self._fetch_jwt_token()
+            if jwt_token:
+                return jwt_token
+            # If fetch fails, fall through to static token
+
+        # Fall back to static token
         static_token = self.get("MCP_AUTH_TOKEN") or self.get("SUPERSET_MCP_TOKEN")
         if static_token:
             return static_token
 
-        # Check if we have a valid cached token
-        if self._cached_token and self._token_expiry:
-            if time.time() < self._token_expiry:
-                return self._cached_token
-
-        # Try to fetch a new JWT token
-        jwt_token = self._fetch_jwt_token()
-        if jwt_token:
-            return jwt_token
-
         return None
     
     @property

{testmcpy-0.1.2 → testmcpy-0.1.4}/testmcpy/src/llm_integration.py

@@ -17,12 +17,19 @@ from urllib.parse import urlparse
 # Import MCP components (we'll handle the import error gracefully)
 try:
     from .mcp_client import MCPClient, MCPTool, MCPToolCall, MCPToolResult
+    from ..config import get_config
 except ImportError:
     # Fallback for when running as script
     import sys
     import os
     sys.path.append(os.path.dirname(os.path.abspath(__file__)))
     from mcp_client import MCPClient, MCPTool, MCPToolCall, MCPToolResult
+    # Config will fall back to environment variables
+    def get_config():
+        class FallbackConfig:
+            def get(self, key, default=None):
+                return os.getenv(key, default)
+        return FallbackConfig()
 
 
 @dataclass
@@ -271,10 +278,10 @@ class OpenAIProvider(LLMProvider):
     async def initialize(self):
         """Initialize OpenAI provider."""
         if not self.api_key and self.base_url == "https://api.openai.com/v1":
-            import os
-            self.api_key = os.environ.get("OPENAI_API_KEY", "")
+            config = get_config()
+            self.api_key = config.get("OPENAI_API_KEY", "")
             if not self.api_key:
-                raise ValueError("OpenAI API key not provided")
+                raise ValueError("OpenAI API key not provided. Set OPENAI_API_KEY in ~/.testmcpy or environment.")
 
     async def generate_with_tools(
         self,
@@ -593,18 +600,20 @@ class AnthropicProvider(LLMProvider):
         mcp_url: Optional[str] = None
     ):
         self.model = model
-        self.api_key = api_key or os.environ.get("ANTHROPIC_API_KEY", "")
+        # Use config system for API key
+        config = get_config()
+        self.api_key = api_key or config.get("ANTHROPIC_API_KEY", "")
         self.base_url = base_url
         self.client = httpx.AsyncClient(timeout=60.0)
-        # Use MCP_URL from environment if not provided
+        # Use MCP_URL from config if not provided
         if mcp_url is None:
-            mcp_url = os.environ.get("MCP_URL", "http://localhost:5008/mcp")
+            mcp_url = config.mcp_url
         self.tool_discovery = ToolDiscoveryService(mcp_url)
 
     async def initialize(self):
         """Initialize Anthropic provider."""
         if not self.api_key:
-            raise ValueError("Anthropic API key not provided. Set ANTHROPIC_API_KEY environment variable.")
+            raise ValueError("Anthropic API key not provided. Set ANTHROPIC_API_KEY in ~/.testmcpy, .env, or environment.")
 
         # Try to pre-discover tools, but don't fail if MCP service is unavailable
         try:
@@ -807,10 +816,12 @@ class ClaudeSDKProvider(LLMProvider):
         mcp_url: Optional[str] = None
     ):
         self.model = model
-        self.api_key = api_key or os.environ.get("ANTHROPIC_API_KEY", "")
-        # Use MCP_URL from environment if not provided
+        # Use config system for API key
+        config = get_config()
+        self.api_key = api_key or config.get("ANTHROPIC_API_KEY", "")
+        # Use MCP_URL from config if not provided
         if mcp_url is None:
-            mcp_url = os.environ.get("MCP_URL", "http://localhost:5008/mcp")
+            mcp_url = config.mcp_url
         self.mcp_url = mcp_url
         self.tool_discovery = ToolDiscoveryService(mcp_url)
         self._sdk_tools: List[Any] = []
@@ -819,7 +830,7 @@ class ClaudeSDKProvider(LLMProvider):
     async def initialize(self):
         """Initialize Claude SDK provider."""
         if not self.api_key:
-            raise ValueError("Anthropic API key not provided. Set ANTHROPIC_API_KEY environment variable.")
+            raise ValueError("Anthropic API key not provided. Set ANTHROPIC_API_KEY in ~/.testmcpy, .env, or environment.")
 
         # IMPORTANT: Claude Agent SDK is designed for stdio-based MCP servers (command-line tools),
         # not HTTP-based MCP services. For HTTP MCP services, use the 'anthropic' provider instead.
@@ -1015,9 +1026,10 @@ class ClaudeCodeProvider(LLMProvider):
     ):
         self.model = model
         self.claude_cli_path = claude_cli_path or self._find_claude_cli()
-        # Use MCP_URL from environment if not provided
+        # Use MCP_URL from config if not provided
+        config = get_config()
         if mcp_url is None:
-            mcp_url = os.environ.get("MCP_URL", "http://localhost:5008/mcp")
+            mcp_url = config.mcp_url
         self.tool_discovery = ToolDiscoveryService(mcp_url)
 
     def _find_claude_cli(self) -> str:

{testmcpy-0.1.2 → testmcpy-0.1.4}/testmcpy/src/test_runner.py

@@ -10,9 +10,9 @@ import json
 import re
 from datetime import datetime, timedelta
 
-from src.mcp_client import MCPClient, MCPToolCall, MCPToolResult
-from src.llm_integration import LLMProvider, create_llm_provider
-from evals.base_evaluators import BaseEvaluator, EvalResult, create_evaluator
+from .mcp_client import MCPClient, MCPToolCall, MCPToolResult
+from .llm_integration import LLMProvider, create_llm_provider
+from ..evals.base_evaluators import BaseEvaluator, EvalResult, create_evaluator
 
 
 class RateLimitTracker:

{testmcpy-0.1.2 → testmcpy-0.1.4}/testmcpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testmcpy
-Version: 0.1.2
+Version: 0.1.4
 Summary: A comprehensive testing framework for validating LLM tool calling capabilities with MCP services
 Author-email: Preset <amin@preset.io>
 License: Apache-2.0