working through circular imports, removing __init__ loaded Types / Definitions

7 files changed, 90 insertions, 73 deletions

diff --git a/test_utils/models/conftest.py b/test_utils/models/conftest.py
index 3a10ea3..089f2e6 100644
--- a/test_utils/models/conftest.py
+++ b/test_utils/models/conftest.py
@@ -12,13 +12,12 @@ import pytest
 from pydantic import AwareDatetime, PositiveInt
 from pytest import FixtureRequest as Request
 
-from generalresearch.models import Source
+from generalresearch.models.definitions import Source
 from generalresearch.models.thl.definitions import (
     WALL_ALLOWED_STATUS_STATUS_CODE,
     Status,
 )
 from generalresearch.models.thl.survey.model import Buyer, Survey
-from generalresearch.pg_helper import PostgresConfig
 
 if TYPE_CHECKING:
     from generalresearch.currency import USDCent
@@ -53,6 +52,7 @@ if TYPE_CHECKING:
     from generalresearch.models.thl.user import User
     from generalresearch.models.thl.user_iphistory import IPRecord
     from generalresearch.models.thl.userhealth import AuditLog, AuditLogLevel
+    from generalresearch.pg_helper import PostgresConfig
 
 # === THL ===
 
diff --git a/test_utils/models/contest/conftest.py b/test_utils/models/contest/conftest.py
index 84930b8..91425dc 100644
--- a/test_utils/models/contest/conftest.py
+++ b/test_utils/models/contest/conftest.py
@@ -3,36 +3,41 @@ from __future__ import annotations
 from collections.abc import Callable
 from datetime import UTC, datetime
 from decimal import Decimal
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pytest import FixtureRequest as Request
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.thl.contest_manager import ContestManager
-from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
 from generalresearch.models.thl.contest import (
     ContestEndCondition,
     ContestPrize,
 )
-from generalresearch.models.thl.contest.contest import Contest
 from generalresearch.models.thl.contest.definitions import (
     ContestPrizeKind,
     ContestType,
 )
-from generalresearch.models.thl.contest.leaderboard import (
-    LeaderboardContestCreate,
-)
-from generalresearch.models.thl.contest.milestone import (
-    MilestoneContestCreate,
-)
 from generalresearch.models.thl.contest.raffle import (
     ContestEntryType,
-    RaffleContest,
     RaffleContestCreate,
 )
-from generalresearch.models.thl.product import Product
-from generalresearch.models.thl.user import User
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.contest_manager import ContestManager
+    from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager
+    from generalresearch.models.thl.contest.contest import Contest
+    from generalresearch.models.thl.contest.leaderboard import (
+        LeaderboardContestCreate,
+    )
+    from generalresearch.models.thl.contest.milestone import (
+        MilestoneContestCreate,
+    )
+    from generalresearch.models.thl.contest.raffle import (
+        RaffleContest,
+    )
+    from generalresearch.models.thl.product import Product
+    from generalresearch.models.thl.user import User
 
 # === Miscellaneous ===
 
diff --git a/test_utils/models/gr/conftest.py b/test_utils/models/gr/conftest.py
index b623255..6c1877a 100644
--- a/test_utils/models/gr/conftest.py
+++ b/test_utils/models/gr/conftest.py
@@ -2,30 +2,32 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from random import randint
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 from pydantic import PositiveInt
 from pydantic_extra_types.phone_numbers import PhoneNumber
 
-from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
-from generalresearch.managers.gr.business import (
-    BusinessAddressManager,
-    BusinessBankAccountManager,
-    BusinessManager,
-)
-from generalresearch.managers.gr.team import MembershipManager, TeamManager
-from generalresearch.models.custom_types import UUIDStr
-from generalresearch.models.gr.authentication import GRToken, GRUser
-from generalresearch.models.gr.business import (
-    Business,
-    BusinessAddress,
-    BusinessBankAccount,
-    TransferMethod,
-)
-from generalresearch.models.gr.team import Membership, Team
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+if TYPE_CHECKING:
+    from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
+    from generalresearch.managers.gr.business import (
+        BusinessAddressManager,
+        BusinessBankAccountManager,
+        BusinessManager,
+    )
+    from generalresearch.managers.gr.team import MembershipManager, TeamManager
+    from generalresearch.models.custom_types import UUIDStr
+    from generalresearch.models.gr.authentication import GRToken, GRUser
+    from generalresearch.models.gr.business import (
+        Business,
+        BusinessAddress,
+        BusinessBankAccount,
+        TransferMethod,
+    )
+    from generalresearch.models.gr.team import Membership, Team
+    from generalresearch.pg_helper import PostgresConfig
+    from generalresearch.redis_helper import RedisConfig
 
 # --- Static ---
 
diff --git a/test_utils/models/ledger/conftest.py b/test_utils/models/ledger/conftest.py
index 1c1027c..8437c7f 100644
--- a/test_utils/models/ledger/conftest.py
+++ b/test_utils/models/ledger/conftest.py
@@ -11,7 +11,6 @@ import pytest
 from pytest import FixtureRequest as Request
 
 from generalresearch.currency import USDCent
