Ruff cleanup

9 files changed, 113 insertions, 79 deletions

diff --git a/tests/models/thl/test_adjustments.py b/tests/models/thl/test_adjustments.py
index 15d01d0..27091bb 100644
--- a/tests/models/thl/test_adjustments.py
+++ b/tests/models/thl/test_adjustments.py
@@ -1,16 +1,20 @@
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta, timezone
 from decimal import Decimal
+from typing import Callable
 
 import pytest
 
 from generalresearch.models import Source
+from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.session import (
-    Wall,
+    Session,
+    SessionAdjustedStatus,
     Status,
     StatusCode1,
+    Wall,
     WallAdjustedStatus,
-    SessionAdjustedStatus,
 )
+from generalresearch.models.thl.user import User
 
 started1 = datetime(2023, 1, 1, tzinfo=timezone.utc)
 started2 = datetime(2023, 1, 1, 0, 10, 0, tzinfo=timezone.utc)
@@ -25,14 +29,18 @@ adj_ts3 = datetime(2023, 2, 4, tzinfo=timezone.utc)
 class TestProductAdjustments:
 
     @pytest.mark.parametrize("payout", [".6", "1", "1.8", "2", "500.0000"])
-    def test_determine_bp_payment_no_rounding(self, product_factory, payout):
+    def test_determine_bp_payment_no_rounding(
+        self, product_factory: Callable[..., Product], payout
+    ):
         p1 = product_factory(commission_pct=Decimal("0.05"))
         res = p1.determine_bp_payment(thl_net=Decimal(payout))
         assert isinstance(res, Decimal)
         assert res == Decimal(payout) * Decimal("0.95")
 
     @pytest.mark.parametrize("payout", [".01", ".05", ".5"])
-    def test_determine_bp_payment_rounding(self, product_factory, payout):
+    def test_determine_bp_payment_rounding(
+        self, product_factory: Callable[..., Product], payout
+    ):
         p1 = product_factory(commission_pct=Decimal("0.05"))
         res = p1.determine_bp_payment(thl_net=Decimal(payout))
         assert isinstance(res, Decimal)
@@ -41,7 +49,7 @@ class TestProductAdjustments:
 
 class TestSessionAdjustments:
 
