Updated ARCHITECTURE.md: - Changed govmap.py section to govmap/ package section - Updated architecture diagram to show modular package structure - Marked Phase 3 as completed (✅) - Listed all package modules and their responsibilities Updated CLAUDE.md: - Updated Business Logic Layer description with package structure - Updated Key Files section with new modular package details - Updated development roadmap to show Phase 3 as complete - Updated "Adding New API Endpoint Support" instructions - Updated "Important Notes for AI Agents" with package info - Changed test count from 27 to 34 tests (all passing) All documentation now reflects the completed modular refactoring while emphasizing backward compatibility. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
11 KiB
CLAUDE.md
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
Project Overview
Nadlan-MCP is a Model Context Protocol (MCP) server that provides Israeli real estate data to AI agents. It interfaces with the Israeli government's Govmap API to retrieve property deals, market trends, and real estate information.
Key Technology: FastMCP server exposing 7 main tools for querying Israeli real estate data
Product Vision & Use Cases
See USECASES.md for the complete feature roadmap and user-facing capabilities.
Current Capabilities (✅ Implemented)
- Address & Location Services - Address autocomplete, location-based deal search
- Real Estate Deal Analysis - Recent deals, street/neighborhood analysis, filtering
- Market Intelligence - Trend analysis, price per sqm tracking
- Comparative Analysis - Multi-address comparison, investment insights
In Development (🚧 In Progress)
- Enhanced deal filtering (property type, rooms, price range, area, floor)
- Valuation data provision tools (
get_valuation_comparables,get_deal_statistics) - Market activity metrics (detailed activity and velocity metrics)
Future Features (📋 Planned)
- Amenity Scoring - Comprehensive quality-of-life analysis using:
- Google Places API / OpenStreetMap for amenity locations
- Ministry of Education data for school rankings
- Ministry of Health data for healthcare facility ratings
- CBS demographic data
- Public transport APIs
- Caching system (in-memory → Redis)
- Async/parallel processing
- Multi-language support
Important Design Principle: The MCP provides data; the LLM provides intelligence. Avoid implementing complex analysis or predictions in the MCP layer - that's the LLM's job.
Development Commands
Running the Server
# Run the FastMCP server (recommended)
python run_fastmcp_server.py
# Or run directly as module
python -m nadlan_mcp.fastmcp_server
Testing
# Run all tests
pytest
# Run specific test file
pytest tests/test_govmap_client.py
# Run with coverage
pytest --cov=nadlan_mcp
# Run only unit tests (skip integration)
pytest -m unit
# Run integration tests (makes real API calls)
pytest -m integration
Code Quality
# Format code with black
black nadlan_mcp/ tests/
# Sort imports
isort nadlan_mcp/ tests/
# Type checking
mypy nadlan_mcp/
# Linting
flake8 nadlan_mcp/
Architecture
The codebase follows a three-layer architecture:
1. MCP Tools Layer (nadlan_mcp/fastmcp_server.py)
- Exposes 7 tools to LLM clients via FastMCP
- Handles tool parameter validation and JSON response formatting
- Main tools:
find_recent_deals_for_address,analyze_market_trends,compare_addresses - Important: Tools return structured JSON by default; use
summarized_response=Truefor condensed summaries
2. Business Logic Layer (nadlan_mcp/govmap/ package)
- Modular package with specialized modules (see ARCHITECTURE.md for details)
client.py- GovmapClient class with core API methodsvalidators.py- Input validation functionsfilters.py- Deal filtering logicstatistics.py- Statistical calculationsmarket_analysis.py- Market analysis functionsutils.py- Helper utilities- Reliability features: retry logic with exponential backoff, rate limiting, input validation
- Key Design Principle: MCP provides data, LLM provides intelligence - avoid complex analysis in the MCP layer
3. Configuration Layer (nadlan_mcp/config.py)
GovmapConfigdataclass with environment variable support- Global config accessed via
get_config()andset_config() - All timeouts, retries, rate limits are configurable
Key Files
nadlan_mcp/govmap/- ✅ Refactored modular package (Phase 3 complete)client.py- Core API client (~30KB, GovmapClient class)validators.py- Input validation (~3KB)filters.py- Deal filtering (~5KB)statistics.py- Statistical calculations (~4KB)market_analysis.py- Market analysis (~17KB)utils.py- Helper utilities (~4KB)__init__.py- Package exports for backward compatibility
nadlan_mcp/fastmcp_server.py- MCP tool definitions (10 implemented tools)nadlan_mcp/config.py- Configuration managementrun_fastmcp_server.py- Server entry pointtests/test_govmap_client.py- Main test suite (34 tests, all passing)USECASES.md- Product roadmap and feature status (essential reading)ARCHITECTURE.md- Detailed system architecture and design decisionsTASKS.md- Implementation tasks and progress tracking.cursor/plans/PHASE3-REFACTORING.md- Detailed refactoring plan (✅ completed)
Available MCP Tools
Implemented (✅):
autocomplete_address- Search and autocomplete Israeli addressesget_deals_by_radius- Get deals within a radius of coordinatesget_street_deals- Get deals for a specific street polygonget_neighborhood_deals- Get deals for a neighborhood polygonfind_recent_deals_for_address- Main comprehensive analysis toolanalyze_market_trends- Analyze market trends and price patternscompare_addresses- Compare real estate markets between multiple addresses
In Progress (🚧):
get_valuation_comparables- Get comparable properties for valuation analysisget_deal_statistics- Calculate statistical aggregations on deal dataget_market_activity_metrics- Detailed market activity and velocity metrics
Planned (📋):
get_address_amenity_rating- Comprehensive amenity analysis with quality metricscompare_addresses_by_amenities- Side-by-side amenity comparisonfind_amenities_near_address- Raw amenity list with quality data
Important Patterns
Retry Logic
All API calls use automatic retry with exponential backoff (configurable via GOVMAP_MAX_RETRIES). The pattern is implemented in GovmapClient._make_request().
Rate Limiting
Client enforces rate limiting via _rate_limit() method, tracking last request time and sleeping if needed. Default: 5 requests/second.
Error Handling
- Validation errors: Raise
ValueErrorimmediately with clear message - Network errors: Retry with backoff, then raise
requests.RequestException - API response errors: Raise
ValueErrorwith specific details - Never return empty lists on error - always raise exceptions
Input Validation
All user inputs are validated before API calls:
_validate_address()- address strings_validate_coordinates()- coordinate tuples_validate_positive_int()- numeric parameters
Deal Prioritization
find_recent_deals_for_address() assigns priority levels:
- Priority 0: Same building deals
- Priority 1: Street deals
- Priority 2: Neighborhood deals
Helper _is_same_building() checks if deals are from the same property using address matching.
Data Flow Example
- LLM calls find_recent_deals_for_address("סוקולוב 38 חולון")
- Tool validates inputs → calls GovmapClient
- Client workflow:
- autocomplete_address() → get coordinates
- get_deals_by_radius() → extract polygon_ids
- For each polygon: get_street_deals() + get_neighborhood_deals()
- Filter & prioritize deals (same building > street > neighborhood)
- Sort by priority then date
- Return JSON with deals + metadata
Testing Strategy
- Unit tests: Mock API responses, test validation and retry logic
- Integration tests: Mark with
@pytest.mark.integration, use real API (use sparingly) - Fixtures defined in
tests/conftest.py - Consider using VCR.py for recording/replaying API interactions (planned)
Configuration via Environment Variables
# API Settings
GOVMAP_BASE_URL=https://www.govmap.gov.il/api/
GOVMAP_USER_AGENT=NadlanMCP/1.0.0
# Timeouts (seconds)
GOVMAP_CONNECT_TIMEOUT=10
GOVMAP_READ_TIMEOUT=30
# Retry Settings
GOVMAP_MAX_RETRIES=3
GOVMAP_RETRY_MIN_WAIT=1
GOVMAP_RETRY_MAX_WAIT=10
# Rate Limiting
GOVMAP_REQUESTS_PER_SECOND=5.0
# Defaults
GOVMAP_DEFAULT_RADIUS=50
GOVMAP_DEFAULT_YEARS_BACK=2
GOVMAP_DEFAULT_DEAL_LIMIT=100
Development Roadmap
See TASKS.md for complete implementation plan. Current status:
- Phase 2.2: Market analysis tools (✅ complete)
- Phase 2.3: Enhanced filtering (✅ complete)
- Phase 3: Package refactoring (✅ complete - monolithic govmap.py refactored into modular package)
- Phase 4: Pydantic data models (planned)
- Phase 5: Expanded test coverage (ongoing)
Common Tasks
Adding a New MCP Tool
- Add
@mcp.tool()decorated function infastmcp_server.py - Call appropriate
GovmapClientmethods - Format response as JSON string
- Add error handling with try/except
- Update README.md with tool documentation
Adding New API Endpoint Support
- Add method to
GovmapClientclass ingovmap/client.py - Implement validation (use
validators.pyfunctions) - Implement retry logic and rate limiting (follow existing patterns)
- Add unit tests in
tests/test_govmap_client.py - Optionally expose as MCP tool in
fastmcp_server.py
Modifying Configuration
- Add field to
GovmapConfigdataclass inconfig.py - Add environment variable default in
field(default_factory=...) - Add validation in
_validate()method - Update ARCHITECTURE.md with new config option
Govmap API Endpoints
The client uses these Govmap API endpoints:
POST /search-service/autocomplete- Address searchPOST /layers-catalog/entitiesByPoint- Get block/parcel dataGET /real-estate/deals/{point}/{radius}- Deals within radiusGET /real-estate/street-deals/{polygon_id}- Street-level dealsGET /real-estate/neighborhood-deals/{polygon_id}- Neighborhood deals
Note: No API key required (public API). Be respectful of rate limits.
Known Limitations
- No caching (planned for future)
- Synchronous API calls (async conversion planned)
- Hebrew addresses work best; English support is limited
- Rate limiting is per-instance, not distributed
- Deal data freshness depends on government updates (not real-time)
Important Notes for AI Agents
- This project uses FastMCP, not the standard MCP library
- All coordinate tuples are
(longitude, latitude)in ITM projection (Israeli Transverse Mercator) - The
govmappackage is now modular - each module has a specific responsibility:client.py- API calls and HTTP logicvalidators.py- Input validationfilters.py- Deal filteringstatistics.py- Statistical calculationsmarket_analysis.py- Market analysis metricsutils.py- Helper utilities
- Floor numbers in Hebrew (e.g., "קרקע", "מרתף") are parsed by
extract_floor_number()inutils.py - Deal types: 1 = first hand/new construction, 2 = second hand/resale
- Backward compatibility maintained:
from nadlan_mcp.govmap import GovmapClientstill works