3 files changed, 89 insertions, 91 deletions

diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index 74e4081..88eef72 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Callable, Optional
+from typing import TYPE_CHECKING, Callable
 
 import pytest
 
@@ -21,12 +23,12 @@ if TYPE_CHECKING:
 
 @pytest.fixture
 def user_collection(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
     thl_web_rr: PostgresConfig,
-) -> "UserDFCollection":
+) -> UserDFCollection:
     from generalresearch.incite.collections.thl_web import (
         DFCollectionType,
         UserDFCollection,
@@ -43,12 +45,12 @@ def user_collection(
 
 @pytest.fixture
 def wall_collection(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
     thl_web_rr: PostgresConfig,
-) -> "WallDFCollection":
+) -> WallDFCollection:
     from generalresearch.incite.collections.thl_web import (
         DFCollectionType,
         WallDFCollection,
@@ -65,12 +67,12 @@ def wall_collection(
 
 @pytest.fixture
 def session_collection(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
     thl_web_rr: PostgresConfig,
-) -> "SessionDFCollection":
+) -> SessionDFCollection:
     from generalresearch.incite.collections.thl_web import (
         DFCollectionType,
         SessionDFCollection,
@@ -103,12 +105,12 @@ def session_collection(
 
 @pytest.fixture
 def task_adj_collection(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
-    duration: Optional[timedelta],
+    duration: timedelta | None,
     start: datetime,
     thl_web_rr: PostgresConfig,
-) -> "TaskAdjustmentDFCollection":
+) -> TaskAdjustmentDFCollection:
     from generalresearch.incite.collections.thl_web import (
         DFCollectionType,
         TaskAdjustmentDFCollection,
@@ -127,12 +129,12 @@ def task_adj_collection(
 
 @pytest.fixture
 def auditlog_collection(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
     thl_web_rr: PostgresConfig,
-) -> "AuditLogDFCollection":
+) -> AuditLogDFCollection:
     from generalresearch.incite.collections.thl_web import (
         AuditLogDFCollection,
         DFCollectionType,
@@ -149,12 +151,12 @@ def auditlog_collection(
 
 @pytest.fixture
 def ledger_collection(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
     thl_web_rr: PostgresConfig,
-) -> "LedgerDFCollection":
+) -> LedgerDFCollection:
     from generalresearch.incite.collections.thl_web import (
         DFCollectionType,
         LedgerDFCollection,
@@ -171,7 +173,7 @@ def ledger_collection(
 
 @pytest.fixture
 def rm_ledger_collection(
-    ledger_collection: "LedgerDFCollection",
+    ledger_collection: LedgerDFCollection,
 ) -> Callable[..., None]:
 
     def _inner():
@@ -187,13 +189,13 @@ def rm_ledger_collection(
 
 @pytest.fixture
 def df_collection(
-    mnt_filepath: "GRLDatasets",
-    df_collection_data_type: "DFCollectionType",
+    mnt_filepath: GRLDatasets,
+    df_collection_data_type: DFCollectionType,
     offset: str,
     duration: timedelta,
     utc_90days_ago: datetime,
     thl_web_rr: PostgresConfig,
-) -> "DFCollection":
+) -> DFCollection:
     from generalresearch.incite.collections import DFCollection
 
     start = utc_90days_ago.replace(microsecond=0)
diff --git a/test_utils/incite/conftest.py b/test_utils/incite/conftest.py
index 058093e..12e57c5 100644
--- a/test_utils/incite/conftest.py
+++ b/test_utils/incite/conftest.py
@@ -1,18 +1,17 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta, timezone
 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, Optional
+from typing import TYPE_CHECKING, Callable
 from uuid import uuid4
 
 import pytest
 from _pytest.fixtures import SubRequest
 from faker import Faker
 
-# from test_utils.managers.ledger.conftest import session_with_tx_factory
-# from test_utils.models.conftest import session_factory
-
 if TYPE_CHECKING:
     from generalresearch.config import GRLBaseSettings
     from generalresearch.incite.base import GRLDatasets
@@ -33,7 +32,7 @@ fake = Faker()
 
 
 @pytest.fixture
-def mnt_gr_api_dir(request: SubRequest, settings: "GRLBaseSettings") -> Path:
+def mnt_gr_api_dir(request: SubRequest, settings: GRLBaseSettings) -> Path:
     p = Path(settings.mnt_gr_api_dir)
     p.mkdir(parents=True, exist_ok=True)
 
@@ -56,7 +55,7 @@ def mnt_gr_api_dir(request: SubRequest, settings: "GRLBaseSettings") -> Path:
 
 
 @pytest.fixture
-def event_report_request(utc_hour_ago: datetime, start: datetime) -> "ReportRequest":
+def event_report_request(utc_hour_ago: datetime, start: datetime) -> ReportRequest:
     from generalresearch.models.admin.request import (
         ReportRequest,
         ReportType,
@@ -72,7 +71,7 @@ def event_report_request(utc_hour_ago: datetime, start: datetime) -> "ReportRequ
 
 
 @pytest.fixture
-def session_report_request(utc_hour_ago: datetime, start: datetime) -> "ReportRequest":
+def session_report_request(utc_hour_ago: datetime, start: datetime) -> ReportRequest:
     from generalresearch.models.admin.request import (
         ReportRequest,
         ReportType,
@@ -88,7 +87,7 @@ def session_report_request(utc_hour_ago: datetime, start: datetime) -> "ReportRe
 
 
 @pytest.fixture
-def mnt_filepath(request: SubRequest) -> "GRLDatasets":
+def mnt_filepath(request: SubRequest) -> GRLDatasets:
     """
     Creates a temporary file path for all DFCollections &
     Mergers parquet files.
@@ -114,7 +113,7 @@ def mnt_filepath(request: SubRequest) -> "GRLDatasets":
 
 
 @pytest.fixture
-def start(utc_90days_ago: datetime) -> "datetime":
+def start(utc_90days_ago: datetime) -> datetime:
     s = utc_90days_ago.replace(microsecond=0)
     return s
 
@@ -125,19 +124,19 @@ def offset() -> str:
 
 
 @pytest.fixture
-def duration() -> Optional["timedelta"]:
+def duration() -> timedelta | None:
     return timedelta(hours=1)
 
 
 @pytest.fixture
-def df_collection_data_type() -> "DFCollectionType":
+def df_collection_data_type() -> DFCollectionType:
     from generalresearch.incite.collections import DFCollectionType
 
     return DFCollectionType.TEST
 
 
 @pytest.fixture
-def merge_type() -> "MergeType":
+def merge_type() -> MergeType:
     from generalresearch.incite.mergers import MergeType
 
     return MergeType.TEST
@@ -145,16 +144,16 @@ def merge_type() -> "MergeType":
 
 @pytest.fixture
 def incite_item_factory(
-    session_factory: Callable[..., "Session"],
-    product: "Product",
-    user_factory: Callable[..., "User"],
-    session_with_tx_factory: Callable[..., "Session"],
+    session_factory: Callable[..., Session],
+    product: Product,
+    user_factory: Callable[..., User],
+    session_with_tx_factory: Callable[..., Session],
 ) -> Callable[..., None]:
 
     def _inner(
-        item: "DFCollectionItem",
+        item: DFCollectionItem,
         observations: int = 3,
-        user: Optional["User"] = None,
+        user: User | None = None,
     ):
         from generalresearch.incite.collections import (
             DFCollection,
@@ -204,6 +203,4 @@ def incite_item_factory(
                 case _:
                     raise ValueError("Unsupported DFCollectionItem")
 
-        return None
-
     return _inner
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index d094b84..e9970c2 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -1,46 +1,45 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 
 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 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
 # --------------------------
 
 
 @pytest.fixture
-def rm_pop_ledger_merge(pop_ledger_merge: "PopLedgerMerge") -> Callable[..., None]:
+def rm_pop_ledger_merge(pop_ledger_merge: PopLedgerMerge) -> Callable[..., None]:
 
     def _inner():
         clear_directory(pop_ledger_merge.archive_path)
@@ -50,11 +49,11 @@ def rm_pop_ledger_merge(pop_ledger_merge: "PopLedgerMerge") -> Callable[..., Non
 
 @pytest.fixture
 def pop_ledger_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     start: datetime,
     duration: timedelta,
-) -> "PopLedgerMerge":
+) -> PopLedgerMerge:
 
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
@@ -70,8 +69,8 @@ def pop_ledger_merge(
 @pytest.fixture
 def pop_ledger_merge_item(
     start: datetime,
-    pop_ledger_merge: "PopLedgerMerge",
-) -> "PopLedgerMergeItem":
+    pop_ledger_merge: PopLedgerMerge,
+) -> PopLedgerMergeItem:
 
     from generalresearch.incite.mergers.pop_ledger import PopLedgerMergeItem
 
@@ -83,9 +82,9 @@ def pop_ledger_merge_item(
 
 @pytest.fixture
 def ym_survey_wall_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     start: datetime,
-) -> "YMSurveyWallMerge":
+) -> YMSurveyWallMerge:
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.ym_survey_wall import YMSurveyWallMerge
 
@@ -98,8 +97,8 @@ def ym_survey_wall_merge(
 
 @pytest.fixture
 def ym_survey_wall_merge_item(
-    start: datetime, ym_survey_wall_merge: "YMSurveyWallMerge"
-) -> "YMSurveyWallMergeCollectionItem":
+    start: datetime, ym_survey_wall_merge: YMSurveyWallMerge
+) -> YMSurveyWallMergeCollectionItem:
     from generalresearch.incite.mergers.ym_survey_wall import (
         YMSurveyWallMergeCollectionItem,
     )
@@ -112,11 +111,11 @@ def ym_survey_wall_merge_item(
 
 @pytest.fixture
 def ym_wall_summary_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
-) -> "YMWallSummaryMerge":
+) -> YMWallSummaryMerge:
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.ym_wall_summary import YMWallSummaryMerge
 
@@ -129,8 +128,8 @@ def ym_wall_summary_merge(
 
 
 def ym_wall_summary_merge_item(
-    start: datetime, ym_wall_summary_merge: "YMWallSummaryMerge"
-) -> "YMWallSummaryMergeItem":
+    start: datetime, ym_wall_summary_merge: YMWallSummaryMerge
+) -> YMWallSummaryMergeItem:
     from generalresearch.incite.mergers.ym_wall_summary import (
         YMWallSummaryMergeItem,
     )
@@ -148,11 +147,11 @@ def ym_wall_summary_merge_item(
 
 @pytest.fixture
 def enriched_session_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
-) -> "EnrichedSessionMerge":
+) -> EnrichedSessionMerge:
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.foundations.enriched_session import (
         EnrichedSessionMerge,
@@ -168,11 +167,11 @@ def enriched_session_merge(
 
 @pytest.fixture
 def enriched_task_adjust_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
-) -> "EnrichedTaskAdjustMerge":
+) -> EnrichedTaskAdjustMerge:
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.foundations.enriched_task_adjust import (
         EnrichedTaskAdjustMerge,
@@ -190,11 +189,11 @@ def enriched_task_adjust_merge(
 
 @pytest.fixture
 def enriched_wall_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     offset: str,
     duration: timedelta,
     start: datetime,
-) -> "EnrichedWallMerge":
+) -> EnrichedWallMerge:
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.foundations.enriched_wall import (
         EnrichedWallMerge,
@@ -210,11 +209,11 @@ def enriched_wall_merge(
 
 @pytest.fixture
 def user_id_product_merge(
-    mnt_filepath: "GRLDatasets",
+    mnt_filepath: GRLDatasets,
     duration: timedelta,
     offset: str,
     start: datetime,
-) -> "UserIdProductMerge":
+) -> UserIdProductMerge:
     from generalresearch.incite.mergers import MergeType
     from generalresearch.incite.mergers.foundations.user_id_product import (
         UserIdProductMerge,
@@ -235,8 +234,8 @@ def user_id_product_merge(
 
 @pytest.fixture
 def merge_collection(
-    mnt_filepath: "GRLDatasets",
-    merge_type: "MergeType",
+    mnt_filepath: GRLDatasets,
+    merge_type: MergeType,
     offset: str,
     duration: timedelta,
     start: datetime,