-    def test_status_complete(self, session_factory, user):
+    def test_status_complete(self, session_factory: Callable[..., Session], user: User):
         # Completed Session with 2 wall events
         s1 = session_factory(
             user=user,
@@ -64,7 +72,9 @@ class TestSessionAdjustments:
 
 class TestAdjustments:
 
-    def test_finish_with_status(self, session_factory, user, session_manager):
+    def test_finish_with_status(
+        self, session_factory: Callable[..., Session], user: User, session_manager
+    ):
         # Completed Session with 2 wall events
         s1 = session_factory(
             user=user,
@@ -86,7 +96,9 @@ class TestAdjustments:
 
         assert Decimal("0.95") == payout
 
-    def test_never_adjusted(self, session_factory, user, session_manager):
+    def test_never_adjusted(
+        self, session_factory: Callable[..., Session], user: User, session_manager
+    ):
         s1 = session_factory(
             user=user,
             wall_count=5,
@@ -115,7 +127,11 @@ class TestAdjustments:
         assert s1.adjusted_timestamp is None
 
     def test_adjustment_wall_values(
-        self, session_factory, user, session_manager, wall_manager
+        self,
+        session_factory: Callable[..., Session],
+        user: User,
+        session_manager,
+        wall_manager,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -162,7 +178,11 @@ class TestAdjustments:
         assert s1.adjusted_user_payout is None
 
     def test_adjustment_session_values(
-        self, wall_manager, session_manager, session_factory, user
+        self,
+        wall_manager,
+        session_manager,
+        session_factory: Callable[..., Session],
+        user: User,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -202,7 +222,11 @@ class TestAdjustments:
         assert s1.adjusted_user_payout is None
 
     def test_double_adjustment_session_values(
-        self, wall_manager, session_manager, session_factory, user
+        self,
+        wall_manager,
+        session_manager,
+        session_factory: Callable[..., Session],
+        user: User,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -251,7 +275,11 @@ class TestAdjustments:
         assert s1.adjusted_user_payout is None
 
     def test_double_adjustment_sm_vs_db_values(
-        self, wall_manager, session_manager, session_factory, user
+        self,
+        wall_manager,
+        session_manager,
+        session_factory: Callable[..., Session],
+        user: User,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -314,7 +342,11 @@ class TestAdjustments:
             ) == w_db.model_dump_json(exclude={"cpi", "req_cpi"})
 
     def test_double_adjustment_double_completes(
-        self, wall_manager, session_manager, session_factory, user
+        self,
+        wall_manager,
+        session_manager,
+        session_factory: Callable[..., Session],
+        user: User,
     ):
         # Completed Session with 2 wall events
         s1 = session_factory(
@@ -384,7 +416,12 @@ class TestAdjustments:
         assert adj_ts3 == s1.adjusted_timestamp
 
     def test_complete_to_fail(
-        self, session_factory, user, session_manager, wall_manager, utc_hour_ago
+        self,
+        session_factory: Callable[..., Session],
+        user: User,
+        session_manager,
+        wall_manager,
+        utc_hour_ago: datetime,
     ):
         s1 = session_factory(
             user=user,
@@ -422,6 +459,7 @@ class TestAdjustments:
         assert Status.FAIL == new_status
         assert Decimal(0) == new_payout
 
+        assert isinstance(user.product, Product)
         assert not user.product.user_wallet_config.enabled
         assert new_user_payout is None
 
@@ -477,7 +515,12 @@ class TestAdjustments:
         # assert Decimal("0.24") == s1.adjusted_user_payout
         assert s1.adjusted_user_payout is None
 
-    def test_complete_to_fail_to_complete(self, user, session_factory, utc_hour_ago):
+    def test_complete_to_fail_to_complete(
+        self,
+        user: User,
+        session_factory: Callable[..., Session],
+        utc_hour_ago: datetime,
+    ):
         # Setup: Complete, then adjust it to fail
         s1 = session_factory(
             user=user,
@@ -529,7 +572,10 @@ class TestAdjustments:
         assert s1.adjusted_user_payout is None
 
     def test_complete_to_fail_to_complete_adj(
-        self, user, session_factory, utc_hour_ago
+        self,
+        user: User,
+        session_factory: Callable[..., Session],
+        utc_hour_ago: datetime,
     ):
         s1 = session_factory(
             user=user,
@@ -634,7 +680,12 @@ class TestAdjustments:
         # assert Decimal("0.48") == s.adjusted_user_payout
         assert s1.adjusted_user_payout is None
 
-    def test_fail_to_complete_to_fail(self, user, session_factory, utc_hour_ago):
+    def test_fail_to_complete_to_fail(
+        self,
+        user: User,
+        session_factory: Callable[..., Session],
+        utc_hour_ago: datetime,
+    ):
         # End with an abandon
         s1 = session_factory(
             user=user,
diff --git a/tests/models/thl/test_contest/test_contest.py b/tests/models/thl/test_contest/test_contest.py
index d53eee5..0fbd4cc 100644
--- a/tests/models/thl/test_contest/test_contest.py
+++ b/tests/models/thl/test_contest/test_contest.py
@@ -1,4 +1,8 @@
+from typing import Callable
+
 import pytest
+
+from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 
 
@@ -11,13 +15,13 @@ class TestContest:
     """
 
     @pytest.fixture(scope="function")
-    def user_1(self, user_factory, product) -> User:
+    def user_1(self, user_factory: Callable[..., User], product: Product) -> User:
         return user_factory(product=product)
 
     @pytest.fixture(scope="function")
-    def user_2(self, user_factory, product) -> User:
+    def user_2(self, user_factory: Callable[..., User], product: Product) -> User:
         return user_factory(product=product)
 
     @pytest.fixture(scope="function")
-    def user_3(self, user_factory, product) -> User:
+    def user_3(self, user_factory: Callable[..., User], product: Product) -> User:
         return user_factory(product=product)
diff --git a/tests/models/thl/test_contest/test_leaderboard_contest.py b/tests/models/thl/test_contest/test_leaderboard_contest.py
index 98f3215..8b714ee 100644
--- a/tests/models/thl/test_contest/test_leaderboard_contest.py
+++ b/tests/models/thl/test_contest/test_leaderboard_contest.py
@@ -7,8 +7,8 @@ from generalresearch.currency import USDCent
 from generalresearch.managers.leaderboard.manager import LeaderboardManager
 from generalresearch.models.thl.contest import ContestPrize
 from generalresearch.models.thl.contest.definitions import (
-    ContestType,
     ContestPrizeKind,
+    ContestType,
 )
 from generalresearch.models.thl.contest.leaderboard import (
     LeaderboardContest,
@@ -17,6 +17,7 @@ from generalresearch.models.thl.contest.utils import (
     distribute_leaderboard_prizes,
 )
 from generalresearch.models.thl.leaderboard import LeaderboardRow
+from generalresearch.models.thl.product import Product
 from tests.models.thl.test_contest.test_contest import TestContest
 
 
@@ -24,7 +25,7 @@ class TestLeaderboardContest(TestContest):
 
     @pytest.fixture
     def leaderboard_contest(
-        self, product, thl_redis, user_manager
+        self, product: Product, thl_redis, user_manager
     ) -> "LeaderboardContest":
         board_key = f"leaderboard:{product.uuid}:us:weekly:2025-05-26:complete_count"
 
diff --git a/tests/models/thl/test_ledger.py b/tests/models/thl/test_ledger.py
index d706357..257de3c 100644
--- a/tests/models/thl/test_ledger.py
+++ b/tests/models/thl/test_ledger.py
@@ -1,12 +1,16 @@
 from datetime import datetime, timezone
-from decimal import Decimal
 from uuid import uuid4
 
 import pytest
 from pydantic import ValidationError
 
-from generalresearch.models.thl.ledger import LedgerAccount, Direction, AccountType
-from generalresearch.models.thl.ledger import LedgerTransaction, LedgerEntry
+from generalresearch.models.thl.ledger import (
+    AccountType,
+    Direction,
+    LedgerAccount,
+    LedgerEntry,
+    LedgerTransaction,
+)
 
 
 class TestLedgerTransaction:
@@ -43,14 +47,6 @@ class TestLedgerTransaction:
             LedgerEntry(
                 direction=Direction.CREDIT,
                 account_uuid="3f3735eaed264c2a9f8a114934afa121",
-                amount=Decimal("1"),
-            )
-        assert "Input should be a valid integer" in str(cm.value)
-
-        with pytest.raises(ValidationError) as cm:
-            LedgerEntry(
-                direction=Direction.CREDIT,
-                account_uuid="3f3735eaed264c2a9f8a114934afa121",
                 amount=1.2,
             )
         assert "Input should be a valid integer" in str(cm.value)
diff --git a/tests/models/thl/test_product.py b/tests/models/thl/test_product.py
index 2d20ba1..5e9b249 100644
--- a/tests/models/thl/test_product.py
+++ b/tests/models/thl/test_product.py
@@ -826,22 +826,18 @@ class TestProductBalance:
 
     def test_not_inconsistent(
         self,
-        product,
+        product: Product,
         mnt_filepath,
-        thl_lm,
-        client_no_amm,
-        thl_redis_config,
-        brokerage_product_payout_event_manager,
+        thl_lm: ThlLedgerManager,
+        client_no_amm: DaskClient,
         delete_ledger_db,
         create_main_accounts,
         delete_df_collection,
         ledger_collection,
-        business,
-        user_factory,
-        product_factory,
+        user_factory: Callable[..., User],
         session_with_tx_factory,
-        pop_ledger_merge,
-        start,
+        pop_ledger_merge: PopLedgerMerge,
+        start: datetime,
         bp_payout_factory,
         payout_event_manager,
     ):
@@ -905,22 +901,16 @@ class TestProductPOPFinancial:
         self,
         product,
         mnt_filepath,
-        thl_lm,
+        thl_lm: ThlLedgerManager,
         client_no_amm,
-        thl_redis_config,
-        brokerage_product_payout_event_manager,
         delete_ledger_db,
         create_main_accounts,
         delete_df_collection,
         ledger_collection,
-        business,
-        user_factory,
-        product_factory,
+        user_factory: Callable[..., User],
         session_with_tx_factory,
-        pop_ledger_merge,
-        start,
-        bp_payout_factory,
-        payout_event_manager,
+        pop_ledger_merge: PopLedgerMerge,
+        start: datetime,
     ):
         # This is very similar to the test_complete_payout_pq_inconsistent
         #   test, however this time we're only going to assign the payout
@@ -984,22 +974,20 @@ class TestProductCache:
 
     def test_basic(
         self,
-        product,
+        product: Product,
         mnt_filepath,
         thl_lm,
-        client_no_amm,
+        client_no_amm: DaskClient,
         thl_redis_config,
         brokerage_product_payout_event_manager,
         delete_ledger_db,
         create_main_accounts,
         delete_df_collection,
         ledger_collection,
-        business,
-        user_factory,
-        product_factory,
+        user_factory: Callable[..., User],
         session_with_tx_factory,
-        pop_ledger_merge,
-        start,
+        pop_ledger_merge: PopLedgerMerge,
+        start: datetime,
     ):
         # Now let's load it up and actually test some things
         delete_ledger_db()
@@ -1008,7 +996,7 @@ class TestProductCache:
 
         # Confirm the default / null behavior
         rc = thl_redis_config.create_redis_client()
-        res: Optional[str] = rc.get(product.cache_key)
+        res: str | None = rc.get(product.cache_key)
         assert res is None
         with pytest.raises(expected_exception=AssertionError):
             product.set_cache(
@@ -1043,13 +1031,14 @@ class TestProductCache:
         )
 
         # Fetch from cache and assert the instance loaded from redis
-        res: Optional[str] = rc.get(product.cache_key)
+        res: str | None = rc.get(product.cache_key)
         assert isinstance(res, str)
         from generalresearch.models.thl.ledger import LedgerAccount
 
         assert isinstance(product.bp_account, LedgerAccount)
 
         p1: Product = Product.model_validate_json(res)
+        assert isinstance(p1.balance, ProductBalances)
         assert p1.balance.product_id == product.uuid
         assert p1.balance.payout_usd_str == "$0.71"
         assert p1.balance.retainer_usd_str == "$0.17"
@@ -1057,22 +1046,20 @@ class TestProductCache:
 
     def test_neg_balance_cache(
         self,
-        product,
+        product: Product,
         mnt_filepath,
         thl_lm,
-        client_no_amm,
+        client_no_amm: DaskClient,
         thl_redis_config,
         brokerage_product_payout_event_manager,
         delete_ledger_db,
         create_main_accounts,
         delete_df_collection,
         ledger_collection,
-        business,
-        user_factory,
-        product_factory,
+        user_factory: Callable[..., User],
         session_with_tx_factory,
-        pop_ledger_merge,
-        start,
+        pop_ledger_merge: PopLedgerMerge,
+        start: datetime,
         bp_payout_factory,
         payout_event_manager,
         adj_to_fail_with_tx_factory,
diff --git a/tests/models/thl/test_soft_pair.py b/tests/models/thl/test_soft_pair.py
index bac0e8d..588847e 100644
--- a/tests/models/thl/test_soft_pair.py
+++ b/tests/models/thl/test_soft_pair.py
@@ -4,8 +4,8 @@ from generalresearch.models.thl.soft_pair import SoftPairResult, SoftPairResultT
 
 def test_model():
     from generalresearch.models.dynata.survey import (
-        DynataCondition,
         ConditionValueType,
+        DynataCondition,
     )
 
     c1 = DynataCondition(
diff --git a/tests/models/thl/test_user.py b/tests/models/thl/test_user.py
index 25af694..943ae8e 100644
--- a/tests/models/thl/test_user.py
+++ b/tests/models/thl/test_user.py
@@ -101,11 +101,6 @@ class TestUserProductID:
         assert "1 validation error for User" in str(cm.value)
         assert "Input should be a valid string" in str(cm.value)
 
-        with pytest.raises(expected_exception=ValueError) as cm:
-            User(user_id=self.user_id, product_id=Decimal("0"))
-        assert "1 validation error for User" in str(cm.value)
-        assert "Input should be a valid string" in str(cm.value)
-
     def test_empty(self):
         from generalresearch.models.thl.user import User
 
@@ -121,8 +116,8 @@ class TestUserProductID:
         product_id = uuid4().hex[:31]
         with pytest.raises(expected_exception=ValueError) as cm:
             User(user_id=self.user_id, product_id=product_id)
-        assert "1 validation error for User", str(cm.value)
-        assert "String should have at least 32 characters", str(cm.value)
+        assert "1 validation error for User" in str(cm.value)
+        assert "String should have at least 32 characters" in str(cm.value)
 
         product_id = uuid4().hex * 2
         with pytest.raises(ValueError) as cm:
diff --git a/tests/models/thl/test_user_iphistory.py b/tests/models/thl/test_user_iphistory.py
index 46018e0..596849c 100644
--- a/tests/models/thl/test_user_iphistory.py
+++ b/tests/models/thl/test_user_iphistory.py
@@ -1,4 +1,4 @@
-from datetime import timezone, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from generalresearch.models.thl.user_iphistory import (
     UserIPHistory,
diff --git a/tests/models/thl/test_wall_session.py b/tests/models/thl/test_wall_session.py
index ab140e9..1208c56 100644
--- a/tests/models/thl/test_wall_session.py
+++ b/tests/models/thl/test_wall_session.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 
 import pytest