.gitignore

@@ -70,8 +70,4 @@ yarn-error.log*
 # Frontend build
 frontend/dist/
 frontend/build/
-frontend/.astro/
+frontend/.astro/
-
-# Temporary refactoring documentation
-REFACTORING_*.md
-TOOLS_REFACTORING_CHECKLIST.md

pyproject.toml

@@ -3,7 +3,7 @@ name = "mcrentcast"
 version = "0.1.0"
 description = "MCP Server for Rentcast API with intelligent caching and rate limiting"
 authors = [
-    {name = "Ryan Malloy", email = "ryan@supported.systems"}
+    {name = "Your Name", email = "your.email@example.com"}
 ]
 readme = "README.md"
 license = {text = "MIT"}
@@ -55,25 +55,6 @@ mcrentcast-mock-api = "mcrentcast.mock_api:run_mock_server"
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.hatch.build.targets.sdist]
-exclude = [
-    "/.claude",
-    "/.env",
-    "/.venv",
-    "/.git",
-    "/.pytest_cache",
-    "/.coverage",
-    "/reports",
-    "/data",
-    "/dist",
-    "/frontend",
-    "/REFACTORING_*.md",
-    "/CLAUDE.md",
-    "/docker-compose.yml",
-    "/Dockerfile",
-    "/Makefile",
-]
-
 [tool.ruff]
 target-version = "py313"
 line-length = 88

src/mcrentcast/database.py

@@ -3,7 +3,7 @@
 import hashlib
 import json
 import uuid
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from decimal import Decimal
 from typing import Any, Dict, List, Optional, Tuple
 from uuid import UUID
@@ -131,13 +131,13 @@ class DatabaseManager:
         with self.get_session() as session:
             entry = session.query(CacheEntryDB).filter(
                 CacheEntryDB.cache_key == cache_key,
-                CacheEntryDB.expires_at > datetime.now(timezone.utc)
+                CacheEntryDB.expires_at > datetime.utcnow()
             ).first()
             
             if entry:
                 # Update hit count and last accessed
                 entry.hit_count += 1
-                entry.last_accessed = datetime.now(timezone.utc)
+                entry.last_accessed = datetime.utcnow()
                 session.commit()
                 
                 return CacheEntry(
@@ -154,7 +154,7 @@ class DatabaseManager:
     async def set_cache_entry(self, cache_key: str, response_data: Dict[str, Any], ttl_hours: Optional[int] = None) -> CacheEntry:
         """Set cache entry."""
         ttl = ttl_hours or settings.cache_ttl_hours
-        expires_at = datetime.now(timezone.utc) + timedelta(hours=ttl)
+        expires_at = datetime.utcnow() + timedelta(hours=ttl)
         
         with self.get_session() as session:
             # Remove existing entry if it exists
@@ -194,7 +194,7 @@ class DatabaseManager:
         """Clean expired cache entries."""
         with self.get_session() as session:
             count = session.query(CacheEntryDB).filter(
-                CacheEntryDB.expires_at < datetime.now(timezone.utc)
+                CacheEntryDB.expires_at < datetime.utcnow()
             ).delete()
             session.commit()
             
@@ -233,7 +233,7 @@ class DatabaseManager:
     async def check_rate_limit(self, identifier: str, endpoint: str, requests_per_minute: Optional[int] = None) -> Tuple[bool, int]:
         """Check if request is within rate limit."""
         limit = requests_per_minute or settings.requests_per_minute
-        window_start = datetime.now(timezone.utc) - timedelta(minutes=1)
+        window_start = datetime.utcnow() - timedelta(minutes=1)
         
         with self.get_session() as session:
             # Clean old rate limit records
@@ -252,7 +252,7 @@ class DatabaseManager:
                     identifier=identifier,
                     endpoint=endpoint,
                     requests_count=1,
-                    window_start=datetime.now(timezone.utc)
+                    window_start=datetime.utcnow()
                 )
                 session.add(rate_limit)
             else:
@@ -311,7 +311,7 @@ class DatabaseManager:
             
     async def get_usage_stats(self, days: int = 30) -> Dict[str, Any]:
         """Get API usage statistics."""
