Terraform config debugging

Author: jcpitre

api/src/shared/common/db_utils.py

@@ -4,7 +4,6 @@
 from sqlalchemy.orm.query import Query
 from sqlalchemy.orm.strategy_options import _AbstractLoad
 
-from .error_handling import raise_internal_http_validation_error, invalid_bounding_method, invalid_bounding_coordinates
 from shared.database_gen.sqlacodegen_models import (
     Feed,
     Gtfsdataset,
@@ -22,7 +21,7 @@
 
 from sqlalchemy import or_
 
-from feeds.impl.error_handling import raise_http_validation_error
+from .error_handling import raise_internal_http_validation_error, invalid_bounding_coordinates, invalid_bounding_method
 
 
 def get_gtfs_feeds_query(
@@ -153,7 +152,9 @@ def apply_bounding_filtering(
         len(bounding_latitudes_tokens := bounding_latitudes.split(",")) != 2
         or len(bounding_longitudes_tokens := bounding_longitudes.split(",")) != 2
     ):
-        raise_http_validation_error(invalid_bounding_coordinates.format(bounding_latitudes, bounding_longitudes))
+        raise_internal_http_validation_error(
+            invalid_bounding_coordinates.format(bounding_latitudes, bounding_longitudes)
+        )
     min_latitude, max_latitude = bounding_latitudes_tokens
     min_longitude, max_longitude = bounding_longitudes_tokens
     try:
@@ -162,7 +163,9 @@ def apply_bounding_filtering(
         min_longitude = float(min_longitude)
         max_longitude = float(max_longitude)
     except ValueError:
-        raise_http_validation_error(invalid_bounding_coordinates.format(bounding_latitudes, bounding_longitudes))
+        raise_internal_http_validation_error(
+            invalid_bounding_coordinates.format(bounding_latitudes, bounding_longitudes)
+        )
     points = [
         (min_longitude, min_latitude),
         (min_longitude, max_latitude),
@@ -188,7 +191,7 @@ def apply_bounding_filtering(
     elif bounding_filter_method == "disjoint":
         return query.filter(Gtfsdataset.bounding_box.ST_Disjoint(bounding_box))
     else:
-        raise_http_validation_error(invalid_bounding_method.format(bounding_filter_method))
+        raise_internal_http_validation_error(invalid_bounding_method.format(bounding_filter_method))
 
 
 def get_joinedload_options() -> [_AbstractLoad]:

api/src/shared/feed_filters/feed_filter.py

@@ -3,7 +3,7 @@
 from fastapi_filter.contrib.sqlalchemy import Filter
 
 from shared.database_gen.sqlacodegen_models import Feed
-from utils.param_utils import normalize_str_parameter
+from shared.feed_filters.param_utils import normalize_str_parameter
 
 
 class FeedFilter(Filter):

api/src/shared/feed_filters/gtfs_dataset_filter.py

@@ -3,7 +3,7 @@
 from fastapi_filter.contrib.sqlalchemy import Filter
 
 from shared.database_gen.sqlacodegen_models import Gtfsdataset
-from utils.param_utils import normalize_str_parameter
+from shared.feed_filters.param_utils import normalize_str_parameter
 
 
 class GtfsDatasetFilter(Filter):

api/src/shared/feed_filters/gtfs_feed_filter.py

@@ -3,7 +3,7 @@
 from fastapi_filter.contrib.sqlalchemy import Filter
 
 from shared.database_gen.sqlacodegen_models import Location, Gtfsfeed
-from utils.param_utils import normalize_str_parameter
+from shared.feed_filters.param_utils import normalize_str_parameter
 
 
 class LocationFilter(Filter):

api/src/shared/feed_filters/gtfs_rt_feed_filter.py

@@ -4,7 +4,7 @@
 
 from shared.database_gen.sqlacodegen_models import Gtfsrealtimefeed, Entitytype
 from shared.feed_filters.gtfs_feed_filter import LocationFilter
-from utils.param_utils import normalize_str_parameter
+from shared.feed_filters.param_utils import normalize_str_parameter
 
 
 class EntityTypeFilter(Filter):

api/src/utils/param_utils.py …i/src/shared/feed_filters/param_utils.pyapi/src/utils/param_utils.py renamed to api/src/shared/feed_filters/param_utils.py api/src/utils/param_utils.py renamed to api/src/shared/feed_filters/param_utils.py

@@ -1,4 +1,4 @@
-from utils.param_utils import normalize_str_parameter
+from shared.feed_filters.param_utils import normalize_str_parameter
 
 
 def test_normalize_str_parameter():

api/tests/unittest/test_param_utils.py

@@ -29,7 +29,7 @@
 from collections import OrderedDict
 from shared.common.db_utils import get_gtfs_feeds_query, get_gtfs_rt_feeds_query
 
-from helpers.database import Database
+from shared.helpers.database import Database
 
 load_dotenv()
 csv_default_file_path = "./output.csv"
@@ -112,28 +112,28 @@ def export_csv(request=None):
 
             print(f"Retrieved {len(gtfs_rt_feeds)} GTFS realtime feeds.")
 
-    except Exception as error:
-        print(f"Error retrieving feeds: {error}")
-        raise Exception(f"Error retrieving feeds: {error}")
+            data_collector = DataCollector()
 
-    data_collector = DataCollector()
+            for feed in gtfs_feeds:
+                # print(f"Processing feed {feed.stable_id}")
+                data = get_feed_csv_data(feed)
 
-    for feed in gtfs_feeds:
-        # print(f"Processing feed {feed.stable_id}")
-        data = get_feed_csv_data(feed)
+                for key, value in data.items():
+                    data_collector.add_data(key, value)
+                data_collector.finalize_row()
+            print(f"Procewssed {len(gtfs_feeds)} GTFS feeds.")
 
-        for key, value in data.items():
-            data_collector.add_data(key, value)
-        data_collector.finalize_row()
-    print(f"Procewssed {len(gtfs_feeds)} GTFS feeds.")
+            for feed in gtfs_rt_feeds:
+                # print(f"Processing rt feed {feed.stable_id}")
+                data = get_gtfs_rt_feed_csv_data(feed)
+                for key, value in data.items():
+                    data_collector.add_data(key, value)
+                data_collector.finalize_row()
+            print(f"Processed {len(gtfs_rt_feeds)} GTFS realtime feeds.")
 
-    for feed in gtfs_rt_feeds:
-        # print(f"Processing rt feed {feed.stable_id}")
-        data = get_gtfs_rt_feed_csv_data(feed)
-        for key, value in data.items():
-            data_collector.add_data(key, value)
-        data_collector.finalize_row()
-    print(f"Processed {len(gtfs_rt_feeds)} GTFS realtime feeds.")
+    except Exception as error:
+        print(f"Error retrieving feeds: {error}")
+        raise Exception(f"Error retrieving feeds: {error}")
 
     data_collector.write_csv(csv_file_path)