viktor/wrongmove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More ruff fixes (#2)

Browse source 
* adding ruff auto check for pull requests as well as fixing all ruff errors

* More ruff fixes: forgot half of the ruff checks

Forgot to do a git add all :D

---------

Co-authored-by: Kadir <git@k8n.dev>
This commit is contained in:
Kadir 2025-09-14 19:44:03 +01:00 • committed by GitHub
parent 4c23acdb55
commit 0801aaf200
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crawler/5_routing.py
View file

@ -36,7 +36,7 @@ async def update_routing_info(
routes_data = routing.transit_route(
listing.latitude,
listing.longtitude,
listing.longitude,
destination_mode.destination_address,
destination_mode.travel_mode,
)

4
crawler/alembic/versions/6363b18a22ca_initial.py
View file

@ -29,7 +29,7 @@ def upgrade() -> None:
sa.Column('square_meters', sa.Float(), nullable=True),
sa.Column('agency', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
sa.Column('council_tax_band', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
sa.Column('longtitude', sa.Float(), nullable=False),
sa.Column('longitude', sa.Float(), nullable=False),
sa.Column('latitude', sa.Float(), nullable=False),
sa.Column('price_history_json', sa.TEXT(), nullable=False),
sa.Column('listing_site', sa.Enum('RIGHTMOVE', name='listingsite'), nullable=False),
@ -49,7 +49,7 @@ def upgrade() -> None:
sa.Column('square_meters', sa.Float(), nullable=True),
sa.Column('agency', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
sa.Column('council_tax_band', sqlmodel.sql.sqltypes.AutoString(), nullable=True),
sa.Column('longtitude', sa.Float(), nullable=False),
sa.Column('longitude', sa.Float(), nullable=False),
sa.Column('latitude', sa.Float(), nullable=False),
sa.Column('price_history_json', sa.TEXT(), nullable=False),
sa.Column('listing_site', sa.Enum('RIGHTMOVE', name='listingsite'), nullable=False),

2
crawler/api/app.py
View file

@ -101,7 +101,7 @@ async def get_task_status(
task_result = listing_tasks.dump_listings_task.AsyncResult(task_id)
try:
result = json.dumps(task_result.result)
except:
except Exception:
result = str(task_result.result)
return {

6
crawler/data_access.py
View file

@ -399,13 +399,7 @@ class Listing:
for item in data
]
@property
def longtitude(self) -> float:
return self.detailobject["property"]["longitude"]
@property
def latitude(self) -> float:
return self.detailobject["property"]["latitude"]
@property
def listing_site(self) -> ListingSite:

8
crawler/frontend/src/components/Map.tsx
View file

@ -195,18 +195,18 @@ export function Map(
.call(xAxis);
}
function openListingsDialog(longtitude: number, latitude: number) {
function openListingsDialog(longitude: number, latitude: number) {
const searchBuffer = 0.001 // ~100m
const properties = heatmap._tree.search({
minX: longtitude - searchBuffer,
maxX: longtitude + searchBuffer,
minX: longitude - searchBuffer,
maxX: longitude + searchBuffer,
minY: latitude - searchBuffer,
maxY: latitude + searchBuffer
})
if (properties.length > 0) {
const listingDialogPopup = getListingDialog(properties);
new mapboxgl.Popup()
.setLngLat([longtitude, latitude])
.setLngLat([longitude, latitude])
.setHTML(renderToString(listingDialogPopup))
.setMaxWidth("500px")
.addTo(mapRef.current);

6
crawler/listing_processor.py
View file

@ -113,7 +113,7 @@ class FetchListingDetailsStep(Step):
council_tax_band=listing_details["property"]["councilTaxInfo"]["content"][
0
]["value"],
longtitude=listing_details["property"]["longitude"],
longitude=listing_details["property"]["longitude"],
latitude=listing_details["property"]["latitude"],
price_history_json="{}", # TODO: should upsert from existing
listing_site=ListingSite.RIGHTMOVE,
@ -153,8 +153,8 @@ class FetchImagesStep(Step):
"floorplans", []
)
client_timeout = aiohttp.ClientTimeout(total=30)
for floorplan in all_floorplans:
url = floorplan["url"]
for floorplan_obj in all_floorplans:
url = floorplan_obj["url"]
picname = url.split("/")[-1]
floorplan_path = Path(base_path, str(listing.id), "floorplans", picname)
if floorplan_path.exists():

1
crawler/main.py
View file

@ -185,7 +185,6 @@ def dump_images(ctx: click.core.Context):
@cli.command()
@click.pass_context
def detect_floorplan(ctx: click.core.Context):
data_dir = ctx.obj["data_dir"]
click.echo(f"Running detect_floorplan for listings stored in {engine.url}")
repository = ListingRepository(engine=engine)
asyncio.run(detect_floorplan_module.detect_floorplan(repository))

2
crawler/models/listing.py
View file

@ -59,7 +59,7 @@ class Listing(SQLModel, table=False):
square_meters: float | None = Field(default=None, nullable=True, index=True)
agency: str | None = Field(default=None, nullable=True)
council_tax_band: str | None = Field(default=None, nullable=True)
longtitude: float = Field(nullable=False)
longitude: float = Field(nullable=False)
latitude: float = Field(nullable=False)
# price_history: List[Dict[str, Any]] = Field(default_factory=list, sa_type=JSON)
price_history_json: str = Field(sa_type=TEXT)

1
crawler/proof_of_concept/listings.py
View file

@ -33,7 +33,6 @@ response = requests.get(
verify=False,
)
import requests
headers = {
"Host": "api.rightmove.co.uk",

2
crawler/proof_of_concept/routing_routing.py
View file

@ -61,7 +61,7 @@ def extract_time(d):
distance_per_transit[step["travelMode"]] += step.get("distanceMeters", 0)
print(
f"dis {distance}, dur {duration}, duration per transit {dict(duration_per_transit)}, distance per transit {dict(distance_per_transit)}"
f"dis {distance}, dur {duration}, duration per transit {dict(duration_per_transit)}, distance per transit {dict(distance_per_transit)}, duration_static {duration_static}"
)

7
crawler/pyproject.toml
View file

@ -46,3 +46,10 @@ podman-compose = "^1.5.0"
[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
[tool.ruff]
# List of rules (error codes) to ignore
lint.ignore = [
"E741", # Ambigious name
]
exclude = ["*.ipynb"]

8
crawler/rec/rightmove_parser.py
View file

@ -1,8 +0,0 @@
def parse_listing_json_entry(d):
id = d["identifier"]
# address = d['address']
propertyType = d["propertyType"]
price = d["price"]
latitude = d["latitude"]
longitude = d["longitude"]
updated_date = d["updateDate"]

4
crawler/repositories/listing_repository.py
View file

@ -160,7 +160,7 @@ class ListingRepository:
square_meters=await listing.sqm_ocr(),
agency=listing.agency,
council_tax_band=listing.councilTaxBand,
longtitude=listing.longtitude,
longitude=listing.longitude,
latitude=listing.latitude,
price_history_json=modelListing.serialize_price_history(
listing.priceHistory
@ -180,7 +180,7 @@ class ListingRepository:
square_meters=await listing.sqm_ocr(),
agency=listing.agency,
council_tax_band=listing.councilTaxBand,
longtitude=listing.longtitude,
longitude=listing.longitude,
latitude=listing.latitude,
price_history_json=modelListing.serialize_price_history(
listing.priceHistory

2
crawler/ui_exporter.py
View file

@ -46,7 +46,7 @@ async def export_immoweb(
},
"geometry": {
"coordinates": [
listing.longtitude,
listing.longitude,
listing.latitude,
],
"type": "Point",