Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions navitia_client/client/apis/arrival_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/contributors_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/coverage_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/datasets_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/departure_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/equipment_report_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/freefloatings_nearby_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion navitia_client/client/apis/inverted_geocoding_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion navitia_client/client/apis/isochrone_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion navitia_client/client/apis/journeys_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/line_report_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion navitia_client/client/apis/place_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/places_nearby_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
Original file line number Diff line number Diff line change
@@ -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]):
Expand Down
2 changes: 1 addition & 1 deletion navitia_client/client/apis/route_schedules_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/stop_schedules_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions navitia_client/client/apis/terminus_schedules_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
6 changes: 3 additions & 3 deletions navitia_client/client/apis/traffic_report_apis.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
24 changes: 0 additions & 24 deletions navitia_client/entities/__init__.py
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions navitia_client/entities/response/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading