diff options
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | generalresearch/grliq/models/forensic_summary.py | 4 | ||||
| -rw-r--r-- | generalresearch/managers/thl/ipinfo.py | 1 | ||||
| -rw-r--r-- | generalresearch/models/thl/ledger.py | 4 | ||||
| -rw-r--r-- | generalresearch/models/thl/product.py | 5 | ||||
| -rw-r--r-- | generalresearch/models/thl/session.py | 10 | ||||
| -rw-r--r-- | generalresearch/models/thl/wallet/payout.py | 7 | ||||
| -rw-r--r-- | test_utils/conftest.py | 1 |
8 files changed, 17 insertions, 17 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index f7eefbd..0d920f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { axes { axis { name 'PYTHON_VERSION' - values 'python3.14', 'python3.13', 'python3.12', 'python3.11' + values 'python3.14', 'python3.13', 'python3.12', } } diff --git a/generalresearch/grliq/models/forensic_summary.py b/generalresearch/grliq/models/forensic_summary.py index aaefdfb..b3bbd55 100644 --- a/generalresearch/grliq/models/forensic_summary.py +++ b/generalresearch/grliq/models/forensic_summary.py @@ -215,10 +215,10 @@ class CountryRTTDistribution(BaseModel): ) # we could split by this optionally - user_type: UserType | None = Field( + user_type: AccessType | None = Field( default=None, description="user_type of the client_ip as determined by MaxMind", - examples=[UserType.RESIDENTIAL], + examples=[AccessType.RESIDENTIAL], ) rtt_min: float = Field(gt=0, examples=[133.332]) diff --git a/generalresearch/managers/thl/ipinfo.py b/generalresearch/managers/thl/ipinfo.py index 496fe3e..90757a2 100644 --- a/generalresearch/managers/thl/ipinfo.py +++ b/generalresearch/managers/thl/ipinfo.py @@ -5,7 +5,6 @@ from collections.abc import Collection from decimal import Decimal import faker -import pymysql from grip_client.enums import AccessType from more_itertools import chunked from psycopg import Cursor diff --git a/generalresearch/models/thl/ledger.py b/generalresearch/models/thl/ledger.py index 2b25d2e..518e390 100644 --- a/generalresearch/models/thl/ledger.py +++ b/generalresearch/models/thl/ledger.py @@ -340,8 +340,8 @@ class LedgerTransaction(BaseModel): ), "ledger entries must balance" return entries - def model_dump_mysql(self, *args, **kwargs) -> dict[str, Any]: - d = self.model_dump(mode="json", *args, **kwargs) + def model_dump_mysql(self) -> dict[str, Any]: + d = self.model_dump(mode="json") if "created" in d: d["created"] = self.created.replace(tzinfo=None) return d diff --git a/generalresearch/models/thl/product.py b/generalresearch/models/thl/product.py index 65ed177..83955a6 100644 --- a/generalresearch/models/thl/product.py +++ b/generalresearch/models/thl/product.py @@ -1396,8 +1396,9 @@ class Product(BaseModel, validate_assignment=True): # --- ORM --- - def model_dump_mysql(self, *args, **kwargs) -> dict[str, Any]: - d = self.model_dump(mode="json", *args, **kwargs) + def model_dump_mysql(self) -> dict[str, Any]: + d = self.model_dump(mode="json") + assert self.created if "created" in d: d["created"] = self.created.replace(tzinfo=None) diff --git a/generalresearch/models/thl/session.py b/generalresearch/models/thl/session.py index 5653526..31dc668 100644 --- a/generalresearch/models/thl/session.py +++ b/generalresearch/models/thl/session.py @@ -445,9 +445,9 @@ class Wall(WallBase): d = self.model_dump(mode="json", exclude={"elapsed"}) return json.dumps(d) - def model_dump_mysql(self, *args, **kwargs) -> dict[str, Any]: + def model_dump_mysql(self) -> dict[str, Any]: # Generate a dictionary representation of the model, with special handling for datetimes - d = self.model_dump(mode="json", exclude={"elapsed"}, *args, **kwargs) + d = self.model_dump(mode="json", exclude={"elapsed"}) d["started"] = self.started.replace(tzinfo=None) if self.finished: d["finished"] = self.finished.replace(tzinfo=None) @@ -816,14 +816,12 @@ class Session(BaseModel): self.model_config["validate_assignment"] = True self.__class__.model_validate(self) - def model_dump_mysql( - self, *args, **kwargs - ) -> dict[str, str | int | datetime | float | None]: + def model_dump_mysql(self) -> dict[str, str | int | datetime | float | None]: # Generate a dictionary representation of the model, with special # handling for datetimes, and nested models such as User & Bucket - d = self.model_dump(mode="json", *args, **kwargs) + d = self.model_dump(mode="json") d["started"] = self.started.replace(tzinfo=None) if self.finished: diff --git a/generalresearch/models/thl/wallet/payout.py b/generalresearch/models/thl/wallet/payout.py index 42530b3..d43807d 100644 --- a/generalresearch/models/thl/wallet/payout.py +++ b/generalresearch/models/thl/wallet/payout.py @@ -129,13 +129,16 @@ class PayoutEvent(BaseModel, validate_assignment=True): else: raise ValueError("this shouldn't happen") - def model_dump_mysql(self, *args, **kwargs) -> dict[str, Any]: - d = self.model_dump(mode="json", *args, **kwargs) + def model_dump_mysql(self) -> dict[str, Any]: + d = self.model_dump(mode="json") + if "created" in d: d["created"] = self.created.replace(tzinfo=None) if d.get("request_data") is not None: d["request_data"] = json.dumps(self.request_data) if d.get("order_data") is not None: + assert self.order_data + if isinstance(self.order_data, dict): d["order_data"] = json.dumps(self.order_data) else: diff --git a/test_utils/conftest.py b/test_utils/conftest.py index 757f141..af78738 100644 --- a/test_utils/conftest.py +++ b/test_utils/conftest.py @@ -233,7 +233,6 @@ def django_db_factory( _ran = {} import django - from django.apps import apps from django.conf import settings as django_settings from django.core.management import call_command |