mirror of
https://github.com/Bunsly/HomeHarvest.git
synced 2026-03-04 19:44:29 -08:00
Compare commits
14 Commits
fix/realto
...
v0.8.18
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a6ac96db4 | ||
|
|
129ab37dff | ||
|
|
9a0cac650e | ||
|
|
a1c1bcc822 | ||
|
|
6f3faceb27 | ||
|
|
cab0216f29 | ||
|
|
8ee720ce5c | ||
|
|
8eb138ee1a | ||
|
|
ef6db606fd | ||
|
|
9406c92a66 | ||
|
|
fefacdd264 | ||
|
|
3579c10196 | ||
|
|
f5784e0191 | ||
|
|
57093f5d17 |
@@ -2,8 +2,6 @@ from __future__ import annotations
|
|||||||
from typing import Union
|
from typing import Union
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from requests.adapters import HTTPAdapter
|
|
||||||
from urllib3.util.retry import Retry
|
|
||||||
import uuid
|
import uuid
|
||||||
from ...exceptions import AuthenticationError
|
from ...exceptions import AuthenticationError
|
||||||
from .models import Property, ListingType, SiteName, SearchPropertyType, ReturnType
|
from .models import Property, ListingType, SiteName, SearchPropertyType, ReturnType
|
||||||
@@ -11,6 +9,27 @@ import json
|
|||||||
from pydantic import BaseModel
|
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):
|
class ScraperInput(BaseModel):
|
||||||
location: str
|
location: str
|
||||||
listing_type: ListingType | list[ListingType] | None
|
listing_type: ListingType | list[ListingType] | None
|
||||||
@@ -60,8 +79,6 @@ class ScraperInput(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class Scraper:
|
class Scraper:
|
||||||
session = None
|
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
scraper_input: ScraperInput,
|
scraper_input: ScraperInput,
|
||||||
@@ -69,40 +86,8 @@ class Scraper:
|
|||||||
self.location = scraper_input.location
|
self.location = scraper_input.location
|
||||||
self.listing_type = scraper_input.listing_type
|
self.listing_type = scraper_input.listing_type
|
||||||
self.property_type = scraper_input.property_type
|
self.property_type = scraper_input.property_type
|
||||||
|
self.proxy = scraper_input.proxy
|
||||||
if not self.session:
|
self.proxies = {"http": self.proxy, "https": self.proxy} if self.proxy else None
|
||||||
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(
|
|
||||||
{
|
|
||||||
'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',
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
if scraper_input.proxy:
|
|
||||||
proxy_url = scraper_input.proxy
|
|
||||||
proxies = {"http": proxy_url, "https": proxy_url}
|
|
||||||
self.session.proxies.update(proxies)
|
|
||||||
|
|
||||||
self.listing_type = scraper_input.listing_type
|
self.listing_type = scraper_input.listing_type
|
||||||
self.radius = scraper_input.radius
|
self.radius = scraper_input.radius
|
||||||
@@ -113,7 +98,7 @@ class Scraper:
|
|||||||
self.date_from_precision = scraper_input.date_from_precision
|
self.date_from_precision = scraper_input.date_from_precision
|
||||||
self.date_to_precision = scraper_input.date_to_precision
|
self.date_to_precision = scraper_input.date_to_precision
|
||||||
self.foreclosure = scraper_input.foreclosure
|
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.exclude_pending = scraper_input.exclude_pending
|
||||||
self.limit = scraper_input.limit
|
self.limit = scraper_input.limit
|
||||||
self.offset = scraper_input.offset
|
self.offset = scraper_input.offset
|
||||||
|
|||||||
@@ -8,25 +8,27 @@ This module implements the scraper for realtor.com
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
import requests
|
||||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
from datetime import datetime
|
|
||||||
from json import JSONDecodeError
|
from json import JSONDecodeError
|
||||||
from typing import Dict, Union
|
from typing import Dict, Union
|
||||||
|
|
||||||
from tenacity import (
|
from tenacity import (
|
||||||
retry,
|
retry,
|
||||||
retry_if_exception_type,
|
retry_if_exception_type,
|
||||||
|
retry_if_not_exception_type,
|
||||||
wait_exponential,
|
wait_exponential,
|
||||||
stop_after_attempt,
|
stop_after_attempt,
|
||||||
)
|
)
|
||||||
|
|
||||||
from .. import Scraper
|
from .. import Scraper, DEFAULT_HEADERS
|
||||||
|
from ....exceptions import AuthenticationError
|
||||||
from ..models import (
|
from ..models import (
|
||||||
Property,
|
Property,
|
||||||
ListingType,
|
ListingType,
|
||||||
ReturnType
|
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 (
|
from .processors import (
|
||||||
process_property,
|
process_property,
|
||||||
process_extra_property_details,
|
process_extra_property_details,
|
||||||
@@ -35,47 +37,68 @@ from .processors import (
|
|||||||
|
|
||||||
|
|
||||||
class RealtorScraper(Scraper):
|
class RealtorScraper(Scraper):
|
||||||
SEARCH_GQL_URL = "https://api.frontdoor.realtor.com/graphql"
|
SEARCH_GQL_URL = "https://www.realtor.com/frontdoor/graphql"
|
||||||
NUM_PROPERTY_WORKERS = 20
|
NUM_PROPERTY_WORKERS = 20
|
||||||
DEFAULT_PAGE_SIZE = 200
|
DEFAULT_PAGE_SIZE = 200
|
||||||
|
|
||||||
def __init__(self, scraper_input):
|
def __init__(self, scraper_input):
|
||||||
super().__init__(scraper_input)
|
super().__init__(scraper_input)
|
||||||
|
|
||||||
def handle_location(self):
|
@staticmethod
|
||||||
query = """query Search_suggestions($searchInput: SearchSuggestionsInput!) {
|
def _minify_query(query: str) -> str:
|
||||||
search_suggestions(search_input: $searchInput) {
|
"""Minify GraphQL query by collapsing whitespace to single spaces."""
|
||||||
geo_results {
|
# Split on whitespace, filter empty strings, join with single space
|
||||||
type
|
return ' '.join(query.split())
|
||||||
text
|
|
||||||
geo {
|
|
||||||
_id
|
|
||||||
area_type
|
|
||||||
city
|
|
||||||
state_code
|
|
||||||
postal_code
|
|
||||||
county
|
|
||||||
centroid { lat lon }
|
|
||||||
slug_id
|
|
||||||
geo_id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}"""
|
|
||||||
|
|
||||||
|
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 = requests.post(
|
||||||
|
self.SEARCH_GQL_URL,
|
||||||
|
headers=DEFAULT_HEADERS,
|
||||||
|
data=json.dumps(payload, separators=(',', ':')),
|
||||||
|
proxies=self.proxies
|
||||||
|
)
|
||||||
|
|
||||||
|
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...")
|
||||||
|
|
||||||
|
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 = {
|
variables = {
|
||||||
"searchInput": {
|
"searchInput": {
|
||||||
"search_term": self.location
|
"search_term": self.location
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
payload = {
|
response_json = self._graphql_post(SEARCH_SUGGESTIONS_QUERY, variables, "Search_suggestions")
|
||||||
"query": query,
|
|
||||||
"variables": variables,
|
|
||||||
}
|
|
||||||
|
|
||||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
|
||||||
response_json = response.json()
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
response_json is None
|
response_json is None
|
||||||
@@ -86,6 +109,11 @@ class RealtorScraper(Scraper):
|
|||||||
or "geo_results" not in response_json["data"]["search_suggestions"]
|
or "geo_results" not in response_json["data"]["search_suggestions"]
|
||||||
or not response_json["data"]["search_suggestions"]["geo_results"]
|
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 None
|
||||||
|
|
||||||
geo_result = response_json["data"]["search_suggestions"]["geo_results"][0]
|
geo_result = response_json["data"]["search_suggestions"]["geo_results"][0]
|
||||||
@@ -102,31 +130,34 @@ class RealtorScraper(Scraper):
|
|||||||
}
|
}
|
||||||
|
|
||||||
if geo.get("area_type") == "address":
|
if geo.get("area_type") == "address":
|
||||||
geo_id = geo.get("_id", "")
|
# Try to get mpr_id directly from API response first
|
||||||
if geo_id.startswith("addr:"):
|
if geo.get("mpr_id"):
|
||||||
result["mpr_id"] = geo_id.replace("addr:", "")
|
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
|
return result
|
||||||
|
|
||||||
def get_latest_listing_id(self, property_id: str) -> str | None:
|
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) {
|
property(id: $property_id) {
|
||||||
listings {
|
listings {
|
||||||
listing_id
|
...ListingFragment
|
||||||
primary
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
variables = {"property_id": property_id}
|
variables = {"property_id": property_id}
|
||||||
payload = {
|
response_json = self._graphql_post(query, variables, "GetPropertyListingId")
|
||||||
"query": query,
|
|
||||||
"variables": variables,
|
|
||||||
}
|
|
||||||
|
|
||||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
|
||||||
response_json = response.json()
|
|
||||||
|
|
||||||
property_info = response_json["data"]["property"]
|
property_info = response_json["data"]["property"]
|
||||||
if property_info["listings"] is None:
|
if property_info["listings"] is None:
|
||||||
@@ -144,18 +175,16 @@ class RealtorScraper(Scraper):
|
|||||||
def handle_home(self, property_id: str) -> list[Property]:
|
def handle_home(self, property_id: str) -> list[Property]:
|
||||||
"""Fetch single home with proper error handling."""
|
"""Fetch single home with proper error handling."""
|
||||||
query = (
|
query = (
|
||||||
"""query Home($property_id: ID!) {
|
"""query GetHomeDetails($property_id: ID!) {
|
||||||
home(property_id: $property_id) %s
|
home(property_id: $property_id) %s
|
||||||
}"""
|
}"""
|
||||||
% HOMES_DATA
|
% HOMES_DATA
|
||||||
)
|
)
|
||||||
|
|
||||||
variables = {"property_id": property_id}
|
variables = {"property_id": property_id}
|
||||||
payload = {"query": query, "variables": variables}
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = self.session.post(self.SEARCH_GQL_URL, json=payload)
|
data = self._graphql_post(query, variables, "GetHomeDetails")
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
# Check for errors or missing data
|
# Check for errors or missing data
|
||||||
if "errors" in data or "data" not in data:
|
if "errors" in data or "data" not in data:
|
||||||
@@ -374,12 +403,12 @@ class RealtorScraper(Scraper):
|
|||||||
is_foreclosure = "foreclosure: false"
|
is_foreclosure = "foreclosure: false"
|
||||||
|
|
||||||
if search_type == "comps": #: comps search, came from an address
|
if search_type == "comps": #: comps search, came from an address
|
||||||
query = """query Property_search(
|
query = """query GetHomeSearch(
|
||||||
$coordinates: [Float]!
|
$coordinates: [Float]!
|
||||||
$radius: String!
|
$radius: String!
|
||||||
$offset: Int!,
|
$offset: Int!,
|
||||||
) {
|
) {
|
||||||
home_search(
|
homeSearch: home_search(
|
||||||
query: {
|
query: {
|
||||||
%s
|
%s
|
||||||
nearby: {
|
nearby: {
|
||||||
@@ -407,11 +436,11 @@ class RealtorScraper(Scraper):
|
|||||||
GENERAL_RESULTS_QUERY,
|
GENERAL_RESULTS_QUERY,
|
||||||
)
|
)
|
||||||
elif search_type == "area": #: general search, came from a general location
|
elif search_type == "area": #: general search, came from a general location
|
||||||
query = """query Home_search(
|
query = """query GetHomeSearch(
|
||||||
$search_location: SearchLocation,
|
$search_location: SearchLocation,
|
||||||
$offset: Int,
|
$offset: Int
|
||||||
) {
|
) {
|
||||||
home_search(
|
homeSearch: home_search(
|
||||||
query: {
|
query: {
|
||||||
%s
|
%s
|
||||||
search_location: $search_location
|
search_location: $search_location
|
||||||
@@ -439,11 +468,11 @@ class RealtorScraper(Scraper):
|
|||||||
)
|
)
|
||||||
else: #: general search, came from an address
|
else: #: general search, came from an address
|
||||||
query = (
|
query = (
|
||||||
"""query Property_search(
|
"""query GetHomeSearch(
|
||||||
$property_id: [ID]!
|
$property_id: [ID]!
|
||||||
$offset: Int!,
|
$offset: Int!,
|
||||||
) {
|
) {
|
||||||
home_search(
|
homeSearch: home_search(
|
||||||
query: {
|
query: {
|
||||||
property_id: $property_id
|
property_id: $property_id
|
||||||
}
|
}
|
||||||
@@ -454,14 +483,8 @@ class RealtorScraper(Scraper):
|
|||||||
% GENERAL_RESULTS_QUERY
|
% GENERAL_RESULTS_QUERY
|
||||||
)
|
)
|
||||||
|
|
||||||
payload = {
|
response_json = self._graphql_post(query, variables, "GetHomeSearch")
|
||||||
"query": query,
|
search_key = "homeSearch"
|
||||||
"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"
|
|
||||||
|
|
||||||
properties: list[Union[Property, dict]] = []
|
properties: list[Union[Property, dict]] = []
|
||||||
|
|
||||||
@@ -1081,8 +1104,8 @@ class RealtorScraper(Scraper):
|
|||||||
|
|
||||||
|
|
||||||
@retry(
|
@retry(
|
||||||
retry=retry_if_exception_type(JSONDecodeError),
|
retry=retry_if_exception_type((JSONDecodeError, Exception)) & retry_if_not_exception_type(AuthenticationError),
|
||||||
wait=wait_exponential(min=4, max=10),
|
wait=wait_exponential(multiplier=1, min=1, max=10),
|
||||||
stop=stop_after_attempt(3),
|
stop=stop_after_attempt(3),
|
||||||
)
|
)
|
||||||
def get_bulk_prop_details(self, property_ids: list[str]) -> dict:
|
def get_bulk_prop_details(self, property_ids: list[str]) -> dict:
|
||||||
@@ -1095,24 +1118,25 @@ class RealtorScraper(Scraper):
|
|||||||
|
|
||||||
property_ids = list(set(property_ids))
|
property_ids = list(set(property_ids))
|
||||||
|
|
||||||
# Construct the bulk query
|
|
||||||
fragments = "\n".join(
|
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
|
for property_id in property_ids
|
||||||
)
|
)
|
||||||
query = f"""{HOME_FRAGMENT}
|
query = f"""query GetHome {{
|
||||||
|
{fragments}
|
||||||
query GetHomes {{
|
}}"""
|
||||||
{fragments}
|
|
||||||
}}"""
|
|
||||||
|
|
||||||
response = self.session.post(self.SEARCH_GQL_URL, json={"query": query})
|
data = self._graphql_post(query, {}, "GetHome")
|
||||||
data = response.json()
|
|
||||||
|
|
||||||
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 {}
|
return {}
|
||||||
|
|
||||||
properties = data["data"]
|
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 = """{
|
_SEARCH_HOMES_DATA_BASE = """{
|
||||||
pending_date
|
pending_date
|
||||||
listing_id
|
listing_id
|
||||||
@@ -181,8 +371,189 @@ _SEARCH_HOMES_DATA_BASE = """{
|
|||||||
|
|
||||||
|
|
||||||
HOME_FRAGMENT = """
|
HOME_FRAGMENT = """
|
||||||
fragment HomeData on Home {
|
fragment PropertyResult on Home {
|
||||||
|
__typename
|
||||||
|
pending_date
|
||||||
|
listing_id
|
||||||
property_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) {
|
nearbySchools: nearby_schools(radius: 5.0, limit_per_level: 3) {
|
||||||
__typename schools { district { __typename id name } }
|
__typename schools { district { __typename id name } }
|
||||||
}
|
}
|
||||||
@@ -198,11 +569,6 @@ fragment HomeData on Home {
|
|||||||
last_n_days
|
last_n_days
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
location {
|
|
||||||
parcel {
|
|
||||||
parcel_id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
taxHistory: tax_history { __typename tax year assessment { __typename building land total } }
|
taxHistory: tax_history { __typename tax year assessment { __typename building land total } }
|
||||||
property_history {
|
property_history {
|
||||||
date
|
date
|
||||||
@@ -227,6 +593,18 @@ fragment HomeData on Home {
|
|||||||
text
|
text
|
||||||
category
|
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
|
}""" % _SEARCH_HOMES_DATA_BASE
|
||||||
|
|
||||||
GENERAL_RESULTS_QUERY = """{
|
# Query body using inline fields (kept for backward compatibility)
|
||||||
|
GENERAL_RESULTS_QUERY_BODY = """{
|
||||||
count
|
count
|
||||||
total
|
total
|
||||||
results %s
|
results %s
|
||||||
}""" % SEARCH_HOMES_DATA
|
}""" % 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]
|
[tool.poetry]
|
||||||
name = "homeharvest"
|
name = "homeharvest"
|
||||||
version = "0.8.6b"
|
version = "0.8.18"
|
||||||
description = "Real estate scraping library"
|
description = "Real estate scraping library"
|
||||||
authors = ["Zachary Hampton <zachary@bunsly.com>", "Cullen Watson <cullen@bunsly.com>"]
|
authors = ["Zachary Hampton <zachary@bunsly.com>", "Cullen Watson <cullen@bunsly.com>"]
|
||||||
homepage = "https://github.com/ZacharyHampton/HomeHarvest"
|
homepage = "https://github.com/ZacharyHampton/HomeHarvest"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import pytz
|
import pytz
|
||||||
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
|
|
||||||
from homeharvest import scrape_property, Property
|
from homeharvest import scrape_property, Property
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
@@ -307,6 +308,30 @@ def test_phone_number_matching():
|
|||||||
assert row["agent_phones"].values[0] == matching_row["agent_phones"].values[0]
|
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():
|
def test_return_type():
|
||||||
results = {
|
results = {
|
||||||
"pandas": [scrape_property(location="Surprise, AZ", listing_type="for_rent", limit=100)],
|
"pandas": [scrape_property(location="Surprise, AZ", listing_type="for_rent", limit=100)],
|
||||||
|
|||||||
Reference in New Issue
Block a user