-from generalresearch.managers.base import PostgresManager
 from test_utils.models.conftest import (
     payout_config,
     product_amt_true,
@@ -24,6 +23,9 @@ from test_utils.models.conftest import (
     wall_factory,
 )
 
+if TYPE_CHECKING:
+    from generalresearch.managers.base import PostgresManager
+
 _ = (
     user_factory,
     product_user_wallet_no,
diff --git a/test_utils/models/network/conftest.py b/test_utils/models/network/conftest.py
index 6ba37a3..4ff59ee 100644
--- a/test_utils/models/network/conftest.py
+++ b/test_utils/models/network/conftest.py
@@ -1,5 +1,6 @@
 import os
 from datetime import UTC, datetime, timedelta
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
@@ -23,7 +24,9 @@ from generalresearch.models.network.tool_run_command import (
     RDNSRunCommand,
     RDNSRunCommandOptions,
 )
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+    from generalresearch.pg_helper import PostgresConfig
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/models/thl/conftest.py b/test_utils/models/thl/conftest.py
index fc57c73..3c77e27 100644
--- a/test_utils/models/thl/conftest.py
+++ b/test_utils/models/thl/conftest.py
@@ -5,7 +5,7 @@ from datetime import UTC, datetime
 from decimal import ROUND_DOWN, Decimal
 from random import choice as rand_choice
 from random import randint, random
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 import faker
@@ -13,47 +13,53 @@ import pytest
 from grip_client.enums import AccessType
 from pydantic import PositiveInt
 
-from generalresearch.managers.thl.ipinfo import IPGeonameManager, IPInformationManager
-from generalresearch.managers.thl.payout import UserPayoutEventManager
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.user_manager.user_manager import UserManager
-from generalresearch.managers.thl.userhealth import AuditLogManager, IPRecordManager
-from generalresearch.managers.thl.wall import WallManager
-from generalresearch.models import DeviceType
-from generalresearch.models.custom_types import (
-    AwareDatetimeISO,
-    IPvAnyAddressStr,
-    UUIDStr,
-)
-from generalresearch.models.legacy.bucket import Bucket
-from generalresearch.models.thl.definitions import (
-    PayoutStatus,
-)
-from generalresearch.models.thl.ipinfo import IPGeoname, IPInformation
-from generalresearch.models.thl.payout import UserPayoutEvent
-from generalresearch.models.thl.product import (
-    PayoutConfig,
-    Product,
-    ProfilingConfig,
-    SessionConfig,
-    SourcesConfig,
-    SupplyConfig,
-    UserCreateConfig,
-    UserHealthConfig,
-    UserWalletConfig,
-)
+from generalresearch.models.thl.definitions import PayoutStatus
 from generalresearch.models.thl.session import (
-    Session,
     Source,
     Status,
-    Wall,
 )
 from generalresearch.models.thl.user import User
-from generalresearch.models.thl.user_iphistory import IPRecord
-from generalresearch.models.thl.userhealth import AuditLog, AuditLogLevel
-from generalresearch.models.thl.wallet import PayoutType
-from generalresearch.models.thl.wallet.cashout_method import CashMailOrderData
+from generalresearch.models.thl.userhealth import AuditLogLevel
+from generalresearch.models.thl.wallet.definitions import PayoutType
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.ipinfo import (
+        IPGeonameManager,
+        IPInformationManager,
+    )
+    from generalresearch.managers.thl.payout import UserPayoutEventManager
+    from generalresearch.managers.thl.product import ProductManager
+    from generalresearch.managers.thl.session import SessionManager
+    from generalresearch.managers.thl.user_manager.user_manager import UserManager
+    from generalresearch.managers.thl.userhealth import AuditLogManager, IPRecordManager
+    from generalresearch.managers.thl.wall import WallManager
+    from generalresearch.models.custom_types import (
+        AwareDatetimeISO,
+        IPvAnyAddressStr,
+        UUIDStr,
+    )
+    from generalresearch.models.definitions import DeviceType
+    from generalresearch.models.legacy.bucket import Bucket
+    from generalresearch.models.thl.ipinfo import IPGeoname, IPInformation
+    from generalresearch.models.thl.payout import UserPayoutEvent
+    from generalresearch.models.thl.product import (
+        PayoutConfig,
+        Product,
+        ProfilingConfig,
+        SessionConfig,
+        SourcesConfig,
+        SupplyConfig,
+        UserCreateConfig,
+        UserHealthConfig,
+        UserWalletConfig,
+    )
+    from generalresearch.models.thl.session import (
+        Session,
+        Wall,
+    )
+    from generalresearch.models.thl.user_iphistory import IPRecord
+    from generalresearch.models.thl.userhealth import AuditLog
+    from generalresearch.models.thl.wallet.cashout_method import CashMailOrderData
 
 fake = faker.Faker()
 
diff --git a/test_utils/models/upk/conftest.py b/test_utils/models/upk/conftest.py
index ef77dd6..59266b2 100644
--- a/test_utils/models/upk/conftest.py
+++ b/test_utils/models/upk/conftest.py
@@ -9,10 +9,9 @@ from uuid import UUID
 import pandas as pd
 import pytest
 
-from generalresearch.pg_helper import PostgresConfig
-
 if TYPE_CHECKING:
     from generalresearch.managers.thl.category import CategoryManager
+    from generalresearch.pg_helper import PostgresConfig
 
 
 def insert_data_from_csv(