mirror of
https://github.com/Bunsly/HomeHarvest.git
synced 2026-03-05 03:54:29 -08:00
Compare commits
5 Commits
v0.8.4
...
fix/realto
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
406ff97260 | ||
|
|
a8c9d0fd66 | ||
|
|
0b283e18bd | ||
|
|
8bf1f9e24b | ||
|
|
79b2b648f5 |
@@ -84,7 +84,7 @@ properties = scrape_property(
|
||||
#### Sorting & Listing Types
|
||||
```py
|
||||
# Sort options: list_price, list_date, sqft, beds, baths, last_update_date
|
||||
# Listing types: "for_sale", "for_rent", "sold", "pending", list, or None (all)
|
||||
# Listing types: "for_sale", "for_rent", "sold", "pending", "off_market", list, or None (common types)
|
||||
properties = scrape_property(
|
||||
location="Miami, FL",
|
||||
listing_type=["for_sale", "pending"], # Single string, list, or None
|
||||
@@ -158,7 +158,7 @@ Required
|
||||
│ - 'other'
|
||||
│ - 'ready_to_build'
|
||||
│ - List of strings returns properties matching ANY status: ['for_sale', 'pending']
|
||||
│ - None returns all listing types
|
||||
│ - None returns common listing types (for_sale, for_rent, sold, pending, off_market)
|
||||
│
|
||||
Optional
|
||||
├── property_type (list): Choose the type of properties.
|
||||
|
||||
@@ -81,21 +81,21 @@ class Scraper:
|
||||
Scraper.session.mount("https://", adapter)
|
||||
Scraper.session.headers.update(
|
||||
{
|
||||
"accept": "application/json, text/javascript",
|
||||
"accept-language": "en-US,en;q=0.9",
|
||||
"cache-control": "no-cache",
|
||||
"content-type": "application/json",
|
||||
"origin": "https://www.realtor.com",
|
||||
"pragma": "no-cache",
|
||||
"priority": "u=1, i",
|
||||
"rdc-ab-tests": "commute_travel_time_variation:v1",
|
||||
"sec-ch-ua": '"Not)A;Brand";v="99", "Google Chrome";v="127", "Chromium";v="127"',
|
||||
"sec-ch-ua-mobile": "?0",
|
||||
"sec-ch-ua-platform": '"Windows"',
|
||||
"sec-fetch-dest": "empty",
|
||||
"sec-fetch-mode": "cors",
|
||||
"sec-fetch-site": "same-origin",
|
||||
"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
|
||||
'sec-ch-ua-platform': '"macOS"',
|
||||
'rdc-client-name': 'rdc-search-for-sale-desktop',
|
||||
'sec-ch-ua': '"Chromium";v="142", "Google Chrome";v="142", "Not_A Brand";v="99"',
|
||||
'sec-ch-ua-mobile': '?0',
|
||||
'rdc-client-version': '0.1.0',
|
||||
'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36',
|
||||
'accept': 'application/json',
|
||||
'content-type': 'application/json',
|
||||
'origin': 'https://www.realtor.com',
|
||||
'sec-fetch-site': 'same-site',
|
||||
'sec-fetch-mode': 'cors',
|
||||
'sec-fetch-dest': 'empty',
|
||||
'referer': 'https://www.realtor.com/',
|
||||
'accept-language': 'en-US,en;q=0.9',
|
||||
'priority': 'u=1, i',
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -35,10 +35,7 @@ from .processors import (
|
||||
|
||||
|
||||
class RealtorScraper(Scraper):
|
||||
SEARCH_GQL_URL = "https://www.realtor.com/api/v1/rdc_search_srp?client_id=rdc-search-new-communities&schema=vesta"
|
||||
PROPERTY_URL = "https://www.realtor.com/realestateandhomes-detail/"
|
||||
PROPERTY_GQL = "https://graph.realtor.com/graphql"
|
||||
ADDRESS_AUTOCOMPLETE_URL = "https://parser-external.geo.moveaws.com/suggest"
|
||||
SEARCH_GQL_URL = "https://api.frontdoor.realtor.com/graphql"
|
||||
NUM_PROPERTY_WORKERS = 20
|
||||
DEFAULT_PAGE_SIZE = 200
|
||||
|
||||
@@ -46,33 +43,70 @@ class RealtorScraper(Scraper):
|
||||
super().__init__(scraper_input)
|
||||
|
||||
def handle_location(self):
|
||||
# Get client_id from listing_type
|
||||
if self.listing_type is None:
|
||||
client_id = "for-sale"
|
||||
elif isinstance(self.listing_type, list):
|
||||
client_id = self.listing_type[0].value.lower().replace("_", "-") if self.listing_type else "for-sale"
|
||||
else:
|
||||
client_id = self.listing_type.value.lower().replace("_", "-")
|
||||
query = """query Search_suggestions($searchInput: SearchSuggestionsInput!) {
|
||||
search_suggestions(search_input: $searchInput) {
|
||||
geo_results {
|
||||
type
|
||||
text
|
||||
geo {
|
||||
_id
|
||||
area_type
|
||||
city
|
||||
state_code
|
||||
postal_code
|
||||
county
|
||||
centroid { lat lon }
|
||||
slug_id
|
||||
geo_id
|
||||
}
|
||||
}
|
||||
}
|
||||
}"""
|
||||
|
||||
params = {
|
||||
"input": self.location,
|
||||
"client_id": client_id,
|
||||
"limit": "1",
|
||||
"area_types": "city,state,county,postal_code,address,street,neighborhood,school,school_district,university,park",
|
||||
variables = {
|
||||
"searchInput": {
|
||||
"search_term": self.location
|
||||
}
|
||||
}
|
||||
|
||||
response = self.session.get(
|
||||
self.ADDRESS_AUTOCOMPLETE_URL,
|
||||
params=params,
|
||||
)
|
||||
payload = {
|
||||
"query": query,
|
||||
"variables": variables,
|
||||
}
|
||||
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
||||
response_json = response.json()
|
||||
|
||||
result = response_json["autocomplete"]
|
||||
|
||||
if not result:
|
||||
if (
|
||||
response_json is None
|
||||
or "data" not in response_json
|
||||
or response_json["data"] is None
|
||||
or "search_suggestions" not in response_json["data"]
|
||||
or response_json["data"]["search_suggestions"] is None
|
||||
or "geo_results" not in response_json["data"]["search_suggestions"]
|
||||
or not response_json["data"]["search_suggestions"]["geo_results"]
|
||||
):
|
||||
return None
|
||||
|
||||
return result[0]
|
||||
geo_result = response_json["data"]["search_suggestions"]["geo_results"][0]
|
||||
geo = geo_result.get("geo", {})
|
||||
|
||||
result = {
|
||||
"text": geo_result.get("text"),
|
||||
"area_type": geo.get("area_type"),
|
||||
"city": geo.get("city"),
|
||||
"state_code": geo.get("state_code"),
|
||||
"postal_code": geo.get("postal_code"),
|
||||
"county": geo.get("county"),
|
||||
"centroid": geo.get("centroid"),
|
||||
}
|
||||
|
||||
if geo.get("area_type") == "address":
|
||||
geo_id = geo.get("_id", "")
|
||||
if geo_id.startswith("addr:"):
|
||||
result["mpr_id"] = geo_id.replace("addr:", "")
|
||||
|
||||
return result
|
||||
|
||||
def get_latest_listing_id(self, property_id: str) -> str | None:
|
||||
query = """query Property($property_id: ID!) {
|
||||
@@ -108,6 +142,7 @@ class RealtorScraper(Scraper):
|
||||
return property_info["listings"][0]["listing_id"]
|
||||
|
||||
def handle_home(self, property_id: str) -> list[Property]:
|
||||
"""Fetch single home with proper error handling."""
|
||||
query = (
|
||||
"""query Home($property_id: ID!) {
|
||||
home(property_id: $property_id) %s
|
||||
@@ -116,23 +151,33 @@ class RealtorScraper(Scraper):
|
||||
)
|
||||
|
||||
variables = {"property_id": property_id}
|
||||
payload = {
|
||||
"query": query,
|
||||
"variables": variables,
|
||||
}
|
||||
payload = {"query": query, "variables": variables}
|
||||
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
||||
response_json = response.json()
|
||||
try:
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
||||
data = response.json()
|
||||
|
||||
property_info = response_json["data"]["home"]
|
||||
# Check for errors or missing data
|
||||
if "errors" in data or "data" not in data:
|
||||
return []
|
||||
|
||||
if self.return_type != ReturnType.raw:
|
||||
return [process_property(property_info, self.mls_only, self.extra_property_data,
|
||||
self.exclude_pending, self.listing_type, get_key, process_extra_property_details)]
|
||||
else:
|
||||
return [property_info]
|
||||
if data["data"] is None or "home" not in data["data"]:
|
||||
return []
|
||||
|
||||
property_info = data["data"]["home"]
|
||||
if property_info is None:
|
||||
return []
|
||||
|
||||
# Process based on return type
|
||||
if self.return_type != ReturnType.raw:
|
||||
return [process_property(property_info, self.mls_only, self.extra_property_data,
|
||||
self.exclude_pending, self.listing_type, get_key,
|
||||
process_extra_property_details)]
|
||||
else:
|
||||
return [property_info]
|
||||
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
def general_search(self, variables: dict, search_type: str) -> Dict[str, Union[int, Union[list[Property], list[dict]]]]:
|
||||
"""
|
||||
@@ -144,7 +189,15 @@ class RealtorScraper(Scraper):
|
||||
# Determine date field based on listing type
|
||||
# Convert listing_type to list for uniform handling
|
||||
if self.listing_type is None:
|
||||
listing_types = []
|
||||
# When None, return all common listing types as documented
|
||||
# Note: NEW_COMMUNITY, OTHER, and READY_TO_BUILD are excluded as they typically return no results
|
||||
listing_types = [
|
||||
ListingType.FOR_SALE,
|
||||
ListingType.FOR_RENT,
|
||||
ListingType.SOLD,
|
||||
ListingType.PENDING,
|
||||
ListingType.OFF_MARKET,
|
||||
]
|
||||
date_field = None # When no listing_type is specified, skip date filtering
|
||||
elif isinstance(self.listing_type, list):
|
||||
listing_types = self.listing_type
|
||||
@@ -277,10 +330,14 @@ class RealtorScraper(Scraper):
|
||||
else:
|
||||
sort_param = "" #: prioritize normal fractal sort from realtor
|
||||
|
||||
# Handle PENDING with or_filters (applies if PENDING is in the list or is the single type)
|
||||
# Handle PENDING with or_filters
|
||||
# Only use or_filters when PENDING is the only type or mixed only with FOR_SALE
|
||||
# Using or_filters with other types (SOLD, FOR_RENT, etc.) will exclude those types
|
||||
has_pending = ListingType.PENDING in listing_types
|
||||
other_types = [lt for lt in listing_types if lt not in [ListingType.PENDING, ListingType.FOR_SALE]]
|
||||
use_or_filters = has_pending and len(other_types) == 0
|
||||
pending_or_contingent_param = (
|
||||
"or_filters: { contingent: true, pending: true }" if has_pending else ""
|
||||
"or_filters: { contingent: true, pending: true }" if use_or_filters else ""
|
||||
)
|
||||
|
||||
# Build bucket parameter (only use fractal sort if no custom sort is specified)
|
||||
@@ -351,19 +408,13 @@ class RealtorScraper(Scraper):
|
||||
)
|
||||
elif search_type == "area": #: general search, came from a general location
|
||||
query = """query Home_search(
|
||||
$city: String,
|
||||
$county: [String],
|
||||
$state_code: String,
|
||||
$postal_code: String
|
||||
$search_location: SearchLocation,
|
||||
$offset: Int,
|
||||
) {
|
||||
home_search(
|
||||
query: {
|
||||
%s
|
||||
city: $city
|
||||
county: $county
|
||||
postal_code: $postal_code
|
||||
state_code: $state_code
|
||||
search_location: $search_location
|
||||
%s
|
||||
%s
|
||||
%s
|
||||
@@ -499,24 +550,16 @@ class RealtorScraper(Scraper):
|
||||
if not location_info.get("centroid"):
|
||||
return []
|
||||
|
||||
coordinates = list(location_info["centroid"].values())
|
||||
centroid = location_info["centroid"]
|
||||
coordinates = [centroid["lon"], centroid["lat"]] # GeoJSON order: [lon, lat]
|
||||
search_variables |= {
|
||||
"coordinates": coordinates,
|
||||
"radius": "{}mi".format(self.radius),
|
||||
}
|
||||
|
||||
elif location_type == "postal_code":
|
||||
else: #: general search (city, county, postal_code, etc.)
|
||||
search_variables |= {
|
||||
"postal_code": location_info.get("postal_code"),
|
||||
}
|
||||
|
||||
else: #: general search, location
|
||||
search_variables |= {
|
||||
"city": location_info.get("city"),
|
||||
"county": location_info.get("county"),
|
||||
"state_code": location_info.get("state_code"),
|
||||
"postal_code": location_info.get("postal_code"),
|
||||
|
||||
"search_location": {"location": location_info.get("text")},
|
||||
}
|
||||
|
||||
if self.foreclosure:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "homeharvest"
|
||||
version = "0.8.4"
|
||||
version = "0.8.6b"
|
||||
description = "Real estate scraping library"
|
||||
authors = ["Zachary Hampton <zachary@bunsly.com>", "Cullen Watson <cullen@bunsly.com>"]
|
||||
homepage = "https://github.com/ZacharyHampton/HomeHarvest"
|
||||
|
||||
@@ -87,6 +87,25 @@ def test_realtor_date_range_sold():
|
||||
)
|
||||
|
||||
|
||||
def test_listing_type_none_includes_sold():
|
||||
"""Test that listing_type=None includes sold listings (issue #142)"""
|
||||
# Get properties with listing_type=None (should include all common types)
|
||||
result_none = scrape_property(
|
||||
location="Warren, MI",
|
||||
listing_type=None
|
||||
)
|
||||
|
||||
# Verify we got results
|
||||
assert result_none is not None and len(result_none) > 0
|
||||
|
||||
# Verify sold listings are included
|
||||
status_types = set(result_none['status'].unique())
|
||||
assert 'SOLD' in status_types, "SOLD listings should be included when listing_type=None"
|
||||
|
||||
# Verify we get multiple listing types (not just one)
|
||||
assert len(status_types) > 1, "Should return multiple listing types when listing_type=None"
|
||||
|
||||
|
||||
def test_realtor_single_property():
|
||||
results = [
|
||||
scrape_property(
|
||||
|
||||
Reference in New Issue
Block a user