From 5682f48a96b0713929a4bb52e72eec5907d5dd32 Mon Sep 17 00:00:00 2001 From: Max Nanis Date: Mon, 24 Aug 2026 17:12:54 -0700 Subject: pytest fixture annotations, ruf manual edits --- tests/managers/thl/test_ledger/test_thl_lm_tx.py | 14 +-- tests/managers/thl/test_ledger/test_user_txs.py | 23 ++-- tests/managers/thl/test_payout.py | 125 ++++++++++------------ tests/managers/thl/test_survey.py | 8 +- tests/managers/thl/test_user_manager/test_base.py | 30 ++++-- tests/managers/thl/test_user_streak.py | 4 +- tests/managers/thl/test_wall_manager.py | 6 +- 7 files changed, 110 insertions(+), 100 deletions(-) (limited to 'tests/managers') 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 90e5469..6fb0a0f 100644 --- a/tests/managers/thl/test_ledger/test_thl_lm_tx.py +++ b/tests/managers/thl/test_ledger/test_thl_lm_tx.py @@ -1181,7 +1181,7 @@ class TestThlLedgerManagerAdj: thl_lm.create_tx_task_complete(wall=w2, user=user, created=w2.started) status, status_code_1 = s1.determine_session_status() - thl_net, commission_amount, bp_pay, user_pay = s1.determine_payments() + _, _, bp_pay, user_pay = s1.determine_payments() session_manager.finish_with_status( session=s1, status=status, @@ -1251,7 +1251,7 @@ class TestThlLedgerManagerAdj: user=user, created=utc_hour_ago + timedelta(minutes=45), ) - new_status, new_payout, new_user_payout = s1.determine_new_status_and_payouts() + _, _, _ = s1.determine_new_status_and_payouts() s1.adjust_status() thl_lm.create_tx_bp_adjustment(session=s1) assert 380 == thl_lm.get_account_balance(bp_wallet_account) @@ -1261,13 +1261,13 @@ class TestThlLedgerManagerAdj: def test_create_tx_bp_adjustment_small( self, - user_factory, + user_factory: Callable[..., User], product_user_wallet_no, create_main_accounts, delete_ledger_db, - thl_lm, - lm, - utc_hour_ago, + thl_ledger_manager, + ledger_manager, + utc_hour_ago: datetime, currency, ): delete_ledger_db() @@ -1296,7 +1296,7 @@ class TestThlLedgerManagerAdj: session = Session(started=wall1.started, user=user, wall_events=[wall1]) status, status_code_1 = session.determine_session_status() - thl_net, commission_amount, bp_pay, user_pay = session.determine_payments() + _, _, bp_pay, user_pay = session.determine_payments() session.update( status=status, status_code_1=status_code_1, diff --git a/tests/managers/thl/test_ledger/test_user_txs.py b/tests/managers/thl/test_ledger/test_user_txs.py index 881eb03..a6bfa79 100644 --- a/tests/managers/thl/test_ledger/test_user_txs.py +++ b/tests/managers/thl/test_ledger/test_user_txs.py @@ -4,6 +4,7 @@ from decimal import Decimal from typing import TYPE_CHECKING from uuid import uuid4 +from generalresearch.config import GRLBaseSettings from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager from generalresearch.managers.thl.user_compensate import user_compensate from generalresearch.models.thl.definitions import ( @@ -47,7 +48,7 @@ def test_user_txs( s: Session = session_with_tx_factory(user=user, wall_req_cpi=Decimal("1.00")) - bribe_uuid = user_compensate( + user_compensate( ledger_manager=thl_lm, user=user, amount_int=100, @@ -213,13 +214,13 @@ def test_user_txs_rolling_balance( user_factory: Callable[..., User], product_amt_true: Product, create_main_accounts, - thl_lm, - lm, + thl_ledger_manager: ThlLedgerManager, + ledger_manager: LedgerManager, delete_ledger_db: Callable[..., None], session_with_tx_factory, adj_to_fail_with_tx_factory, user_payout_event_manager, - settings: GRLSettings, + settings: GRLBaseSettings, ): """ Creates 3 $1.00 bonuses (postive), @@ -232,11 +233,11 @@ def test_user_txs_rolling_balance( create_main_accounts() user: User = user_factory(product=product_amt_true) - account = thl_lm.get_account_or_create_user_wallet(user) + account = thl_ledger_manager.get_account_or_create_user_wallet(user) for _ in range(3): user_compensate( - ledger_manager=thl_lm, + ledger_manager=thl_ledger_manager, user=user, amount_int=100, skip_flag_check=True, @@ -250,19 +251,19 @@ def test_user_txs_rolling_balance( payout_type=PayoutType.AMT_BONUS, request_data={}, ) - thl_lm.create_tx_user_payout_request( + thl_ledger_manager.create_tx_user_payout_request( user=user, payout_event=pe, ) for _ in range(3): user_compensate( - ledger_manager=thl_lm, + ledger_manager=thl_ledger_manager, user=user, amount_int=100, skip_flag_check=True, ) - txs = thl_lm.get_user_txs(user, page=1, size=10) + txs = thl_ledger_manager.get_user_txs(user, page=1, size=10) assert txs.transactions[0].balance_after == 100 assert txs.transactions[1].balance_after == 200 assert txs.transactions[2].balance_after == 300 @@ -273,7 +274,7 @@ def test_user_txs_rolling_balance( # Ascending order, get 2nd page, make sure the balances include # the previous txs. (will return last 3 txs) - txs = thl_lm.get_user_txs(user, page=2, size=4) + txs = thl_ledger_manager.get_user_txs(user, page=2, size=4) assert len(txs.transactions) == 3 assert txs.transactions[0].balance_after == 250 assert txs.transactions[1].balance_after == 350 @@ -281,7 +282,7 @@ def test_user_txs_rolling_balance( # Descending order, get 1st page. Will # return most recent 3 txs in desc order - txs = thl_lm.get_user_txs(user, page=1, size=3, order_by="-created") + txs = thl_ledger_manager.get_user_txs(user, page=1, size=3, order_by="-created") assert len(txs.transactions) == 3 assert txs.transactions[0].balance_after == 450 assert txs.transactions[1].balance_after == 350 diff --git a/tests/managers/thl/test_payout.py b/tests/managers/thl/test_payout.py index c4f20cd..39bbe6b 100644 --- a/tests/managers/thl/test_payout.py +++ b/tests/managers/thl/test_payout.py @@ -1,6 +1,8 @@ import io import logging import os +from collections.abc import Callable +from dask.distributed import Client as DaskClient from datetime import UTC, datetime, timedelta from decimal import Decimal from random import choice as rand_choice @@ -11,6 +13,7 @@ import pandas as pd import pytest from generalresearch.currency import USDCent +from generalresearch.managers.thl.ledger_manager.ledger import LedgerManager from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager from generalresearch.managers.thl.payout import UserPayoutEventManager from generalresearch.models.thl.definitions import PayoutStatus @@ -21,8 +24,10 @@ from generalresearch.models.thl.payout import ( UserPayoutEvent, ) from generalresearch.models.thl.product import Product +from generalresearch.models.gr.business import Business from generalresearch.models.thl.user import User from generalresearch.models.thl.wallet import PayoutType +from generalresearch.pg_helper import PostgresConfig logger = logging.getLogger() @@ -32,13 +37,13 @@ cashout_method_uuid = uuid4().hex class TestPayout: def test_get_by_uuid_and_create( self, - user, + user: User, user_payout_event_manager: UserPayoutEventManager, - thl_lm, - utc_now, + thl_ledger_manager: ThlLedgerManager, + utc_now: datetime, ): - user_account: LedgerAccount = thl_lm.get_account_or_create_user_wallet( - user=user + user_account: LedgerAccount = ( + thl_ledger_manager.get_account_or_create_user_wallet(user=user) ) pe1: UserPayoutEvent = user_payout_event_manager.create( @@ -58,11 +63,18 @@ class TestPayout: assert pe1 == pe2 - def test_update(self, user, user_payout_event_manager, lm, thl_lm, utc_now): + def test_update( + self, + user: User, + user_payout_event_manager, + ledger_manager: LedgerManager, + thl_ledger_manager: ThlLedgerManager, + utc_now: datetime, + ): from generalresearch.models.thl.definitions import PayoutStatus from generalresearch.models.thl.wallet import PayoutType - user_account = thl_lm.get_account_or_create_user_wallet(user=user) + user_account = thl_ledger_manager.get_account_or_create_user_wallet(user=user) pe1 = user_payout_event_manager.create( status=PayoutStatus.PENDING, @@ -90,15 +102,6 @@ class TestPayout: def test_create_bp_payout( self, - user, - thl_web_rr, - user_payout_event_manager, - lm, - thl_lm, - product, - brokerage_product_payout_event_manager, - delete_ledger_db, - create_main_accounts, ): # create_bp_payout_event does not get called directly. We have tests # for the ledger methods already @@ -107,11 +110,11 @@ class TestPayout: @pytest.fixture def pending_bp_pe( self, - thl_web_rw, - product, + thl_web_rw: PostgresConfig, + product: Product, thl_lm: ThlLedgerManager, brokerage_product_payout_event_manager, - utc_now, + utc_now: datetime, ) -> BrokerageProductPayoutEvent: account = thl_lm.get_account_or_create_bp_wallet(product=product) bp_pe = BrokerageProductPayoutEvent( @@ -140,14 +143,11 @@ class TestPayout: def test_create_bp_payout_quick_dupe( self, - user, - product, - thl_web_rw, + product: Product, brokerage_product_payout_event_manager, - thl_lm, - lm, - utc_now, - create_main_accounts, + thl_lm: ThlLedgerManager, + ledger_manager, + utc_now: datetime, pending_bp_pe, ): thl_lm.get_account_or_create_bp_wallet(product=product) @@ -170,19 +170,18 @@ class TestPayout: def test_filter( self, - thl_web_rw, - thl_lm, - lm, - product, - user, + thl_ledger_manager: ThlLedgerManager, + ledger_manager, + product: Product, + user: User, user_payout_event_manager, - utc_now, + utc_now: datetime, ): from generalresearch.models.thl.definitions import PayoutStatus from generalresearch.models.thl.wallet import PayoutType - user_account = thl_lm.get_account_or_create_user_wallet(user=user) - bp_account = thl_lm.get_account_or_create_bp_wallet(product=product) + user_account = thl_ledger_manager.get_account_or_create_user_wallet(user=user) + bp_account = thl_ledger_manager.get_account_or_create_bp_wallet(product=product) user_payout_event_manager.create( status=PayoutStatus.PENDING, @@ -267,11 +266,10 @@ class TestBusinessPayoutEventManager: self, brokerage_product_payout_event_manager, business_payout_event_manager, - delete_ledger_db, + delete_ledger_db: Callable[..., None], create_main_accounts, - thl_lm, - thl_web_rr, - product_factory, + thl_ledger_manager: ThlLedgerManager, + product_factory: Callable[..., Product], bp_payout_factory, business, ): @@ -279,7 +277,7 @@ class TestBusinessPayoutEventManager: create_main_accounts() p1: Product = product_factory(business=business) - thl_lm.get_account_or_create_bp_wallet(product=p1) + thl_ledger_manager.get_account_or_create_bp_wallet(product=p1) ach_id1 = uuid4().hex ach_id2 = uuid4().hex @@ -315,24 +313,22 @@ class TestBusinessPayoutEventManager: def test_update_ext_reference_ids( self, - brokerage_product_payout_event_manager, business_payout_event_manager, - delete_ledger_db, - create_main_accounts, + delete_ledger_db: Callable[..., None],, + create_main_accounts: Callable[..., None], thl_ledger_manager, - thl_web_rr, - product_factory, - bp_payout_factory, + thl_web_rr: PostgresConfig, + product_factory: Callable[..., Product], delete_df_collection, user_factory, ledger_collection, session_with_tx_factory, pop_ledger_merge, client_no_amm, - mnt_filepath, + mnt_filepath: GRLDataset, product_manager, - start, - business, + start: datetime, + business: Business, ): delete_ledger_db() create_main_accounts() @@ -766,7 +762,6 @@ class TestBusinessPayoutEventManager: thl_lm.get_account_or_create_bp_wallet(product=p3) ach_id1 = uuid4().hex - ach_id2 = uuid4().hex # Product 1: Complete, Payout, Recon.. s1 = session_with_tx_factory( @@ -915,8 +910,8 @@ class TestBusinessPayoutEventManager: self, product, mnt_filepath, - thl_lm, - client_no_amm, + thl_ledger_manager: ThlLedgerManager, + client_no_amm: DaskClient, thl_redis_config, payout_event_manager, brokerage_product_payout_event_manager, @@ -934,7 +929,7 @@ class TestBusinessPayoutEventManager: bp_payout_factory, adj_to_fail_with_tx_factory, thl_web_rr, - lm, + ledger_manager, product_manager, rm_ledger_collection, rm_pop_ledger_merge, @@ -980,7 +975,7 @@ class TestBusinessPayoutEventManager: pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection) business.prebuild_balance( thl_pg_config=thl_web_rr, - lm=lm, + lm=ledger_manager, ds=mnt_filepath, client=client_no_amm, pop_ledger=pop_ledger_merge, @@ -1032,7 +1027,7 @@ class TestBusinessPayoutEventManager: # sent to the Business business.prebuild_balance( thl_pg_config=thl_web_rr, - lm=lm, + lm=ledger_manager, ds=mnt_filepath, client=client_no_amm, pop_ledger=pop_ledger_merge, @@ -1050,11 +1045,9 @@ class TestBusinessPayoutEventManager: def test_ach_tx_id_reference( self, - product, mnt_filepath, - thl_lm, + thl_ledger_manager, client_no_amm, - thl_redis_config, payout_event_manager, brokerage_product_payout_event_manager, business_payout_event_manager, @@ -1062,12 +1055,12 @@ class TestBusinessPayoutEventManager: create_main_accounts, delete_df_collection, ledger_collection, - business, + business: Business, user_factory, product_factory, session_with_tx_factory, pop_ledger_merge, - start, + start: datetime, bp_payout_factory, adj_to_fail_with_tx_factory, thl_web_rr, @@ -1088,9 +1081,9 @@ class TestBusinessPayoutEventManager: u1: User = user_factory(product=p1) u2: User = user_factory(product=p2) u3: User = user_factory(product=p3) - thl_lm.get_account_or_create_bp_wallet(product=p1) - thl_lm.get_account_or_create_bp_wallet(product=p2) - thl_lm.get_account_or_create_bp_wallet(product=p3) + thl_ledger_manager.get_account_or_create_bp_wallet(product=p1) + thl_ledger_manager.get_account_or_create_bp_wallet(product=p2) + thl_ledger_manager.get_account_or_create_bp_wallet(product=p3) ach_id1 = uuid4().hex ach_id2 = uuid4().hex @@ -1102,7 +1095,7 @@ class TestBusinessPayoutEventManager: wall_req_cpi=Decimal("7.50"), started=start + timedelta(days=1, hours=1 + iidx, minutes=1 + idx), ) - payout_event_manager.set_account_lookup_table(thl_lm=thl_lm) + payout_event_manager.set_account_lookup_table(thl_lm=thl_ledger_manager) rm_ledger_collection() rm_pop_ledger_merge() @@ -1121,7 +1114,7 @@ class TestBusinessPayoutEventManager: amount=USDCent(100_01), transaction_id=ach_id1, pm=product_manager, - thl_lm=thl_lm, + thl_lm=thl_ledger_manager, created=start + timedelta(days=2, hours=1), ) @@ -1142,7 +1135,7 @@ class TestBusinessPayoutEventManager: amount=USDCent(100_02), transaction_id=ach_id2, pm=product_manager, - thl_lm=thl_lm, + thl_lm=thl_ledger_manager, created=start + timedelta(days=4, hours=1), ) @@ -1155,7 +1148,7 @@ class TestBusinessPayoutEventManager: pop_ledger_merge.build(client=client_no_amm, ledger_coll=ledger_collection) business.prebuild_payouts( thl_pg_config=thl_web_rr, - thl_lm=thl_lm, + thl_lm=thl_ledger_manager, bpem=business_payout_event_manager, ) business.prebuild_balance( diff --git a/tests/managers/thl/test_survey.py b/tests/managers/thl/test_survey.py index 117a6aa..eec7c3b 100644 --- a/tests/managers/thl/test_survey.py +++ b/tests/managers/thl/test_survey.py @@ -174,9 +174,9 @@ class TestSurvey: qs = sorted(qs, key=lambda x: x.importance.task_count if x.importance else 0) # qd = {q.id: q for q in qs} - q = [x for x in qs if x.ext_question_id == "i:adhoc_13126"][0] + q = next(x for x in qs if x.ext_question_id == "i:adhoc_13126") q.explanation_template = "You have been diagnosed with: {answer}." - q = [x for x in qs if x.ext_question_id == "gr:gender"][0] + q = next(x for x in qs if x.ext_question_id == "gr:gender") q.explanation_template = "Your gender is {answer}." ecs = [] @@ -251,9 +251,9 @@ class TestSurveyStat: survey_stats.append(ss) print(len(survey_stats)) print(survey_stats[12].natural_key, survey_stats[2000].natural_key) - print(f"----a-----: {datetime.now().isoformat()}") + print(f"----a-----: {datetime.now(tz=UTC).isoformat()}") res = surveystat_manager.update_or_create(survey_stats) - print(f"----b-----: {datetime.now().isoformat()}") + print(f"----b-----: {datetime.now(tz=UTC).isoformat()}") assert len(res) == 20_000 return diff --git a/tests/managers/thl/test_user_manager/test_base.py b/tests/managers/thl/test_user_manager/test_base.py index 7d83c11..5235a0f 100644 --- a/tests/managers/thl/test_user_manager/test_base.py +++ b/tests/managers/thl/test_user_manager/test_base.py @@ -5,6 +5,7 @@ from uuid import uuid4 import pytest +from generalresearch.managers.thl.product import ProductManager from generalresearch.managers.thl.user_manager import ( UserCreateNotAllowedError, get_bp_user_create_limit_hourly, @@ -15,8 +16,10 @@ from generalresearch.managers.thl.user_manager.rate_limit import ( from generalresearch.managers.thl.user_manager.user_manager import ( UserManager, ) +from generalresearch.managers.thl.userhealth import AuditLogManager from generalresearch.models.thl.product import Product, UserCreateConfig from generalresearch.models.thl.user import User +from generalresearch.pg_helper import PostgresConfig logger = logging.getLogger() @@ -83,7 +86,7 @@ class TestUserManager: class TestBlockUserManager: - def test_block_user(self, product, user_manager: UserManager): + def test_block_user(self, product: Product, user_manager: UserManager): product_user_id = f"user-{uuid4().hex[:10]}" # mysql_user_manager to skip user creation limit check @@ -109,7 +112,9 @@ class TestBlockUserManager: user = user_manager.get_user(user_id=user.user_id) assert user.blocked - def test_block_user_whitelist(self, product, user_manager, thl_web_rw): + def test_block_user_whitelist( + self, product: Product, user_manager: UserManager, thl_web_rw: PostgresConfig + ): product_user_id = f"user-{uuid4().hex[:10]}" # mysql_user_manager to skip user creation limit check @@ -135,7 +140,12 @@ class TestBlockUserManager: class TestCreateUserManager: - def test_create_user(self, product_manager, thl_web_rw, user_manager): + def test_create_user( + self, + product_manager: ProductManager, + thl_web_rw: PostgresConfig, + user_manager: UserManager, + ): product: Product = product_manager.create_dummy( user_create_config=UserCreateConfig( min_hourly_create_limit=10, max_hourly_create_limit=69 @@ -172,7 +182,9 @@ class TestCreateUserManager: assert u2.user_id == user.user_id assert u2.uuid == user.uuid - def test_create_user_integrity_error(self, product_manager, user_manager, caplog): + def test_create_user_integrity_error( + self, product_manager, user_manager: UserManager, caplog + ): product: Product = product_manager.create_dummy( product_id=uuid4().hex, team_id=uuid4().hex, @@ -213,7 +225,9 @@ class TestCreateUserManager: assert user1 == user2 - def test_raise_allow_user_create(self, product_manager, user_manager): + def test_raise_allow_user_create( + self, product_manager: ProductManager, user_manager: UserManager + ): rand_num = randint(25, 200) product: Product = product_manager.create_dummy( product_id=uuid4().hex, @@ -250,7 +264,7 @@ class TestCreateUserManager: user_manager.user_manager_limiter.storage.clear(key=key) n = 0 - with pytest.raises(expected_exception=UserCreateNotAllowedError) as cm: + with pytest.raises(expected_exception=UserCreateNotAllowedError): for n, _ in enumerate(range(rl_value + 5)): user_manager.user_manager_limiter.raise_allow_user_create( product=product @@ -260,7 +274,9 @@ class TestCreateUserManager: class TestUserManagerMethods: - def test_audit_log(self, user_manager, user, audit_log_manager): + def test_audit_log( + self, user_manager: UserManager, user: User, audit_log_manager: AuditLogManager + ): from generalresearch.models.thl.userhealth import AuditLog res = audit_log_manager.filter_by_user_id(user_id=user.user_id) diff --git a/tests/managers/thl/test_user_streak.py b/tests/managers/thl/test_user_streak.py index be0729c..e87869f 100644 --- a/tests/managers/thl/test_user_streak.py +++ b/tests/managers/thl/test_user_streak.py @@ -192,11 +192,11 @@ def test_user_streak_complete_active(user_streak_manager, user, session_manager) streaks = user_streak_manager.get_user_streaks( user_id=user.user_id, country_iso="us" ) - streak = [ + streak = next( s for s in streaks if s.fulfillment == StreakFulfillment.COMPLETE and s.period == StreakPeriod.DAY - ][0] + ) assert streak == expected_streak # And now they complete today diff --git a/tests/managers/thl/test_wall_manager.py b/tests/managers/thl/test_wall_manager.py index 067a29e..1071627 100644 --- a/tests/managers/thl/test_wall_manager.py +++ b/tests/managers/thl/test_wall_manager.py @@ -233,7 +233,7 @@ class TestWallCacheManager: attempts = wall_cache_manager.get_attempts(user_id=user.user_id) assert len(attempts) == 1 - wall2 = wall_manager.create_dummy( + wall_manager.create_dummy( session_id=session.id, user_id=session.user_id, started=start2, @@ -260,7 +260,7 @@ class TestWallCacheManager: wall_cache_manager.update_attempts_redis_(attempts10000, user_id=user.user_id) session = session_manager.create_dummy(started=start3, user=user) - wall3 = wall_manager.create_dummy( + wall_manager.create_dummy( session_id=session.id, user_id=session.user_id, started=start3, @@ -274,5 +274,5 @@ class TestWallCacheManager: redis_key = wall_cache_manager.get_cache_key_(user_id=user.user_id) assert wall_cache_manager.redis_client.llen(redis_key) == 5000 - assert len(attempts) == 5000 + assert len(attempts) == 5_000 assert attempts[0].req_survey_id == "33333" -- cgit v1.2.3