diff --git a/navitia_client/client/apis/arrival_apis.py b/navitia_client/client/apis/arrival_apis.py index 414dd8e..113197b 100644 --- a/navitia_client/client/apis/arrival_apis.py +++ b/navitia_client/client/apis/arrival_apis.py @@ -1,8 +1,8 @@ from datetime import datetime from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.arrival import Arrival +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.arrival import Arrival class ArrivalApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/contributors_apis.py b/navitia_client/client/apis/contributors_apis.py index f353205..cb97eed 100644 --- a/navitia_client/client/apis/contributors_apis.py +++ b/navitia_client/client/apis/contributors_apis.py @@ -1,8 +1,8 @@ from typing import Any, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.contributor import Contributor -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.contributor import Contributor +from navitia_client.entities.response import Pagination class ContributorsApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/coverage_apis.py b/navitia_client/client/apis/coverage_apis.py index 9e54b0c..84abd3d 100644 --- a/navitia_client/client/apis/coverage_apis.py +++ b/navitia_client/client/apis/coverage_apis.py @@ -1,8 +1,8 @@ from typing import Any, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.administrative_region import Region -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.administrative_region import Region +from navitia_client.entities.response import Pagination class CoverageApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/datasets_apis.py b/navitia_client/client/apis/datasets_apis.py index 0a495d6..e981a66 100644 --- a/navitia_client/client/apis/datasets_apis.py +++ b/navitia_client/client/apis/datasets_apis.py @@ -1,8 +1,8 @@ from typing import Any, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.dataset import Dataset -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.dataset import Dataset +from navitia_client.entities.response import Pagination class DatasetsApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/departure_apis.py b/navitia_client/client/apis/departure_apis.py index 307ea4f..1d45327 100644 --- a/navitia_client/client/apis/departure_apis.py +++ b/navitia_client/client/apis/departure_apis.py @@ -1,8 +1,8 @@ from datetime import datetime from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.departure import Departure +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.departure import Departure class DepartureApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/equipment_report_apis.py b/navitia_client/client/apis/equipment_report_apis.py index de83687..c4338f3 100644 --- a/navitia_client/client/apis/equipment_report_apis.py +++ b/navitia_client/client/apis/equipment_report_apis.py @@ -1,7 +1,7 @@ from typing import Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.equipment_reports import EquipmentReports -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.equipment_reports import EquipmentReports +from navitia_client.entities.response import Pagination class EquipmentReportsApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/freefloatings_nearby_apis.py b/navitia_client/client/apis/freefloatings_nearby_apis.py index f7cad3e..76baa24 100644 --- a/navitia_client/client/apis/freefloatings_nearby_apis.py +++ b/navitia_client/client/apis/freefloatings_nearby_apis.py @@ -1,8 +1,8 @@ from typing import Any, Dict, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.free_floating import FreeFloating -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.free_floating import FreeFloating +from navitia_client.entities.response import Pagination class FreefloatingsNearbyApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/inverted_geocoding_apis.py b/navitia_client/client/apis/inverted_geocoding_apis.py index 3d77867..6c7142b 100644 --- a/navitia_client/client/apis/inverted_geocoding_apis.py +++ b/navitia_client/client/apis/inverted_geocoding_apis.py @@ -1,6 +1,6 @@ from typing import Any, Sequence from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.place import Place +from navitia_client.entities.response.place import Place class InvertedGeocodingApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/isochrone_apis.py b/navitia_client/client/apis/isochrone_apis.py index d26a524..284dc63 100644 --- a/navitia_client/client/apis/isochrone_apis.py +++ b/navitia_client/client/apis/isochrone_apis.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Any, Optional, Sequence from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.isochrones import Isochrone +from navitia_client.entities.response.isochrones import Isochrone class IsochronesApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/journeys_apis.py b/navitia_client/client/apis/journeys_apis.py index ed5aad6..2f2a053 100644 --- a/navitia_client/client/apis/journeys_apis.py +++ b/navitia_client/client/apis/journeys_apis.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Optional, Sequence from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.journey import Journey, ParkMode +from navitia_client.entities.response import Journey, ParkMode class JourneyApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/line_report_apis.py b/navitia_client/client/apis/line_report_apis.py index f954ce3..db3377a 100644 --- a/navitia_client/client/apis/line_report_apis.py +++ b/navitia_client/client/apis/line_report_apis.py @@ -1,8 +1,8 @@ from datetime import datetime from typing import Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.disruption import Disruption -from navitia_client.entities.line_report import LineReport +from navitia_client.entities.response.disruption import Disruption +from navitia_client.entities.response.line_report import LineReport class LineReportsApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/place_apis.py b/navitia_client/client/apis/place_apis.py index 1a55399..d8833bb 100644 --- a/navitia_client/client/apis/place_apis.py +++ b/navitia_client/client/apis/place_apis.py @@ -1,6 +1,6 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.place import Place +from navitia_client.entities.response.place import Place class PlacesApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/places_nearby_apis.py b/navitia_client/client/apis/places_nearby_apis.py index 82f4e62..2392368 100644 --- a/navitia_client/client/apis/places_nearby_apis.py +++ b/navitia_client/client/apis/places_nearby_apis.py @@ -1,7 +1,7 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.place import Place +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.place import Place class PlacesNearbyApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/public_transport_objects_apis.py b/navitia_client/client/apis/public_transport_objects_apis.py index 98fd921..cebf27f 100644 --- a/navitia_client/client/apis/public_transport_objects_apis.py +++ b/navitia_client/client/apis/public_transport_objects_apis.py @@ -1,6 +1,6 @@ from typing import Any, Optional, Sequence from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.pt_object import PtObject +from navitia_client.entities.response.pt_object import PtObject class PublicTransportObjectsApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/public_transportation_apis/commercial_mode_apis.py b/navitia_client/client/apis/public_transportation_apis/commercial_mode_apis.py index 301529a..90c3137 100644 --- a/navitia_client/client/apis/public_transportation_apis/commercial_mode_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/commercial_mode_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.physical_mode import CommercialMode +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.physical_mode import CommercialMode class CommercialModeApiClient(ApiBaseClient, EntityApi[CommercialMode]): diff --git a/navitia_client/client/apis/public_transportation_apis/company_apis.py b/navitia_client/client/apis/public_transportation_apis/company_apis.py index 9058c8d..61f0506 100644 --- a/navitia_client/client/apis/public_transportation_apis/company_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/company_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.company import Company -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.company import Company +from navitia_client.entities.response import Pagination class CompanyApiClient(ApiBaseClient, EntityApi[Company]): diff --git a/navitia_client/client/apis/public_transportation_apis/disruption_apis.py b/navitia_client/client/apis/public_transportation_apis/disruption_apis.py index 88c2d88..3fbd75a 100644 --- a/navitia_client/client/apis/public_transportation_apis/disruption_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/disruption_apis.py @@ -1,10 +1,10 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.disruption import ( +from navitia_client.entities.response.disruption import ( Disruption, ) -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response import Pagination class DisruptionApiClient(ApiBaseClient, EntityApi[Disruption]): diff --git a/navitia_client/client/apis/public_transportation_apis/entity_apis.py b/navitia_client/client/apis/public_transportation_apis/entity_apis.py index 88d0957..4cfcd17 100644 --- a/navitia_client/client/apis/public_transportation_apis/entity_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/entity_apis.py @@ -1,14 +1,14 @@ from abc import ABC, abstractmethod from typing import Any, Generic, Optional, Sequence, Tuple, TypeVar -from navitia_client.entities.company import Company -from navitia_client.entities.disruption import Disruption -from navitia_client.entities.line_and_route import Line, Route -from navitia_client.entities.network import Network -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.physical_mode import CommercialMode, PhysicalMode -from navitia_client.entities.stop_area import StopArea, StopPoint -from navitia_client.entities.vehicle_journey import VehicleJourney +from navitia_client.entities.response.company import Company +from navitia_client.entities.response.disruption import Disruption +from navitia_client.entities.response.line_and_route import Line, Route +from navitia_client.entities.response.network import Network +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.physical_mode import CommercialMode, PhysicalMode +from navitia_client.entities.response.stop_area import StopArea, StopPoint +from navitia_client.entities.response.vehicle_journey import VehicleJourney TEntity = TypeVar( "TEntity", diff --git a/navitia_client/client/apis/public_transportation_apis/line_apis.py b/navitia_client/client/apis/public_transportation_apis/line_apis.py index f65ec40..0a9fae2 100644 --- a/navitia_client/client/apis/public_transportation_apis/line_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/line_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.line_and_route import Line -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.line_and_route import Line +from navitia_client.entities.response import Pagination class LineApiClient(ApiBaseClient, EntityApi[Line]): diff --git a/navitia_client/client/apis/public_transportation_apis/network_apis.py b/navitia_client/client/apis/public_transportation_apis/network_apis.py index 2ab1362..0fc1108 100644 --- a/navitia_client/client/apis/public_transportation_apis/network_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/network_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.network import Network -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response import Network +from navitia_client.entities.response import Pagination class NetworkApiClient(ApiBaseClient, EntityApi[Network]): diff --git a/navitia_client/client/apis/public_transportation_apis/physical_mode_apis.py b/navitia_client/client/apis/public_transportation_apis/physical_mode_apis.py index f901cf5..9c189b8 100644 --- a/navitia_client/client/apis/public_transportation_apis/physical_mode_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/physical_mode_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.physical_mode import PhysicalMode +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.physical_mode import PhysicalMode class PhysicalModeApiClient(ApiBaseClient, EntityApi[PhysicalMode]): diff --git a/navitia_client/client/apis/public_transportation_apis/route_apis.py b/navitia_client/client/apis/public_transportation_apis/route_apis.py index 61053c0..a173343 100644 --- a/navitia_client/client/apis/public_transportation_apis/route_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/route_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.line_and_route import Route -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.line_and_route import Route +from navitia_client.entities.response import Pagination class RouteApiClient(ApiBaseClient, EntityApi[Route]): diff --git a/navitia_client/client/apis/public_transportation_apis/stop_area_apis.py b/navitia_client/client/apis/public_transportation_apis/stop_area_apis.py index 838bd7a..8ed7c26 100644 --- a/navitia_client/client/apis/public_transportation_apis/stop_area_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/stop_area_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.stop_area import StopArea +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.stop_area import StopArea class StopAreaApiClient(ApiBaseClient, EntityApi[StopArea]): diff --git a/navitia_client/client/apis/public_transportation_apis/stop_point_apis.py b/navitia_client/client/apis/public_transportation_apis/stop_point_apis.py index 3c51424..484d89a 100644 --- a/navitia_client/client/apis/public_transportation_apis/stop_point_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/stop_point_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.stop_area import StopPoint +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.stop_area import StopPoint class StopPointApiClient(ApiBaseClient, EntityApi[StopPoint]): diff --git a/navitia_client/client/apis/public_transportation_apis/vehicle_journey_apis.py b/navitia_client/client/apis/public_transportation_apis/vehicle_journey_apis.py index bb740b9..161970a 100644 --- a/navitia_client/client/apis/public_transportation_apis/vehicle_journey_apis.py +++ b/navitia_client/client/apis/public_transportation_apis/vehicle_journey_apis.py @@ -1,8 +1,8 @@ from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient from navitia_client.client.apis.public_transportation_apis.entity_apis import EntityApi -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.vehicle_journey import VehicleJourney +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.vehicle_journey import VehicleJourney class VehicleJourneyApiClient(ApiBaseClient, EntityApi[VehicleJourney]): diff --git a/navitia_client/client/apis/route_schedules_apis.py b/navitia_client/client/apis/route_schedules_apis.py index 1283ec0..9062b31 100644 --- a/navitia_client/client/apis/route_schedules_apis.py +++ b/navitia_client/client/apis/route_schedules_apis.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Any, Optional, Sequence from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.route_schedule import RouteSchedule +from navitia_client.entities.response.route_schedule import RouteSchedule class RouteSchedulesApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/stop_schedules_apis.py b/navitia_client/client/apis/stop_schedules_apis.py index b83c0ec..b462476 100644 --- a/navitia_client/client/apis/stop_schedules_apis.py +++ b/navitia_client/client/apis/stop_schedules_apis.py @@ -1,8 +1,8 @@ from datetime import datetime from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.stop_schedule import StopSchedule +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.stop_schedule import StopSchedule class StopSchedulesApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/terminus_schedules_apis.py b/navitia_client/client/apis/terminus_schedules_apis.py index 852f9a2..d903ea2 100644 --- a/navitia_client/client/apis/terminus_schedules_apis.py +++ b/navitia_client/client/apis/terminus_schedules_apis.py @@ -1,8 +1,8 @@ from datetime import datetime from typing import Any, Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.stop_schedule import TerminusSchedule +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.stop_schedule import TerminusSchedule class TerminusSchedulesApiClient(ApiBaseClient): diff --git a/navitia_client/client/apis/traffic_report_apis.py b/navitia_client/client/apis/traffic_report_apis.py index 329d4f3..448d866 100644 --- a/navitia_client/client/apis/traffic_report_apis.py +++ b/navitia_client/client/apis/traffic_report_apis.py @@ -1,9 +1,9 @@ from datetime import datetime from typing import Optional, Sequence, Tuple from navitia_client.client.apis.api_base_client import ApiBaseClient -from navitia_client.entities.disruption import Disruption -from navitia_client.entities.pagination import Pagination -from navitia_client.entities.traffic_report import TrafficReport +from navitia_client.entities.response.disruption import Disruption +from navitia_client.entities.response import Pagination +from navitia_client.entities.response.traffic_report import TrafficReport class TrafficReportsApiClient(ApiBaseClient): diff --git a/navitia_client/entities/__init__.py b/navitia_client/entities/__init__.py index 4abeed5..e69de29 100644 --- a/navitia_client/entities/__init__.py +++ b/navitia_client/entities/__init__.py @@ -1,24 +0,0 @@ -# ruff: noqa: F401 - -from .base_entity import BaseEntity -from .coord import Coord -from .administrative_region import AdministrativeRegion -from .stand import StandStatus, Stands -from .poi import POIType, POI -from .trip import Trip -from .stop_area import StopArea, StopPoint -from .network import Network -from .address import Address -from .physical_mode import PhysicalModeId, CommercialMode, PhysicalMode -from .place import Place, PlaceEmbeddedType -from .pt_object import PtObject, PtObjectEmbeddedType -from .line_and_route import Line, Route -from .disruption import DisruptionStatus, Disruption -from .context import Context -from .pt_datetime import PTDatetime -from .note import Note -from .stop_datetime import StopDateTime -from .equipment import EquipmentAvailability, EquipmentDetails, StopAreaEquipments -from .equipment_reports import EquipmentReports -from .display_information import DisplayInformation -from .journey import ParkMode diff --git a/navitia_client/entities/response/__init__.py b/navitia_client/entities/response/__init__.py new file mode 100644 index 0000000..b0c89ff --- /dev/null +++ b/navitia_client/entities/response/__init__.py @@ -0,0 +1,26 @@ +# ruff: noqa: F401 + +from .address import Address +from .administrative_region import AdministrativeRegion +from .arrival import Arrival +from .base_entity import BaseEntity +from .context import Context +from .coord import Coord +from .display_information import DisplayInformation +from .disruption import Disruption, DisruptionStatus +from .equipment import EquipmentAvailability, EquipmentDetails, StopAreaEquipments +from .equipment_reports import EquipmentReports +from .journey import Journey, ParkMode +from .line_and_route import Line, Route +from .network import Network +from .note import Note +from .pagination import Pagination +from .physical_mode import CommercialMode, PhysicalMode, PhysicalModeId +from .place import Place, PlaceEmbeddedType +from .poi import POI, POIType +from .pt_datetime import PTDatetime +from .pt_object import PtObject, PtObjectEmbeddedType +from .stand import Stands, StandStatus +from .stop_area import StopArea, StopPoint +from .stop_datetime import StopDateTime +from .trip import Trip diff --git a/navitia_client/entities/access_point.py b/navitia_client/entities/response/access_point.py similarity index 100% rename from navitia_client/entities/access_point.py rename to navitia_client/entities/response/access_point.py diff --git a/navitia_client/entities/address.py b/navitia_client/entities/response/address.py similarity index 100% rename from navitia_client/entities/address.py rename to navitia_client/entities/response/address.py diff --git a/navitia_client/entities/administrative_region.py b/navitia_client/entities/response/administrative_region.py similarity index 100% rename from navitia_client/entities/administrative_region.py rename to navitia_client/entities/response/administrative_region.py diff --git a/navitia_client/entities/arrival.py b/navitia_client/entities/response/arrival.py similarity index 70% rename from navitia_client/entities/arrival.py rename to navitia_client/entities/response/arrival.py index b33099d..d59c82e 100644 --- a/navitia_client/entities/arrival.py +++ b/navitia_client/entities/response/arrival.py @@ -1,9 +1,9 @@ from dataclasses import dataclass from typing import Any -from navitia_client.entities.line_and_route import Route -from navitia_client.entities.stop_area import StopPoint -from navitia_client.entities.stop_datetime import StopDateTime +from navitia_client.entities.response.line_and_route import Route +from navitia_client.entities.response.stop_area import StopPoint +from navitia_client.entities.response.stop_datetime import StopDateTime @dataclass diff --git a/navitia_client/entities/base_entity.py b/navitia_client/entities/response/base_entity.py similarity index 100% rename from navitia_client/entities/base_entity.py rename to navitia_client/entities/response/base_entity.py diff --git a/navitia_client/entities/company.py b/navitia_client/entities/response/company.py similarity index 100% rename from navitia_client/entities/company.py rename to navitia_client/entities/response/company.py diff --git a/navitia_client/entities/context.py b/navitia_client/entities/response/context.py similarity index 100% rename from navitia_client/entities/context.py rename to navitia_client/entities/response/context.py diff --git a/navitia_client/entities/contributor.py b/navitia_client/entities/response/contributor.py similarity index 85% rename from navitia_client/entities/contributor.py rename to navitia_client/entities/response/contributor.py index 255d557..ab9128c 100644 --- a/navitia_client/entities/contributor.py +++ b/navitia_client/entities/response/contributor.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from typing import Any, Optional -from navitia_client.entities.base_entity import BaseEntity +from navitia_client.entities.response.base_entity import BaseEntity @dataclass diff --git a/navitia_client/entities/coord.py b/navitia_client/entities/response/coord.py similarity index 100% rename from navitia_client/entities/coord.py rename to navitia_client/entities/response/coord.py diff --git a/navitia_client/entities/dataset.py b/navitia_client/entities/response/dataset.py similarity index 93% rename from navitia_client/entities/dataset.py rename to navitia_client/entities/response/dataset.py index 455cb7d..6119e09 100644 --- a/navitia_client/entities/dataset.py +++ b/navitia_client/entities/response/dataset.py @@ -2,7 +2,7 @@ from datetime import datetime from typing import Any, Optional -from navitia_client.entities.contributor import Contributor +from navitia_client.entities.response.contributor import Contributor @dataclass diff --git a/navitia_client/entities/departure.py b/navitia_client/entities/response/departure.py similarity index 70% rename from navitia_client/entities/departure.py rename to navitia_client/entities/response/departure.py index a25efdf..c1e41c6 100644 --- a/navitia_client/entities/departure.py +++ b/navitia_client/entities/response/departure.py @@ -1,9 +1,9 @@ from dataclasses import dataclass from typing import Any -from navitia_client.entities.line_and_route import Route -from navitia_client.entities.stop_area import StopPoint -from navitia_client.entities.stop_datetime import StopDateTime +from navitia_client.entities.response.line_and_route import Route +from navitia_client.entities.response.stop_area import StopPoint +from navitia_client.entities.response.stop_datetime import StopDateTime @dataclass diff --git a/navitia_client/entities/direction.py b/navitia_client/entities/response/direction.py similarity index 79% rename from navitia_client/entities/direction.py rename to navitia_client/entities/response/direction.py index a65392b..e073855 100644 --- a/navitia_client/entities/direction.py +++ b/navitia_client/entities/response/direction.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from typing import Any -from navitia_client.entities.base_entity import BaseEntity -from navitia_client.entities.stop_area import StopArea +from navitia_client.entities.response.base_entity import BaseEntity +from navitia_client.entities.response.stop_area import StopArea @dataclass diff --git a/navitia_client/entities/display_information.py b/navitia_client/entities/response/display_information.py similarity index 100% rename from navitia_client/entities/display_information.py rename to navitia_client/entities/response/display_information.py diff --git a/navitia_client/entities/disruption.py b/navitia_client/entities/response/disruption.py similarity index 100% rename from navitia_client/entities/disruption.py rename to navitia_client/entities/response/disruption.py diff --git a/navitia_client/entities/equipment.py b/navitia_client/entities/response/equipment.py similarity index 100% rename from navitia_client/entities/equipment.py rename to navitia_client/entities/response/equipment.py diff --git a/navitia_client/entities/equipment_reports.py b/navitia_client/entities/response/equipment_reports.py similarity index 100% rename from navitia_client/entities/equipment_reports.py rename to navitia_client/entities/response/equipment_reports.py diff --git a/navitia_client/entities/free_floating.py b/navitia_client/entities/response/free_floating.py similarity index 100% rename from navitia_client/entities/free_floating.py rename to navitia_client/entities/response/free_floating.py diff --git a/navitia_client/entities/isochrones.py b/navitia_client/entities/response/isochrones.py similarity index 94% rename from navitia_client/entities/isochrones.py rename to navitia_client/entities/response/isochrones.py index 61ea4da..7ad4074 100644 --- a/navitia_client/entities/isochrones.py +++ b/navitia_client/entities/response/isochrones.py @@ -2,7 +2,7 @@ from datetime import datetime from typing import Any -from navitia_client.entities.place import Place +from navitia_client.entities.response.place import Place @dataclass diff --git a/navitia_client/entities/journey.py b/navitia_client/entities/response/journey.py similarity index 93% rename from navitia_client/entities/journey.py rename to navitia_client/entities/response/journey.py index b211bf2..caf96da 100644 --- a/navitia_client/entities/journey.py +++ b/navitia_client/entities/response/journey.py @@ -3,11 +3,11 @@ from enum import Enum from typing import Any, Optional, Sequence -from navitia_client.entities.display_information import DisplayInformation -from navitia_client.entities.link import Link -from navitia_client.entities.path import Path -from navitia_client.entities.place import Place -from navitia_client.entities.ticket import Fare +from navitia_client.entities.response.display_information import DisplayInformation +from navitia_client.entities.response.link import Link +from navitia_client.entities.response.path import Path +from navitia_client.entities.response.place import Place +from navitia_client.entities.response.ticket import Fare class ParkMode(Enum): diff --git a/navitia_client/entities/line_and_route.py b/navitia_client/entities/response/line_and_route.py similarity index 87% rename from navitia_client/entities/line_and_route.py rename to navitia_client/entities/response/line_and_route.py index 8a527a0..648a26e 100644 --- a/navitia_client/entities/line_and_route.py +++ b/navitia_client/entities/response/line_and_route.py @@ -2,11 +2,11 @@ from typing import Any, Optional, Sequence -from navitia_client.entities.direction import Direction -from navitia_client.entities.network import Network +from navitia_client.entities.response.direction import Direction +from navitia_client.entities.response.network import Network -from navitia_client.entities.base_entity import BaseEntity -from navitia_client.entities.physical_mode import CommercialMode, PhysicalMode +from navitia_client.entities.response.base_entity import BaseEntity +from navitia_client.entities.response.physical_mode import CommercialMode, PhysicalMode @dataclass diff --git a/navitia_client/entities/line_report.py b/navitia_client/entities/response/line_report.py similarity index 75% rename from navitia_client/entities/line_report.py rename to navitia_client/entities/response/line_report.py index 3447c23..b12b657 100644 --- a/navitia_client/entities/line_report.py +++ b/navitia_client/entities/response/line_report.py @@ -1,8 +1,8 @@ from dataclasses import dataclass from typing import Any, Sequence -from navitia_client.entities.line_and_route import Line -from navitia_client.entities.pt_object import PtObject +from navitia_client.entities.response.line_and_route import Line +from navitia_client.entities.response.pt_object import PtObject @dataclass diff --git a/navitia_client/entities/link.py b/navitia_client/entities/response/link.py similarity index 80% rename from navitia_client/entities/link.py rename to navitia_client/entities/response/link.py index 4274756..8705956 100644 --- a/navitia_client/entities/link.py +++ b/navitia_client/entities/response/link.py @@ -1,9 +1,9 @@ from typing import Any, Optional, Sequence, Type -from navitia_client.entities.line_and_route import Line, Route -from navitia_client.entities.network import Network -from navitia_client.entities.physical_mode import CommercialMode, PhysicalMode -from navitia_client.entities.vehicle_journey import VehicleJourney +from navitia_client.entities.response.line_and_route import Line, Route +from navitia_client.entities.response.network import Network +from navitia_client.entities.response.physical_mode import CommercialMode, PhysicalMode +from navitia_client.entities.response.vehicle_journey import VehicleJourney class Link: diff --git a/navitia_client/entities/network.py b/navitia_client/entities/response/network.py similarity index 100% rename from navitia_client/entities/network.py rename to navitia_client/entities/response/network.py diff --git a/navitia_client/entities/note.py b/navitia_client/entities/response/note.py similarity index 100% rename from navitia_client/entities/note.py rename to navitia_client/entities/response/note.py diff --git a/navitia_client/entities/pagination.py b/navitia_client/entities/response/pagination.py similarity index 100% rename from navitia_client/entities/pagination.py rename to navitia_client/entities/response/pagination.py diff --git a/navitia_client/entities/path.py b/navitia_client/entities/response/path.py similarity index 100% rename from navitia_client/entities/path.py rename to navitia_client/entities/response/path.py diff --git a/navitia_client/entities/pathway.py b/navitia_client/entities/response/pathway.py similarity index 100% rename from navitia_client/entities/pathway.py rename to navitia_client/entities/response/pathway.py diff --git a/navitia_client/entities/physical_mode.py b/navitia_client/entities/response/physical_mode.py similarity index 100% rename from navitia_client/entities/physical_mode.py rename to navitia_client/entities/response/physical_mode.py diff --git a/navitia_client/entities/place.py b/navitia_client/entities/response/place.py similarity index 100% rename from navitia_client/entities/place.py rename to navitia_client/entities/response/place.py diff --git a/navitia_client/entities/poi.py b/navitia_client/entities/response/poi.py similarity index 100% rename from navitia_client/entities/poi.py rename to navitia_client/entities/response/poi.py diff --git a/navitia_client/entities/pt_datetime.py b/navitia_client/entities/response/pt_datetime.py similarity index 94% rename from navitia_client/entities/pt_datetime.py rename to navitia_client/entities/response/pt_datetime.py index 616159a..a389e9b 100644 --- a/navitia_client/entities/pt_datetime.py +++ b/navitia_client/entities/response/pt_datetime.py @@ -2,7 +2,7 @@ from datetime import datetime from typing import Any, Optional, Sequence -from navitia_client.entities.link import Link +from navitia_client.entities.response.link import Link @dataclass diff --git a/navitia_client/entities/pt_object.py b/navitia_client/entities/response/pt_object.py similarity index 100% rename from navitia_client/entities/pt_object.py rename to navitia_client/entities/response/pt_object.py diff --git a/navitia_client/entities/route_schedule.py b/navitia_client/entities/response/route_schedule.py similarity index 74% rename from navitia_client/entities/route_schedule.py rename to navitia_client/entities/response/route_schedule.py index 05a586b..f980958 100644 --- a/navitia_client/entities/route_schedule.py +++ b/navitia_client/entities/response/route_schedule.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from typing import Any -from navitia_client.entities.display_information import DisplayInformation -from navitia_client.entities.schedule_table import ScheduleTable +from navitia_client.entities.response.display_information import DisplayInformation +from navitia_client.entities.response.schedule_table import ScheduleTable @dataclass diff --git a/navitia_client/entities/schedule_table.py b/navitia_client/entities/response/schedule_table.py similarity index 85% rename from navitia_client/entities/schedule_table.py rename to navitia_client/entities/response/schedule_table.py index 39bb84b..e80cd8d 100644 --- a/navitia_client/entities/schedule_table.py +++ b/navitia_client/entities/response/schedule_table.py @@ -1,10 +1,10 @@ from dataclasses import dataclass from typing import Any, Sequence -from navitia_client.entities.display_information import DisplayInformation -from navitia_client.entities.link import Link -from navitia_client.entities.pt_datetime import PTDatetime -from navitia_client.entities.stop_area import StopPoint +from navitia_client.entities.response.display_information import DisplayInformation +from navitia_client.entities.response.link import Link +from navitia_client.entities.response.pt_datetime import PTDatetime +from navitia_client.entities.response.stop_area import StopPoint @dataclass diff --git a/navitia_client/entities/stand.py b/navitia_client/entities/response/stand.py similarity index 100% rename from navitia_client/entities/stand.py rename to navitia_client/entities/response/stand.py diff --git a/navitia_client/entities/stop_area.py b/navitia_client/entities/response/stop_area.py similarity index 100% rename from navitia_client/entities/stop_area.py rename to navitia_client/entities/response/stop_area.py diff --git a/navitia_client/entities/stop_datetime.py b/navitia_client/entities/response/stop_datetime.py similarity index 95% rename from navitia_client/entities/stop_datetime.py rename to navitia_client/entities/response/stop_datetime.py index 20f6712..9600fe5 100644 --- a/navitia_client/entities/stop_datetime.py +++ b/navitia_client/entities/response/stop_datetime.py @@ -2,7 +2,7 @@ from datetime import datetime from typing import Any, Sequence -from navitia_client.entities.link import Link +from navitia_client.entities.response.link import Link @dataclass diff --git a/navitia_client/entities/stop_schedule.py b/navitia_client/entities/response/stop_schedule.py similarity index 86% rename from navitia_client/entities/stop_schedule.py rename to navitia_client/entities/response/stop_schedule.py index 115009b..650b52d 100644 --- a/navitia_client/entities/stop_schedule.py +++ b/navitia_client/entities/response/stop_schedule.py @@ -2,10 +2,10 @@ from enum import Enum from typing import Any, Optional, Sequence -from navitia_client.entities.display_information import DisplayInformation -from navitia_client.entities.line_and_route import Route -from navitia_client.entities.pt_datetime import PTDatetime -from navitia_client.entities.stop_area import StopPoint +from navitia_client.entities.response.display_information import DisplayInformation +from navitia_client.entities.response.line_and_route import Route +from navitia_client.entities.response.pt_datetime import PTDatetime +from navitia_client.entities.response.stop_area import StopPoint @dataclass diff --git a/navitia_client/entities/ticket.py b/navitia_client/entities/response/ticket.py similarity index 90% rename from navitia_client/entities/ticket.py rename to navitia_client/entities/response/ticket.py index 2dd9054..ff5b088 100644 --- a/navitia_client/entities/ticket.py +++ b/navitia_client/entities/response/ticket.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from typing import Any, Optional, Sequence -from navitia_client.entities.base_entity import BaseEntity -from navitia_client.entities.link import Link +from navitia_client.entities.response.base_entity import BaseEntity +from navitia_client.entities.response.link import Link @dataclass diff --git a/navitia_client/entities/traffic_report.py b/navitia_client/entities/response/traffic_report.py similarity index 78% rename from navitia_client/entities/traffic_report.py rename to navitia_client/entities/response/traffic_report.py index cb75c2b..5ac4eef 100644 --- a/navitia_client/entities/traffic_report.py +++ b/navitia_client/entities/response/traffic_report.py @@ -1,8 +1,8 @@ from dataclasses import dataclass from typing import Any, Sequence -from navitia_client.entities.network import Network -from navitia_client.entities.vehicle_journey import VehicleJourney +from navitia_client.entities.response.network import Network +from navitia_client.entities.response.vehicle_journey import VehicleJourney @dataclass diff --git a/navitia_client/entities/trip.py b/navitia_client/entities/response/trip.py similarity index 100% rename from navitia_client/entities/trip.py rename to navitia_client/entities/response/trip.py diff --git a/navitia_client/entities/vehicle_journey.py b/navitia_client/entities/response/vehicle_journey.py similarity index 94% rename from navitia_client/entities/vehicle_journey.py rename to navitia_client/entities/response/vehicle_journey.py index 6d9e16b..99f303c 100644 --- a/navitia_client/entities/vehicle_journey.py +++ b/navitia_client/entities/response/vehicle_journey.py @@ -2,10 +2,10 @@ from datetime import datetime from typing import Any, Optional, Sequence -from navitia_client.entities.base_entity import BaseEntity -from navitia_client.entities.disruption import Disruption -from navitia_client.entities.stop_area import StopPoint -from navitia_client.entities.trip import Trip +from navitia_client.entities.response.base_entity import BaseEntity +from navitia_client.entities.response.disruption import Disruption +from navitia_client.entities.response.stop_area import StopPoint +from navitia_client.entities.response.trip import Trip @dataclass diff --git a/tests/client/apis/public_transportation_apis/test_commercial_mode_apis.py b/tests/client/apis/public_transportation_apis/test_commercial_mode_apis.py index f2fe1a4..1ff8936 100644 --- a/tests/client/apis/public_transportation_apis/test_commercial_mode_apis.py +++ b/tests/client/apis/public_transportation_apis/test_commercial_mode_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.physical_mode import CommercialMode +from navitia_client.entities.response.physical_mode import CommercialMode from navitia_client.client.apis.public_transportation_apis import ( CommercialModeApiClient, ) diff --git a/tests/client/apis/public_transportation_apis/test_company_apis.py b/tests/client/apis/public_transportation_apis/test_company_apis.py index 9227138..814d010 100644 --- a/tests/client/apis/public_transportation_apis/test_company_apis.py +++ b/tests/client/apis/public_transportation_apis/test_company_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.company import Company +from navitia_client.entities.response.company import Company from navitia_client.client.apis.public_transportation_apis import CompanyApiClient diff --git a/tests/client/apis/public_transportation_apis/test_disruption_apis.py b/tests/client/apis/public_transportation_apis/test_disruption_apis.py index aaae4f1..96cfe54 100644 --- a/tests/client/apis/public_transportation_apis/test_disruption_apis.py +++ b/tests/client/apis/public_transportation_apis/test_disruption_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.disruption import Disruption +from navitia_client.entities.response.disruption import Disruption from navitia_client.client.apis.public_transportation_apis import DisruptionApiClient diff --git a/tests/client/apis/public_transportation_apis/test_line_apis.py b/tests/client/apis/public_transportation_apis/test_line_apis.py index 4c27eb0..2617afe 100644 --- a/tests/client/apis/public_transportation_apis/test_line_apis.py +++ b/tests/client/apis/public_transportation_apis/test_line_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.line_and_route import Line +from navitia_client.entities.response.line_and_route import Line from navitia_client.client.apis.public_transportation_apis import LineApiClient diff --git a/tests/client/apis/public_transportation_apis/test_network_apis.py b/tests/client/apis/public_transportation_apis/test_network_apis.py index 3b20d8c..abbb031 100644 --- a/tests/client/apis/public_transportation_apis/test_network_apis.py +++ b/tests/client/apis/public_transportation_apis/test_network_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.network import Network +from navitia_client.entities.response.network import Network from navitia_client.client.apis.public_transportation_apis import NetworkApiClient diff --git a/tests/client/apis/public_transportation_apis/test_physical_mode_apis.py b/tests/client/apis/public_transportation_apis/test_physical_mode_apis.py index 9db8c22..8169a40 100644 --- a/tests/client/apis/public_transportation_apis/test_physical_mode_apis.py +++ b/tests/client/apis/public_transportation_apis/test_physical_mode_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.physical_mode import PhysicalMode +from navitia_client.entities.response.physical_mode import PhysicalMode from navitia_client.client.apis.public_transportation_apis import ( PhysicalModeApiClient, ) diff --git a/tests/client/apis/public_transportation_apis/test_route_apis.py b/tests/client/apis/public_transportation_apis/test_route_apis.py index 94d7035..aa38e2c 100644 --- a/tests/client/apis/public_transportation_apis/test_route_apis.py +++ b/tests/client/apis/public_transportation_apis/test_route_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.line_and_route import Route +from navitia_client.entities.response.line_and_route import Route from navitia_client.client.apis.public_transportation_apis import RouteApiClient diff --git a/tests/client/apis/public_transportation_apis/test_stop_area_apis.py b/tests/client/apis/public_transportation_apis/test_stop_area_apis.py index c2bae2f..da38cae 100644 --- a/tests/client/apis/public_transportation_apis/test_stop_area_apis.py +++ b/tests/client/apis/public_transportation_apis/test_stop_area_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.stop_area import StopArea +from navitia_client.entities.response.stop_area import StopArea from navitia_client.client.apis.public_transportation_apis import StopAreaApiClient diff --git a/tests/client/apis/public_transportation_apis/test_stop_point_apis.py b/tests/client/apis/public_transportation_apis/test_stop_point_apis.py index 70b6098..bbae423 100644 --- a/tests/client/apis/public_transportation_apis/test_stop_point_apis.py +++ b/tests/client/apis/public_transportation_apis/test_stop_point_apis.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.stop_area import StopPoint +from navitia_client.entities.response.stop_area import StopPoint from navitia_client.client.apis.public_transportation_apis import StopPointApiClient diff --git a/tests/client/apis/public_transportation_apis/test_vehicle_journeys_apis.py b/tests/client/apis/public_transportation_apis/test_vehicle_journeys_apis.py index a617c20..a5c7004 100644 --- a/tests/client/apis/public_transportation_apis/test_vehicle_journeys_apis.py +++ b/tests/client/apis/public_transportation_apis/test_vehicle_journeys_apis.py @@ -2,7 +2,7 @@ from unittest.mock import MagicMock, patch -from navitia_client.entities.vehicle_journey import VehicleJourney +from navitia_client.entities.response.vehicle_journey import VehicleJourney from navitia_client.client.apis.public_transportation_apis import ( VehicleJourneyApiClient, ) diff --git a/tests/client/apis/test_arrival_apis.py b/tests/client/apis/test_arrival_apis.py index d84e494..22311c4 100644 --- a/tests/client/apis/test_arrival_apis.py +++ b/tests/client/apis/test_arrival_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.arrival_apis import ( ArrivalApiClient, ) -from navitia_client.entities.arrival import Arrival +from navitia_client.entities.response.arrival import Arrival @pytest.fixture diff --git a/tests/client/apis/test_contributors_apis.py b/tests/client/apis/test_contributors_apis.py index baedbf7..250494d 100644 --- a/tests/client/apis/test_contributors_apis.py +++ b/tests/client/apis/test_contributors_apis.py @@ -4,8 +4,8 @@ import pytest from navitia_client.client.apis.contributors_apis import ContributorsApiClient -from navitia_client.entities.contributor import Contributor -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.contributor import Contributor +from navitia_client.entities.response import Pagination @pytest.fixture diff --git a/tests/client/apis/test_coverage_apis.py b/tests/client/apis/test_coverage_apis.py index 8db4787..d28da60 100644 --- a/tests/client/apis/test_coverage_apis.py +++ b/tests/client/apis/test_coverage_apis.py @@ -5,8 +5,8 @@ import pytest from navitia_client.client.apis.coverage_apis import CoverageApiClient -from navitia_client.entities.administrative_region import Region -from navitia_client.entities.pagination import Pagination +from navitia_client.entities.response.administrative_region import Region +from navitia_client.entities.response import Pagination @pytest.fixture diff --git a/tests/client/apis/test_datasets_apis.py b/tests/client/apis/test_datasets_apis.py index 1ccf39e..1ecc23e 100644 --- a/tests/client/apis/test_datasets_apis.py +++ b/tests/client/apis/test_datasets_apis.py @@ -5,7 +5,7 @@ import pytest from navitia_client.client.apis.datasets_apis import DatasetsApiClient -from navitia_client.entities.dataset import Dataset +from navitia_client.entities.response.dataset import Dataset @pytest.fixture diff --git a/tests/client/apis/test_departure_apis.py b/tests/client/apis/test_departure_apis.py index 8891e17..47c3304 100644 --- a/tests/client/apis/test_departure_apis.py +++ b/tests/client/apis/test_departure_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.departure_apis import ( DepartureApiClient, ) -from navitia_client.entities.departure import Departure +from navitia_client.entities.response.departure import Departure @pytest.fixture diff --git a/tests/client/apis/test_inverted_geocoding_apis.py b/tests/client/apis/test_inverted_geocoding_apis.py index 8e2232e..8bea08e 100644 --- a/tests/client/apis/test_inverted_geocoding_apis.py +++ b/tests/client/apis/test_inverted_geocoding_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.inverted_geocoding_apis import ( InvertedGeocodingApiClient, ) -from navitia_client.entities.place import Place +from navitia_client.entities.response.place import Place @pytest.fixture diff --git a/tests/client/apis/test_isochrones_apis.py b/tests/client/apis/test_isochrones_apis.py index 01a5eaa..19755cf 100644 --- a/tests/client/apis/test_isochrones_apis.py +++ b/tests/client/apis/test_isochrones_apis.py @@ -4,7 +4,7 @@ import pytest from navitia_client.client.apis.isochrone_apis import IsochronesApiClient -from navitia_client.entities.isochrones import Isochrone +from navitia_client.entities.response.isochrones import Isochrone @pytest.fixture diff --git a/tests/client/apis/test_journeys_apis.py b/tests/client/apis/test_journeys_apis.py index 2acf037..cb98c17 100644 --- a/tests/client/apis/test_journeys_apis.py +++ b/tests/client/apis/test_journeys_apis.py @@ -5,7 +5,7 @@ import pytest from navitia_client.client.apis.journeys_apis import JourneyApiClient -from navitia_client.entities.journey import Journey +from navitia_client.entities.response import Journey @pytest.fixture diff --git a/tests/client/apis/test_line_report_apis.py b/tests/client/apis/test_line_report_apis.py index 2405230..ee1fe5f 100644 --- a/tests/client/apis/test_line_report_apis.py +++ b/tests/client/apis/test_line_report_apis.py @@ -4,8 +4,8 @@ import pytest from navitia_client.client.apis.line_report_apis import LineReportsApiClient -from navitia_client.entities.disruption import Disruption -from navitia_client.entities.line_report import LineReport +from navitia_client.entities.response.disruption import Disruption +from navitia_client.entities.response.line_report import LineReport @pytest.fixture diff --git a/tests/client/apis/test_places_apis.py b/tests/client/apis/test_places_apis.py index acf5e44..f0c499c 100644 --- a/tests/client/apis/test_places_apis.py +++ b/tests/client/apis/test_places_apis.py @@ -4,7 +4,7 @@ import pytest from navitia_client.client.apis.place_apis import PlacesApiClient -from navitia_client.entities.place import Place +from navitia_client.entities.response.place import Place @pytest.fixture diff --git a/tests/client/apis/test_places_nearby_apis.py b/tests/client/apis/test_places_nearby_apis.py index b5f6959..3caee15 100644 --- a/tests/client/apis/test_places_nearby_apis.py +++ b/tests/client/apis/test_places_nearby_apis.py @@ -4,7 +4,7 @@ import pytest from navitia_client.client.apis.places_nearby_apis import PlacesNearbyApiClient -from navitia_client.entities.place import Place +from navitia_client.entities.response.place import Place @pytest.fixture diff --git a/tests/client/apis/test_public_transport_objects_apis.py b/tests/client/apis/test_public_transport_objects_apis.py index d0c64b3..c090b29 100644 --- a/tests/client/apis/test_public_transport_objects_apis.py +++ b/tests/client/apis/test_public_transport_objects_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.public_transport_objects_apis import ( PublicTransportObjectsApiClient, ) -from navitia_client.entities.pt_object import PtObject +from navitia_client.entities.response.pt_object import PtObject @pytest.fixture diff --git a/tests/client/apis/test_route_schedules_apis.py b/tests/client/apis/test_route_schedules_apis.py index 732df49..c00b65e 100644 --- a/tests/client/apis/test_route_schedules_apis.py +++ b/tests/client/apis/test_route_schedules_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.route_schedules_apis import ( RouteSchedulesApiClient, ) -from navitia_client.entities.route_schedule import RouteSchedule +from navitia_client.entities.response.route_schedule import RouteSchedule @pytest.fixture diff --git a/tests/client/apis/test_stop_schedules_apis.py b/tests/client/apis/test_stop_schedules_apis.py index 479f4f5..99904a5 100644 --- a/tests/client/apis/test_stop_schedules_apis.py +++ b/tests/client/apis/test_stop_schedules_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.stop_schedules_apis import ( StopSchedulesApiClient, ) -from navitia_client.entities.stop_schedule import StopSchedule +from navitia_client.entities.response.stop_schedule import StopSchedule @pytest.fixture diff --git a/tests/client/apis/test_terminus_schedules_apis.py b/tests/client/apis/test_terminus_schedules_apis.py index a25d7d9..188b0fe 100644 --- a/tests/client/apis/test_terminus_schedules_apis.py +++ b/tests/client/apis/test_terminus_schedules_apis.py @@ -6,7 +6,7 @@ from navitia_client.client.apis.terminus_schedules_apis import ( TerminusSchedulesApiClient, ) -from navitia_client.entities.stop_schedule import TerminusSchedule +from navitia_client.entities.response.stop_schedule import TerminusSchedule @pytest.fixture diff --git a/tests/client/apis/test_traffic_report_apis.py b/tests/client/apis/test_traffic_report_apis.py index 83f9860..a1de00a 100644 --- a/tests/client/apis/test_traffic_report_apis.py +++ b/tests/client/apis/test_traffic_report_apis.py @@ -4,8 +4,8 @@ import pytest from navitia_client.client.apis.traffic_report_apis import TrafficReportsApiClient -from navitia_client.entities.disruption import Disruption -from navitia_client.entities.traffic_report import TrafficReport +from navitia_client.entities.response.disruption import Disruption +from navitia_client.entities.response.traffic_report import TrafficReport @pytest.fixture