working through circular imports, removing __init__ loaded Types / Definitions

2 files changed, 31 insertions, 28 deletions

diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index 631bb7b..f490e14 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -6,12 +6,11 @@ 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,
@@ -20,6 +19,7 @@ if TYPE_CHECKING:
         UserDFCollection,
         WallDFCollection,
     )
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index 1f88804..4eb3f2d 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -2,37 +2,40 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING
 
 import pytest
 
-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,
-)
 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
 # --------------------------