From 6b4f8d6b8700a65bdf74beb3d95c969a81464a56 Mon Sep 17 00:00:00 2001 From: Max Nanis Date: Tue, 18 Aug 2026 13:14:45 -0700 Subject: build ignore, py-utils replace, typing with Ruff --- tests/models/thl/test_product.py | 127 +++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 59 deletions(-) (limited to 'tests/models/thl/test_product.py') diff --git a/tests/models/thl/test_product.py b/tests/models/thl/test_product.py index 52f60c2..2d20ba1 100644 --- a/tests/models/thl/test_product.py +++ b/tests/models/thl/test_product.py @@ -1,26 +1,39 @@ import os import shutil -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta, timezone from decimal import Decimal -from typing import Optional +from typing import Callable, Optional from uuid import uuid4 import pytest +from dask.distributed import Client as DaskClient from pydantic import ValidationError from generalresearch.currency import USDCent +from generalresearch.incite import GRLDatasets +from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge +from generalresearch.managers.thl.ledger_manager.thl_ledger import ( + ThlLedgerManager, +) +from generalresearch.managers.thl.product import ProductManager from generalresearch.models import Source +from generalresearch.models.gr.business import Business +from generalresearch.models.thl.finance import ProductBalances from generalresearch.models.thl.product import ( - Product, + BrokerageProductPayoutEvent, + BrokerageProductPayoutEventManager, + IntegrationMode, PayoutConfig, PayoutTransformation, + Product, ProfilingConfig, + SourceConfig, SourcesConfig, - IntegrationMode, SupplyConfig, - SourceConfig, SupplyPolicy, ) +from generalresearch.models.thl.session import Session +from generalresearch.models.thl.user import User class TestProduct: @@ -28,11 +41,11 @@ class TestProduct: def test_init(self): # By default, just a Pydantic instance doesn't have an id_int instance = Product.model_validate( - dict( - id="968a9acc79b74b6fb49542d82516d284", - name="test-968a9acc", - redirect_url="https://www.google.com/hey", - ) + obj={ + "id": "968a9acc79b74b6fb49542d82516d284", + "name": "test-968a9acc", + "redirect_url": "https://www.google.com/hey", + } ) assert instance.id_int is None @@ -40,29 +53,31 @@ class TestProduct: # We're not excluding anything here, only in the "*Out" variants assert "id_int" in res - def test_init_db(self, product_manager): + def test_init_db(self, product_manager: ProductManager): # By default, just a Pydantic instance doesn't have an id_int instance = product_manager.create_dummy() assert isinstance(instance.id_int, int) res = instance.model_dump_json() + assert isinstance(res, Product) # we json skip & exclude res = instance.model_dump() + assert isinstance(res, Product) def test_redirect_url(self): p = Product.model_validate( - dict( - id="968a9acc79b74b6fb49542d82516d284", - created="2023-09-21T22:13:09.274672Z", - commission_pct=Decimal("0.05"), - enabled=True, - sources=[{"name": "d", "active": True}], - name="test-968a9acc", - max_session_len=600, - team_id="8b5e94afd8a246bf8556ad9986486baa", - redirect_url="https://www.google.com/hey", - ) + obj={ + "id": "968a9acc79b74b6fb49542d82516d284", + "created": "2023-09-21T22:13:09.274672Z", + "commission_pct": Decimal("0.05"), + "enabled": True, + "sources": [{"name": "d", "active": True}], + "name": "test-968a9acc", + "max_session_len": 600, + "team_id": "8b5e94afd8a246bf8556ad9986486baa", + "redirect_url": "https://www.google.com/hey", + } ) with pytest.raises(expected_exception=ValidationError): @@ -99,14 +114,14 @@ class TestProduct: p.harmonizer_domain = "https://profile.generalresearch.com/" p.harmonizer_domain = "https://profile.generalresearch.com" assert p.harmonizer_domain == "https://profile.generalresearch.com/" - with pytest.raises(expected_exception=Exception): + with pytest.raises(expected_exception=ValueError): p.harmonizer_domain = "" - with pytest.raises(expected_exception=Exception): + with pytest.raises(expected_exception=ValueError): p.harmonizer_domain = None - with pytest.raises(expected_exception=Exception): + with pytest.raises(expected_exception=ValueError): # no https p.harmonizer_domain = "http://profile.generalresearch.com" - with pytest.raises(expected_exception=Exception): + with pytest.raises(expected_exception=ValueError): # "/a" at the end p.harmonizer_domain = "https://profile.generalresearch.com/a" @@ -201,23 +216,29 @@ class TestProduct: assert p.calculate_user_payment( Decimal("0.10"), user_wallet_balance=Decimal(0) ) == Decimal("0.07") + assert p.calculate_user_payment( Decimal("1.05"), user_wallet_balance=Decimal(0) ) == Decimal("0.97") + assert p.calculate_user_payment( Decimal(".05"), user_wallet_balance=Decimal(1) ) == Decimal("0.02") + # final balance will be <0, so pay the full amount assert p.calculate_user_payment( Decimal(".50"), user_wallet_balance=Decimal(-1) ) == p.calculate_user_payment(Decimal("0.50")) + # final balance will be >0, so do the 7c rounding - assert p.calculate_user_payment( + res1 = p.calculate_user_payment( Decimal(".50"), user_wallet_balance=Decimal("-0.10") - ) == ( - p.calculate_user_payment(Decimal(".40"), user_wallet_balance=Decimal(0)) - - Decimal("-0.10") ) + res2 = p.calculate_user_payment( + bp_payout=Decimal(".40"), user_wallet_balance=Decimal(0) + ) + assert res2 + assert res1 == (res2 - Decimal("-0.10")) def test_payout_xform_none(self): p = Product( @@ -568,34 +589,26 @@ class TestProductFinancials: def test_balance( self, - business, - product_factory, - user_factory, - mnt_filepath, - bp_payout_factory, - thl_lm, - lm, - duration, - offset, - thl_redis_config, - start, - thl_web_rr, - brokerage_product_payout_event_manager, - session_with_tx_factory, + business: Business, + product_factory: Callable[..., Product], + user_factory: Callable[..., User], + mnt_filepath: GRLDatasets, + bp_payout_factory: Callable[..., BrokerageProductPayoutEvent], + thl_lm: ThlLedgerManager, + start: datetime, + brokerage_product_payout_event_manager: BrokerageProductPayoutEventManager, + session_with_tx_factory: Callable[..., Session], delete_ledger_db, create_main_accounts, - client_no_amm, + client_no_amm: DaskClient, ledger_collection, - pop_ledger_merge, + pop_ledger_merge: PopLedgerMerge, delete_df_collection, ): delete_ledger_db() create_main_accounts() delete_df_collection(coll=ledger_collection) - from generalresearch.models.thl.product import Product - from generalresearch.models.thl.user import User - from generalresearch.models.thl.finance import ProductBalances from generalresearch.currency import USDCent p1: Product = product_factory(business=business) @@ -759,20 +772,16 @@ class TestProductBalance: def test_inconsistent( self, - product, - mnt_filepath, - thl_lm, - client_no_amm, - thl_redis_config, - brokerage_product_payout_event_manager, + product: Product, + mnt_filepath: GRLDatasets, + thl_lm: ThlLedgerManager, + client_no_amm: DaskClient, delete_ledger_db, create_main_accounts, delete_df_collection, ledger_collection, - business, - user_factory, - product_factory, - session_with_tx_factory, + user_factory: Callable[..., User], + session_with_tx_factory: Callable[..., Session], pop_ledger_merge, start, bp_payout_factory, -- cgit v1.2.3 From 0742210fc7eaa54d8068bfd18414158dc9b33672 Mon Sep 17 00:00:00 2001 From: Max Nanis Date: Tue, 18 Aug 2026 16:35:11 -0700 Subject: Ruff cleanup --- generalresearch/incite/collections/__init__.py | 7 +- generalresearch/models/morning/survey.py | 6 +- test_utils/managers/network/conftest.py | 6 +- tests/models/gr/test_business.py | 11 +-- .../models/legacy/test_offerwall_parse_response.py | 19 +++-- .../models/legacy/test_user_question_answer_in.py | 11 +-- tests/models/morning/test.py | 7 +- tests/models/network/test_nmap.py | 11 +-- tests/models/network/test_rdns.py | 9 ++- tests/models/prodege/test_survey_participation.py | 2 +- tests/models/spectrum/test_survey.py | 2 +- tests/models/test_device.py | 2 - tests/models/test_finance.py | 88 +++++++++------------- tests/models/thl/test_adjustments.py | 85 ++++++++++++++++----- tests/models/thl/test_contest/test_contest.py | 10 ++- .../thl/test_contest/test_leaderboard_contest.py | 5 +- tests/models/thl/test_ledger.py | 18 ++--- tests/models/thl/test_product.py | 59 ++++++--------- tests/models/thl/test_soft_pair.py | 2 +- tests/models/thl/test_user.py | 9 +-- tests/models/thl/test_user_iphistory.py | 2 +- tests/models/thl/test_wall_session.py | 2 +- 22 files changed, 190 insertions(+), 183 deletions(-) (limited to 'tests/models/thl/test_product.py') diff --git a/generalresearch/incite/collections/__init__.py b/generalresearch/incite/collections/__init__.py index ebe774e..17c119a 100644 --- a/generalresearch/incite/collections/__init__.py +++ b/generalresearch/incite/collections/__init__.py @@ -582,10 +582,9 @@ class DFCollectionItem(CollectionItemBase): return self.to_archive(ddf=ddf, is_partial=False, overwrite=overwrite) def clear_corrupt_archive(self): - if self.has_archive(include_empty=False): - if not self.valid_archive(self.path): - LOG.warning(f"invalid archive, deleting: {self.path}") - self.delete_archive(self.path) + if self.has_archive(include_empty=False) and not self.valid_archive(self.path): + LOG.warning(f"invalid archive, deleting: {self.path}") + self.delete_archive(self.path) class DFCollection(CollectionBase): diff --git a/generalresearch/models/morning/survey.py b/generalresearch/models/morning/survey.py index bc71e58..255a63c 100644 --- a/generalresearch/models/morning/survey.py +++ b/generalresearch/models/morning/survey.py @@ -473,7 +473,7 @@ class MorningBid(MorningTaskStatistics): def is_changed(self, other) -> bool: return not self.is_unchanged(other) - def to_mysql(self) -> Dict[str, Any]: + def to_mysql(self) -> dict[str, Any]: d = self.model_dump( mode="json", exclude={ @@ -547,14 +547,14 @@ class MorningBid(MorningTaskStatistics): return False, None, None def determine_eligibility( - self, criteria_evaluation: Dict[str, Optional[bool]] + self, criteria_evaluation: dict[str, Optional[bool]] ) -> Optional[str]: if not self.is_open: return None return self.passes_quotas(criteria_evaluation) def determine_eligibility_soft( - self, criteria_evaluation: Dict[str, Optional[bool]] + self, criteria_evaluation: dict[str, Optional[bool]] ) -> Tuple[Optional[bool], Optional[List[str]], Optional[Set[str]]]: if not self.is_open: return False, None, None diff --git a/test_utils/managers/network/conftest.py b/test_utils/managers/network/conftest.py index c699c93..6c5ea23 100644 --- a/test_utils/managers/network/conftest.py +++ b/test_utils/managers/network/conftest.py @@ -1,5 +1,5 @@ import os -from datetime import timedelta, datetime, timezone +from datetime import datetime, timedelta, timezone from uuid import uuid4 import pytest @@ -10,13 +10,13 @@ from generalresearch.models.network.definitions import IPProtocol from generalresearch.models.network.mtr.parser import parse_mtr_output from generalresearch.models.network.nmap.parser import parse_nmap_xml from generalresearch.models.network.rdns.parser import parse_rdns_output -from generalresearch.models.network.tool_run import NmapRun, Status, RDNSRun, MTRRun +from generalresearch.models.network.tool_run import MTRRun, NmapRun, RDNSRun, Status from generalresearch.models.network.tool_run_command import ( MTRRunCommand, MTRRunCommandOptions, - RDNSRunCommand, NmapRunCommand, NmapRunCommandOptions, + RDNSRunCommand, RDNSRunCommandOptions, ) diff --git a/tests/models/gr/test_business.py b/tests/models/gr/test_business.py index 0b78374..e8bd06a 100644 --- a/tests/models/gr/test_business.py +++ b/tests/models/gr/test_business.py @@ -9,20 +9,14 @@ import pytest # noinspection PyUnresolvedReferences from distributed.utils_test import ( - gen_cluster, client_no_amm, - loop, - loop_in_thread, - cleanup, - cluster_fixture, - client, ) from pytest import approx from generalresearch.currency import USDCent from generalresearch.models.thl.finance import ( - ProductBalances, BusinessBalances, + ProductBalances, ) # from test_utils.incite.conftest import mnt_filepath @@ -669,8 +663,6 @@ class TestBusinessBalance: user_factory, mnt_filepath, bp_payout_factory, - thl_lm, - lm, duration, offset, start, @@ -679,7 +671,6 @@ class TestBusinessBalance: session_with_tx_factory, delete_ledger_db, create_main_accounts, - client_no_amm, ledger_collection, task_adj_collection, pop_ledger_merge, diff --git a/tests/models/legacy/test_offerwall_parse_response.py b/tests/models/legacy/test_offerwall_parse_response.py index 7fb5315..b1c96ad 100644 --- a/tests/models/legacy/test_offerwall_parse_response.py +++ b/tests/models/legacy/test_offerwall_parse_response.py @@ -2,20 +2,20 @@ import json from generalresearch.models import Source from generalresearch.models.legacy.bucket import ( - TopNPlusBucket, - SurveyEligibilityCriterion, + BucketTask, DurationSummary, PayoutSummary, - BucketTask, + SurveyEligibilityCriterion, + TopNPlusBucket, ) class TestOfferwallTopNAndStarwall: def test_45b7228a7(self): from generalresearch.models.legacy.offerwall import ( + StarwallOfferWallResponse, TopNOfferWall, TopNOfferWallResponse, - StarwallOfferWallResponse, ) from tests.models.legacy.data import ( RESPONSE_45b7228a7, @@ -31,8 +31,8 @@ class TestOfferwallTopNAndStarwall: def test_b145b803(self): from generalresearch.models.legacy.offerwall import ( - TopNPlusOfferWallResponse, StarwallPlusOfferWallResponse, + TopNPlusOfferWallResponse, ) from tests.models.legacy.data import ( RESPONSE_b145b803, @@ -44,8 +44,8 @@ class TestOfferwallTopNAndStarwall: def test_d48cce47(self): from generalresearch.models.legacy.offerwall import ( - TopNPlusBlockOfferWallResponse, StarwallPlusBlockOfferWallResponse, + TopNPlusBlockOfferWallResponse, ) from tests.models.legacy.data import ( RESPONSE_b145b803, @@ -62,12 +62,12 @@ class TestOfferwallTopNAndStarwall: def test_1e5f0af8(self): from generalresearch.models.legacy.offerwall import ( - TopNPlusBlockRecontactOfferWallResponse, StarwallPlusBlockRecontactOfferWallResponse, + TopNPlusBlockRecontactOfferWallResponse, ) from tests.models.legacy.data import ( - RESPONSE_d48cce47, RESPONSE_1e5f0af8, + RESPONSE_d48cce47, ) res = json.loads(RESPONSE_1e5f0af8) @@ -149,7 +149,6 @@ class TestMarketplace: from generalresearch.models.legacy.offerwall import ( MarketplaceOfferwallResponse, ) - from tests.models.legacy.data import ( RESPONSE_5fa23085, ) @@ -175,8 +174,8 @@ class TestTimebucks: TimeBucksBlockOfferwallResponse, ) from tests.models.legacy.data import ( - RESPONSE_1705e4f8, RESPONSE_0af0f7ec, + RESPONSE_1705e4f8, ) res = json.loads(RESPONSE_0af0f7ec) diff --git a/tests/models/legacy/test_user_question_answer_in.py b/tests/models/legacy/test_user_question_answer_in.py index 253c46e..224334a 100644 --- a/tests/models/legacy/test_user_question_answer_in.py +++ b/tests/models/legacy/test_user_question_answer_in.py @@ -24,12 +24,12 @@ class TestUserQuestionAnswers: session_factory, utc_hour_ago, ): - from generalresearch.models.thl.session import Session, Wall - from generalresearch.models.thl.user import User from generalresearch.models import Source from generalresearch.models.legacy.questions import ( UserQuestionAnswers, ) + from generalresearch.models.thl.session import Session, Wall + from generalresearch.models.thl.user import User u: User = user_factory(product=product) @@ -161,10 +161,7 @@ class TestUserQuestionAnswers: def test_allow_answer_failures_silent( self, - product_manager, user_manager, - session_manager, - wall_manager, product, user_factory, utc_hour_ago, @@ -176,11 +173,11 @@ class TestUserQuestionAnswers: that one QuestionAnswerIn without "loosing" any of the other QuestionAnswerIn items that they provided. """ - from generalresearch.models.thl.session import Session, Wall - from generalresearch.models.thl.user import User from generalresearch.models.legacy.questions import ( UserQuestionAnswers, ) + from generalresearch.models.thl.session import Session, Wall + from generalresearch.models.thl.user import User u: User = user_factory(product=product) diff --git a/tests/models/morning/test.py b/tests/models/morning/test.py index cf4982d..bedf9c2 100644 --- a/tests/models/morning/test.py +++ b/tests/models/morning/test.py @@ -185,8 +185,11 @@ class TestMorningBid: from generalresearch.models.morning.survey import MorningBid s = MorningBid.model_validate(bid) - d = s.model_dump(mode="json") - d = s.to_mysql() + res = s.model_dump(mode="json") + assert isinstance(res, dict) + + res = s.to_mysql() + assert isinstance(res, dict) def test_manager(self): # todo: credentials n stuff diff --git a/tests/models/network/test_nmap.py b/tests/models/network/test_nmap.py index 0be98d4..a135a13 100644 --- a/tests/models/network/test_nmap.py +++ b/tests/models/network/test_nmap.py @@ -1,20 +1,21 @@ import subprocess -from generalresearch.models.network.definitions import IPProtocol -from generalresearch.models.network.nmap.execute import execute_nmap import faker +from generalresearch.managers.network.tool_run import ToolRunManager +from generalresearch.models.network.definitions import IPProtocol +from generalresearch.models.network.nmap.execute import execute_nmap from generalresearch.models.network.nmap.result import PortState -from generalresearch.models.network.tool_run import ToolName, ToolClass +from generalresearch.models.network.tool_run import ToolClass, ToolName fake = faker.Faker() -def resolve(host): +def resolve(host: str): return subprocess.check_output(["dig", host, "+short"]).decode().strip() -def test_execute_nmap_scanme(toolrun_manager): +def test_execute_nmap_scanme(toolrun_manager: ToolRunManager): ip = resolve("scanme.nmap.org") run = execute_nmap(ip=ip, top_ports=None, ports="20-30", enable_advanced=False) diff --git a/tests/models/network/test_rdns.py b/tests/models/network/test_rdns.py index e56c494..5c3b024 100644 --- a/tests/models/network/test_rdns.py +++ b/tests/models/network/test_rdns.py @@ -1,12 +1,13 @@ -from generalresearch.models.network.rdns.execute import execute_rdns import faker -from generalresearch.models.network.tool_run import ToolName, ToolClass +from generalresearch.managers.network.tool_run import ToolRunManager +from generalresearch.models.network.rdns.execute import execute_rdns +from generalresearch.models.network.tool_run import ToolClass, ToolName fake = faker.Faker() -def test_execute_rdns_grl(toolrun_manager): +def test_execute_rdns_grl(toolrun_manager: ToolRunManager): ip = "65.19.129.53" run = execute_rdns(ip=ip) assert run.tool_name == ToolName.DIG @@ -20,7 +21,7 @@ def test_execute_rdns_grl(toolrun_manager): toolrun_manager.create_rdns_run(run) -def test_execute_rdns_none(toolrun_manager): +def test_execute_rdns_none(toolrun_manager: ToolRunManager): ip = fake.ipv6() run = execute_rdns(ip) result = run.parsed diff --git a/tests/models/prodege/test_survey_participation.py b/tests/models/prodege/test_survey_participation.py index b85cc91..68d7838 100644 --- a/tests/models/prodege/test_survey_participation.py +++ b/tests/models/prodege/test_survey_participation.py @@ -1,4 +1,4 @@ -from datetime import timezone, datetime, timedelta +from datetime import datetime, timedelta, timezone class TestProdegeParticipation: diff --git a/tests/models/spectrum/test_survey.py b/tests/models/spectrum/test_survey.py index 65dec60..b612a63 100644 --- a/tests/models/spectrum/test_survey.py +++ b/tests/models/spectrum/test_survey.py @@ -1,4 +1,4 @@ -from datetime import timezone, datetime +from datetime import datetime, timezone from decimal import Decimal diff --git a/tests/models/test_device.py b/tests/models/test_device.py index 480e0c0..bf72c81 100644 --- a/tests/models/test_device.py +++ b/tests/models/test_device.py @@ -1,5 +1,3 @@ -import pytest - iphone_ua_string = ( "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) " "Version/5.1 Mobile/9B179 Safari/7534.48.3" diff --git a/tests/models/test_finance.py b/tests/models/test_finance.py index 888bf49..bd548b3 100644 --- a/tests/models/test_finance.py +++ b/tests/models/test_finance.py @@ -1,36 +1,36 @@ -from datetime import timezone, timedelta +from datetime import datetime, timedelta, timezone from itertools import product as iter_product from random import randint +from typing import Callable from uuid import uuid4 import pandas as pd import pytest +from dask.distributed import Client as DaskClient # noinspection PyUnresolvedReferences from distributed.utils_test import ( - gen_cluster, client_no_amm, - loop, - loop_in_thread, - cleanup, - cluster_fixture, - client, ) from faker import Faker +from generalresearch.incite.collections.thl_web import LedgerDFCollection +from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge from generalresearch.incite.schemas.mergers.pop_ledger import ( numerical_col_names, ) +from generalresearch.managers.thl.ledger_manager.thl_ledger import ThlLedgerManager from generalresearch.models.thl.finance import ( + BusinessBalances, POPFinancial, ProductBalances, - BusinessBalances, ) -from test_utils.conftest import delete_df_collection +from generalresearch.models.thl.product import Product +from generalresearch.models.thl.session import Session +from generalresearch.models.thl.user import User from test_utils.incite.collections.conftest import ledger_collection from test_utils.incite.mergers.conftest import pop_ledger_merge from test_utils.managers.ledger.conftest import ( - create_main_accounts, session_with_tx_factory, ) @@ -665,20 +665,12 @@ class TestProductFinanceData: def test_base( self, - client_no_amm, - ledger_collection, - pop_ledger_merge, - mnt_filepath, - session_with_tx_factory, - product, - user_factory, - start, - duration, - delete_df_collection, - thl_lm, - create_main_accounts, + product: Product, + user_factory: Callable[..., User], + start: datetime, + duration: timedelta, + thl_lm: ThlLedgerManager, ): - from generalresearch.models.thl.user import User # -- Build & Setup # assert ledger_collection.start is None @@ -687,7 +679,7 @@ class TestProductFinanceData: for item in ledger_collection.items: - for s_idx in range(3): + for _ in range(3): rand_item_time = fake.date_time_between( start_date=item.start, end_date=item.finish, @@ -736,8 +728,8 @@ class TestProductFinanceData: # On this, we can assert all products are the same, and that there are # no overlapping time intervals - assert 1 == len(set(list([i.product_id for i in res]))) - assert len(res) == len(set(list([i.time for i in res]))) + assert 1 == len({i.product_id for i in res}) + assert len(res) == len({i.time for i in res}) @pytest.mark.parametrize( @@ -753,18 +745,16 @@ class TestPOPFinancialData: def test_base( self, - client_no_amm, - ledger_collection, - pop_ledger_merge, - mnt_filepath, - user_factory, - product, - start, - duration, + client_no_amm: DaskClient, + ledger_collection: LedgerDFCollection, + pop_ledger_merge: PopLedgerMerge, + user_factory: Callable[..., User], + product: Product, + start: datetime, + duration: timedelta, create_main_accounts, - session_with_tx_factory, - session_manager, - thl_lm, + session_with_tx_factory: Callable[..., Session], + thl_lm: ThlLedgerManager, delete_df_collection, delete_ledger_db, ): @@ -776,7 +766,7 @@ class TestPOPFinancialData: # assert ledger_collection.offset is None users = [] - for idx in range(5): + for _ in range(5): u = user_factory(product=product) for item in ledger_collection.items: @@ -853,25 +843,19 @@ class TestPOPFinancialData: class TestBusinessBalanceData: def test_from_pandas( self, - client_no_amm, - ledger_collection, - pop_ledger_merge, - user_factory, - product, + client_no_amm: DaskClient, + ledger_collection: LedgerDFCollection, + pop_ledger_merge: PopLedgerMerge, + user_factory: Callable[..., User], + product: Product, create_main_accounts, - session_factory, - thl_lm, - session_manager, - start, + thl_lm: ThlLedgerManager, thl_web_rr, - duration, delete_df_collection, delete_ledger_db, - session_with_tx_factory, - offset, + session_with_tx_factory: Callable[..., Session], rm_ledger_collection, ): - from generalresearch.models.thl.user import User from generalresearch.models.thl.ledger import LedgerAccount delete_ledger_db() @@ -879,7 +863,7 @@ class TestBusinessBalanceData: delete_df_collection(coll=ledger_collection) rm_ledger_collection() - for idx in range(5): + for _ in range(5): u: User = user_factory(product=product, created=ledger_collection.start) for item in ledger_collection.items: 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: @@ -39,14 +43,6 @@ class TestLedgerTransaction: ) assert "Input should be less than 9223372036854775807" in str(cm.value) - with pytest.raises(ValidationError) as cm: - 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, 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 -- cgit v1.2.3