From 16c5f4f1631ed943505699409585e3d8a9b9ffaf Mon Sep 17 00:00:00 2001 From: Francia Csaba Date: Tue, 7 May 2024 13:10:17 +0200 Subject: [PATCH] Fixed imports --- amarillo-gtfs-generator/__init__.py | 1 - amarillo-gtfs-generator/gtfs.py | 2 +- amarillo-gtfs-generator/gtfs_generator.py | 2 +- amarillo-gtfs-generator/gtfsrt/realtime_extension_pb2.py | 2 +- amarillo-gtfs-generator/router.py | 2 +- amarillo-gtfs-generator/services/trips.py | 6 +++--- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/amarillo-gtfs-generator/__init__.py b/amarillo-gtfs-generator/__init__.py index 3aa6b3b..e69de29 100644 --- a/amarillo-gtfs-generator/__init__.py +++ b/amarillo-gtfs-generator/__init__.py @@ -1 +0,0 @@ -from .gtfs_generator import setup \ No newline at end of file diff --git a/amarillo-gtfs-generator/gtfs.py b/amarillo-gtfs-generator/gtfs.py index 6b11c5a..ce0c722 100644 --- a/amarillo-gtfs-generator/gtfs.py +++ b/amarillo-gtfs-generator/gtfs.py @@ -1,5 +1,5 @@ from .gtfsrt import gtfs_realtime_pb2 as gtfs_realtime_pb2 -from gtfsrt import realtime_extension_pb2 as mfdzrte +from .gtfsrt import realtime_extension_pb2 as mfdzrte from .gtfs_constants import * from google.protobuf.json_format import MessageToDict from google.protobuf.json_format import ParseDict diff --git a/amarillo-gtfs-generator/gtfs_generator.py b/amarillo-gtfs-generator/gtfs_generator.py index 4d6ed1b..41a85c9 100644 --- a/amarillo-gtfs-generator/gtfs_generator.py +++ b/amarillo-gtfs-generator/gtfs_generator.py @@ -5,7 +5,7 @@ from .gtfs_export import GtfsExport, GtfsFeedInfo, GtfsAgency from .gtfs import GtfsRtProducer from amarillo.utils.container import container # from amarillo.plugins.gtfs_export.router import router -from amarillo.plugins.enhancer.configuration import configure_enhancer_services +# from amarillo.plugins.enhancer.configuration import configure_enhancer_services from glob import glob import json import schedule diff --git a/amarillo-gtfs-generator/gtfsrt/realtime_extension_pb2.py b/amarillo-gtfs-generator/gtfsrt/realtime_extension_pb2.py index c2bbd7b..f4419c0 100644 --- a/amarillo-gtfs-generator/gtfsrt/realtime_extension_pb2.py +++ b/amarillo-gtfs-generator/gtfsrt/realtime_extension_pb2.py @@ -11,7 +11,7 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -import amarillo.plugins.enhancer.services.gtfsrt.gtfs_realtime_pb2 as gtfs__realtime__pb2 +from . import gtfs_realtime_pb2 as gtfs__realtime__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18realtime_extension.proto\x12\x10transit_realtime\x1a\x13gtfs-realtime.proto\"p\n\x1bMfdzTripDescriptorExtension\x12\x11\n\troute_url\x18\x01 \x01(\t\x12\x11\n\tagency_id\x18\x02 \x01(\t\x12\x17\n\x0froute_long_name\x18\x03 \x01(\t\x12\x12\n\nroute_type\x18\x04 \x01(\r\"\xb0\x02\n\x1fMfdzStopTimePropertiesExtension\x12X\n\x0bpickup_type\x18\x01 \x01(\x0e\x32\x43.transit_realtime.MfdzStopTimePropertiesExtension.DropOffPickupType\x12Y\n\x0c\x64ropoff_type\x18\x02 \x01(\x0e\x32\x43.transit_realtime.MfdzStopTimePropertiesExtension.DropOffPickupType\"X\n\x11\x44ropOffPickupType\x12\x0b\n\x07REGULAR\x10\x00\x12\x08\n\x04NONE\x10\x01\x12\x10\n\x0cPHONE_AGENCY\x10\x02\x12\x1a\n\x16\x43OORDINATE_WITH_DRIVER\x10\x03:i\n\x0ftrip_descriptor\x12 .transit_realtime.TripDescriptor\x18\xf5\x07 \x01(\x0b\x32-.transit_realtime.MfdzTripDescriptorExtension:\x90\x01\n\x14stop_time_properties\x12>.transit_realtime.TripUpdate.StopTimeUpdate.StopTimeProperties\x18\xf5\x07 \x01(\x0b\x32\x31.transit_realtime.MfdzStopTimePropertiesExtensionB\t\n\x07\x64\x65.mfdz') diff --git a/amarillo-gtfs-generator/router.py b/amarillo-gtfs-generator/router.py index df40d42..2a35901 100644 --- a/amarillo-gtfs-generator/router.py +++ b/amarillo-gtfs-generator/router.py @@ -5,7 +5,7 @@ from fastapi import APIRouter, HTTPException, status, Depends from amarillo.models.Carpool import Region from amarillo.services.regions import RegionService # from amarillo.services.oauth2 import get_current_user, verify_permission -from amarillo.models.User import User +# from amarillo.models.User import User from amarillo.utils.container import container from fastapi.responses import FileResponse diff --git a/amarillo-gtfs-generator/services/trips.py b/amarillo-gtfs-generator/services/trips.py index 6faa749..56879af 100644 --- a/amarillo-gtfs-generator/services/trips.py +++ b/amarillo-gtfs-generator/services/trips.py @@ -1,7 +1,7 @@ -from amarillo.plugins.enhancer.models.gtfs import GtfsTimeDelta, GtfsStopTime -from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType, Driver, RidesharingInfo +from ..models.gtfs import GtfsTimeDelta, GtfsStopTime +from ..models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType, Driver, RidesharingInfo from amarillo.services.config import config -from amarillo.plugins.enhancer.services.gtfs_constants import * +from ..gtfs_constants import * from amarillo.plugins.enhancer.services.routing import RoutingService, RoutingException from amarillo.plugins.enhancer.services.stops import is_carpooling_stop from amarillo.utils.utils import assert_folder_exists, is_older_than_days, yesterday, geodesic_distance_in_m