-        cutoff_date = datetime.now(timezone.utc) - timedelta(days=days)
+        cutoff_date = datetime.utcnow() - timedelta(days=days)
         
         with self.get_session() as session:
             total_requests = session.query(ApiUsageDB).filter(
@@ -348,7 +348,7 @@ class DatabaseManager:
     async def create_confirmation(self, endpoint: str, parameters: Dict[str, Any]) -> str:
         """Create user confirmation request."""
         parameter_hash = self.create_parameter_hash(endpoint, parameters)
-        expires_at = datetime.now(timezone.utc) + timedelta(minutes=settings.confirmation_timeout_minutes)
+        expires_at = datetime.utcnow() + timedelta(minutes=settings.confirmation_timeout_minutes)
         
         with self.get_session() as session:
             # Remove existing confirmation if it exists
@@ -371,7 +371,7 @@ class DatabaseManager:
         with self.get_session() as session:
             confirmation = session.query(UserConfirmationDB).filter(
                 UserConfirmationDB.parameter_hash == parameter_hash,
-                UserConfirmationDB.expires_at > datetime.now(timezone.utc)
+                UserConfirmationDB.expires_at > datetime.utcnow()
             ).first()
             
             if confirmation:
@@ -383,12 +383,12 @@ class DatabaseManager:
         with self.get_session() as session:
             confirmation = session.query(UserConfirmationDB).filter(
                 UserConfirmationDB.parameter_hash == parameter_hash,
-                UserConfirmationDB.expires_at > datetime.now(timezone.utc)
+                UserConfirmationDB.expires_at > datetime.utcnow()
             ).first()
             
             if confirmation:
                 confirmation.confirmed = True
-                confirmation.confirmed_at = datetime.now(timezone.utc)
+                confirmation.confirmed_at = datetime.utcnow()
                 session.commit()
                 
                 logger.info("User request confirmed", parameter_hash=parameter_hash)
@@ -408,7 +408,7 @@ class DatabaseManager:
             config = session.query(ConfigurationDB).filter(ConfigurationDB.key == key).first()
             if config:
                 config.value = value
-                config.updated_at = datetime.now(timezone.utc)
+                config.updated_at = datetime.utcnow()
             else:
                 config = ConfigurationDB(key=key, value=value)
                 session.add(config)

src/mcrentcast/server.py

@@ -3,7 +3,7 @@
 import asyncio
 import hashlib
 import json
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 from decimal import Decimal
 from typing import Any, Dict, List, Optional
 
@@ -875,8 +875,8 @@ async def get_api_limits() -> Dict[str, Any]:
     """Get current API rate limits and usage quotas."""
     try:
         # Get current usage counts
-        today_start = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+        today_start = datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0)
-        month_start = datetime.now(timezone.utc).replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+        month_start = datetime.utcnow().replace(day=1, hour=0, minute=0, second=0, microsecond=0)
         
         daily_usage = await db_manager.get_usage_stats(1)
         monthly_usage = await db_manager.get_usage_stats(30)

tests/conftest.py

@@ -7,7 +7,7 @@ following the project's testing framework requirements.
 import asyncio
 import logging
 import sys
-from datetime import datetime, timezone
+from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict
 
@@ -232,13 +232,13 @@ def pytest_html_results_summary(prefix, session, postfix):
 async def test_setup_and_teardown():
     """Automatic setup and teardown for each test."""
     # Setup
-    test_start_time = datetime.now(timezone.utc)
+    test_start_time = datetime.utcnow()
     
     # Test execution happens here
     yield
     
     # Teardown
-    test_duration = (datetime.now(timezone.utc) - test_start_time).total_seconds()
+    test_duration = (datetime.utcnow() - test_start_time).total_seconds()
     
     # Log test completion (optional)
     if test_duration > 5.0:  # Log slow tests
@@ -254,11 +254,11 @@ def test_performance_tracker():
             self.start_time = None
             
         def start_tracking(self, operation: str):
-            self.start_time = datetime.now(timezone.utc)
+            self.start_time = datetime.utcnow()
             
         def end_tracking(self, operation: str):
             if self.start_time:
-                duration = (datetime.now(timezone.utc) - self.start_time).total_seconds() * 1000
+                duration = (datetime.utcnow() - self.start_time).total_seconds() * 1000
                 self.metrics[operation] = duration
                 self.start_time = None
                 

