From d49b11e28ba7dbf59fa2cce4d028cad862833a6c Mon Sep 17 00:00:00 2001 From: Kadir Tugan Date: Sat, 18 Nov 2023 12:30:04 +0200 Subject: [PATCH] ruff format --- rec/db.py | 2 +- rec/query.py | 58 +++++++++++++++++++++++------------------ rec/rightmove_parser.py | 15 +++++------ 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/rec/db.py b/rec/db.py index da2e4c0..7d3ac41 100644 --- a/rec/db.py +++ b/rec/db.py @@ -31,5 +31,5 @@ class RightmoveListing(Base): ) -if __name__ == '__main__': +if __name__ == "__main__": Base.metadata.create_all(engine) diff --git a/rec/query.py b/rec/query.py index 665af16..6ea2d94 100644 --- a/rec/query.py +++ b/rec/query.py @@ -6,55 +6,61 @@ import requests from rec.db import RightmoveListing import urllib3 + urllib3.disable_warnings() -cache = Cache(r'_cache') +cache = Cache(r"_cache") headers = { - 'Host': 'api.rightmove.co.uk', + "Host": "api.rightmove.co.uk", # 'Accept-Encoding': 'gzip, deflate, br', - 'User-Agent': 'okhttp/4.10.0', - 'Connection': 'close', + "User-Agent": "okhttp/4.10.0", + "Connection": "close", } + @cache.memoize() def listing_query(page: int, min_bedrooms: int, max_bedrooms: int): print("Executing") params = { - 'locationIdentifier': 'POSTCODE^4228216', - 'channel': 'BUY', - 'page': str(page), - 'numberOfPropertiesPerPage': '25', - 'radius': '5.0', - 'sortBy': 'distance', - 'includeUnavailableProperties': 'false', - 'propertyTypes': 'flat', - 'dontShow': 'sharedOwnership,retirement', - 'minPrice': '150000', - 'maxPrice': '500000', - 'minBedrooms': str(min_bedrooms), - 'maxBedrooms': str(max_bedrooms), - 'apiApplication': 'ANDROID', - 'appVersion': '3.70.0', + "locationIdentifier": "POSTCODE^4228216", + "channel": "BUY", + "page": str(page), + "numberOfPropertiesPerPage": "25", + "radius": "5.0", + "sortBy": "distance", + "includeUnavailableProperties": "false", + "propertyTypes": "flat", + "dontShow": "sharedOwnership,retirement", + "minPrice": "150000", + "maxPrice": "500000", + "minBedrooms": str(min_bedrooms), + "maxBedrooms": str(max_bedrooms), + "apiApplication": "ANDROID", + "appVersion": "3.70.0", } - response = requests.get('https://api.rightmove.co.uk/api/property-listing', params=params, headers=headers, - verify=False) + response = requests.get( + "https://api.rightmove.co.uk/api/property-listing", + params=params, + headers=headers, + verify=False, + ) if response.status_code != 200: raise Exception("Failed due to: ", response.text) return response.json() -if __name__ == '__main__': +if __name__ == "__main__": response = listing_query(1, 2, 2) resp = response - for d in resp['properties']: + for d in resp["properties"]: rl = RightmoveListing( - id=d['identifier'], + id=d["identifier"], listing_json=d, - price=d['price'], - updated_timestamp = d['updateDate'], + price=d["price"], + updated_timestamp=d["updateDate"], ) rl.save() diff --git a/rec/rightmove_parser.py b/rec/rightmove_parser.py index bbfc7e3..350af98 100644 --- a/rec/rightmove_parser.py +++ b/rec/rightmove_parser.py @@ -1,11 +1,8 @@ - def parse_listing_json_entry(d): - id = d['identifier'] + id = d["identifier"] # address = d['address'] - propertyType = d['propertyType'] - price = d['price'] - latitude = d['latitude'] - longitude = d['longitude'] - updated_date = d['updateDate'] - - + propertyType = d["propertyType"] + price = d["price"] + latitude = d["latitude"] + longitude = d["longitude"] + updated_date = d["updateDate"]