mirror of
https://github.com/Bunsly/HomeHarvest.git
synced 2026-03-04 19:44:29 -08:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a6ac96db4 | ||
|
|
129ab37dff | ||
|
|
9a0cac650e | ||
|
|
a1c1bcc822 | ||
|
|
6f3faceb27 | ||
|
|
cab0216f29 | ||
|
|
8ee720ce5c | ||
|
|
8eb138ee1a | ||
|
|
ef6db606fd | ||
|
|
9406c92a66 | ||
|
|
fefacdd264 | ||
|
|
3579c10196 | ||
|
|
f5784e0191 | ||
|
|
57093f5d17 | ||
|
|
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.
|
||||
|
||||
@@ -2,8 +2,6 @@ from __future__ import annotations
|
||||
from typing import Union
|
||||
|
||||
import requests
|
||||
from requests.adapters import HTTPAdapter
|
||||
from urllib3.util.retry import Retry
|
||||
import uuid
|
||||
from ...exceptions import AuthenticationError
|
||||
from .models import Property, ListingType, SiteName, SearchPropertyType, ReturnType
|
||||
@@ -11,6 +9,27 @@ import json
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
DEFAULT_HEADERS = {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': '*/*',
|
||||
'Accept-Language': 'en-US,en;q=0.9',
|
||||
'Cache-Control': 'no-cache',
|
||||
'Origin': 'https://www.realtor.com',
|
||||
'Pragma': 'no-cache',
|
||||
'Referer': 'https://www.realtor.com/',
|
||||
'rdc-client-name': 'RDC_WEB_SRP_FS_PAGE',
|
||||
'rdc-client-version': '3.0.2515',
|
||||
'sec-ch-ua': '"Google Chrome";v="135", "Not-A.Brand";v="8", "Chromium";v="135"',
|
||||
'sec-ch-ua-mobile': '?0',
|
||||
'sec-ch-ua-platform': '"macOS"',
|
||||
'sec-fetch-dest': 'empty',
|
||||
'sec-fetch-mode': 'cors',
|
||||
'sec-fetch-site': 'same-site',
|
||||
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36',
|
||||
'x-is-bot': 'false',
|
||||
}
|
||||
|
||||
|
||||
class ScraperInput(BaseModel):
|
||||
location: str
|
||||
listing_type: ListingType | list[ListingType] | None
|
||||
@@ -60,8 +79,6 @@ class ScraperInput(BaseModel):
|
||||
|
||||
|
||||
class Scraper:
|
||||
session = None
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
scraper_input: ScraperInput,
|
||||
@@ -69,40 +86,8 @@ class Scraper:
|
||||
self.location = scraper_input.location
|
||||
self.listing_type = scraper_input.listing_type
|
||||
self.property_type = scraper_input.property_type
|
||||
|
||||
if not self.session:
|
||||
Scraper.session = requests.Session()
|
||||
retries = Retry(
|
||||
total=3, backoff_factor=4, status_forcelist=[429, 403], allowed_methods=frozenset(["GET", "POST"])
|
||||
)
|
||||
|
||||
adapter = HTTPAdapter(max_retries=retries)
|
||||
Scraper.session.mount("http://", adapter)
|
||||
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",
|
||||
}
|
||||
)
|
||||
|
||||
if scraper_input.proxy:
|
||||
proxy_url = scraper_input.proxy
|
||||
proxies = {"http": proxy_url, "https": proxy_url}
|
||||
self.session.proxies.update(proxies)
|
||||
self.proxy = scraper_input.proxy
|
||||
self.proxies = {"http": self.proxy, "https": self.proxy} if self.proxy else None
|
||||
|
||||
self.listing_type = scraper_input.listing_type
|
||||
self.radius = scraper_input.radius
|
||||
@@ -113,7 +98,7 @@ class Scraper:
|
||||
self.date_from_precision = scraper_input.date_from_precision
|
||||
self.date_to_precision = scraper_input.date_to_precision
|
||||
self.foreclosure = scraper_input.foreclosure
|
||||
self.extra_property_data = scraper_input.extra_property_data
|
||||
self.extra_property_data = False # TODO: temporarily disabled
|
||||
self.exclude_pending = scraper_input.exclude_pending
|
||||
self.limit = scraper_input.limit
|
||||
self.offset = scraper_input.offset
|
||||
|
||||
@@ -8,25 +8,27 @@ This module implements the scraper for realtor.com
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import requests
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
from datetime import datetime
|
||||
from json import JSONDecodeError
|
||||
from typing import Dict, Union
|
||||
|
||||
from tenacity import (
|
||||
retry,
|
||||
retry_if_exception_type,
|
||||
retry_if_not_exception_type,
|
||||
wait_exponential,
|
||||
stop_after_attempt,
|
||||
)
|
||||
|
||||
from .. import Scraper
|
||||
from .. import Scraper, DEFAULT_HEADERS
|
||||
from ....exceptions import AuthenticationError
|
||||
from ..models import (
|
||||
Property,
|
||||
ListingType,
|
||||
ReturnType
|
||||
)
|
||||
from .queries import GENERAL_RESULTS_QUERY, SEARCH_HOMES_DATA, HOMES_DATA, HOME_FRAGMENT
|
||||
from .queries import GENERAL_RESULTS_QUERY, HOMES_DATA, SEARCH_SUGGESTIONS_QUERY
|
||||
from .processors import (
|
||||
process_property,
|
||||
process_extra_property_details,
|
||||
@@ -35,64 +37,127 @@ 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://www.realtor.com/frontdoor/graphql"
|
||||
NUM_PROPERTY_WORKERS = 20
|
||||
DEFAULT_PAGE_SIZE = 200
|
||||
|
||||
def __init__(self, scraper_input):
|
||||
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("_", "-")
|
||||
@staticmethod
|
||||
def _minify_query(query: str) -> str:
|
||||
"""Minify GraphQL query by collapsing whitespace to single spaces."""
|
||||
# Split on whitespace, filter empty strings, join with single space
|
||||
return ' '.join(query.split())
|
||||
|
||||
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",
|
||||
def _graphql_post(self, query: str, variables: dict, operation_name: str) -> dict:
|
||||
"""
|
||||
Execute a GraphQL query.
|
||||
|
||||
Args:
|
||||
query: GraphQL query string (must include operationName matching operation_name param)
|
||||
variables: Query variables dictionary
|
||||
operation_name: Name of the GraphQL operation
|
||||
|
||||
Returns:
|
||||
Response JSON dictionary
|
||||
"""
|
||||
payload = {
|
||||
"operationName": operation_name,
|
||||
"query": self._minify_query(query),
|
||||
"variables": variables,
|
||||
}
|
||||
|
||||
response = self.session.get(
|
||||
self.ADDRESS_AUTOCOMPLETE_URL,
|
||||
params=params,
|
||||
response = requests.post(
|
||||
self.SEARCH_GQL_URL,
|
||||
headers=DEFAULT_HEADERS,
|
||||
data=json.dumps(payload, separators=(',', ':')),
|
||||
proxies=self.proxies
|
||||
)
|
||||
response_json = response.json()
|
||||
|
||||
result = response_json["autocomplete"]
|
||||
if response.status_code == 403:
|
||||
if not self.proxy:
|
||||
raise AuthenticationError(
|
||||
"Received 403 Forbidden from Realtor.com API.",
|
||||
response=response
|
||||
)
|
||||
else:
|
||||
raise Exception("Received 403 Forbidden, retrying...")
|
||||
|
||||
if not result:
|
||||
return response.json()
|
||||
|
||||
@retry(
|
||||
retry=retry_if_exception_type(Exception),
|
||||
wait=wait_exponential(multiplier=1, min=1, max=4),
|
||||
stop=stop_after_attempt(3),
|
||||
)
|
||||
def handle_location(self):
|
||||
variables = {
|
||||
"searchInput": {
|
||||
"search_term": self.location
|
||||
}
|
||||
}
|
||||
|
||||
response_json = self._graphql_post(SEARCH_SUGGESTIONS_QUERY, variables, "Search_suggestions")
|
||||
|
||||
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"]
|
||||
):
|
||||
# If we got a 400 error with "Required parameter is missing", raise to trigger retry
|
||||
if response_json and "errors" in response_json:
|
||||
error_msgs = [e.get("message", "") for e in response_json.get("errors", [])]
|
||||
if any("Required parameter is missing" in msg for msg in error_msgs):
|
||||
raise Exception(f"Transient API error: {error_msgs}")
|
||||
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":
|
||||
# Try to get mpr_id directly from API response first
|
||||
if geo.get("mpr_id"):
|
||||
result["mpr_id"] = geo.get("mpr_id")
|
||||
else:
|
||||
# Fallback: extract from _id field if it has addr: prefix
|
||||
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!) {
|
||||
query = """
|
||||
fragment ListingFragment on Listing {
|
||||
listing_id
|
||||
primary
|
||||
}
|
||||
query GetPropertyListingId($property_id: ID!) {
|
||||
property(id: $property_id) {
|
||||
listings {
|
||||
listing_id
|
||||
primary
|
||||
...ListingFragment
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
variables = {"property_id": property_id}
|
||||
payload = {
|
||||
"query": query,
|
||||
"variables": variables,
|
||||
}
|
||||
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
||||
response_json = response.json()
|
||||
response_json = self._graphql_post(query, variables, "GetPropertyListingId")
|
||||
|
||||
property_info = response_json["data"]["property"]
|
||||
if property_info["listings"] is None:
|
||||
@@ -108,31 +173,40 @@ 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!) {
|
||||
"""query GetHomeDetails($property_id: ID!) {
|
||||
home(property_id: $property_id) %s
|
||||
}"""
|
||||
% HOMES_DATA
|
||||
)
|
||||
|
||||
variables = {"property_id": property_id}
|
||||
payload = {
|
||||
"query": query,
|
||||
"variables": variables,
|
||||
}
|
||||
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
||||
response_json = response.json()
|
||||
try:
|
||||
data = self._graphql_post(query, variables, "GetHomeDetails")
|
||||
|
||||
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 +218,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 +359,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)
|
||||
@@ -317,12 +403,12 @@ class RealtorScraper(Scraper):
|
||||
is_foreclosure = "foreclosure: false"
|
||||
|
||||
if search_type == "comps": #: comps search, came from an address
|
||||
query = """query Property_search(
|
||||
query = """query GetHomeSearch(
|
||||
$coordinates: [Float]!
|
||||
$radius: String!
|
||||
$offset: Int!,
|
||||
) {
|
||||
home_search(
|
||||
homeSearch: home_search(
|
||||
query: {
|
||||
%s
|
||||
nearby: {
|
||||
@@ -350,20 +436,14 @@ class RealtorScraper(Scraper):
|
||||
GENERAL_RESULTS_QUERY,
|
||||
)
|
||||
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
|
||||
$offset: Int,
|
||||
query = """query GetHomeSearch(
|
||||
$search_location: SearchLocation,
|
||||
$offset: Int
|
||||
) {
|
||||
home_search(
|
||||
homeSearch: home_search(
|
||||
query: {
|
||||
%s
|
||||
city: $city
|
||||
county: $county
|
||||
postal_code: $postal_code
|
||||
state_code: $state_code
|
||||
search_location: $search_location
|
||||
%s
|
||||
%s
|
||||
%s
|
||||
@@ -388,11 +468,11 @@ class RealtorScraper(Scraper):
|
||||
)
|
||||
else: #: general search, came from an address
|
||||
query = (
|
||||
"""query Property_search(
|
||||
"""query GetHomeSearch(
|
||||
$property_id: [ID]!
|
||||
$offset: Int!,
|
||||
) {
|
||||
home_search(
|
||||
homeSearch: home_search(
|
||||
query: {
|
||||
property_id: $property_id
|
||||
}
|
||||
@@ -403,14 +483,8 @@ class RealtorScraper(Scraper):
|
||||
% GENERAL_RESULTS_QUERY
|
||||
)
|
||||
|
||||
payload = {
|
||||
"query": query,
|
||||
"variables": variables,
|
||||
}
|
||||
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
||||
response_json = response.json()
|
||||
search_key = "home_search" if "home_search" in query else "property_search"
|
||||
response_json = self._graphql_post(query, variables, "GetHomeSearch")
|
||||
search_key = "homeSearch"
|
||||
|
||||
properties: list[Union[Property, dict]] = []
|
||||
|
||||
@@ -499,24 +573,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:
|
||||
@@ -1038,8 +1104,8 @@ class RealtorScraper(Scraper):
|
||||
|
||||
|
||||
@retry(
|
||||
retry=retry_if_exception_type(JSONDecodeError),
|
||||
wait=wait_exponential(min=4, max=10),
|
||||
retry=retry_if_exception_type((JSONDecodeError, Exception)) & retry_if_not_exception_type(AuthenticationError),
|
||||
wait=wait_exponential(multiplier=1, min=1, max=10),
|
||||
stop=stop_after_attempt(3),
|
||||
)
|
||||
def get_bulk_prop_details(self, property_ids: list[str]) -> dict:
|
||||
@@ -1052,24 +1118,25 @@ class RealtorScraper(Scraper):
|
||||
|
||||
property_ids = list(set(property_ids))
|
||||
|
||||
# Construct the bulk query
|
||||
fragments = "\n".join(
|
||||
f'home_{property_id}: home(property_id: {property_id}) {{ ...HomeData }}'
|
||||
f'home_{property_id}: home(property_id: {property_id}) {HOMES_DATA}'
|
||||
for property_id in property_ids
|
||||
)
|
||||
query = f"""{HOME_FRAGMENT}
|
||||
|
||||
query GetHomes {{
|
||||
{fragments}
|
||||
}}"""
|
||||
query = f"""query GetHome {{
|
||||
{fragments}
|
||||
}}"""
|
||||
|
||||
response = self.session.post(self.SEARCH_GQL_URL, json={"query": query})
|
||||
data = response.json()
|
||||
data = self._graphql_post(query, {}, "GetHome")
|
||||
|
||||
if "data" not in data:
|
||||
if "data" not in data or data["data"] is None:
|
||||
# If we got a 400 error with "Required parameter is missing", raise to trigger retry
|
||||
if data and "errors" in data:
|
||||
error_msgs = [e.get("message", "") for e in data.get("errors", [])]
|
||||
if any("Required parameter is missing" in msg for msg in error_msgs):
|
||||
raise Exception(f"Transient API error: {error_msgs}")
|
||||
return {}
|
||||
|
||||
properties = data["data"]
|
||||
return {data.replace('home_', ''): properties[data] for data in properties if properties[data]}
|
||||
return {key.replace('home_', ''): properties[key] for key in properties if properties[key]}
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,193 @@
|
||||
SEARCH_RESULTS_FRAGMENT = """
|
||||
fragment PropertyResult on SearchHome {
|
||||
__typename
|
||||
pending_date
|
||||
listing_id
|
||||
property_id
|
||||
href
|
||||
permalink
|
||||
list_date
|
||||
status
|
||||
mls_status
|
||||
last_sold_price
|
||||
last_sold_date
|
||||
last_status_change_date
|
||||
last_update_date
|
||||
list_price
|
||||
list_price_max
|
||||
list_price_min
|
||||
price_per_sqft
|
||||
tags
|
||||
open_houses {
|
||||
start_date
|
||||
end_date
|
||||
description
|
||||
time_zone
|
||||
dst
|
||||
href
|
||||
methods
|
||||
}
|
||||
details {
|
||||
category
|
||||
text
|
||||
parent_category
|
||||
}
|
||||
pet_policy {
|
||||
cats
|
||||
dogs
|
||||
dogs_small
|
||||
dogs_large
|
||||
__typename
|
||||
}
|
||||
units {
|
||||
availability {
|
||||
date
|
||||
__typename
|
||||
}
|
||||
description {
|
||||
baths_consolidated
|
||||
baths
|
||||
beds
|
||||
sqft
|
||||
__typename
|
||||
}
|
||||
photos(https: true) {
|
||||
title
|
||||
href
|
||||
tags {
|
||||
label
|
||||
}
|
||||
}
|
||||
list_price
|
||||
__typename
|
||||
}
|
||||
flags {
|
||||
is_contingent
|
||||
is_pending
|
||||
is_new_construction
|
||||
}
|
||||
description {
|
||||
type
|
||||
sqft
|
||||
beds
|
||||
baths_full
|
||||
baths_half
|
||||
lot_sqft
|
||||
year_built
|
||||
garage
|
||||
type
|
||||
name
|
||||
stories
|
||||
text
|
||||
}
|
||||
source {
|
||||
id
|
||||
listing_id
|
||||
}
|
||||
hoa {
|
||||
fee
|
||||
}
|
||||
location {
|
||||
address {
|
||||
street_direction
|
||||
street_number
|
||||
street_name
|
||||
street_suffix
|
||||
line
|
||||
unit
|
||||
city
|
||||
state_code
|
||||
postal_code
|
||||
coordinate {
|
||||
lon
|
||||
lat
|
||||
}
|
||||
}
|
||||
county {
|
||||
name
|
||||
fips_code
|
||||
}
|
||||
neighborhoods {
|
||||
name
|
||||
}
|
||||
}
|
||||
tax_record {
|
||||
cl_id
|
||||
public_record_id
|
||||
last_update_date
|
||||
apn
|
||||
tax_parcel_id
|
||||
}
|
||||
primary_photo(https: true) {
|
||||
href
|
||||
}
|
||||
advertisers {
|
||||
email
|
||||
broker {
|
||||
name
|
||||
fulfillment_id
|
||||
}
|
||||
type
|
||||
name
|
||||
fulfillment_id
|
||||
builder {
|
||||
name
|
||||
fulfillment_id
|
||||
}
|
||||
phones {
|
||||
ext
|
||||
primary
|
||||
type
|
||||
number
|
||||
}
|
||||
office {
|
||||
name
|
||||
email
|
||||
fulfillment_id
|
||||
href
|
||||
phones {
|
||||
number
|
||||
type
|
||||
primary
|
||||
ext
|
||||
}
|
||||
mls_set
|
||||
}
|
||||
corporation {
|
||||
specialties
|
||||
name
|
||||
bio
|
||||
href
|
||||
fulfillment_id
|
||||
}
|
||||
mls_set
|
||||
nrds_id
|
||||
state_license
|
||||
rental_corporation {
|
||||
fulfillment_id
|
||||
}
|
||||
rental_management {
|
||||
name
|
||||
href
|
||||
fulfillment_id
|
||||
}
|
||||
}
|
||||
current_estimates {
|
||||
__typename
|
||||
source {
|
||||
__typename
|
||||
type
|
||||
name
|
||||
}
|
||||
estimate
|
||||
estimateHigh: estimate_high
|
||||
estimateLow: estimate_low
|
||||
date
|
||||
isBestHomeValue: isbest_homevalue
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
_SEARCH_HOMES_DATA_BASE = """{
|
||||
pending_date
|
||||
listing_id
|
||||
@@ -181,8 +371,189 @@ _SEARCH_HOMES_DATA_BASE = """{
|
||||
|
||||
|
||||
HOME_FRAGMENT = """
|
||||
fragment HomeData on Home {
|
||||
fragment PropertyResult on Home {
|
||||
__typename
|
||||
pending_date
|
||||
listing_id
|
||||
property_id
|
||||
href
|
||||
permalink
|
||||
list_date
|
||||
status
|
||||
mls_status
|
||||
last_sold_price
|
||||
last_sold_date
|
||||
last_status_change_date
|
||||
last_update_date
|
||||
list_price
|
||||
list_price_max
|
||||
list_price_min
|
||||
price_per_sqft
|
||||
tags
|
||||
open_houses {
|
||||
start_date
|
||||
end_date
|
||||
description
|
||||
time_zone
|
||||
dst
|
||||
href
|
||||
methods
|
||||
}
|
||||
details {
|
||||
category
|
||||
text
|
||||
parent_category
|
||||
}
|
||||
pet_policy {
|
||||
cats
|
||||
dogs
|
||||
dogs_small
|
||||
dogs_large
|
||||
__typename
|
||||
}
|
||||
units {
|
||||
availability {
|
||||
date
|
||||
__typename
|
||||
}
|
||||
description {
|
||||
baths_consolidated
|
||||
baths
|
||||
beds
|
||||
sqft
|
||||
__typename
|
||||
}
|
||||
photos(https: true) {
|
||||
title
|
||||
href
|
||||
tags {
|
||||
label
|
||||
}
|
||||
}
|
||||
list_price
|
||||
__typename
|
||||
}
|
||||
flags {
|
||||
is_contingent
|
||||
is_pending
|
||||
is_new_construction
|
||||
}
|
||||
description {
|
||||
type
|
||||
sqft
|
||||
beds
|
||||
baths_full
|
||||
baths_half
|
||||
lot_sqft
|
||||
year_built
|
||||
garage
|
||||
type
|
||||
name
|
||||
stories
|
||||
text
|
||||
}
|
||||
source {
|
||||
id
|
||||
listing_id
|
||||
}
|
||||
hoa {
|
||||
fee
|
||||
}
|
||||
location {
|
||||
address {
|
||||
street_direction
|
||||
street_number
|
||||
street_name
|
||||
street_suffix
|
||||
line
|
||||
unit
|
||||
city
|
||||
state_code
|
||||
postal_code
|
||||
coordinate {
|
||||
lon
|
||||
lat
|
||||
}
|
||||
}
|
||||
county {
|
||||
name
|
||||
fips_code
|
||||
}
|
||||
neighborhoods {
|
||||
name
|
||||
}
|
||||
parcel {
|
||||
parcel_id
|
||||
}
|
||||
}
|
||||
tax_record {
|
||||
cl_id
|
||||
public_record_id
|
||||
last_update_date
|
||||
apn
|
||||
tax_parcel_id
|
||||
}
|
||||
primary_photo(https: true) {
|
||||
href
|
||||
}
|
||||
photos(https: true) {
|
||||
title
|
||||
href
|
||||
tags {
|
||||
label
|
||||
}
|
||||
}
|
||||
advertisers {
|
||||
email
|
||||
broker {
|
||||
name
|
||||
fulfillment_id
|
||||
}
|
||||
type
|
||||
name
|
||||
fulfillment_id
|
||||
builder {
|
||||
name
|
||||
fulfillment_id
|
||||
}
|
||||
phones {
|
||||
ext
|
||||
primary
|
||||
type
|
||||
number
|
||||
}
|
||||
office {
|
||||
name
|
||||
email
|
||||
fulfillment_id
|
||||
href
|
||||
phones {
|
||||
number
|
||||
type
|
||||
primary
|
||||
ext
|
||||
}
|
||||
mls_set
|
||||
}
|
||||
corporation {
|
||||
specialties
|
||||
name
|
||||
bio
|
||||
href
|
||||
fulfillment_id
|
||||
}
|
||||
mls_set
|
||||
nrds_id
|
||||
state_license
|
||||
rental_corporation {
|
||||
fulfillment_id
|
||||
}
|
||||
rental_management {
|
||||
name
|
||||
href
|
||||
fulfillment_id
|
||||
}
|
||||
}
|
||||
nearbySchools: nearby_schools(radius: 5.0, limit_per_level: 3) {
|
||||
__typename schools { district { __typename id name } }
|
||||
}
|
||||
@@ -198,11 +569,6 @@ fragment HomeData on Home {
|
||||
last_n_days
|
||||
}
|
||||
}
|
||||
location {
|
||||
parcel {
|
||||
parcel_id
|
||||
}
|
||||
}
|
||||
taxHistory: tax_history { __typename tax year assessment { __typename building land total } }
|
||||
property_history {
|
||||
date
|
||||
@@ -227,6 +593,18 @@ fragment HomeData on Home {
|
||||
text
|
||||
category
|
||||
}
|
||||
estimates {
|
||||
__typename
|
||||
currentValues: current_values {
|
||||
__typename
|
||||
source { __typename type name }
|
||||
estimate
|
||||
estimateHigh: estimate_high
|
||||
estimateLow: estimate_low
|
||||
date
|
||||
isBestHomeValue: isbest_homevalue
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
@@ -300,8 +678,128 @@ current_estimates {
|
||||
}
|
||||
}""" % _SEARCH_HOMES_DATA_BASE
|
||||
|
||||
GENERAL_RESULTS_QUERY = """{
|
||||
# Query body using inline fields (kept for backward compatibility)
|
||||
GENERAL_RESULTS_QUERY_BODY = """{
|
||||
count
|
||||
total
|
||||
results %s
|
||||
}""" % SEARCH_HOMES_DATA
|
||||
|
||||
GENERAL_RESULTS_QUERY = """{
|
||||
__typename
|
||||
count
|
||||
total
|
||||
results %s
|
||||
}""" % SEARCH_HOMES_DATA
|
||||
|
||||
LISTING_PHOTOS_FRAGMENT = """
|
||||
fragment ListingPhotosFragment on SearchHome {
|
||||
__typename
|
||||
photos(https: true) {
|
||||
__typename
|
||||
title
|
||||
href
|
||||
tags {
|
||||
__typename
|
||||
label
|
||||
probability
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
SEARCH_SUGGESTIONS_QUERY = """query Search_suggestions($searchInput: SearchSuggestionsInput!) {
|
||||
search_suggestions(search_input: $searchInput) {
|
||||
raw_input_parser_result
|
||||
typeahead_results {
|
||||
display_string
|
||||
display_geo
|
||||
geo {
|
||||
_id
|
||||
_score
|
||||
mpr_id
|
||||
area_type
|
||||
city
|
||||
state_code
|
||||
state
|
||||
postal_code
|
||||
country
|
||||
lat
|
||||
lon
|
||||
county
|
||||
counties {
|
||||
name
|
||||
fips
|
||||
state_code
|
||||
}
|
||||
slug_id
|
||||
geo_id
|
||||
score
|
||||
name
|
||||
city_slug_id
|
||||
centroid {
|
||||
lat
|
||||
lon
|
||||
}
|
||||
county_needed_for_uniq
|
||||
street
|
||||
line
|
||||
school
|
||||
school_id
|
||||
school_district
|
||||
has_catchment
|
||||
university
|
||||
university_id
|
||||
neighborhood
|
||||
park
|
||||
}
|
||||
url
|
||||
}
|
||||
geo_results {
|
||||
type
|
||||
text
|
||||
geo {
|
||||
_id
|
||||
_score
|
||||
mpr_id
|
||||
area_type
|
||||
city
|
||||
state_code
|
||||
state
|
||||
postal_code
|
||||
country
|
||||
lat
|
||||
lon
|
||||
county
|
||||
counties {
|
||||
name
|
||||
fips
|
||||
state_code
|
||||
}
|
||||
slug_id
|
||||
geo_id
|
||||
score
|
||||
name
|
||||
city_slug_id
|
||||
centroid {
|
||||
lat
|
||||
lon
|
||||
}
|
||||
county_needed_for_uniq
|
||||
street
|
||||
line
|
||||
school
|
||||
school_id
|
||||
school_district
|
||||
has_catchment
|
||||
university
|
||||
university_id
|
||||
neighborhood
|
||||
park
|
||||
}
|
||||
}
|
||||
no_matches
|
||||
has_results
|
||||
original_string
|
||||
}
|
||||
}"""
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "homeharvest"
|
||||
version = "0.8.4"
|
||||
version = "0.8.18"
|
||||
description = "Real estate scraping library"
|
||||
authors = ["Zachary Hampton <zachary@bunsly.com>", "Cullen Watson <cullen@bunsly.com>"]
|
||||
homepage = "https://github.com/ZacharyHampton/HomeHarvest"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import pytz
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
|
||||
from homeharvest import scrape_property, Property
|
||||
import pandas as pd
|
||||
@@ -87,6 +88,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(
|
||||
@@ -288,6 +308,30 @@ def test_phone_number_matching():
|
||||
assert row["agent_phones"].values[0] == matching_row["agent_phones"].values[0]
|
||||
|
||||
|
||||
def test_parallel_search_consistency():
|
||||
"""Test that the same search executed 3 times in parallel returns consistent results"""
|
||||
def search_task():
|
||||
return scrape_property(
|
||||
location="Phoenix, AZ",
|
||||
listing_type="for_sale",
|
||||
limit=100
|
||||
)
|
||||
|
||||
with ThreadPoolExecutor(max_workers=3) as executor:
|
||||
futures = [executor.submit(search_task) for _ in range(3)]
|
||||
results = [future.result() for future in as_completed(futures)]
|
||||
|
||||
# Verify all results are valid
|
||||
assert all([result is not None for result in results])
|
||||
assert all([isinstance(result, pd.DataFrame) for result in results])
|
||||
assert all([len(result) > 0 for result in results])
|
||||
|
||||
# Verify all results have the same length (primary consistency check)
|
||||
lengths = [len(result) for result in results]
|
||||
assert len(set(lengths)) == 1, \
|
||||
f"All parallel searches should return same number of results, got lengths: {lengths}"
|
||||
|
||||
|
||||
def test_return_type():
|
||||
results = {
|
||||
"pandas": [scrape_property(location="Surprise, AZ", listing_type="for_rent", limit=100)],
|
||||
|
||||
Reference in New Issue
Block a user