tests/test_mcp_server.py

@@ -8,19 +8,12 @@ Tests all 13 MCP tools with various scenarios including:
 - Error handling and edge cases
 - Mock vs real API modes
 
-NOTE: These tests use outdated testing patterns from before the FastMCP refactoring.
+Following FastMCP testing guidelines from https://gofastmcp.com/development/tests
-They are marked for skipping until they can be updated to use the FastMCP Client pattern.
-
-See tests/test_smoke.py for working tests using the current FastMCP testing approach.
-Reference: https://gofastmcp.com/patterns/testing
 """
 
 import asyncio
 import pytest
-
+from datetime import datetime, timedelta
-pytestmark = pytest.mark.skip(reason="Tests need updating for FastMCP Client pattern - see test_smoke.py")
-import pytest
-from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 from unittest.mock import AsyncMock, MagicMock, patch, call
 from typing import Any, Dict, List
@@ -57,7 +50,7 @@ from mcrentcast.rentcast_client import (
 )
 
 
-class ReportGenerator:
+class TestReporter:
     """Enhanced test reporter with syntax highlighting for comprehensive test output."""
     
     def __init__(self, test_name: str):
@@ -66,7 +59,7 @@ class ReportGenerator:
         self.processing_steps = []
         self.outputs = []
         self.quality_metrics = []
-        self.start_time = datetime.now(timezone.utc)
+        self.start_time = datetime.utcnow()
         
     def log_input(self, name: str, data: Any, description: str = ""):
         """Log test input with automatic syntax detection."""
@@ -74,7 +67,7 @@ class ReportGenerator:
             "name": name,
             "data": data,
             "description": description,
-            "timestamp": datetime.now(timezone.utc)
+            "timestamp": datetime.utcnow()
         })
         
     def log_processing_step(self, step: str, description: str, duration_ms: float = 0):
@@ -83,7 +76,7 @@ class ReportGenerator:
             "step": step,
             "description": description,
             "duration_ms": duration_ms,
-            "timestamp": datetime.now(timezone.utc)
+            "timestamp": datetime.utcnow()
         })
         
     def log_output(self, name: str, data: Any, quality_score: float = None):
@@ -92,7 +85,7 @@ class ReportGenerator:
             "name": name,
             "data": data,
             "quality_score": quality_score,
-            "timestamp": datetime.now(timezone.utc)
+            "timestamp": datetime.utcnow()
         })
         
     def log_quality_metric(self, metric: str, value: float, threshold: float = None, passed: bool = None):
@@ -102,12 +95,12 @@ class ReportGenerator:
             "value": value,
             "threshold": threshold,
             "passed": passed,
-            "timestamp": datetime.now(timezone.utc)
+            "timestamp": datetime.utcnow()
         })
         
     def complete(self):
         """Complete test reporting."""
-        end_time = datetime.now(timezone.utc)
+        end_time = datetime.utcnow()
         duration = (end_time - self.start_time).total_seconds() * 1000
         print(f"\n🏠 TEST COMPLETE: {self.test_name} (Duration: {duration:.2f}ms)")
         return {
@@ -194,8 +187,8 @@ def sample_cache_stats():
         total_misses=30,
         cache_size_mb=8.5,
         hit_rate=80.0,
-        oldest_entry=datetime.now(timezone.utc) - timedelta(hours=48),
+        oldest_entry=datetime.utcnow() - timedelta(hours=48),
-        newest_entry=datetime.now(timezone.utc) - timedelta(minutes=15)
+        newest_entry=datetime.utcnow() - timedelta(minutes=15)
     )
 
 
@@ -206,7 +199,7 @@ class TestApiKeyManagement:
     @pytest.mark.asyncio
     async def test_set_api_key_success(self, mock_db_manager):
         """Test successful API key setting."""
-        reporter = ReportGenerator("set_api_key_success")
+        reporter = TestReporter("set_api_key_success")
         
         api_key = "test_rentcast_key_123"
         request = SetApiKeyRequest(api_key=api_key)
@@ -236,7 +229,7 @@ class TestApiKeyManagement:
     @pytest.mark.asyncio
     async def test_set_api_key_empty(self, mock_db_manager):
         """Test setting empty API key."""
-        reporter = ReportGenerator("set_api_key_empty")
+        reporter = TestReporter("set_api_key_empty")
         
         request = SetApiKeyRequest(api_key="")
         
@@ -263,7 +256,7 @@ class TestPropertySearch:
     @pytest.mark.asyncio
     async def test_search_properties_no_api_key(self):
         """Test property search without API key configured."""
-        reporter = ReportGenerator("search_properties_no_api_key")
+        reporter = TestReporter("search_properties_no_api_key")
         
         request = PropertySearchRequest(city="Austin", state="TX")
         reporter.log_input("search_request", request.model_dump(), "Property search without API key")
@@ -286,7 +279,7 @@ class TestPropertySearch:
     @pytest.mark.asyncio
     async def test_search_properties_cached_hit(self, mock_db_manager, mock_rentcast_client, sample_property):
         """Test property search with cache hit."""
-        reporter = ReportGenerator("search_properties_cached_hit")
+        reporter = TestReporter("search_properties_cached_hit")
         
         request = PropertySearchRequest(city="Austin", state="TX", limit=5)
         cache_key = "mock_cache_key_123"
@@ -324,7 +317,7 @@ class TestPropertySearch:
     @pytest.mark.asyncio
     async def test_search_properties_cache_miss_confirmation(self, mock_db_manager, mock_rentcast_client):
         """Test property search with cache miss requiring confirmation."""
-        reporter = ReportGenerator("search_properties_cache_miss_confirmation")
+        reporter = TestReporter("search_properties_cache_miss_confirmation")
         
         request = PropertySearchRequest(city="Dallas", state="TX")
         
@@ -362,7 +355,7 @@ class TestPropertySearch:
     @pytest.mark.asyncio
     async def test_search_properties_confirmed_api_call(self, mock_db_manager, mock_rentcast_client, sample_property):
         """Test property search with confirmed API call."""
-        reporter = ReportGenerator("search_properties_confirmed_api_call")
+        reporter = TestReporter("search_properties_confirmed_api_call")
         
         request = PropertySearchRequest(city="Houston", state="TX", force_refresh=True)
         
@@ -397,7 +390,7 @@ class TestPropertySearch:
     @pytest.mark.asyncio
     async def test_search_properties_rate_limit_error(self, mock_db_manager, mock_rentcast_client):
         """Test property search with rate limit exceeded."""
-        reporter = ReportGenerator("search_properties_rate_limit_error")
+        reporter = TestReporter("search_properties_rate_limit_error")
         
         request = PropertySearchRequest(zipCode="90210")
         
@@ -434,7 +427,7 @@ class TestPropertyDetails:
     @pytest.mark.asyncio
     async def test_get_property_success(self, mock_db_manager, mock_rentcast_client, sample_property):
         """Test successful property details retrieval."""
-        reporter = ReportGenerator("get_property_success")
+        reporter = TestReporter("get_property_success")
         
         property_id = "prop_123"
         request = PropertyByIdRequest(property_id=property_id)
@@ -468,7 +461,7 @@ class TestPropertyDetails:
     @pytest.mark.asyncio 
     async def test_get_property_not_found(self, mock_db_manager, mock_rentcast_client):
         """Test property not found scenario."""
-        reporter = ReportGenerator("get_property_not_found")
+        reporter = TestReporter("get_property_not_found")
         
         request = PropertyByIdRequest(property_id="nonexistent_123")
         
@@ -501,7 +494,7 @@ class TestValueEstimation:
     @pytest.mark.asyncio
     async def test_get_value_estimate_success(self, mock_db_manager, mock_rentcast_client):
         """Test successful value estimation."""
-        reporter = ReportGenerator("get_value_estimate_success")
+        reporter = TestReporter("get_value_estimate_success")
         
         address = "456 Oak Ave, Austin, TX"
         request = ValueEstimateRequest(address=address)
@@ -546,7 +539,7 @@ class TestValueEstimation:
     @pytest.mark.asyncio
     async def test_get_value_estimate_unavailable(self, mock_db_manager, mock_rentcast_client):
         """Test value estimation when data is unavailable."""
-        reporter = ReportGenerator("get_value_estimate_unavailable")
+        reporter = TestReporter("get_value_estimate_unavailable")
         
         request = ValueEstimateRequest(address="999 Unknown St, Middle, NV")
         
@@ -579,7 +572,7 @@ class TestRentEstimation:
     @pytest.mark.asyncio
     async def test_get_rent_estimate_full_params(self, mock_db_manager, mock_rentcast_client):
         """Test rent estimation with full parameters."""
-        reporter = ReportGenerator("get_rent_estimate_full_params")
+        reporter = TestReporter("get_rent_estimate_full_params")
         
         request = RentEstimateRequest(
             address="789 Elm St, Dallas, TX",
@@ -627,7 +620,7 @@ class TestRentEstimation:
     @pytest.mark.asyncio
     async def test_get_rent_estimate_minimal_params(self, mock_db_manager, mock_rentcast_client):
         """Test rent estimation with minimal parameters."""
-        reporter = ReportGenerator("get_rent_estimate_minimal_params")
+        reporter = TestReporter("get_rent_estimate_minimal_params")
         
         request = RentEstimateRequest(address="321 Pine St, Austin, TX")
         
@@ -670,7 +663,7 @@ class TestListings:
     @pytest.mark.asyncio
     async def test_search_sale_listings(self, mock_db_manager, mock_rentcast_client):
         """Test searching sale listings."""
-        reporter = ReportGenerator("search_sale_listings")
+        reporter = TestReporter("search_sale_listings")
         
         request = ListingSearchRequest(city="San Antonio", state="TX", limit=3)
         
@@ -729,7 +722,7 @@ class TestListings:
     @pytest.mark.asyncio
     async def test_search_rental_listings(self, mock_db_manager, mock_rentcast_client):
         """Test searching rental listings."""
-        reporter = ReportGenerator("search_rental_listings")
+        reporter = TestReporter("search_rental_listings")
         
         request = ListingSearchRequest(zipCode="78701", limit=2)
         
@@ -781,7 +774,7 @@ class TestMarketStatistics:
     @pytest.mark.asyncio
     async def test_get_market_statistics_city(self, mock_db_manager, mock_rentcast_client):
         """Test market statistics by city."""
-        reporter = ReportGenerator("get_market_statistics_city")
+        reporter = TestReporter("get_market_statistics_city")
         
         request = MarketStatsRequest(city="Austin", state="TX")
         
@@ -828,7 +821,7 @@ class TestMarketStatistics:
     @pytest.mark.asyncio
     async def test_get_market_statistics_zipcode(self, mock_db_manager, mock_rentcast_client):
         """Test market statistics by ZIP code."""
-        reporter = ReportGenerator("get_market_statistics_zipcode")
+        reporter = TestReporter("get_market_statistics_zipcode")
         
         request = MarketStatsRequest(zipCode="90210")
         
@@ -875,7 +868,7 @@ class TestCacheManagement:
     @pytest.mark.asyncio
     async def test_get_cache_stats_comprehensive(self, mock_db_manager, sample_cache_stats):
         """Test comprehensive cache statistics retrieval."""
-        reporter = ReportGenerator("get_cache_stats_comprehensive")
+        reporter = TestReporter("get_cache_stats_comprehensive")
         
         reporter.log_input("cache_request", "get_cache_stats", "Comprehensive cache statistics")
         
@@ -905,7 +898,7 @@ class TestCacheManagement:
     @pytest.mark.asyncio
     async def test_expire_cache_specific_key(self, mock_db_manager):
         """Test expiring specific cache key."""
-        reporter = ReportGenerator("expire_cache_specific_key")
+        reporter = TestReporter("expire_cache_specific_key")
         
         cache_key = "property_records_austin_tx_123456"
         request = ExpireCacheRequest(cache_key=cache_key)
@@ -933,7 +926,7 @@ class TestCacheManagement:
     @pytest.mark.asyncio
     async def test_expire_cache_all(self, mock_db_manager):
         """Test expiring all cache entries."""
-        reporter = ReportGenerator("expire_cache_all")
+        reporter = TestReporter("expire_cache_all")
         
         request = ExpireCacheRequest(all=True)
         
@@ -960,7 +953,7 @@ class TestCacheManagement:
     @pytest.mark.asyncio
     async def test_expire_cache_nonexistent_key(self, mock_db_manager):
         """Test expiring nonexistent cache key."""
-        reporter = ReportGenerator("expire_cache_nonexistent_key")
+        reporter = TestReporter("expire_cache_nonexistent_key")
         
         request = ExpireCacheRequest(cache_key="nonexistent_key_999")
         
@@ -990,7 +983,7 @@ class TestUsageAndLimits:
     @pytest.mark.asyncio
     async def test_get_usage_stats_default(self, mock_db_manager):
         """Test getting usage statistics with default period."""
-        reporter = ReportGenerator("get_usage_stats_default")
+        reporter = TestReporter("get_usage_stats_default")
         
         reporter.log_input("usage_request", {"days": 30}, "Default 30-day usage statistics")
         
@@ -1031,7 +1024,7 @@ class TestUsageAndLimits:
     @pytest.mark.asyncio
     async def test_set_api_limits_comprehensive(self, mock_db_manager):
         """Test setting comprehensive API limits."""
-        reporter = ReportGenerator("set_api_limits_comprehensive")
+        reporter = TestReporter("set_api_limits_comprehensive")
         
         request = SetLimitsRequest(
             daily_limit=200,
@@ -1075,7 +1068,7 @@ class TestUsageAndLimits:
     @pytest.mark.asyncio
     async def test_get_api_limits_with_usage(self, mock_db_manager):
         """Test getting API limits with current usage."""
-        reporter = ReportGenerator("get_api_limits_with_usage")
+        reporter = TestReporter("get_api_limits_with_usage")
         
         reporter.log_input("limits_request", "get_api_limits", "Current limits and usage")
         
@@ -1113,7 +1106,7 @@ class TestUsageAndLimits:
     @pytest.mark.asyncio
     async def test_set_api_limits_partial(self, mock_db_manager):
         """Test setting partial API limits."""
-        reporter = ReportGenerator("set_api_limits_partial")
+        reporter = TestReporter("set_api_limits_partial")
         
         request = SetLimitsRequest(requests_per_minute=10)  # Only update rate limit
         
@@ -1149,7 +1142,7 @@ class TestErrorHandling:
     @pytest.mark.asyncio
     async def test_api_error_handling(self, mock_db_manager, mock_rentcast_client):
         """Test API error handling."""
-        reporter = ReportGenerator("api_error_handling")
+        reporter = TestReporter("api_error_handling")
         
         request = PropertySearchRequest(city="TestCity", state="TX")
         
@@ -1181,7 +1174,7 @@ class TestErrorHandling:
     @pytest.mark.asyncio
     async def test_database_error_handling(self, mock_db_manager):
         """Test database error handling."""
-        reporter = ReportGenerator("database_error_handling")
+        reporter = TestReporter("database_error_handling")
         
         reporter.log_input("db_error_request", "get_cache_stats", "Database error simulation")
         
@@ -1210,7 +1203,7 @@ class TestRateLimiting:
     @pytest.mark.asyncio
     async def test_rate_limit_backoff(self, mock_db_manager, mock_rentcast_client):
         """Test exponential backoff on rate limits."""
-        reporter = ReportGenerator("rate_limit_backoff")
+        reporter = TestReporter("rate_limit_backoff")
         
         request = PropertySearchRequest(city="TestCity", state="CA")
         
@@ -1240,7 +1233,7 @@ class TestRateLimiting:
     @pytest.mark.asyncio
     async def test_concurrent_requests_rate_limiting(self, mock_db_manager, mock_rentcast_client):
         """Test rate limiting with concurrent requests."""
-        reporter = ReportGenerator("concurrent_requests_rate_limiting")
+        reporter = TestReporter("concurrent_requests_rate_limiting")
         
         # Create multiple concurrent requests
         requests = [
@@ -1286,7 +1279,7 @@ class TestMockApiMode:
     @pytest.mark.asyncio
     async def test_mock_api_mode_property_search(self, mock_db_manager):
         """Test property search in mock API mode."""
-        reporter = ReportGenerator("mock_api_mode_property_search")
+        reporter = TestReporter("mock_api_mode_property_search")
         
         request = PropertySearchRequest(city="MockCity", state="TX")
         
@@ -1328,7 +1321,7 @@ class TestSmokeTests:
     @pytest.mark.asyncio
     async def test_all_tools_exist(self):
         """Test that all 13 expected tools exist."""
-        reporter = ReportGenerator("all_tools_exist")
+        reporter = TestReporter("all_tools_exist")
         
         expected_tools = [
             "set_api_key",
@@ -1374,7 +1367,7 @@ class TestSmokeTests:
     @pytest.mark.asyncio
     async def test_basic_server_functionality(self):
         """Test basic server functionality without external dependencies."""
-        reporter = ReportGenerator("basic_server_functionality")
+        reporter = TestReporter("basic_server_functionality")
         
         reporter.log_processing_step("server_check", "Verifying basic server setup")
         

tests/test_server.py

@@ -1,24 +1,15 @@
-"""Basic tests for mcrentcast MCP server.
+"""Basic tests for mcrentcast MCP server."""
-
-NOTE: These tests use outdated testing patterns from before the FastMCP refactoring.
-They are marked for skipping until they can be updated to use the FastMCP Client pattern.
-
-See tests/test_smoke.py for working tests using the current FastMCP testing approach.
-Reference: https://gofastmcp.com/patterns/testing
-"""
 
 import pytest
-
-pytestmark = pytest.mark.skip(reason="Tests need updating for FastMCP Client pattern - see test_smoke.py")
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from mcrentcast.server import (
+from src.mcrentcast.server import (
     app,
     SetApiKeyRequest,
     PropertySearchRequest,
     ExpireCacheRequest,
 )
-from mcrentcast.models import PropertyRecord
+from src.mcrentcast.models import PropertyRecord
 
 
 @pytest.mark.asyncio
@@ -26,7 +17,7 @@ async def test_set_api_key():
     """Test setting API key."""
     request = SetApiKeyRequest(api_key="test_api_key_123")
     
-    with patch("mcrentcast.server.db_manager") as mock_db:
+    with patch("src.mcrentcast.server.db_manager") as mock_db:
         mock_db.set_config = AsyncMock()
         
         result = await app.tools["set_api_key"](request)
@@ -41,7 +32,7 @@ async def test_search_properties_no_api_key():
     """Test searching properties without API key."""
     request = PropertySearchRequest(city="Austin", state="TX")
     
-    with patch("mcrentcast.server.check_api_key", return_value=False):
+    with patch("src.mcrentcast.server.check_api_key", return_value=False):
         result = await app.tools["search_properties"](request)
         
         assert "error" in result
@@ -61,15 +52,15 @@ async def test_search_properties_cached():
         zipCode="78701"
     )
     
-    with patch("mcrentcast.server.check_api_key", return_value=True), \
+    with patch("src.mcrentcast.server.check_api_key", return_value=True), \
-         patch("mcrentcast.server.get_rentcast_client") as mock_client_getter:
+         patch("src.mcrentcast.server.get_rentcast_client") as mock_client_getter:
         
         mock_client = MagicMock()
         mock_client._create_cache_key.return_value = "test_cache_key"
         mock_client.get_property_records = AsyncMock(return_value=([mock_property], True, 12.5))
         mock_client_getter.return_value = mock_client
         
-        with patch("mcrentcast.server.db_manager") as mock_db:
+        with patch("src.mcrentcast.server.db_manager") as mock_db:
             mock_db.get_cache_entry = AsyncMock(return_value=MagicMock())
             
             result = await app.tools["search_properties"](request)
@@ -85,7 +76,7 @@ async def test_expire_cache():
     """Test expiring cache entries."""
     request = ExpireCacheRequest(cache_key="test_key")
     
-    with patch("mcrentcast.server.db_manager") as mock_db:
+    with patch("src.mcrentcast.server.db_manager") as mock_db:
         mock_db.expire_cache_entry = AsyncMock(return_value=True)
         
         result = await app.tools["expire_cache"](request)
@@ -97,7 +88,7 @@ async def test_expire_cache():
 @pytest.mark.asyncio
 async def test_get_cache_stats():
     """Test getting cache statistics."""
-    from mcrentcast.models import CacheStats
+    from src.mcrentcast.models import CacheStats
     
     mock_stats = CacheStats(
         total_entries=100,
@@ -107,7 +98,7 @@ async def test_get_cache_stats():
         hit_rate=80.0
     )
     
-    with patch("mcrentcast.server.db_manager") as mock_db:
+    with patch("src.mcrentcast.server.db_manager") as mock_db:
         mock_db.get_cache_stats = AsyncMock(return_value=mock_stats)
         
         result = await app.tools["get_cache_stats"]()
@@ -120,9 +111,9 @@ async def test_get_cache_stats():
 @pytest.mark.asyncio
 async def test_health_check():
     """Test health check endpoint."""
-    from mcrentcast.server import health_check
+    from src.mcrentcast.server import health_check
     
-    with patch("mcrentcast.server.settings") as mock_settings:
+    with patch("src.mcrentcast.server.settings") as mock_settings:
         mock_settings.validate_api_key.return_value = True
         mock_settings.mode = "development"
         

tests/test_smoke.py

@@ -1,113 +0,0 @@
-"""Smoke tests for mcrentcast MCP server using FastMCP testing patterns.
-
-These tests verify basic functionality using the recommended FastMCP Client approach.
-Full test suite refactoring is tracked in GitHub issues.
-
-Reference: https://gofastmcp.com/patterns/testing
-"""
-
-import pytest
-import pytest_asyncio
-from fastmcp import Client
-from fastmcp.client.transports import FastMCPTransport
-
-from mcrentcast.server import app
-
-
-@pytest_asyncio.fixture
-async def mcp_client():
-    """Create FastMCP test client."""
-    async with Client(app) as client:
-        yield client
-
-
-@pytest.mark.asyncio
-async def test_server_ping(mcp_client: Client[FastMCPTransport]):
-    """Test server responds to ping."""
-    result = await mcp_client.ping()
-    assert result is not None
-
-
-@pytest.mark.asyncio
-async def test_list_tools(mcp_client: Client[FastMCPTransport]):
-    """Test server lists all available tools."""
-    tools = await mcp_client.list_tools()
-
-    # Verify expected tools exist
-    tool_names = {tool.name for tool in tools}
-    expected_tools = {
-        "set_api_key",
-        "search_properties",
-        "get_property",
-        "get_value_estimate",
-        "get_rent_estimate",
-        "search_sale_listings",
-        "search_rental_listings",
-        "get_market_statistics",
-        "expire_cache",
-        "set_api_limits",
-    }
-
-    assert expected_tools.issubset(tool_names), f"Missing tools: {expected_tools - tool_names}"
-    assert len(tools) >= 10, f"Expected at least 10 tools, got {len(tools)}"
-
-
-@pytest.mark.asyncio
-async def test_set_api_key(mcp_client: Client[FastMCPTransport]):
-    """Test setting API key."""
-    result = await mcp_client.call_tool(
-        name="set_api_key",
-        arguments={"api_key": "test_key_12345"}
-    )
-
-    assert result.data is not None
-    assert "success" in result.data
-    assert result.data["success"] is True
-
-
-@pytest.mark.asyncio
-async def test_search_properties_requires_api_key(mcp_client: Client[FastMCPTransport]):
-    """Test search_properties validates API key is set."""
-    # This should fail gracefully without a valid API key
-    result = await mcp_client.call_tool(
-        name="search_properties",
-        arguments={
-            "address": "123 Test St",
-            "city": "Testville",
-            "state": "CA",
-            "limit": 5
-        }
-    )
-
-    # Even without API key, should return structured response
-    assert result.data is not None
-
-
-@pytest.mark.asyncio
-async def test_expire_cache(mcp_client: Client[FastMCPTransport]):
-    """Test cache expiration tool."""
-    result = await mcp_client.call_tool(
-        name="expire_cache",
-        arguments={
-            "all": True
-        }
-    )
-
-    assert result.data is not None
-    assert "success" in result.data
-
-
-@pytest.mark.asyncio
-async def test_set_api_limits(mcp_client: Client[FastMCPTransport]):
-    """Test setting API rate limits."""
-    result = await mcp_client.call_tool(
-        name="set_api_limits",
-        arguments={
-            "daily_limit": 100,
-            "monthly_limit": 500,
-            "requests_per_minute": 5
-        }
-    )
-
-    assert result.data is not None
-    assert "success" in result.data