aboutsummaryrefslogtreecommitdiff
path: root/test_utils
diff options
context:
space:
mode:
Diffstat (limited to 'test_utils')
-rw-r--r--test_utils/conftest.py17
-rw-r--r--test_utils/grliq/conftest.py12
-rw-r--r--test_utils/incite/collections/conftest.py4
-rw-r--r--test_utils/incite/mergers/conftest.py55
-rw-r--r--test_utils/managers/cashout_methods.py2
-rw-r--r--test_utils/managers/conftest.py55
-rw-r--r--test_utils/managers/contest/conftest.py6
-rw-r--r--test_utils/managers/gr/conftest.py7
-rw-r--r--test_utils/managers/ledger/conftest.py14
-rw-r--r--test_utils/managers/thl/conftest.py51
-rw-r--r--test_utils/managers/upk/conftest.py9
-rw-r--r--test_utils/models/conftest.py4
-rw-r--r--test_utils/models/contest/conftest.py29
-rw-r--r--test_utils/models/gr/conftest.py38
-rw-r--r--test_utils/models/ledger/conftest.py4
-rw-r--r--test_utils/models/network/conftest.py5
-rw-r--r--test_utils/models/thl/conftest.py80
-rw-r--r--test_utils/models/upk/conftest.py3
-rw-r--r--test_utils/spectrum/conftest.py8
19 files changed, 220 insertions, 183 deletions
diff --git a/test_utils/conftest.py b/test_utils/conftest.py
index f55fe11..397d98f 100644
--- a/test_utils/conftest.py
+++ b/test_utils/conftest.py
@@ -9,6 +9,7 @@ from collections.abc import Callable, Generator
from datetime import UTC, datetime, timedelta
from os.path import join as pjoin
from pathlib import Path
+from typing import TYPE_CHECKING
from uuid import uuid4
import pytest
@@ -17,23 +18,13 @@ from dotenv import load_dotenv
from pydantic import MariaDBDsn, PostgresDsn, TypeAdapter
from pytest import TempPathFactory
-from generalresearch.config import GRLBaseSettings
from generalresearch.currency import USDCent
from generalresearch.models.custom_types import InternalHostname, PostgresDict
-from generalresearch.pg_helper import PostgresConfig
from generalresearch.sql_helper import SqlHelper
-# -- redis notes from jenkins file
-# sh "redis-cli -u ${env.THL_REDIS} FLUSHDB"
-# sh "redis-cli -u ${env.GR_REDIS} FLUSHDB"
-
-# script {
-# env.GR_REDIS_DB = new Random().nextInt(1024).toString()
-# env.GR_REDIS = "redis://${env.REDIS}:6379/${env.GR_REDIS_DB}"
-# echo "Using GR Redis: ${env.GR_REDIS}"
-# if (sh(script: "redis-cli -u ${env.GR_REDIS} SET jenkins_lock 1 NX EX 3600", returnStdout: true).trim() != 'OK')
-# error('Redis already locked... aborting.')
-# }
+if TYPE_CHECKING:
+ from generalresearch.config import GRLBaseSettings
+ from generalresearch.pg_helper import PostgresConfig
@pytest.fixture(scope="session")
diff --git a/test_utils/grliq/conftest.py b/test_utils/grliq/conftest.py
index 891b73c..bb1a167 100644
--- a/test_utils/grliq/conftest.py
+++ b/test_utils/grliq/conftest.py
@@ -2,19 +2,15 @@ from __future__ import annotations
from collections.abc import Callable
from datetime import UTC, datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any
from uuid import uuid4
import pytest
from pydantic import PostgresDsn
-from generalresearch.config import GRLBaseSettings
from generalresearch.grliq.managers.forensic_data import (
GrlIqDataManager,
)
-from generalresearch.grliq.managers.forensic_events import (
- GrlIqEventManager,
-)
from generalresearch.grliq.managers.forensic_results import (
GrlIqCategoryResultsReader,
)
@@ -25,6 +21,12 @@ from generalresearch.grliq.models.forensic_result import (
)
from generalresearch.pg_helper import PostgresConfig
+if TYPE_CHECKING:
+ from generalresearch.config import GRLBaseSettings
+ from generalresearch.grliq.managers.forensic_events import (
+ GrlIqEventManager,
+ )
+
# === Miscellaneous ===
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
# --------------------------
diff --git a/test_utils/managers/cashout_methods.py b/test_utils/managers/cashout_methods.py
index 238cdda..adf82f4 100644
--- a/test_utils/managers/cashout_methods.py
+++ b/test_utils/managers/cashout_methods.py
@@ -6,11 +6,11 @@ from uuid import uuid4
import pytest
-from generalresearch.models.thl.wallet import Currency, PayoutType
from generalresearch.models.thl.wallet.cashout_method import (
CashoutMethod,
TangoCashoutMethodData,
)
+from generalresearch.models.thl.wallet.definitions import Currency, PayoutType
@pytest.fixture(scope="session")
diff --git a/test_utils/managers/conftest.py b/test_utils/managers/conftest.py
index 9c6a1a7..ed771c7 100644
--- a/test_utils/managers/conftest.py
+++ b/test_utils/managers/conftest.py
@@ -1,41 +1,44 @@
from __future__ import annotations
from collections.abc import Callable
+from typing import TYPE_CHECKING
import pytest
-from generalresearch.managers.gr.business import (
- BusinessAddressManager,
- BusinessBankAccountManager,
- BusinessManager,
-)
-from generalresearch.managers.gr.team import (
- MembershipManager,
- TeamManager,
-)
-from generalresearch.managers.spectrum.survey import SpectrumSurveyManager
-from generalresearch.managers.thl.buyer import BuyerManager
from generalresearch.managers.thl.cashout_method import (
CashoutMethodManager,
)
-from generalresearch.managers.thl.ipinfo import (
- GeoIpInfoManager,
- IPGeonameManager,
- IPInformationManager,
-)
from generalresearch.managers.thl.user_streak import (
UserStreakManager,
)
-from generalresearch.managers.thl.userhealth import (
- AuditLogManager,
- IPRecordManager,
- UserIpHistoryManager,
-)
-from generalresearch.models import Source
-from generalresearch.models.thl.wallet.cashout_method import CashoutMethod
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
-from generalresearch.sql_helper import SqlHelper
+from generalresearch.models.definitions import Source
+
+if TYPE_CHECKING:
+ from generalresearch.managers.gr.business import (
+ BusinessAddressManager,
+ BusinessBankAccountManager,
+ BusinessManager,
+ )
+ from generalresearch.managers.gr.team import (
+ MembershipManager,
+ TeamManager,
+ )
+ from generalresearch.managers.spectrum.survey import SpectrumSurveyManager
+ from generalresearch.managers.thl.buyer import BuyerManager
+ from generalresearch.managers.thl.ipinfo import (
+ GeoIpInfoManager,
+ IPGeonameManager,
+ IPInformationManager,
+ )
+ from generalresearch.managers.thl.userhealth import (
+ AuditLogManager,
+ IPRecordManager,
+ UserIpHistoryManager,
+ )
+ from generalresearch.models.thl.wallet.cashout_method import CashoutMethod
+ from generalresearch.pg_helper import PostgresConfig
+ from generalresearch.redis_helper import RedisConfig
+ from generalresearch.sql_helper import SqlHelper
# === THL ===
diff --git a/test_utils/managers/contest/conftest.py b/test_utils/managers/contest/conftest.py
index a9375f6..b29cf18 100644
--- a/test_utils/managers/contest/conftest.py
+++ b/test_utils/managers/contest/conftest.py
@@ -1,10 +1,14 @@
from __future__ import annotations
+from typing import TYPE_CHECKING
+
import pytest
from generalresearch.managers.base import Permission
from generalresearch.managers.thl.contest_manager import ContestManager
-from generalresearch.pg_helper import PostgresConfig
+
+if TYPE_CHECKING:
+ from generalresearch.pg_helper import PostgresConfig
@pytest.fixture(scope="session")
diff --git a/test_utils/managers/gr/conftest.py b/test_utils/managers/gr/conftest.py
index 40bd7b3..5392c69 100644
--- a/test_utils/managers/gr/conftest.py
+++ b/test_utils/managers/gr/conftest.py
@@ -3,6 +3,7 @@ from __future__ import annotations
import subprocess
from collections.abc import Callable, Generator
from random import randint
+from typing import TYPE_CHECKING
import pytest
import redis
@@ -10,8 +11,6 @@ import redis.asyncio as redis_async
from pydantic import PostgresDsn
from redis import Redis
-from generalresearch.config import GRLBaseSettings
-from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
from generalresearch.managers.gr.business import (
BusinessAddressManager,
BusinessBankAccountManager,
@@ -20,6 +19,10 @@ from generalresearch.managers.gr.business import (
from generalresearch.pg_helper import PostgresConfig
from generalresearch.redis_helper import RedisConfig
+if TYPE_CHECKING:
+ from generalresearch.config import GRLBaseSettings
+ from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
+
# === Msc ===
@pytest.fixture(scope="session")
diff --git a/test_utils/managers/ledger/conftest.py b/test_utils/managers/ledger/conftest.py
index ce8348e..c60ee1b 100644
--- a/test_utils/managers/ledger/conftest.py
+++ b/test_utils/managers/ledger/conftest.py
@@ -1,18 +1,24 @@
from __future__ import annotations
+from typing import TYPE_CHECKING
+
import pytest
from generalresearch.managers.base import Permission
from generalresearch.managers.thl.ledger_manager.ledger import (
- LedgerAccountManager,
LedgerManager,
- LedgerTransactionManager,
)
from generalresearch.managers.thl.ledger_manager.thl_ledger import (
ThlLedgerManager,
)
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+ from generalresearch.managers.thl.ledger_manager.ledger import (
+ LedgerAccountManager,
+ LedgerTransactionManager,
+ )
+ from generalresearch.pg_helper import PostgresConfig
+ from generalresearch.redis_helper import RedisConfig
# --- Ledger ---
diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index d40b7d2..af3fd23 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -1,44 +1,47 @@
from __future__ import annotations
from collections.abc import Callable
+from typing import TYPE_CHECKING
import pytest
from pydantic import PostgresDsn
-from generalresearch.config import GRLBaseSettings
from generalresearch.managers.base import Permission
-from generalresearch.managers.thl.buyer import BuyerManager
-from generalresearch.managers.thl.category import CategoryManager
-from generalresearch.managers.thl.payout import (
- BrokerageProductPayoutEventManager,
- BusinessPayoutEventManager,
- PayoutEventManager,
- UserPayoutEventManager,
-)
-from generalresearch.managers.thl.product import ProductManager
-from generalresearch.managers.thl.session import SessionManager
-from generalresearch.managers.thl.task_adjustment import (
- TaskAdjustmentManager,
-)
from generalresearch.managers.thl.user_manager.mysql_user_manager import (
MysqlUserManager,
)
from generalresearch.managers.thl.user_manager.redis_user_manager import (
RedisUserManager,
)
-from generalresearch.managers.thl.user_manager.user_manager import (
- UserManager,
-)
-from generalresearch.managers.thl.user_manager.user_metadata_manager import (
- UserMetadataManager,
-)
-from generalresearch.managers.thl.wall import (
- WallCacheManager,
- WallManager,
-)
from generalresearch.pg_helper import PostgresConfig
from generalresearch.redis_helper import RedisConfig
+if TYPE_CHECKING:
+ from generalresearch.config import GRLBaseSettings
+ from generalresearch.managers.thl.buyer import BuyerManager
+ from generalresearch.managers.thl.category import CategoryManager
+ from generalresearch.managers.thl.payout import (
+ BrokerageProductPayoutEventManager,
+ BusinessPayoutEventManager,
+ PayoutEventManager,
+ UserPayoutEventManager,
+ )
+ from generalresearch.managers.thl.product import ProductManager
+ from generalresearch.managers.thl.session import SessionManager
+ from generalresearch.managers.thl.task_adjustment import (
+ TaskAdjustmentManager,
+ )
+ from generalresearch.managers.thl.user_manager.user_manager import (
+ UserManager,
+ )
+ from generalresearch.managers.thl.user_manager.user_metadata_manager import (
+ UserMetadataManager,
+ )
+ from generalresearch.managers.thl.wall import (
+ WallCacheManager,
+ WallManager,
+ )
+
@pytest.fixture(scope="session")
def thl_web_rr(django_db_factory: Callable[..., PostgresDsn]) -> PostgresConfig:
diff --git a/test_utils/managers/upk/conftest.py b/test_utils/managers/upk/conftest.py
index 7eabee1..f581278 100644
--- a/test_utils/managers/upk/conftest.py
+++ b/test_utils/managers/upk/conftest.py
@@ -1,4 +1,5 @@
from collections.abc import Callable, Generator
+from typing import TYPE_CHECKING
import pytest
@@ -12,9 +13,11 @@ from generalresearch.managers.thl.profiling.uqa import UQAManager
from generalresearch.managers.thl.profiling.user_upk import (
UserUpkManager,
)
-from generalresearch.models.thl.user import User
-from generalresearch.pg_helper import PostgresConfig
-from generalresearch.redis_helper import RedisConfig
+
+if TYPE_CHECKING:
+ from generalresearch.models.thl.user import User
+ from generalresearch.pg_helper import PostgresConfig
+ from generalresearch.redis_helper import RedisConfig
@pytest.fixture(scope="session")
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(
diff --git a/test_utils/spectrum/conftest.py b/test_utils/spectrum/conftest.py
index a8ce9d9..cc91cff 100644
--- a/test_utils/spectrum/conftest.py
+++ b/test_utils/spectrum/conftest.py
@@ -3,16 +3,15 @@ from __future__ import annotations
import time
from datetime import UTC, datetime
from decimal import Decimal
-from typing import Any
+from typing import TYPE_CHECKING, Any
import pytest
-from generalresearch.config import GRLBaseSettings
from generalresearch.managers.spectrum.survey import (
SpectrumCriteriaManager,
SpectrumSurveyManager,
)
-from generalresearch.models import (
+from generalresearch.models.definitions import (
LogicalOperator,
)
from generalresearch.models.spectrum.survey import (
@@ -22,6 +21,9 @@ from generalresearch.models.spectrum.survey import (
from generalresearch.models.thl.survey.condition import ConditionValueType
from generalresearch.sql_helper import SqlHelper
+if TYPE_CHECKING:
+ from generalresearch.config import GRLBaseSettings
+
@pytest.fixture(scope="session")
def spectrum_rw(settings: GRLBaseSettings) -> SqlHelper: