Ruff std replacements

9 files changed, 37 insertions, 113 deletions

diff --git a/tests/managers/thl/test_ledger/test_lm_accounts.py b/tests/managers/thl/test_ledger/test_lm_accounts.py
index faef5fb..11b2835 100644
--- a/tests/managers/thl/test_ledger/test_lm_accounts.py
+++ b/tests/managers/thl/test_ledger/test_lm_accounts.py
@@ -1,4 +1,3 @@
-from collections.abc import Callable
 from itertools import product as iproduct
 from random import randint
 from typing import TYPE_CHECKING
@@ -22,7 +21,6 @@ from generalresearch.models.thl.ledger import (
 if TYPE_CHECKING:
     from pydantic import PositiveInt
 
-    from generalresearch.config import GRLSettings
     from generalresearch.currency import LedgerCurrency
     from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager
     from generalresearch.models.custom_types import AccountType, Direction, UUIDStr
@@ -32,10 +30,6 @@ if TYPE_CHECKING:
         LedgerAccount,
         LedgerTransaction,
     )
-    from generalresearch.models.thl.product import Product
-    from generalresearch.models.thl.session import Session
-    from generalresearch.models.thl.user import User
-    from generalresearch.models.thl.wallet import PayoutType
 
 
 @pytest.mark.parametrize(
diff --git a/tests/managers/thl/test_ledger/test_lm_tx_locks.py b/tests/managers/thl/test_ledger/test_lm_tx_locks.py
index 07c3712..020b74a 100644
--- a/tests/managers/thl/test_ledger/test_lm_tx_locks.py
+++ b/tests/managers/thl/test_ledger/test_lm_tx_locks.py
@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 
 import pytest
@@ -23,7 +23,6 @@ from generalresearch.models.thl.session import (
     WallAdjustedStatus,
 )
 from generalresearch.models.thl.user import User
-from test_utils.models.conftest import product_user_wallet_no, session, user_factory
 
 logger = logging.getLogger("LedgerManager")
 
@@ -56,7 +55,7 @@ class TestLedgerLocks:
         s1 = session_factory(
             user=user,
             wall_count=3,
-            wall_req_cpis=[Decimal("1.23"), Decimal("3.21"), Decimal("4")],
+            wall_req_cpis=[Decimal("1.23"), Decimal("3.21"), Decimal(4)],
             wall_statuses=[Status.COMPLETE, Status.COMPLETE, Status.COMPLETE],
         )
 
@@ -187,7 +186,7 @@ class TestLedgerLocks:
             user_id=user.user_id,
             source=Source.DYNATA,
             req_survey_id="xxx",
-            req_cpi=Decimal("4"),
+            req_cpi=Decimal(4),
             session_id=1,
             status=Status.COMPLETE,
             status_code_1=StatusCode1.COMPLETE,
@@ -292,13 +291,7 @@ class TestLedgerLocks:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         print(thl_net, commission_amount, bp_pay, user_pay)
 
@@ -336,13 +329,7 @@ class TestLedgerLocks:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         print(thl_net, commission_amount, bp_pay, user_pay)
 
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_accounts.py b/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
index 01d5fe1..8d7d828 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_accounts.py
@@ -8,9 +8,9 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_user_wallet(self, user, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         account = thl_lm.get_account_or_create_user_wallet(user=user)
@@ -31,9 +31,9 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_bp_wallet(self, product, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         account = thl_lm.get_account_or_create_bp_wallet(product=product)
@@ -54,8 +54,8 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_bp_commission(self, product, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            Direction,
             AccountType,
+            Direction,
         )
 
         account = thl_lm.get_account_or_create_bp_commission(product=product)
@@ -76,8 +76,8 @@ class TestThlLedgerManagerAccounts:
     def test_get_account_or_create_bp_expense(self, product, expense, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            Direction,
             AccountType,
+            Direction,
         )
 
         account = thl_lm.get_account_or_create_bp_expense(
@@ -98,8 +98,8 @@ class TestThlLedgerManagerAccounts:
     def test_get_or_create_bp_pending_payout_account(self, product, thl_lm, lm):
         from generalresearch.currency import LedgerCurrency
         from generalresearch.models.thl.ledger import (
-            Direction,
             AccountType,
+            Direction,
         )
 
         account = thl_lm.get_or_create_bp_pending_payout_account(product=product)
@@ -132,8 +132,8 @@ class TestThlLedgerManagerAccounts:
         self, account_cash, account_revenue_task_complete, thl_lm, lm
     ):
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
             AccountType,
+            LedgerAccount,
         )
 
         res = thl_lm.get_account_task_complete_revenue()
@@ -155,8 +155,8 @@ class TestThlLedgerManagerAccounts:
 
     def test_get_account_cash(self, account_cash, thl_lm, lm):
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
             AccountType,
+            LedgerAccount,
         )
 
         res = thl_lm.get_account_cash()
@@ -167,10 +167,10 @@ class TestThlLedgerManagerAccounts:
         assert res.display_name == "Operating Cash Account"
 
     def test_get_accounts(self, setup_accounts, product, user_factory, thl_lm, lm, lam):
-        from generalresearch.models.thl.user import User
         from generalresearch.managers.thl.ledger_manager.exceptions import (
             LedgerAccountDoesntExistError,
         )
+        from generalresearch.models.thl.user import User
 
         user1: User = user_factory(product=product)
         user2: User = user_factory(product=product)
@@ -276,9 +276,9 @@ class TestLedgerAccountManager:
             LedgerAccountDoesntExistError,
         )
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         u = uuid4().hex
@@ -311,8 +311,8 @@ class TestLedgerAccountManager:
             LedgerAccountDoesntExistError,
         )
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
             AccountType,
