Added shared. and test_shared. to the import.

Author: jcpitre

functions-python/batch_datasets/src/main.py

@@ -25,9 +25,9 @@
 from google.cloud.pubsub_v1.futures import Future
 from sqlalchemy import or_
 from sqlalchemy.orm import Session
-from database_gen.sqlacodegen_models import Gtfsfeed, Gtfsdataset
-from dataset_service.main import BatchExecutionService, BatchExecution
-from helpers.database import Database
+from shared.database_gen.sqlacodegen_models import Gtfsfeed, Gtfsdataset
+from shared.dataset_service.main import BatchExecutionService, BatchExecution
+from shared.helpers.database import Database
 
 pubsub_topic_name = os.getenv("PUBSUB_TOPIC_NAME")
 project_id = os.getenv("PROJECT_ID")

functions-python/batch_datasets/tests/conftest.py

@@ -17,8 +17,12 @@
 from faker import Faker
 from faker.generator import random
 from datetime import datetime
-from database_gen.sqlacodegen_models import Gtfsfeed, Gtfsrealtimefeed, Gtfsdataset
-from test_utils.database_utils import clean_testing_db, get_testing_session
+from shared.database_gen.sqlacodegen_models import (
+    Gtfsfeed,
+    Gtfsrealtimefeed,
+    Gtfsdataset,
+)
+from test_shared.test_utils.database_utils import clean_testing_db, get_testing_session
 
 
 def populate_database():

functions-python/batch_datasets/tests/test_batch_datasets_main.py

@@ -19,7 +19,7 @@
 import pytest
 from unittest.mock import Mock, patch, MagicMock
 from main import get_non_deprecated_feeds, batch_datasets
-from test_utils.database_utils import get_testing_session, default_db_url
+from test_shared.test_utils.database_utils import get_testing_session, default_db_url
 
 
 def test_get_non_deprecated_feeds():
@@ -46,10 +46,12 @@ def test_batch_datasets(mock_client, mock_publish):
     with get_testing_session() as session:
         feeds = get_non_deprecated_feeds(session)
         with patch(
-            "dataset_service.main.BatchExecutionService.__init__", return_value=None
+            "shared.dataset_service.main.BatchExecutionService.__init__",
+            return_value=None,
         ):
             with patch(
-                "dataset_service.main.BatchExecutionService.save", return_value=None
+                "shared.dataset_service.main.BatchExecutionService.save",
+                return_value=None,
             ):
                 batch_datasets(Mock())
                 assert mock_publish.call_count == 5

functions-python/batch_process_dataset/src/main.py

@@ -29,13 +29,13 @@
 from google.cloud import storage
 from sqlalchemy import func
 
-from database_gen.sqlacodegen_models import Gtfsdataset, t_feedsearch
-from dataset_service.main import DatasetTraceService, DatasetTrace, Status
-from helpers.database import Database, refresh_materialized_view, with_db_session
+from shared.database_gen.sqlacodegen_models import Gtfsdataset, t_feedsearch
+from shared.dataset_service.main import DatasetTraceService, DatasetTrace, Status
+from shared.helpers.database import Database, refresh_materialized_view, with_db_session
 import logging
 
-from helpers.logger import Logger
-from helpers.utils import download_and_get_hash
+from shared.helpers.logger import Logger
+from shared.helpers.utils import download_and_get_hash
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session

functions-python/batch_process_dataset/tests/conftest.py

@@ -17,8 +17,12 @@
 from faker import Faker
 from faker.generator import random
 from datetime import datetime
-from database_gen.sqlacodegen_models import Gtfsfeed, Gtfsrealtimefeed, Gtfsdataset
-from test_utils.database_utils import clean_testing_db, get_testing_session
+from shared.database_gen.sqlacodegen_models import (
+    Gtfsfeed,
+    Gtfsrealtimefeed,
+    Gtfsdataset,
+)
+from test_shared.test_utils.database_utils import clean_testing_db, get_testing_session
 
 
 def populate_database():

functions-python/batch_process_dataset/tests/test_batch_process_dataset_main.py

@@ -11,8 +11,8 @@
     DatasetFile,
     process_dataset,
 )
-from database_gen.sqlacodegen_models import Gtfsfeed
-from test_utils.database_utils import get_testing_session, default_db_url
+from shared.database_gen.sqlacodegen_models import Gtfsfeed
+from test_shared.test_utils.database_utils import get_testing_session, default_db_url
 from cloudevents.http import CloudEvent
 
 public_url = (

functions-python/big_query_ingestion/src/common/bq_data_transfer.py

@@ -5,7 +5,7 @@
 from google.cloud import bigquery, storage
 from google.cloud.bigquery.job import LoadJobConfig, SourceFormat
 
-from helpers.bq_schema.schema import json_schema_to_bigquery, load_json_schema
+from shared.helpers.bq_schema.schema import json_schema_to_bigquery, load_json_schema
 
 # Environment variables
 project_id = os.getenv("PROJECT_ID")

functions-python/big_query_ingestion/src/main.py

@@ -2,7 +2,7 @@
 
 import functions_framework
 
-from helpers.logger import Logger
+from shared.helpers.logger import Logger
 from gbfs.gbfs_big_query_ingest import BigQueryDataTransferGBFS
 from gtfs.gtfs_big_query_ingest import BigQueryDataTransferGTFS
 

functions-python/big_query_ingestion/tests/test_main.py

@@ -9,7 +9,7 @@
 
 class TestMain(unittest.TestCase):
     @patch("main.BigQueryDataTransferGTFS")
-    @patch("helpers.logger.Logger.init_logger")
+    @patch("shared.helpers.logger.Logger.init_logger")
     @patch("main.logging.info")
     def test_ingest_data_to_big_query_gtfs(
         self, mock_logging_info, mock_init_logger, mock_big_query_transfer_gtfs
@@ -28,7 +28,7 @@ def test_ingest_data_to_big_query_gtfs(
         self.assertEqual(response, ("Data successfully loaded to BigQuery", 200))
 
     @patch("main.BigQueryDataTransferGBFS")
-    @patch("helpers.logger.Logger.init_logger")
+    @patch("shared.helpers.logger.Logger.init_logger")
     @patch("main.logging.info")
     def test_ingest_data_to_big_query_gbfs(
         self, mock_logging_info, mock_init_logger, mock_biq_query_transfer_gbfs

functions-python/extract_location/src/bounding_box/bounding_box_extractor.py

@@ -1,7 +1,7 @@
 import numpy
 from geoalchemy2 import WKTElement
 
-from database_gen.sqlacodegen_models import Gtfsdataset
+from shared.database_gen.sqlacodegen_models import Gtfsdataset
 
 
 def create_polygon_wkt_element(bounds: numpy.ndarray) -> WKTElement: