Merge branch 'master' into dev-greg

3 files changed, 52 insertions, 47 deletions

diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index 88eef72..499f90b 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -1,16 +1,16 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.pg_helper import PostgresConfig
 from test_utils.conftest import clear_directory
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import DFCollectionType, GRLDatasets
-    from generalresearch.incite.collections import DFCollection
+    from generalresearch.incite.collections.base import DFCollection
     from generalresearch.incite.collections.thl_web import (
         AuditLogDFCollection,
         LedgerDFCollection,
@@ -19,6 +19,7 @@ if TYPE_CHECKING:
         UserDFCollection,
         WallDFCollection,
     )
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture
@@ -196,7 +197,7 @@ def df_collection(
     utc_90days_ago: datetime,
     thl_web_rr: PostgresConfig,
 ) -> DFCollection:
-    from generalresearch.incite.collections import DFCollection
+    from generalresearch.incite.collections.base import DFCollection
 
     start = utc_90days_ago.replace(microsecond=0)
 
diff --git a/test_utils/incite/conftest.py b/test_utils/incite/conftest.py
index 12e57c5..bcf0511 100644
--- a/test_utils/incite/conftest.py
+++ b/test_utils/incite/conftest.py
@@ -1,11 +1,12 @@
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone
+from collections.abc import Callable
+from datetime import UTC, datetime, timedelta
 from os.path import join as pjoin
 from pathlib import Path
 from random import choice as randchoice
 from shutil import rmtree
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -15,11 +16,11 @@ from faker import Faker
 if TYPE_CHECKING:
     from generalresearch.config import GRLBaseSettings
     from generalresearch.incite.base import GRLDatasets
-    from generalresearch.incite.collections import (
+    from generalresearch.incite.collections.base import (
         DFCollectionItem,
         DFCollectionType,
     )
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.models.admin.request import (
         ReportRequest,
     )
@@ -130,14 +131,14 @@ def duration() -> timedelta | None:
 
 @pytest.fixture
 def df_collection_data_type() -> DFCollectionType:
-    from generalresearch.incite.collections import DFCollectionType
+    from generalresearch.incite.collections.base import DFCollectionType
 
     return DFCollectionType.TEST
 
 
 @pytest.fixture
 def merge_type() -> MergeType:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
 
     return MergeType.TEST
 
@@ -155,7 +156,7 @@ def incite_item_factory(
         observations: int = 3,
         user: User | None = None,
     ):
-        from generalresearch.incite.collections import (
+        from generalresearch.incite.collections.base import (
             DFCollection,
             DFCollectionType,
         )
@@ -166,7 +167,7 @@ def incite_item_factory(
 
         for _ in range(5):
             item_time = fake.date_time_between(
-                start_date=item.start, end_date=item.finish, tzinfo=timezone.utc
+                start_date=item.start, end_date=item.finish, tzinfo=UTC
             )
 
             match data_type:
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index e9970c2..fb95c81 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -1,38 +1,41 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from datetime import datetime, timedelta
-from typing import Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
-from generalresearch.incite.base import GRLDatasets
-from generalresearch.incite.mergers import MergeType
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
-    EnrichedTaskAdjustMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_wall import (
-    EnrichedWallMerge,
-)
-from generalresearch.incite.mergers.foundations.user_id_product import (
-    UserIdProductMerge,
-)
-from generalresearch.incite.mergers.pop_ledger import (
-    PopLedgerMerge,
-    PopLedgerMergeItem,
-)
-from generalresearch.incite.mergers.ym_survey_wall import (
-    YMSurveyWallMerge,
-    YMSurveyWallMergeCollectionItem,
-)
-from generalresearch.incite.mergers.ym_wall_summary import (
-    YMWallSummaryMerge,
-    YMWallSummaryMergeItem,
-)
 from test_utils.conftest import clear_directory
 
+if TYPE_CHECKING:
+    from generalresearch.incite.base import GRLDatasets
+    from generalresearch.incite.mergers.base import MergeType
+    from generalresearch.incite.mergers.foundations.enriched_session import (
+        EnrichedSessionMerge,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
+        EnrichedTaskAdjustMerge,
+    )
+    from generalresearch.incite.mergers.foundations.enriched_wall import (
+        EnrichedWallMerge,
+    )
+    from generalresearch.incite.mergers.foundations.user_id_product import (
+        UserIdProductMerge,
+    )
+    from generalresearch.incite.mergers.pop_ledger import (
+        PopLedgerMerge,
+        PopLedgerMergeItem,
+    )
+    from generalresearch.incite.mergers.ym_survey_wall import (
+        YMSurveyWallMerge,
+        YMSurveyWallMergeCollectionItem,
+    )
+    from generalresearch.incite.mergers.ym_wall_summary import (
+        YMWallSummaryMerge,
+        YMWallSummaryMergeItem,
+    )
+
 # --------------------------
 #      Merges
 # --------------------------
@@ -55,7 +58,7 @@ def pop_ledger_merge(
     duration: timedelta,
 ) -> PopLedgerMerge:
 
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 
     return PopLedgerMerge(
@@ -85,7 +88,7 @@ def ym_survey_wall_merge(
     mnt_filepath: GRLDatasets,
     start: datetime,
 ) -> YMSurveyWallMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.ym_survey_wall import YMSurveyWallMerge
 
     return YMSurveyWallMerge(
@@ -116,7 +119,7 @@ def ym_wall_summary_merge(
     duration: timedelta,
     start: datetime,
 ) -> YMWallSummaryMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.ym_wall_summary import YMWallSummaryMerge
 
     return YMWallSummaryMerge(
@@ -152,7 +155,7 @@ def enriched_session_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedSessionMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_session import (
         EnrichedSessionMerge,
     )
@@ -172,7 +175,7 @@ def enriched_task_adjust_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedTaskAdjustMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
         EnrichedTaskAdjustMerge,
     )
@@ -194,7 +197,7 @@ def enriched_wall_merge(
     duration: timedelta,
     start: datetime,
 ) -> EnrichedWallMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.enriched_wall import (
         EnrichedWallMerge,
     )
@@ -214,7 +217,7 @@ def user_id_product_merge(
     offset: str,
     start: datetime,
 ) -> UserIdProductMerge:
-    from generalresearch.incite.mergers import MergeType
+    from generalresearch.incite.mergers.base import MergeType
     from generalresearch.incite.mergers.foundations.user_id_product import (
         UserIdProductMerge,
     )
@@ -240,7 +243,7 @@ def merge_collection(
     duration: timedelta,
     start: datetime,
 ):
-    from generalresearch.incite.mergers import MergeCollection
+    from generalresearch.incite.mergers.base import MergeCollection
 
     return MergeCollection(
         merge_type=merge_type,