+            LedgerAccount,
         )
 
         with pytest.raises(LedgerAccountDoesntExistError):
@@ -326,10 +326,10 @@ class TestLedgerAccountManager:
         assert user.product.uuid == account.reference_uuid
 
     def test_get_many(self, product_factory, thl_lm, lm, lam, currency):
-        from generalresearch.models.thl.product import Product
         from generalresearch.managers.thl.ledger_manager.exceptions import (
             LedgerAccountDoesntExistError,
         )
+        from generalresearch.models.thl.product import Product
 
         p1: Product = product_factory()
         p2: Product = product_factory()
@@ -388,9 +388,9 @@ class TestLedgerAccountManager:
 
     def test_create_account(self, thl_lm, lm, lam):
         from generalresearch.models.thl.ledger import (
-            LedgerAccount,
-            Direction,
             AccountType,
+            Direction,
+            LedgerAccount,
         )
 
         u = uuid4().hex
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py b/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py
index 1fb9c01..cfb8f8f 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_bp_payout.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
 from uuid import uuid4
@@ -78,13 +78,7 @@ class TestThlLedgerManagerBPPayout:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": now + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=now + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         thl_lm.create_tx_bp_payment(session=session, created=wall1.started)
 
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_tx.py b/tests/managers/thl/test_ledger/test_thl_lm_tx.py
index be988a1..1130621 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_tx.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_tx.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from random import randint
 from uuid import uuid4
@@ -114,7 +114,7 @@ class TestThlLedgerTxManager:
             user_wallet_config=UserWalletConfig(amt=True, enabled=True),
         )
         user = user_factory(product=product)
-        s1 = session_factory(user=user, wall_req_cpi=Decimal("1"))
+        s1 = session_factory(user=user, wall_req_cpi=Decimal(1))
 
         status, status_code_1 = s1.determine_session_status()
         assert status == Status.COMPLETE
@@ -207,9 +207,7 @@ class TestThlLedgerTxManager:
         # Update the finished timestamp, but nothing else. This means that
         #   there is no financial changes needed
         session.update(
-            **{
-                "finished": datetime.now(tz=UTC) + timedelta(minutes=10),
-            }
+            finished=datetime.now(tz=UTC) + timedelta(minutes=10)
         )
         assert session.finished
         with caplog.at_level(logging.INFO):
@@ -829,13 +827,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = s1.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = s1.determine_payments()
         s1.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": s1.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=s1.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         print(thl_net, commission_amount, bp_pay, user_pay)
         thl_lm.create_tx_bp_payment(session=s1, created=w1.started)
@@ -892,13 +884,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
 
         print(thl_net, commission_amount, bp_pay, user_pay)
@@ -930,13 +916,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = session.determine_session_status()
         # thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": Decimal("1.53"),
-                "user_payout": Decimal("1.53"),
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=Decimal("1.53"), user_payout=Decimal("1.53")
         )
 
         thl_lm.create_tx_bp_payment(session=session, created=wall1.started)
@@ -971,13 +951,7 @@ class TestThlLedgerTxManagerFlows:
         status, status_code_1 = session.determine_session_status()
         # thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": session.started + timedelta(minutes=10),
-                "payout": Decimal("0.39"),
-                "user_payout": Decimal("0.26"),
-            }
+            status=status, status_code_1=status_code_1, finished=session.started + timedelta(minutes=10), payout=Decimal("0.39"), user_payout=Decimal("0.26")
         )
         # with pytest.logs(logger, level=logging.WARNING) as cm:
         #     tx = thl_lm.create_transaction_bp_payment(session, created=wall1.started)
