Абалдеть, я довольно быстро изменил json для Ани. Такой плохой, но что поделать, спидран

This commit is contained in:
maksim 2024-06-07 23:47:13 +04:00
parent 8b92541188
commit e73d503017
2 changed files with 7 additions and 8 deletions

View File

@ -1,7 +1,9 @@
from typing import List
from fastapi import APIRouter, HTTPException
from genetic_algorithm.genetic_algorithm import genetic_algorithm, load_graph_from_request
from schemas import TripRequest, FlightSegment, TripResult, TripOption
from schemas import TripRequest, FlightSegment, TripOption
router = APIRouter(
prefix="/flight",
@ -9,7 +11,7 @@ router = APIRouter(
)
@router.post("/get/", response_model=TripResult)
@router.post("/get/", response_model=List[TripOption])
async def get_flight(request: TripRequest):
graphTo, graphBack, start_point, end_point, flightsDataTo, flightsDataBack, departure_date, departure_date_return = load_graph_from_request(
request)
@ -28,7 +30,7 @@ async def get_flight(request: TripRequest):
back_segments = [FlightSegment(**segment) for segment in back_trip["back"]]
trip_options.append(TripOption(to=to_segments, back=back_segments))
return TripResult(trips=trip_options)
return trip_options
else:
resultTo = genetic_algorithm(start=start_point, end=end_point, graph=graphTo, flights_data=flightsDataTo,
@ -39,5 +41,5 @@ async def get_flight(request: TripRequest):
trip_options = [TripOption(to=[FlightSegment(**segment) for segment in trip["to"]], back=[]) for trip in
resultTo]
return TripResult(trips=trip_options)
return trip_options

View File

@ -51,7 +51,4 @@ class FlightSegment(BaseModel):
class TripOption(BaseModel):
to: List[FlightSegment]
back: List[FlightSegment]
class TripResult(BaseModel):
trips: List[TripOption]
back: List[FlightSegment]