@@ -1310,13 +1284,7 @@ class TestThlLedgerManagerAdj:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         thl_lm.create_tx_bp_payment(session, created=wall1.started)
 
@@ -1484,13 +1452,7 @@ class TestThlLedgerManagerAdj:
         assert user_pay == Decimal("1.52")
 
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": now + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=now + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
 
         tx = thl_lm.create_tx_bp_adjustment(session=session, created=wall1.started)
@@ -1664,13 +1626,7 @@ class TestThlLedgerManagerAdj:
         status, status_code_1 = session.determine_session_status()
         thl_net, commission_amount, bp_pay, user_pay = session.determine_payments()
         session.update(
-            **{
-                "status": status,
-                "status_code_1": status_code_1,
-                "finished": utc_hour_ago + timedelta(minutes=10),
-                "payout": bp_pay,
-                "user_payout": user_pay,
-            }
+            status=status, status_code_1=status_code_1, finished=utc_hour_ago + timedelta(minutes=10), payout=bp_pay, user_payout=user_pay
         )
         thl_lm.create_tx_bp_payment(session, created=wall1.started)
 
diff --git a/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py b/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py
index 9253ff0..cd6ea79 100644
--- a/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py
+++ b/tests/managers/thl/test_ledger/test_thl_lm_tx__user_payouts.py
@@ -1,5 +1,5 @@
 import logging
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
@@ -12,7 +12,6 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
 from generalresearch.models.thl.payout import UserPayoutEvent
 from generalresearch.models.thl.user import User
 from generalresearch.models.thl.wallet import PayoutType
-from test_utils.managers.ledger.conftest import create_main_accounts
 
 
 class TestLedgerManagerAMT:
diff --git a/tests/managers/thl/test_ledger/test_thl_pem.py b/tests/managers/thl/test_ledger/test_thl_pem.py
index 5fb9e7d..7a4f0c9 100644
--- a/tests/managers/thl/test_ledger/test_thl_pem.py
+++ b/tests/managers/thl/test_ledger/test_thl_pem.py
@@ -1,6 +1,5 @@
-import uuid
 from random import randint
-from uuid import uuid4, UUID
+from uuid import UUID, uuid4
 
 import pytest
 
@@ -33,7 +32,6 @@ class TestThlPayoutEventManager:
         thl_lm,
         brokerage_product_payout_event_manager,
     ):
-        from generalresearch.models.thl.payout import UserPayoutEvent
 
         N_PRODUCTS = randint(3, 10)
         N_PAYOUT_EVENTS = randint(3, 10)
@@ -73,7 +71,6 @@ class TestThlPayoutEventManager:
         brokerage_product_payout_event_manager,
         thl_lm,
     ):
-        from generalresearch.models.thl.payout import UserPayoutEvent
 
         N_PRODUCTS = randint(3, 10)
         N_PAYOUT_EVENTS = randint(3, 10)
@@ -119,7 +116,6 @@ class TestThlPayoutEventManager:
         description can't be None
         """
         from generalresearch.models.thl.payout import (
-            UserPayoutEvent,
             PayoutType,
         )
 
@@ -174,7 +170,6 @@ class TestThlPayoutEventManager:
         brokerage_product_payout_event_manager,
         lm,
     ):
-        from generalresearch.models.thl.payout import UserPayoutEvent
 
         delete_ledger_db()
         create_main_accounts()
diff --git a/tests/managers/thl/test_ledger/test_user_txs.py b/tests/managers/thl/test_ledger/test_user_txs.py
index b4b0437..f83641e 100644
--- a/tests/managers/thl/test_ledger/test_user_txs.py
+++ b/tests/managers/thl/test_ledger/test_user_txs.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime
 from decimal import Decimal
 from typing import TYPE_CHECKING
 from uuid import uuid4
@@ -8,7 +8,6 @@ from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerMana
 from generalresearch.managers.thl.user_compensate import user_compensate
 from generalresearch.models.thl.definitions import (
     Status,
-    WallAdjustedStatus,
 )
 from generalresearch.models.thl.ledger import (
     TransactionType,
diff --git a/tests/managers/thl/test_ledger/test_wallet.py b/tests/managers/thl/test_ledger/test_wallet.py
index a0abd7c..bb49cd8 100644
--- a/tests/managers/thl/test_ledger/test_wallet.py
+++ b/tests/managers/thl/test_ledger/test_wallet.py
@@ -4,10 +4,10 @@ from uuid import uuid4
 import pytest
 
 from generalresearch.models.thl.product import (
-    UserWalletConfig,
     PayoutConfig,
     PayoutTransformation,
     PayoutTransformationPercentArgs,
+    UserWalletConfig,
 )
 from generalresearch.models.thl.user import User